Skip to content

Commit b30dbed

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents c7dcaca + 3e122e5 commit b30dbed

File tree

4 files changed

+33
-19
lines changed

4 files changed

+33
-19
lines changed

tests/integrations/eslint-plugin-import.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ describe('Integration with eslint-plugin-import', () => {
3535
return
3636
}
3737

38-
cp.execSync(`${ESLINT} a.vue`, { cwd: PLUGIN_DIR, stdio: 'inherit' })
38+
cp.execSync(`${ESLINT} --config eslint.config.mjs a.vue`, {
39+
cwd: PLUGIN_DIR,
40+
stdio: 'inherit'
41+
})
3942
})
4043
})

tests/integrations/eslint-plugin-import/.eslintrc.json

Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import vueEslintParser from 'vue-eslint-parser'
2+
import eslintPluginImport from 'eslint-plugin-import'
3+
import eslintPluginVue from 'eslint-plugin-vue'
4+
5+
export default [
6+
{
7+
files: ['*.vue'],
8+
languageOptions: {
9+
parser: vueEslintParser,
10+
parserOptions: {
11+
sourceType: 'module',
12+
ecmaVersion: 2015
13+
}
14+
},
15+
plugins: {
16+
import: eslintPluginImport,
17+
vue: eslintPluginVue
18+
},
19+
rules: {
20+
'import/default': 'warn',
21+
'import/namespace': 'warn'
22+
},
23+
settings: {
24+
'import/extensions': ['.js', '.vue']
25+
}
26+
}
27+
]

tests/integrations/eslint-plugin-import/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"author": "Toru Nagashima (https://github.com/mysticatea)",
99
"license": "MIT",
1010
"dependencies": {
11-
"eslint": "^7.0.0",
12-
"eslint-plugin-import": "~2.23.4",
11+
"eslint": "^9.0.0",
12+
"eslint-plugin-import": "^2.31.0",
1313
"eslint-plugin-vue": "file:../../.."
1414
}
1515
}

0 commit comments

Comments
 (0)