Merge pull request #173 from VisActor/chore/update-jest

666haiwen · web-flow · commit 632dd5760d3b · 2024-12-30T16:15:57.000+08:00
chore: update jest to 0.29
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/packages/calculator/jest.config.js b/packages/calculator/jest.config.js
@@ -0,0 +1,9 @@
+const path = require('path');
+const baseJestConfig = require('@internal/jest-config/jest.base');
+
+module.exports = {
+  ...baseJestConfig,
+  moduleNameMapper: {
+    ...baseJestConfig.moduleNameMapper
+  }
+};
diff --git a/packages/calculator/jest.config.ts b/packages/calculator/jest.config.ts
diff --git a/packages/calculator/package.json b/packages/calculator/package.json
@@ -32,14 +32,17 @@
     "@visactor/vutils": "~0.17.4"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.0",
+    "@internal/jest-config": "workspace:*",
+    "@types/jest": "~29.5.0",
+    "jest": "~29.5.0",
+    "jest-environment-jsdom": "~29.5.0",
+    "@jest/globals": "~29.5.0",
+    "ts-jest": "~29.2.5",
     "@typescript-eslint/eslint-plugin": "5.30.0",
     "@typescript-eslint/parser": "5.30.0",
     "@types/node": "*",
-    "jest": "^26.0.0",
     "npm-run-all": "^4.1.5",
     "rimraf": "^3.0.2",
-    "ts-jest": "^26.0.0",
     "ts-node": "10.9.0",
     "typescript": "4.9.5",
     "@internal/ts-config": "workspace:*",
diff --git a/packages/chart-advisor/jest.config.js b/packages/chart-advisor/jest.config.js
@@ -0,0 +1,9 @@
+const path = require('path');
+const baseJestConfig = require('@internal/jest-config/jest.base');
+
+module.exports = {
+  ...baseJestConfig,
+  moduleNameMapper: {
+    ...baseJestConfig.moduleNameMapper
+  }
+};
diff --git a/packages/chart-advisor/package.json b/packages/chart-advisor/package.json
@@ -33,10 +33,13 @@
     "@visactor/vutils": "~0.17.4"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.0",
+    "@internal/jest-config": "workspace:*",
+    "@types/jest": "~29.5.0",
+    "jest": "~29.5.0",
+    "jest-environment-jsdom": "~29.5.0",
+    "@jest/globals": "~29.5.0",
+    "ts-jest": "~29.2.5",
     "@types/node": "*",
-    "jest": "^26.0.0",
-    "ts-jest": "^26.0.0",
     "typescript": "4.9.5",
     "undici-types": "^5.27.2",
     "@typescript-eslint/eslint-plugin": "5.30.0",
diff --git a/packages/vmind/__tests__/performance/performance.test.ts b/packages/vmind/__tests__/performance/performance.test.ts
@@ -85,7 +85,7 @@ const testPerformance = (model: Model, vmind: VMind) => {
         } else {
           error('fail to generate with LLM!');
         }
-        done();
+        // done();
       });
     }
     modelResultMap[model].totalCount += 1;
diff --git a/packages/vmind/__tests__/tsconfig.json b/packages/vmind/__tests__/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "extends": "@internal/ts-config/tsconfig.base.json",
+  "include": ["./", "../src"],
+  "compilerOptions": {
+    "paths": {
+      "@visactor/calculator": ["../../calculator/src"],
+      "@visactor/chart-advisor": ["../../chart-advisor/src"]
+    },
+    "lib": ["DOM", "ESNext"]
+  },
+  "references": []
+}
diff --git a/packages/vmind/jest.config.js b/packages/vmind/jest.config.js
@@ -1,32 +1,9 @@
+const path = require('path');
+const baseJestConfig = require('@internal/jest-config/jest.base');
+
 module.exports = {
-  preset: 'ts-jest',
-  runner: 'jest-electron/runner',
-  testEnvironment: 'jest-electron/environment',
-  testMatch: ['<rootDir>/__tests__/unit/**/*.test.(js|ts)'],
-  silent: true,
-  globals: {
-    'ts-jest': {
-      isolatedModules: true,
-      resolveJsonModule: true,
-      esModuleInterop: true,
-      experimentalDecorators: true,
-      module: 'ESNext',
-      tsconfig: './tsconfig.test.json'
-    }
-  },
-  verbose: true,
-  collectCoverage: true,
-  coverageReporters: ['json-summary', 'lcov', 'text'],
-  coveragePathIgnorePatterns: ['node_modules', '__tests__', 'interface.ts', '.d.ts', 'typings', 'vite'],
-  collectCoverageFrom: [
-    '**/src/**',
-    '!**/cjs/**',
-    '!**/build/**',
-    '!**/esm/**',
-    '!**/node_modules/**',
-    '!**/__tests__/**',
-    '!**/types/**',
-    '!**/interface.ts',
-    '!**/vite/**'
-  ]
+  ...baseJestConfig,
+  moduleNameMapper: {
+    ...baseJestConfig.moduleNameMapper
+  }
 };
