From 16eda0536e6100fd4ad92c327e3a73fab2889f9e Mon Sep 17 00:00:00 2001 From: yosuke ota Date: Mon, 11 Oct 2021 11:00:38 +0900 Subject: [PATCH 1/3] Change peer deps eslint ver from `^6.2.0 || ^7.0.0 || ^8.0.0-0` to `^6.2.0 || ^7.0.0 || ^8.0.0` and change to use ESLint v8. --- docs/.eslintrc.js | 7 +++++ .../components/eslint-code-block.vue | 12 +++----- docs/.vuepress/config.js | 10 ++++++- docs/.vuepress/enhanceApp.js | 28 +++++++++++++++++++ docs/.vuepress/shim/eslint.js | 4 +++ docs/.vuepress/shim/eslint/index.js | 2 -- docs/.vuepress/shim/eslint/lib/rules/index.js | 0 package.json | 17 ++++++----- 8 files changed, 60 insertions(+), 20 deletions(-) create mode 100644 docs/.eslintrc.js create mode 100644 docs/.vuepress/enhanceApp.js create mode 100644 docs/.vuepress/shim/eslint.js delete mode 100644 docs/.vuepress/shim/eslint/index.js delete mode 100644 docs/.vuepress/shim/eslint/lib/rules/index.js diff --git a/docs/.eslintrc.js b/docs/.eslintrc.js new file mode 100644 index 000000000..1ec3b7eae --- /dev/null +++ b/docs/.eslintrc.js @@ -0,0 +1,7 @@ +'use strict' + +module.exports = { + parserOptions: { + sourceType: 'module' + } +} diff --git a/docs/.vuepress/components/eslint-code-block.vue b/docs/.vuepress/components/eslint-code-block.vue index 3c37c9234..2c6abd2cc 100644 --- a/docs/.vuepress/components/eslint-code-block.vue +++ b/docs/.vuepress/components/eslint-code-block.vue @@ -122,20 +122,16 @@ export default { async mounted() { // Load linter. - const [{ default: Linter }, { default: coreRules }, { parseForESLint }] = - await Promise.all([ - import('eslint4b/dist/linter'), - import('eslint4b/dist/core-rules'), - import('espree').then(() => import('vue-eslint-parser')) - ]) + const [{ Linter }, { parseForESLint }] = await Promise.all([ + import('eslint/lib/linter'), + import('espree').then(() => import('vue-eslint-parser')) + ]) const linter = (this.linter = new Linter()) for (const ruleId of Object.keys(rules)) { linter.defineRule(`vue/${ruleId}`, rules[ruleId]) } - linter.defineRule('no-undef', coreRules['no-undef']) - linter.defineRule('no-unused-vars', coreRules['no-unused-vars']) linter.defineParser('vue-eslint-parser', { parseForESLint }) } diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js index c0a406166..5bcb7913b 100644 --- a/docs/.vuepress/config.js +++ b/docs/.vuepress/config.js @@ -124,7 +124,15 @@ module.exports = { resolve: { alias: { module: require.resolve('./shim/module'), - eslint: path.resolve(__dirname, './shim/eslint') + eslint$: require.resolve('./shim/eslint'), + esquery: path.resolve( + __dirname, + '../../node_modules/esquery/dist/esquery.min.js' + ), + '@eslint/eslintrc/universal': path.resolve( + __dirname, + '../../node_modules/@eslint/eslintrc/dist/eslintrc-universal.cjs' + ) } } } diff --git a/docs/.vuepress/enhanceApp.js b/docs/.vuepress/enhanceApp.js new file mode 100644 index 000000000..dc7e30771 --- /dev/null +++ b/docs/.vuepress/enhanceApp.js @@ -0,0 +1,28 @@ +/* globals window */ +export default ( + // eslint-disable-next-line no-empty-pattern + { + // Vue, // the version of Vue being used in the VuePress app + // options, // the options for the root Vue instance + // router, // the router instance for the app + // siteData, // site metadata + } +) => { + if (typeof window !== 'undefined') { + if (typeof window.process === 'undefined') { + window.process = new Proxy( + { + env: {}, + cwd: () => undefined + }, + { + get(target, name) { + // For debug + // console.log(name) + return target[name] + } + } + ) + } + } +} diff --git a/docs/.vuepress/shim/eslint.js b/docs/.vuepress/shim/eslint.js new file mode 100644 index 000000000..08af6dfcd --- /dev/null +++ b/docs/.vuepress/shim/eslint.js @@ -0,0 +1,4 @@ +const { Linter } = require('eslint/lib/linter') +module.exports = { + Linter +} diff --git a/docs/.vuepress/shim/eslint/index.js b/docs/.vuepress/shim/eslint/index.js deleted file mode 100644 index e32cb598f..000000000 --- a/docs/.vuepress/shim/eslint/index.js +++ /dev/null @@ -1,2 +0,0 @@ -const Linter = require('eslint4b') -module.exports = { Linter } diff --git a/docs/.vuepress/shim/eslint/lib/rules/index.js b/docs/.vuepress/shim/eslint/lib/rules/index.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/package.json b/package.json index 16e6ead6e..f41bb4360 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "node": ">=8.10" }, "peerDependencies": { - "eslint": "^6.2.0 || ^7.0.0 || ^8.0.0-0" + "eslint": "^6.2.0 || ^7.0.0 || ^8.0.0" }, "dependencies": { "eslint-utils": "^2.1.0", @@ -60,7 +60,7 @@ "vue-eslint-parser": "^7.10.0" }, "devDependencies": { - "@types/eslint": "^7.2.0", + "@types/eslint": "^7.28.1", "@types/eslint-visitor-keys": "^1.0.0", "@types/natural-compare": "^1.4.0", "@types/node": "^13.13.5", @@ -69,20 +69,19 @@ "@vuepress/plugin-pwa": "^1.4.1", "acorn": "^8.5.0", "env-cmd": "^10.1.0", - "eslint": "^7.0.0", + "eslint": "^8.0.0", "eslint-config-prettier": "^6.11.0", "eslint-plugin-eslint-plugin": "^3.5.3", "eslint-plugin-import": "^2.20.2", "eslint-plugin-prettier": "^3.1.3", "eslint-plugin-vue": "file:.", - "eslint4b": "^7.0.0", + "lodash": "^4.17.21", "espree": "^9.0.0", - "lodash": "^4.17.15", "mocha": "^7.1.2", - "nyc": "^15.0.1", - "prettier": "^2.1.1", - "typescript": "^4.3.4", + "nyc": "^15.1.0", + "prettier": "^2.4.1", + "typescript": "^4.4.3", "vue-eslint-editor": "^1.1.0", - "vuepress": "^1.4.1" + "vuepress": "^1.8.2" } } From aebecb34ad2287000e6bdb65089eae14571bffc3 Mon Sep 17 00:00:00 2001 From: yosuke ota Date: Mon, 11 Oct 2021 11:10:19 +0900 Subject: [PATCH 2/3] update --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7d8f4bcde..7ecc73606 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -62,9 +62,9 @@ jobs: command: npm version - checkout - run: - name: Install @typescript-eslint/parser@4 + name: Install eslint@7 and @typescript-eslint/parser@4 command: | - npm install @typescript-eslint/parser@^4 + npm install eslint@7 @typescript-eslint/parser@^4 - run: name: Install dependencies command: npm install From bc8486278934d697cc1de12d5edd88f119798384 Mon Sep 17 00:00:00 2001 From: yosuke ota Date: Mon, 11 Oct 2021 11:13:25 +0900 Subject: [PATCH 3/3] update --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f41bb4360..37075adcf 100644 --- a/package.json +++ b/package.json @@ -75,8 +75,8 @@ "eslint-plugin-import": "^2.20.2", "eslint-plugin-prettier": "^3.1.3", "eslint-plugin-vue": "file:.", - "lodash": "^4.17.21", "espree": "^9.0.0", + "lodash": "^4.17.21", "mocha": "^7.1.2", "nyc": "^15.1.0", "prettier": "^2.4.1",