From 3183cf7f4e0074d46523c2caaa459e8df2b8c4d4 Mon Sep 17 00:00:00 2001 From: Guillaume Chau Date: Tue, 12 Nov 2019 20:18:28 +0100 Subject: [PATCH] test: fix --- packages/test-e2e/.eslintignore | 2 +- packages/test-e2e/package.json | 2 ++ packages/test-e2e/src/vue-apollo.js | 2 +- packages/test-ssr/.eslintignore | 2 ++ packages/test-ssr/.eslintrc.js | 16 ++++++++-------- packages/test-ssr/package.json | 2 +- packages/test-ssr/vue.config.js | 12 ++++++++++++ packages/vue-apollo/.eslintignore | 1 - 8 files changed, 27 insertions(+), 12 deletions(-) create mode 100644 packages/test-ssr/.eslintignore diff --git a/packages/test-e2e/.eslintignore b/packages/test-e2e/.eslintignore index fe70f70..5a4d3e9 100644 --- a/packages/test-e2e/.eslintignore +++ b/packages/test-e2e/.eslintignore @@ -1,2 +1,2 @@ schema.graphql -../../ +dist/ diff --git a/packages/test-e2e/package.json b/packages/test-e2e/package.json index 598432e..ffec48d 100644 --- a/packages/test-e2e/package.json +++ b/packages/test-e2e/package.json @@ -20,6 +20,7 @@ "marked": "^0.7.0", "shortid": "^2.2.8", "vue": "^2.5.16", + "vue-apollo": "^3.0.0", "vue-router": "^3.0.1", "vuex": "^3.0.1" }, @@ -29,6 +30,7 @@ "@vue/cli-plugin-eslint": "^4.0.4", "@vue/cli-service": "^4.0.4", "@vue/eslint-config-standard": "^4.0.0", + "babel-eslint": "^10.0.3", "eslint": "^4.19.1", "eslint-plugin-graphql": "^3.1.0", "eslint-plugin-vue": "^5.2.3", diff --git a/packages/test-e2e/src/vue-apollo.js b/packages/test-e2e/src/vue-apollo.js index db9f3f4..c4f7f8a 100644 --- a/packages/test-e2e/src/vue-apollo.js +++ b/packages/test-e2e/src/vue-apollo.js @@ -1,5 +1,5 @@ import Vue from 'vue' -import VueApollo from '../../../' +import VueApollo from 'vue-apollo' import { createApolloClient, restartWebsockets } from 'vue-cli-plugin-apollo/graphql-client' import { print } from 'graphql' diff --git a/packages/test-ssr/.eslintignore b/packages/test-ssr/.eslintignore new file mode 100644 index 0000000..5a4d3e9 --- /dev/null +++ b/packages/test-ssr/.eslintignore @@ -0,0 +1,2 @@ +schema.graphql +dist/ diff --git a/packages/test-ssr/.eslintrc.js b/packages/test-ssr/.eslintrc.js index 062740a..acd8d32 100644 --- a/packages/test-ssr/.eslintrc.js +++ b/packages/test-ssr/.eslintrc.js @@ -13,14 +13,14 @@ module.exports = { rules: { 'no-console': 'off', 'no-debugger': 'off', - 'graphql/template-strings': [ - 'error', - { - env: 'literal', - projectName: 'app', - schemaJsonFilepath: 'node_modules/.temp/graphql/schema.json' - } - ] + // 'graphql/template-strings': [ + // 'error', + // { + // env: 'literal', + // projectName: 'app', + // schemaJsonFilepath: 'node_modules/.temp/graphql/schema.json' + // } + // ] }, parserOptions: { diff --git a/packages/test-ssr/package.json b/packages/test-ssr/package.json index 76e5f61..60dbacb 100644 --- a/packages/test-ssr/package.json +++ b/packages/test-ssr/package.json @@ -29,7 +29,7 @@ "mkdirp": "^0.5.1", "shortid": "^2.2.8", "vue": "^2.6.10", - "vue-apollo": "^3.0.0-beta.11", + "vue-apollo": "^3.0.0", "vue-router": "^3.0.6", "vue-server-renderer": "^2.6.0" }, diff --git a/packages/test-ssr/vue.config.js b/packages/test-ssr/vue.config.js index 5dc4bb4..8b19059 100644 --- a/packages/test-ssr/vue.config.js +++ b/packages/test-ssr/vue.config.js @@ -1,8 +1,20 @@ +/** @type {import('@vue/cli-service').ProjectOptions} */ module.exports = { pluginOptions: { apollo: { enableMocks: false, enableEngine: false } + }, + + chainWebpack (config) { + config.resolve.symlinks(false) + config.externals([ + 'utf-8-validate', + 'bufferutil' + ]) + config.module.noParse([ + /iconv-loader/ + ]) } } diff --git a/packages/vue-apollo/.eslintignore b/packages/vue-apollo/.eslintignore index 06db850..ab88bd3 100644 --- a/packages/vue-apollo/.eslintignore +++ b/packages/vue-apollo/.eslintignore @@ -1,4 +1,3 @@ node_modules/ dist/ -tests/ schema.graphql