Fixed CI

mantou132 · Dec 11, 2023 · 010f9e7 · 010f9e7
1 parent d9ae37b
commit 010f9e7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -4,9 +4,11 @@
   "version": "1.6.5",
   "scripts": {
     "lint": "lerna exec -- tsc --noEmit && eslint --ext .ts,.js",
-    "test": "lerna exec --scope @mantou/gem --scope gem-book --scope duoyun-ui -- yarn test",
+    "test": "lerna exec --concurrency=1 --scope @mantou/gem --scope gem-book --scope duoyun-ui -- yarn test",
     "release": "lerna version",
-    "prepare": "husky install && yarn --cwd packages/gem build && yarn --cwd packages/gem-analyzer build && yarn --cwd packages/gem-book build && yarn --cwd packages/gem-book link && yarn --cwd packages/gem-port build && yarn --cwd packages/gem-port link"
+    "prepare:build": "yarn --cwd packages/gem build && lerna exec --scope gem-analyzer --scope duoyun-ui --scope gem-book --scope gem-port -- yarn build",
+    "prepare:link": "lerna exec --scope gem-book --scope gem-port -- yarn link",
+    "prepare": "husky install && yarn prepare:build && yarn prepare:link"
   },
   "devDependencies": {
     "@types/node": "^20.10.0",

diff --git a/packages/duoyun-ui/package.json b/packages/duoyun-ui/package.json
@@ -41,7 +41,6 @@
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4-fix.0",
     "@gemjs/config": "^1.6.11",
-    "@mantou/gem": "^1.7.1",
     "@open-wc/testing": "^2.5.33",
     "@types/d3-geo": "^3.0.1",
     "@web/dev-server-esbuild": "^0.2.16",

diff --git a/packages/gem/src/test/history.test.ts b/packages/gem/src/test/history.test.ts
@@ -6,11 +6,13 @@ describe('history 测试', () => {
   it('hash', async () => {
     const historyLength = window.history.length;
     const hash = window.location.hash;
+    // 等待浏览器就绪
+    await aTimeout(1000);
     history.push({ path: '/a', hash: '#a' });
     await aTimeout(10);
     expect(window.location.hash).to.equal('#a');
     history.back();
-    await aTimeout(600);
+    await aTimeout(10);
     expect(window.location.hash).to.equal(hash);
     history.push({ path: '/a', hash: '#b' });
     await aTimeout(10);