update lerna && fix api-proxy jest

didi · Aug 7, 2024 · fd6eb1e · fd6eb1e
1 parent f7673bd
commit fd6eb1e
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 10 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -36,7 +36,7 @@ jobs:
 
       - name: install deps
         if: steps.cache.outputs.cache-hit != 'true'
-        run: npm i && npm i --prefix test/e2e/miniprogram-project && npm i --prefix test/e2e/plugin-project  && npx lerna bootstrap --no-ci
+        run: npm i && npm i --prefix test/e2e/miniprogram-project && npm i --prefix test/e2e/plugin-project
 
       - name: copy-webpack-plugin
         run: npm run copyPlugin --prefix test/e2e/miniprogram-project && npm run copyPlugin --prefix test/e2e/plugin-project

diff --git a/jest.config.json b/jest.config.json
@@ -5,7 +5,6 @@
   "moduleNameMapper": {
     "\\.(css|styl)$": "identity-obj-proxy"
   },
-  "setupFiles": ["./test/unit/setup.js"],
   "testEnvironment": "jsdom",
   "testMatch": [
     "**/packages/**/?(*.)+(spec|test).[jt]s?(x)"

diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,3 @@
 {
-  "packages": [
-    "packages/*"
-  ],
   "version": "2.9.48"
 }
diff --git a/package.json b/package.json
@@ -29,8 +29,11 @@
     "eslint-plugin-promise": "^5.1.1",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^27.2.0",
-    "lerna": "^3.4.3",
+    "lerna": "^8.1.8",
     "typescript": "^4.1.3",
     "vuepress": "^1.9.7"
-  }
+  },
+  "workspaces": [
+    "packages/*"
+  ]
 }
diff --git a/packages/api-proxy/__tests__/web/action-sheet.spec.js b/packages/api-proxy/__tests__/web/action-sheet.spec.js
@@ -2,7 +2,7 @@ import '@testing-library/jest-dom/extend-expect'
 import {
   showActionSheet
 } from '../../src/platform/api/action-sheet/index.web'
-import { dispatchTap } from '../../../../test/utils/touch'
+import { dispatchTap } from '../../test/touch'
 
 describe('test toast', () => {
   afterAll(() => {

diff --git a/packages/api-proxy/jest.config.json b/packages/api-proxy/jest.config.json
@@ -9,5 +9,5 @@
   "globals": {
     "__mpx_mode__": "web"
   },
-  "setupFiles": ["../../test/unit/setup"]
+  "setupFiles": ["./test/setup"]
 }
diff --git a/packages/api-proxy/package.json b/packages/api-proxy/package.json
@@ -37,7 +37,8 @@
   },
   "homepage": "https://github.com/didi/mpx#readme",
   "dependencies": {
-    "axios": "^1.6.7"
+    "axios": "^1.6.7",
+    "@mpxjs/utils": "^2.9.41"
   },
   "peerDependencies": {
     "@react-native-async-storage/async-storage": "^1.23.1",

diff --git a/test/unit/setup.js → packages/api-proxy/test/setup.js b/test/unit/setup.js → packages/api-proxy/test/setup.js
@@ -6,3 +6,8 @@ global.getCurrentPages = function () {
     $el: document.body
   }]
 }
+
+jest.mock('@mpxjs/core', () => ({
+  isRef: jest.fn(),
+  isReactive: jest.fn()
+}))
diff --git a/test/utils/touch.js → packages/api-proxy/test/touch.js b/test/utils/touch.js → packages/api-proxy/test/touch.js