diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 7289abc08..33a82a385 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -68,7 +68,8 @@ '@types/node', 'node', // umd tests need to lock this version - 'react-aliased', + 'react-18', + 'react-dom-18', ], postUpdateOptions: ['pnpmDedupe'], } diff --git a/biome.json b/biome.json index 85c96fd56..5ba710f69 100644 --- a/biome.json +++ b/biome.json @@ -21,10 +21,7 @@ "ignoreUnknown": true }, "formatter": { - "ignore": [ - "**/.rslib/*", - "./tests/e2e/react-component/public/umd/index.js" - ], + "ignore": ["**/.rslib/*", "./tests/e2e/react-component/public/umd/*"], "indentStyle": "space" }, "javascript": { @@ -47,7 +44,7 @@ "enabled": true, "ignore": [ "./tests/integration/**/*/src/*", - "./tests/e2e/react-component/public/umd/index.js" + "./tests/e2e/react-component/public/umd/*" ], "rules": { "recommended": true, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0a514b15e..2b5504ed4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -471,6 +471,12 @@ importers: '@examples/react-component-umd': specifier: workspace:* version: link:../../../examples/react-component-umd + react-18: + specifier: npm:react@18.3.1 + version: react@18.3.1 + react-dom-18: + specifier: npm:react-dom@18.3.1 + version: react-dom@18.3.1(react@19.1.0) tests/integration/alias: {} @@ -968,9 +974,9 @@ importers: react: specifier: ^19.1.0 version: 19.1.0 - react-aliased: - specifier: npm:react@18.3.0 - version: react@18.3.0 + react-18: + specifier: npm:react@18.3.1 + version: react@18.3.1 tests/integration/umd-library-name: devDependencies: @@ -5741,10 +5747,6 @@ packages: react: '>=16.6.0' react-dom: '>=16.6.0' - react@18.3.0: - resolution: {integrity: sha512-RPutkJftSAldDibyrjuku7q11d3oy6wKOyPe5K1HA/HwwrXcEqBdHsLypkC2FFYjP7bPUa6gbzSBhw4sY2JcDg==} - engines: {node: '>=0.10.0'} - react@18.3.1: resolution: {integrity: sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==} engines: {node: '>=0.10.0'} @@ -12327,6 +12329,12 @@ snapshots: react: 18.3.1 scheduler: 0.23.2 + react-dom@18.3.1(react@19.1.0): + dependencies: + loose-envify: 1.4.0 + react: 19.1.0 + scheduler: 0.23.2 + react-dom@19.1.0(react@19.1.0): dependencies: react: 19.1.0 @@ -12390,10 +12398,6 @@ snapshots: react: 19.1.0 react-dom: 19.1.0(react@19.1.0) - react@18.3.0: - dependencies: - loose-envify: 1.4.0 - react@18.3.1: dependencies: loose-envify: 1.4.0 diff --git a/tests/e2e/react-component/package.json b/tests/e2e/react-component/package.json index 88f379def..9024df6c4 100644 --- a/tests/e2e/react-component/package.json +++ b/tests/e2e/react-component/package.json @@ -3,15 +3,16 @@ "version": "1.0.0", "private": true, "scripts": { + "build:umd": "cd ../../../examples/react-component-umd && pnpm run build", "dev:bundle": "../../node_modules/.bin/rsbuild dev --environment=bundle", "dev:bundle-false": "../../node_modules/.bin/rsbuild dev --environment=bundleFalse", - "dev:umd": "pnpm umd:build && pnpm umd:copy && ../../node_modules/.bin/rsbuild dev --environment=umd", - "umd:build": "cd ../../../examples/react-component-umd && pnpm run build", - "umd:copy": "rm -rf ./public && mkdir -p ./public/umd && cp ../../../examples/react-component-umd/dist/umd/index.js ./public/umd/index.js" + "dev:umd": "pnpm build:umd && ../../node_modules/.bin/rsbuild dev --environment=umd" }, "dependencies": { "@examples/react-component-bundle": "workspace:*", "@examples/react-component-bundle-false": "workspace:*", - "@examples/react-component-umd": "workspace:*" + "@examples/react-component-umd": "workspace:*", + "react-18": "npm:react@18.3.1", + "react-dom-18": "npm:react-dom@18.3.1" } } diff --git a/tests/e2e/react-component/rsbuild.config.ts b/tests/e2e/react-component/rsbuild.config.ts index 94e159263..953dc4871 100644 --- a/tests/e2e/react-component/rsbuild.config.ts +++ b/tests/e2e/react-component/rsbuild.config.ts @@ -23,7 +23,7 @@ export default defineConfig({ { tag: 'script', attrs: { - src: 'https://unpkg.com/react@18/umd/react.development.js', + src: '/umd/react.development.js', }, head: true, append: true, @@ -31,7 +31,7 @@ export default defineConfig({ { tag: 'script', attrs: { - src: 'https://unpkg.com/react-dom@18/umd/react-dom.development.js', + src: '/umd/react-dom.development.js', }, head: true, append: true, @@ -57,6 +57,20 @@ export default defineConfig({ 'react-dom': 'window ReactDom', 'react-dom/client': 'window ReactDom', }, + copy: [ + { + from: '../../../examples/react-component-umd/dist/umd/index.js', + to: 'umd/index.js', + }, + { + from: 'node_modules/react-18/umd/react.development.js', + to: 'umd/react.development.js', + }, + { + from: 'node_modules/react-dom-18/umd/react-dom.development.js', + to: 'umd/react-dom.development.js', + }, + ], }, }, }, diff --git a/tests/integration/umd-globals/index.test.ts b/tests/integration/umd-globals/index.test.ts index b00bd4601..ef943a39c 100644 --- a/tests/integration/umd-globals/index.test.ts +++ b/tests/integration/umd-globals/index.test.ts @@ -8,5 +8,5 @@ test('correct read globals from CommonJS', async () => { }); const { fn } = require(entryFiles.umd); - expect(await fn('ok')).toBe('DEBUG:18.3.0/ok'); + expect(await fn('ok')).toBe('DEBUG:18.3.1/ok'); }); diff --git a/tests/integration/umd-globals/package.json b/tests/integration/umd-globals/package.json index 68b023ebc..b336194a3 100644 --- a/tests/integration/umd-globals/package.json +++ b/tests/integration/umd-globals/package.json @@ -4,7 +4,7 @@ "private": true, "devDependencies": { "react": "^19.1.0", - "react-aliased": "npm:react@18.3.0" + "react-18": "npm:react@18.3.1" }, "peerDependencies": { "react": "^18.3.1" diff --git a/tests/integration/umd-globals/rslib.config.ts b/tests/integration/umd-globals/rslib.config.ts index 499892d10..408acc41c 100644 --- a/tests/integration/umd-globals/rslib.config.ts +++ b/tests/integration/umd-globals/rslib.config.ts @@ -5,7 +5,7 @@ export default defineConfig({ lib: [generateBundleUmdConfig()], output: { externals: { - react: 'react-aliased', + react: 'react-18', }, }, source: {