diff --git a/packages/vmind/jest.performance.config.js b/packages/vmind/jest.performance.config.js
@@ -1,23 +1,37 @@
+const path = require('path');
+const baseJestConfig = require('@internal/jest-config/jest.base');
+
 module.exports = {
-  preset: 'ts-jest',
-  silent: false,
-  globals: {
-    'ts-jest': {
-      resolveJsonModule: true,
-      esModuleInterop: true,
-      experimentalDecorators: true,
-      module: 'ESNext',
-      tsconfig: './tsconfig.test.json'
-    }
-  },
-  testTimeout: 60000,
+  ...baseJestConfig,
   moduleNameMapper: {
-    axios: 'axios/dist/node/axios.cjs',
-    'd3-hierarchy': 'd3-hierarchy/dist/d3-hierarchy.min.js',
-    '^src/(.*)$': '<rootDir>/src/$1',
+    ...baseJestConfig.moduleNameMapper,
+    axios: path.resolve(__dirname, 'node_modules/axios/dist/node/axios.cjs')
   },
   verbose: true,
   // 在测试之前设置环境变量
-  setupFiles: ['./test-setup.js'],
-  testEnvironment: 'node'
+  setupFiles: ['./test-setup.js']
 };
+
+// module.exports = {
+//   preset: 'ts-jest',
+//   silent: false,
+//   globals: {
+//     'ts-jest': {
+//       resolveJsonModule: true,
+//       esModuleInterop: true,
+//       experimentalDecorators: true,
+//       module: 'ESNext',
+//       tsconfig: './tsconfig.test.json'
+//     }
+//   },
+//   testTimeout: 60000,
+//   moduleNameMapper: {
+//     axios: 'axios/dist/node/axios.cjs',
+//     'd3-hierarchy': 'd3-hierarchy/dist/d3-hierarchy.min.js',
+//     '^src/(.*)$': '<rootDir>/src/$1'
+//   },
+//   verbose: true,
+//   // 在测试之前设置环境变量
+//   setupFiles: ['./test-setup.js'],
+//   testEnvironment: 'node'
+// };
diff --git a/packages/vmind/package.json b/packages/vmind/package.json
@@ -38,11 +38,11 @@
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "preview": "vite ./__tests__/browser preview",
     "clear": "rm -rf build && rm -rf esm && rm -rf cjs",
-    "test": "jest",
+    "test": "jest ./__tests__/unit/",
     "test-cov": "jest -w 16 --coverage",
     "test-live": "npm run test-watch __tests__/unit/",
     "test-watch": "DEBUG_MODE=1 jest --watch",
-    "test-performance": "jest ./__tests__/performance/performanceTest.ts --config jest.performance.config.js",
+    "test-performance": "jest ./__tests__/performance/performance.test.ts --config jest.performance.config.js",
     "prepublishOnly": "npm run build",
     "postpublish": "npm run clear",
     "release-minor": "npm version minor && npm publish && git commit -a -m 'chore: release minor version for vmind' && git push",
@@ -58,8 +58,9 @@
     "@internal/bundler": "workspace:*",
     "@internal/eslint-config": "workspace:*",
     "@internal/ts-config": "workspace:*",
+    "@internal/jest-config": "workspace:*",
     "@arco-design/web-react": "2.46.1",
-    "@types/jest": "^26.0.0",
+    "@types/jest": "~29.5.0",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
     "@typescript-eslint/eslint-plugin": "5.30.0",
@@ -74,8 +75,11 @@
     "eslint-plugin-react": "7.30.1",
     "typescript": "4.9.5",
     "vite": "3.2.6",
