Merge branch 'master' into 37-full-text-search-top-bar

This commit is contained in:
mattwr18 2019-03-13 22:52:49 -03:00 committed by GitHub
commit 53bd169945
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 396 additions and 999 deletions

View File

@ -47,7 +47,6 @@
"apollo-client": "~2.5.1", "apollo-client": "~2.5.1",
"cookie-universal-nuxt": "~2.0.14", "cookie-universal-nuxt": "~2.0.14",
"cross-env": "~5.2.0", "cross-env": "~5.2.0",
"cypress": "^3.1.5",
"date-fns": "2.0.0-alpha.27", "date-fns": "2.0.0-alpha.27",
"express": "~4.16.4", "express": "~4.16.4",
"graphql": "~14.1.1", "graphql": "~14.1.1",
@ -74,14 +73,14 @@
"@vue/test-utils": "~1.0.0-beta.29", "@vue/test-utils": "~1.0.0-beta.29",
"babel-core": "~7.0.0-bridge.0", "babel-core": "~7.0.0-bridge.0",
"babel-eslint": "~10.0.1", "babel-eslint": "~10.0.1",
"babel-jest": "~24.3.1", "babel-jest": "~24.5.0",
"cypress-cucumber-preprocessor": "~1.11.0", "cypress-cucumber-preprocessor": "~1.11.0",
"eslint": "~5.15.1", "eslint": "~5.15.1",
"eslint-config-prettier": "~3.6.0", "eslint-config-prettier": "~3.6.0",
"eslint-loader": "~2.1.2", "eslint-loader": "~2.1.2",
"eslint-plugin-prettier": "~3.0.1", "eslint-plugin-prettier": "~3.0.1",
"eslint-plugin-vue": "~5.2.2", "eslint-plugin-vue": "~5.2.2",
"jest": "~24.1.0", "jest": "~24.5.0",
"node-sass": "~4.11.0", "node-sass": "~4.11.0",
"nodemon": "~1.18.10", "nodemon": "~1.18.10",
"prettier": "~1.14.3", "prettier": "~1.14.3",

1390
yarn.lock

File diff suppressed because it is too large Load Diff