e22m4u 1 год назад
Родитель
Сommit
512818fafd
4 измененных файлов с 34 добавлено и 29 удалено
  1. 0 20
      .eslintrc.cjs
  2. 26 0
      eslint.config.js
  3. 1 3
      mocha.setup.js
  4. 7 6
      package.json

+ 0 - 20
.eslintrc.cjs

@@ -1,20 +0,0 @@
-module.exports = {
-  env: {
-    es2021: true,
-    node: true
-  },
-  parserOptions: {
-    sourceType: 'module',
-    ecmaVersion: 13,
-  },
-  plugins: [
-    'mocha',
-    'chai-expect',
-  ],
-  extends: [
-    'eslint:recommended',
-    'prettier',
-    'plugin:mocha/recommended',
-    'plugin:chai-expect/recommended',
-  ],
-}

+ 26 - 0
eslint.config.js

@@ -0,0 +1,26 @@
+import js from '@eslint/js';
+import globals from 'globals';
+import mochaPlugin from 'eslint-plugin-mocha';
+import chaiExpectPlugin from 'eslint-plugin-chai-expect';
+import eslintConfigPrettier from 'eslint-config-prettier';
+
+export default [{
+  languageOptions: {
+    globals: {
+      ...globals.node,
+      ...globals.es2021,
+      ...globals.mocha,
+    },
+  },
+  plugins: {
+    'mocha': mochaPlugin,
+    'chai-expect': chaiExpectPlugin,
+  },
+  rules: {
+    ...js.configs.recommended.rules,
+    ...eslintConfigPrettier.rules,
+    ...mochaPlugin.configs.flat.recommended.rules,
+    ...chaiExpectPlugin.configs['recommended-flat'].rules,
+  },
+  files: ['src/**/*.js'],
+}];

+ 1 - 3
mocha.setup.js

@@ -1,7 +1,6 @@
 import url from 'url';
-import chai from 'chai';
 import dotenv from 'dotenv';
-import chaiSpies from 'chai-spies';
+import * as chai from 'chai';
 import chaiAsPromised from 'chai-as-promised';
 
 process.env['NODE_ENV'] = 'test';
@@ -9,5 +8,4 @@ const dirname = url.fileURLToPath(new URL('.', import.meta.url));
 const envFile = `${dirname}/${process.env['NODE_ENV']}.env`;
 dotenv.config({path: envFile});
 
-chai.use(chaiSpies);
 chai.use(chaiAsPromised);

+ 7 - 6
package.json

@@ -36,21 +36,22 @@
   },
   "peerDependencies": {
     "@e22m4u/js-format": "*",
-    "@e22m4u/js-service": "*",
-    "@e22m4u/js-repository": "0.1.x"
+    "@e22m4u/js-repository": "0.1.x",
+    "@e22m4u/js-service": "*"
   },
   "devDependencies": {
     "@commitlint/cli": "~19.3.0",
     "@commitlint/config-conventional": "~19.2.2",
+    "@eslint/js": "^9.5.0",
     "c8": "~10.1.2",
-    "chai": "~4.4.1",
-    "chai-as-promised": "~7.1.2",
-    "chai-spies": "~1.1.0",
+    "chai": "~5.1.1",
+    "chai-as-promised": "~8.0.0",
     "dotenv": "~16.4.5",
-    "eslint": "~8.57.0",
+    "eslint": "~9.5.0",
     "eslint-config-prettier": "~9.1.0",
     "eslint-plugin-chai-expect": "~3.1.0",
     "eslint-plugin-mocha": "~10.4.3",
+    "globals": "^15.6.0",
     "husky": "~9.0.11",
     "mocha": "~10.4.0",
     "prettier": "~3.3.2"