-    "jest": "^26.0.0",
-    "jest-electron": "^0.1.12",
+    "jest": "~29.5.0",
+    "util": "~0.12.5",
+    "jest-environment-jsdom": "~29.5.0",
+    "@jest/globals": "~29.5.0",
+    "ts-jest": "~29.2.5",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "react-router-dom": "6.9.0",
diff --git a/packages/vmind/src/atom/dataQuery/executeQuery.ts b/packages/vmind/src/atom/dataQuery/executeQuery.ts
@@ -1,5 +1,5 @@
 import alasql from 'alasql';
-import type { DataQueryCtx, DataTable, FieldInfo } from 'src/types';
+import type { DataQueryCtx, DataTable, FieldInfo } from '../../types';
 import {
   matchColumnName,
   parseRespondField,
diff --git a/packages/vmind/test-setup.js b/packages/vmind/test-setup.js
@@ -1,5 +1,5 @@
 require('dotenv').config({ path: './.env.local' });
-const { error, log,warn,info,debug } = require('console');
+const { error, log, warn, info, debug } = require('console');
 
 global.console = {
   // eslint-disable-next-line no-undef
@@ -12,3 +12,6 @@ global.console = {
   info: jest.fn(),
   debug: jest.fn()
 };
+
+global.TextEncoder = require('util').TextEncoder;
+global.TextDecoder = require('util').TextDecoder;
diff --git a/rush.json b/rush.json
@@ -17,79 +17,64 @@
     "defaultBranch": "main",
     "defaultRemote": "origin"
   },
-  "allowedProjectTags": [
-    "tool",
-    "share",
-    "package",
-    "doc"
-  ],
+  "allowedProjectTags": ["tool", "share", "package", "doc"],
   "projects": [
     {
       "packageName": "@internal/bundler",
       "projectFolder": "tools/bundler",
-      "tags": [
-        "tool"
-      ],
+      "tags": ["tool"],
       "shouldPublish": false
     },
     {
       "packageName": "@internal/typescript-json-schema",
       "projectFolder": "tools/typescript-json-schema",
-      "tags": [
-        "tool"
-      ],
+      "tags": ["tool"],
       "shouldPublish": false
     },
     {
       "packageName": "@internal/eslint-config",
       "projectFolder": "share/eslint-config",
-      "tags": [
-        "share"
-      ],
+      "tags": ["share"],
+      "shouldPublish": false
+    },
+    {
+      "packageName": "@internal/jest-config",
+      "projectFolder": "share/jest-config",
+      "tags": ["share"],
       "shouldPublish": false
     },
     {
       "packageName": "@internal/ts-config",
       "projectFolder": "share/ts-config",
-      "tags": [
-        "share"
-      ],
+      "tags": ["share"],
       "shouldPublish": false
     },
     {
       "packageName": "@internal/docs",
       "projectFolder": "docs",
-      "tags": [
-        "doc"
-      ],
+      "tags": ["doc"],
       "shouldPublish": false
     },
     {
       "packageName": "@visactor/vmind",
       "projectFolder": "packages/vmind",
       "shouldPublish": true,
       "versionPolicyName": "vmindMin",
-      "tags": [
-        "package"
-      ]
+      "tags": ["package"]
     },
     {
       "packageName": "@visactor/calculator",
       "projectFolder": "packages/calculator",
       "shouldPublish": true,
       "versionPolicyName": "vmindMin",
-      "tags": [
-        "package"
-      ]
+      "tags": ["package"]
     },
     {
       "packageName": "@visactor/chart-advisor",
       "projectFolder": "packages/chart-advisor",
       "shouldPublish": true,
       "versionPolicyName": "vmindMin",
-      "tags": [
-        "package"
-      ]
+      "tags": ["package"]
     }
   ]
-}
+}
diff --git a/share/jest-config/jest.base.js b/share/jest-config/jest.base.js
diff --git a/share/jest-config/package.json b/share/jest-config/package.json

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ const testPerformance = (model: Model, vmind: VMind) => {`
`85`	`85`	`} else {`
`86`	`86`	`error('fail to generate with LLM!');`
`87`	`87`	`}`
`88`		`- done();`
	`88`	`+ // done();`
`89`	`89`	`});`
`90`	`90`	`}`
`91`	`91`	`modelResultMap[model].totalCount += 1;`