From 82b132c45dca4ee0f6b7e3c08ab1c674fa3d07bc Mon Sep 17 00:00:00 2001 From: ruleeeer <70385062+ruleeeer@users.noreply.github.com> Date: Sun, 15 Sep 2024 19:31:01 +0800 Subject: [PATCH] fix: webpack test failed --- package.json | 4 ++-- .../examples/simple-react-webpack/remote/webpack.config.js | 4 ++-- packages/examples/vitestSetup-serve.ts | 5 +++++ .../vue3-demo-webpack-esm-esm/home/webpack.config.js | 3 ++- ...serve.spec.ts => vue3-demo-webpack-esm-var.serve.spec.ts} | 0 packages/examples/vue3-demo-webpack-esm-var/home/index.html | 1 - .../vue3-demo-webpack-esm-var/home/webpack.config.js | 1 + .../vue3-demo-webpack-systemjs/home/webpack.config.js | 1 + packages/examples/webpack-host/host/webpack.config.js | 2 ++ 9 files changed, 15 insertions(+), 6 deletions(-) rename packages/examples/vue3-demo-webpack-esm-var/__tests__/{vue3-demo-webpack-esm-var.dev&serve.spec.ts => vue3-demo-webpack-esm-var.serve.spec.ts} (100%) diff --git a/package.json b/package.json index 213efbb5..2d7e9ff2 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,8 @@ "packages/**" ], "engines": { - "node": "^14.18.0 || >=16.0.0", - "pnpm": ">=8.0.1" + "node": ">=16.0.0", + "pnpm": ">=9.0.0" }, "author": "@originjs", "license": "MulanPSL-2.0", diff --git a/packages/examples/simple-react-webpack/remote/webpack.config.js b/packages/examples/simple-react-webpack/remote/webpack.config.js index 1e2034ff..4a34a15d 100644 --- a/packages/examples/simple-react-webpack/remote/webpack.config.js +++ b/packages/examples/simple-react-webpack/remote/webpack.config.js @@ -40,13 +40,13 @@ module.exports = { }, shared: { react: { - // eager: true, // singleton: true, + eager: true, requiredVersion: '^16.12.0' }, 'react-dom': { - // eager: true, // singleton: true, + eager: true, requiredVersion: '^16.12.0' } } diff --git a/packages/examples/vitestSetup-serve.ts b/packages/examples/vitestSetup-serve.ts index 5bdcf3dd..b8217b99 100644 --- a/packages/examples/vitestSetup-serve.ts +++ b/packages/examples/vitestSetup-serve.ts @@ -81,6 +81,7 @@ beforeAll(async (s) => { } execa('pnpm', ['run', 'serve'], { cwd: testDir, stdio: 'inherit' }) await execa('pnpm', ['run', 'build'], { cwd: testDir, stdio: 'inherit' }) + sleep(3 * 1000); const port = 5000 // use resolved port/base from server @@ -101,6 +102,10 @@ beforeAll(async (s) => { } }, 60000) +function sleep(ms) { + return new Promise(resolve => setTimeout(resolve, ms)); +} + afterAll(async () => { await page?.close() skipError = true diff --git a/packages/examples/vue3-demo-webpack-esm-esm/home/webpack.config.js b/packages/examples/vue3-demo-webpack-esm-esm/home/webpack.config.js index 675cf1c4..0a9bcedd 100644 --- a/packages/examples/vue3-demo-webpack-esm-esm/home/webpack.config.js +++ b/packages/examples/vue3-demo-webpack-esm-esm/home/webpack.config.js @@ -75,7 +75,8 @@ module.exports = (env = {}) => ({ vue: { // singleton: true, // import: false, - requiredVersion: '^3.0.0' + requiredVersion: '^3.0.0', + eager: true, } } }), diff --git a/packages/examples/vue3-demo-webpack-esm-var/__tests__/vue3-demo-webpack-esm-var.dev&serve.spec.ts b/packages/examples/vue3-demo-webpack-esm-var/__tests__/vue3-demo-webpack-esm-var.serve.spec.ts similarity index 100% rename from packages/examples/vue3-demo-webpack-esm-var/__tests__/vue3-demo-webpack-esm-var.dev&serve.spec.ts rename to packages/examples/vue3-demo-webpack-esm-var/__tests__/vue3-demo-webpack-esm-var.serve.spec.ts diff --git a/packages/examples/vue3-demo-webpack-esm-var/home/index.html b/packages/examples/vue3-demo-webpack-esm-var/home/index.html index 605085c6..6c217c62 100644 --- a/packages/examples/vue3-demo-webpack-esm-var/home/index.html +++ b/packages/examples/vue3-demo-webpack-esm-var/home/index.html @@ -1,2 +1 @@ -
diff --git a/packages/examples/vue3-demo-webpack-esm-var/home/webpack.config.js b/packages/examples/vue3-demo-webpack-esm-var/home/webpack.config.js index 1751d2c5..d59483f9 100644 --- a/packages/examples/vue3-demo-webpack-esm-var/home/webpack.config.js +++ b/packages/examples/vue3-demo-webpack-esm-var/home/webpack.config.js @@ -69,6 +69,7 @@ module.exports = (env = {}) => ({ vue: { // singleton: true, // import: false, + eager: true, requiredVersion: '^3.0.0' } } diff --git a/packages/examples/vue3-demo-webpack-systemjs/home/webpack.config.js b/packages/examples/vue3-demo-webpack-systemjs/home/webpack.config.js index 3b8957fc..706e3fb5 100644 --- a/packages/examples/vue3-demo-webpack-systemjs/home/webpack.config.js +++ b/packages/examples/vue3-demo-webpack-systemjs/home/webpack.config.js @@ -69,6 +69,7 @@ module.exports = (env = {}) => ({ vue: { // singleton: true, // import: false, + eager: true, requiredVersion: '^3.0.0' } } diff --git a/packages/examples/webpack-host/host/webpack.config.js b/packages/examples/webpack-host/host/webpack.config.js index 6f8ebd1e..0686e05a 100644 --- a/packages/examples/webpack-host/host/webpack.config.js +++ b/packages/examples/webpack-host/host/webpack.config.js @@ -50,9 +50,11 @@ module.exports = { }, shared: { react: { + eager: true, singleton: true, }, 'react-dom': { + eager: true, singleton: true, }, },