Skip to content

Commit 5e86bda

Browse files
authored
Update dependency eslint to v8 (#248)
* Update dependency eslint to v8 * fix * fix
1 parent f89a2c0 commit 5e86bda

File tree

10 files changed

+286
-259
lines changed

10 files changed

+286
-259
lines changed

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Lint docs
2626
run: yarn lint:docs
2727
test:
28-
name: 'Test for ESLint 7 on Node.js ${{ matrix.node }} OS: ${{matrix.os}}'
28+
name: 'Test for ESLint 8 on Node.js ${{ matrix.node }} OS: ${{matrix.os}}'
2929
runs-on: ${{ matrix.os }}
3030
strategy:
3131
matrix:
@@ -52,7 +52,7 @@ jobs:
5252
strategy:
5353
matrix:
5454
os: [ubuntu-latest]
55-
eslint: [5, 6, 8]
55+
eslint: [5, 6, 7]
5656
node: [14]
5757
steps:
5858
- name: Checkout
@@ -64,7 +64,7 @@ jobs:
6464
- name: Install
6565
run: yarn add eslint@${{ matrix.eslint }}
6666
- name: Install ts-eslint v5
67-
run: yarn add @typescript-eslint/parser@5 @typescript-eslint/eslint-plugin@5
68-
if: matrix.eslint == 8
67+
run: yarn add @typescript-eslint/parser@4 @typescript-eslint/eslint-plugin@4
68+
if: matrix.eslint == 5
6969
- name: Test
7070
run: yarn test

docs/.vuepress/components/eslint-code-block.vue

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
v-model="code"
88
:style="{ height }"
99
class="eslint-code-block"
10-
:filename="resplvedFilename"
10+
:filename="'/path/' + resplvedFilename"
1111
:language="language"
1212
dark
1313
:format="format"
@@ -17,7 +17,6 @@
1717
</template>
1818

1919
<script>
20-
import './setup'
2120
import EslintEditor from 'vue-eslint-editor'
2221
import { rules } from '../../../'
2322
import { setTimeouts } from '../../../dist/utils/default-timeouts'
@@ -194,22 +193,19 @@ export default {
194193
})
195194
// Load linter.
196195
const [
197-
{ default: Linter },
198-
{ default: coreRules },
196+
{ Linter },
199197
vueESLintParser,
200198
jsoncESLintParser,
201199
yamlESLintParser
202200
] = await Promise.all([
203-
import('eslint4b/dist/linter'),
204-
import('eslint4b/dist/core-rules'),
201+
import('eslint'),
205202
import('espree').then(() => import('vue-eslint-parser')),
206203
import('espree').then(() => import('jsonc-eslint-parser')),
207204
import('yaml-eslint-parser')
208205
])
209206
210207
const linter = (this.linter = new Linter({ cwd: '/path' }))
211208
212-
linter.defineRules(coreRules)
213209
for (const ruleId of Object.keys(rules)) {
214210
linter.defineRule(`@intlify/vue-i18n/${ruleId}`, rules[ruleId])
215211
}

docs/.vuepress/components/resource-group.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export default {
1414
return {
1515
$resourceGroup: {
1616
async set(fileName, code) {
17-
Vue.set(data.fileContents, fileName, code)
17+
Vue.set(data.fileContents, '/path/' + fileName, code)
1818
1919
const timeSeq = ++waitSeq
2020
await Vue.nextTick()

docs/.vuepress/components/setup.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

docs/.vuepress/config.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ module.exports = {
1717
alias: {
1818
module: require.resolve('./shim/module'),
1919
glob: require.resolve('./shim/glob'),
20-
eslint: path.resolve(__dirname, './shim/eslint'),
20+
eslint$: path.resolve(__dirname, './shim/eslint'),
21+
'@eslint/eslintrc/universal': path.resolve(
22+
__dirname,
23+
'../../node_modules/@eslint/eslintrc/dist/eslintrc-universal.cjs'
24+
),
2125
'@eslint/eslintrc$': path.resolve(
2226
__dirname,
2327
'./shim/@eslint/eslintrc'

docs/.vuepress/enhanceApp.js

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
export default (
2+
// eslint-disable-next-line no-empty-pattern
3+
{
4+
// Vue, // the version of Vue being used in the VuePress app
5+
// options, // the options for the root Vue instance
6+
// router, // the router instance for the app
7+
// siteData, // site metadata
8+
}
9+
) => {
10+
if (typeof window !== 'undefined') {
11+
if (typeof window.process === 'undefined') {
12+
window.process = new Proxy(
13+
{
14+
env: {},
15+
cwd: () => undefined
16+
},
17+
{
18+
get(target, name) {
19+
// For debug
20+
console.log(name)
21+
return target[name]
22+
}
23+
}
24+
)
25+
}
26+
}
27+
}

docs/.vuepress/shim/eslint/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
import { SourceCode } from '../../../../node_modules/eslint/lib/source-code'
2-
export { SourceCode }
1+
export { Linter } from 'eslint/lib/linter/linter.js'
2+
export { SourceCode } from 'eslint/lib/source-code/index.js'

docs/.vuepress/shim/fs/fake-fs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export function existsSync(filename) {
1010
return Boolean(files[filename]) || filename === '.'
1111
}
1212
export function readFileSync(filename) {
13-
return files[filename] || ''
13+
return files[filename] || files[filename.replace(/^\/path\//, '')] || ''
1414
}
1515

1616
// utility

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
}
2525
},
2626
"dependencies": {
27-
"@eslint/eslintrc": "^0.4.2",
27+
"@eslint/eslintrc": "^1.0.3",
2828
"@intlify/message-compiler": "^9.1.6",
2929
"@intlify/message-resolver": "^9.1.6",
3030
"debug": "^4.3.1",
@@ -50,9 +50,9 @@
5050
"@types/mocha": "^8.0.1",
5151
"@types/parse5": "^6.0.0",
5252
"@types/semver": "^7.3.4",
53-
"@typescript-eslint/eslint-plugin": "^4.10.0",
54-
"@typescript-eslint/parser": "^4.10.0",
55-
"eslint": "^5.15.0 || ^6.0.0 || ^7.0.0",
53+
"@typescript-eslint/eslint-plugin": "^5.2.0",
54+
"@typescript-eslint/parser": "^5.2.0",
55+
"eslint": "^8.1.0",
5656
"eslint-config-prettier": "^8.0.0",
5757
"eslint-plugin-markdown": "^2.0.0",
5858
"eslint-plugin-prettier": "^4.0.0",
@@ -71,7 +71,7 @@
7171
"typescript": "^4.3.2",
7272
"vue-eslint-editor": "^1.1.0",
7373
"vue-github-button": "^1.2.0",
74-
"vuepress": "^1.5.2"
74+
"vuepress": "^1.8.2"
7575
},
7676
"engines": {
7777
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -95,7 +95,7 @@
9595
"license": "MIT",
9696
"main": "dist/index.js",
9797
"peerDependencies": {
98-
"eslint": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
98+
"eslint": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
9999
},
100100
"repository": {
101101
"type": "git",

0 commit comments

Comments
 (0)