Merge branch 'dev'

This commit is contained in:
les
2019-09-11 21:21:47 +02:00
66 changed files with 1053 additions and 896 deletions

View File

@@ -5,9 +5,9 @@
"author": "lesion",
"scripts": {
"dev:nuxt": "cross-env NODE_ENV=development nuxt dev",
"dev": "cross-env DEBUG=fediverse:* NODE_ENV=development nuxt",
"dev": "cross-env DEBUG=*,-babel,-follow-redirects,-send,-body-parser:*,-express:*,-connect:*,-sequelize:* NODE_ENV=development node server/index.js",
"build": "nuxt build",
"start": "cross-env sequelize db:migrate && NODE_ENV=production node server/cli.js",
"start": "cross-env NODE_ENV=production node server/cli.js",
"lint": "eslint --ext .js,.vue --ignore-path .gitignore .",
"doc": "cd docs && bundle exec jekyll b",
"doc:dev": "cd docs && bundle exec jekyll s --drafts",
@@ -37,7 +37,7 @@
".nuxt/"
],
"dependencies": {
"@nuxtjs/auth": "^4.8.2",
"@nuxtjs/auth": "^4.8.3",
"@nuxtjs/axios": "^5.6.0",
"accept-language": "^3.0.18",
"axios": "^0.19.0",
@@ -51,9 +51,10 @@
"cross-env": "^5.2.1",
"dayjs": "^1.8.16",
"element-ui": "^2.12.0",
"email-templates": "^6.0.0",
"email-templates": "^6.0.2",
"express": "^4.17.1",
"express-jwt": "^5.3.1",
"express-middleware-log": "^1.2.0",
"http-signature": "^1.2.0",
"ics": "^2.16.0",
"inquirer": "^7.0.0",
@@ -68,10 +69,11 @@
"nuxt-express-module": "^0.0.11",
"pg": "^7.12.1",
"sass-loader": "^8.0.0",
"sequelize": "^5.18.1",
"sequelize": "^5.18.4",
"sequelize-cli": "^5.5.1",
"sharp": "^0.23.0",
"sqlite3": "^4.1.0",
"url": "^0.11.0",
"v-calendar": "^1.0.0-beta.14",
"vue-awesome": "^3.5.3",
"vue-clipboard2": "^0.3.1",
@@ -82,7 +84,7 @@
"@nuxtjs/eslint-config": "^1.1.2",
"babel-eslint": "^10.0.3",
"eslint": "^6.3.0",
"eslint-config-prettier": "^6.2.0",
"eslint-config-prettier": "^6.3.0",
"eslint-config-standard": ">=14.1.0",
"eslint-loader": "^3.0.0",
"eslint-plugin-import": ">=2.17.3",