From 2e3f60fa6952b582078b7cf616cbd22bbe9f9777 Mon Sep 17 00:00:00 2001 From: neverland Date: Thu, 19 Nov 2026 16:25:37 +0800 Subject: [PATCH 1/4] feat(rspack): upgrade the Solid example to Solid 2 with solid-loader --- pnpm-lock.yaml | 83 +++++++------------ rspack/solid/package.json | 10 +-- .../{rspack.config.js => rspack.config.ts} | 26 ++---- rspack/solid/src/App.jsx | 2 +- rspack/solid/src/index.jsx | 5 +- 5 files changed, 43 insertions(+), 83 deletions(-) rename rspack/solid/{rspack.config.js => rspack.config.ts} (64%) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dd4972a7e..d287add3a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3542,21 +3542,12 @@ importers: rspack/solid: dependencies: - '@babel/core': - specifier: 7.29.7 - version: 7.29.7 - babel-loader: - specifier: 10.1.1 - version: 10.1.1(@babel/core@7.29.7)(@rspack/core@2.2.8)(webpack@5.102.1) - babel-preset-solid: - specifier: 1.9.16 - version: 1.9.16(@babel/core@7.29.7)(solid-js@1.9.17) + '@solidjs/web': + specifier: ^2.0.0 + version: 2.0.0(solid-js@2.0.0) solid-js: - specifier: 1.9.17 - version: 1.9.17 - solid-refresh: - specifier: 0.7.8 - version: 0.7.8(solid-js@1.9.17) + specifier: ^2.0.0 + version: 2.0.0 devDependencies: '@rspack/cli': specifier: 2.2.8 @@ -3567,6 +3558,9 @@ importers: '@rspack/dev-server': specifier: 2.2.1 version: 2.2.1(@rspack/core@2.2.8)(selfsigned@5.5.0) + solid-loader: + specifier: ^1.0.0 + version: 1.0.0(@rspack/core@2.2.8)(@solidjs/web@2.0.0)(solid-js@2.0.0) rspack/source-map-with-vscode-debugging: dependencies: @@ -10361,11 +10355,6 @@ packages: webpack: optional: true - babel-plugin-jsx-dom-expressions@0.40.11: - resolution: {integrity: sha512-k7TkOv7uVYnrq/bYyVvG5cWOC9IObAGfmyW3aMkG8l2sq2qt/5THkUBja69PMLEGGi8G+fXB2Fh7eS4OwZRBoQ==} - peerDependencies: - '@babel/core': ^7.20.12 - babel-plugin-jsx-dom-expressions@0.40.6: resolution: {integrity: sha512-v3P1MW46Lm7VMpAkq0QfyzLWWkC8fh+0aE5Km4msIgDx5kjenHU0pF2s+4/NH8CQn/kla6+Hvws+2AF7bfV5qQ==} peerDependencies: @@ -10402,15 +10391,6 @@ packages: solid-js: optional: true - babel-preset-solid@1.9.16: - resolution: {integrity: sha512-+0h40Qk2oBfkQ4OGDBHIDtvq/XQiOnCfzjNHmMxriAr8MmdsaIbyJgqYglDs4d70sF8O08sSpx61TKdpUt3oRw==} - peerDependencies: - '@babel/core': ^7.0.0 - solid-js: ^1.9.16 - peerDependenciesMeta: - solid-js: - optional: true - babel-walk@3.0.0-canary-5: resolution: {integrity: sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==} engines: {node: '>= 10.0.0'} @@ -15625,13 +15605,15 @@ packages: resolution: {integrity: sha512-9zN4uH2OQeQAYbF4BmIzoaa+L5Hb8Dp6kkP6ZXobHQ1FZVICdmzREPDVDBJY7umzdAE8D6zbFfWhxGtagkyslA==} engines: {node: '>=22.12.0'} - solid-refresh@0.6.3: - resolution: {integrity: sha512-F3aPsX6hVw9ttm5LYlth8Q15x6MlI/J3Dn+o3EQyRTtTxidepSTwAYdozt01/YA+7ObcciagGEyXIopGZzQtbA==} + solid-loader@1.0.0: + resolution: {integrity: sha512-ycdVLW/GuS6N8Wj/6msKCcXPdQGabFrBfDNJ5P0sjJtHUEDee/eW9y6RqpZDEgsABuz6byI0dN07Jia8RK4lwQ==} peerDependencies: - solid-js: ^1.3 + '@rspack/core': ^2.0.0 + '@solidjs/web': ^2.0.0 + solid-js: ^2.0.0 - solid-refresh@0.7.8: - resolution: {integrity: sha512-iG442T3HXJp5jEebCy8okETrWnmX7CnxNOKrJQVeufh6WXSn+xtLXaptUXXMHTWcRqTJOJwQ8UwzxrRtVFSIzA==} + solid-refresh@0.6.3: + resolution: {integrity: sha512-F3aPsX6hVw9ttm5LYlth8Q15x6MlI/J3Dn+o3EQyRTtTxidepSTwAYdozt01/YA+7ObcciagGEyXIopGZzQtbA==} peerDependencies: solid-js: ^1.3 @@ -24259,15 +24241,6 @@ snapshots: '@rspack/core': 2.3.3(@module-federation/runtime-tools@2.9.2)(@swc/helpers@0.5.24) webpack: 5.102.1(esbuild@0.28.2) - babel-plugin-jsx-dom-expressions@0.40.11(@babel/core@7.29.7): - dependencies: - '@babel/core': 7.29.7 - '@babel/helper-module-imports': 7.18.6 - '@babel/plugin-syntax-jsx': 7.29.7(@babel/core@7.29.7) - '@babel/types': 7.29.8 - html-entities: 2.3.3 - parse5: 7.3.0 - babel-plugin-jsx-dom-expressions@0.40.6(@babel/core@7.29.13): dependencies: '@babel/core': 7.29.13 @@ -24343,13 +24316,6 @@ snapshots: optionalDependencies: solid-js: 1.9.17 - babel-preset-solid@1.9.16(@babel/core@7.29.7)(solid-js@1.9.17): - dependencies: - '@babel/core': 7.29.7 - babel-plugin-jsx-dom-expressions: 0.40.11(@babel/core@7.29.7) - optionalDependencies: - solid-js: 1.9.17 - babel-walk@3.0.0-canary-5: dependencies: '@babel/types': 7.29.8 @@ -30876,6 +30842,19 @@ snapshots: seroval: 1.8.2 seroval-plugins: 1.8.0(seroval@1.8.2) + solid-loader@1.0.0(@rspack/core@2.2.8)(@solidjs/web@2.0.0)(solid-js@2.0.0): + dependencies: + '@babel/core': 7.29.13 + '@jridgewell/remapping': 2.3.5 + '@rspack/core': 2.2.8(@module-federation/runtime-tools@2.9.2)(@swc/helpers@0.5.24) + '@solidjs/babel-plugin': 2.0.0(@babel/core@7.29.13) + '@solidjs/compiler': 2.0.0 + '@solidjs/web': 2.0.0(solid-js@2.0.0) + solid-js: 2.0.0 + transitivePeerDependencies: + - '@tsrx/core' + - supports-color + solid-refresh@0.6.3(solid-js@1.9.17): dependencies: '@babel/generator': 7.29.8 @@ -30885,12 +30864,6 @@ snapshots: transitivePeerDependencies: - supports-color - solid-refresh@0.7.8(solid-js@1.9.17): - dependencies: - '@babel/generator': 7.29.7 - '@babel/types': 7.29.7 - solid-js: 1.9.17 - sonic-boom@4.2.1: dependencies: atomic-sleep: 1.0.0 diff --git a/rspack/solid/package.json b/rspack/solid/package.json index c7730f7be..dc814a3d3 100644 --- a/rspack/solid/package.json +++ b/rspack/solid/package.json @@ -9,15 +9,13 @@ "dev": "rspack dev" }, "dependencies": { - "@babel/core": "7.29.7", - "babel-loader": "10.1.1", - "babel-preset-solid": "1.9.16", - "solid-js": "1.9.17", - "solid-refresh": "0.7.8" + "@solidjs/web": "^2.0.0", + "solid-js": "^2.0.0" }, "devDependencies": { "@rspack/cli": "2.2.8", "@rspack/core": "2.2.8", - "@rspack/dev-server": "2.2.1" + "@rspack/dev-server": "2.2.1", + "solid-loader": "^1.0.0" } } diff --git a/rspack/solid/rspack.config.js b/rspack/solid/rspack.config.ts similarity index 64% rename from rspack/solid/rspack.config.js rename to rspack/solid/rspack.config.ts index 9d15526e6..917fd5fd2 100644 --- a/rspack/solid/rspack.config.js +++ b/rspack/solid/rspack.config.ts @@ -1,4 +1,3 @@ -// @ts-check import { defineConfig } from '@rspack/cli'; import { rspack } from '@rspack/core'; @@ -8,15 +7,18 @@ export default defineConfig({ main: './src/index.jsx', }, resolve: { - extensions: ['...', '.ts', '.tsx', '.jsx'], + conditionNames: ['solid', '...'], }, module: { rules: [ { - test: /\.[cm]?[jt]sx?$/, - resolve: { - fullySpecified: false, - }, + test: /\.jsx$/, + loader: 'solid-loader', + }, + { + // Solid loads hydration modules from URLs at runtime. + descriptionData: { name: /^@solidjs\/web$/ }, + parser: { importDynamic: false }, }, { test: /\.css$/, @@ -33,18 +35,6 @@ export default defineConfig({ test: /\.svg$/, type: 'asset/resource', }, - { - test: /\.jsx$/, - use: [ - { - loader: 'babel-loader', - options: { - presets: [['solid']], - plugins: ['solid-refresh/babel'], - }, - }, - ], - }, ], }, plugins: [ diff --git a/rspack/solid/src/App.jsx b/rspack/solid/src/App.jsx index f79c152f5..9fbc3b84e 100644 --- a/rspack/solid/src/App.jsx +++ b/rspack/solid/src/App.jsx @@ -1,7 +1,7 @@ import logo from './logo.svg'; import styles from './App.module.css'; import { createSignal } from 'solid-js'; -import Message from './Message'; +import Message from './Message.jsx'; function App() { const [count, setCount] = createSignal(1); const increment = () => setCount(count() + 1); diff --git a/rspack/solid/src/index.jsx b/rspack/solid/src/index.jsx index 27c0e53ad..eafe52d27 100644 --- a/rspack/solid/src/index.jsx +++ b/rspack/solid/src/index.jsx @@ -1,7 +1,6 @@ -/* @refresh reload */ -import { render } from 'solid-js/web'; +import { render } from '@solidjs/web'; import './index.css'; -import App from './App'; +import App from './App.jsx'; render(() => , document.getElementById('root')); From 1c071aa560eb562d7573609ca05f81af6402e613 Mon Sep 17 00:00:00 2001 From: neverland Date: Thu, 19 Nov 2026 16:30:37 +0800 Subject: [PATCH 2/4] fix(rspack): preserve extensionless imports in the Solid example --- rspack/solid/rspack.config.ts | 7 +++++++ rspack/solid/src/App.jsx | 2 +- rspack/solid/src/index.jsx | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/rspack/solid/rspack.config.ts b/rspack/solid/rspack.config.ts index 917fd5fd2..abb9b4c0f 100644 --- a/rspack/solid/rspack.config.ts +++ b/rspack/solid/rspack.config.ts @@ -7,10 +7,17 @@ export default defineConfig({ main: './src/index.jsx', }, resolve: { + extensions: ['...', '.ts', '.tsx', '.jsx'], conditionNames: ['solid', '...'], }, module: { rules: [ + { + test: /\.[cm]?[jt]sx?$/, + resolve: { + fullySpecified: false, + }, + }, { test: /\.jsx$/, loader: 'solid-loader', diff --git a/rspack/solid/src/App.jsx b/rspack/solid/src/App.jsx index 9fbc3b84e..f79c152f5 100644 --- a/rspack/solid/src/App.jsx +++ b/rspack/solid/src/App.jsx @@ -1,7 +1,7 @@ import logo from './logo.svg'; import styles from './App.module.css'; import { createSignal } from 'solid-js'; -import Message from './Message.jsx'; +import Message from './Message'; function App() { const [count, setCount] = createSignal(1); const increment = () => setCount(count() + 1); diff --git a/rspack/solid/src/index.jsx b/rspack/solid/src/index.jsx index eafe52d27..07412cb87 100644 --- a/rspack/solid/src/index.jsx +++ b/rspack/solid/src/index.jsx @@ -1,6 +1,6 @@ import { render } from '@solidjs/web'; import './index.css'; -import App from './App.jsx'; +import App from './App'; render(() => , document.getElementById('root')); From f79a4bce8de6e17ecc0667c89fd0b9eb19e5829b Mon Sep 17 00:00:00 2001 From: neverland Date: Thu, 19 Nov 2026 16:34:09 +0800 Subject: [PATCH 3/4] feat(rspack): handle Solid scripts with solid-loader and SWC --- rspack/solid/rspack.config.ts | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/rspack/solid/rspack.config.ts b/rspack/solid/rspack.config.ts index abb9b4c0f..22ad733dd 100644 --- a/rspack/solid/rspack.config.ts +++ b/rspack/solid/rspack.config.ts @@ -19,8 +19,19 @@ export default defineConfig({ }, }, { - test: /\.jsx$/, - loader: 'solid-loader', + test: /\.[cm]?[jt]sx?$/, + exclude: /node_modules/, + use: [ + { + loader: 'builtin:swc-loader', + options: { detectSyntax: 'auto' }, + }, + { + loader: 'solid-loader', + // Leave plain TypeScript to SWC. + options: { scriptRegex: /\.[cm]?(?:jsx?|tsx)$/ }, + }, + ], }, { // Solid loads hydration modules from URLs at runtime. From 6edd2a7922cd20b0fdae495acce4e6d834dd1044 Mon Sep 17 00:00:00 2001 From: neverland Date: Thu, 19 Nov 2026 21:29:18 +0800 Subject: [PATCH 4/4] refactor(rspack): use solid-loader 1.0.1 defaults --- pnpm-lock.yaml | 10 +++++----- rspack/solid/package.json | 2 +- rspack/solid/rspack.config.ts | 10 +--------- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d287add3a..a89e2db30 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3559,8 +3559,8 @@ importers: specifier: 2.2.1 version: 2.2.1(@rspack/core@2.2.8)(selfsigned@5.5.0) solid-loader: - specifier: ^1.0.0 - version: 1.0.0(@rspack/core@2.2.8)(@solidjs/web@2.0.0)(solid-js@2.0.0) + specifier: ^1.0.1 + version: 1.0.1(@rspack/core@2.2.8)(@solidjs/web@2.0.0)(solid-js@2.0.0) rspack/source-map-with-vscode-debugging: dependencies: @@ -15605,8 +15605,8 @@ packages: resolution: {integrity: sha512-9zN4uH2OQeQAYbF4BmIzoaa+L5Hb8Dp6kkP6ZXobHQ1FZVICdmzREPDVDBJY7umzdAE8D6zbFfWhxGtagkyslA==} engines: {node: '>=22.12.0'} - solid-loader@1.0.0: - resolution: {integrity: sha512-ycdVLW/GuS6N8Wj/6msKCcXPdQGabFrBfDNJ5P0sjJtHUEDee/eW9y6RqpZDEgsABuz6byI0dN07Jia8RK4lwQ==} + solid-loader@1.0.1: + resolution: {integrity: sha512-jkFW9lFnG5Bl3OD09M8ljF9px7O/qEYYWD7CkjiyFObu6n1U1b/OydnTyT3Ljhp6Hr/vgVx9xnIbzTEnzbCitQ==} peerDependencies: '@rspack/core': ^2.0.0 '@solidjs/web': ^2.0.0 @@ -30842,7 +30842,7 @@ snapshots: seroval: 1.8.2 seroval-plugins: 1.8.0(seroval@1.8.2) - solid-loader@1.0.0(@rspack/core@2.2.8)(@solidjs/web@2.0.0)(solid-js@2.0.0): + solid-loader@1.0.1(@rspack/core@2.2.8)(@solidjs/web@2.0.0)(solid-js@2.0.0): dependencies: '@babel/core': 7.29.13 '@jridgewell/remapping': 2.3.5 diff --git a/rspack/solid/package.json b/rspack/solid/package.json index dc814a3d3..abfd2ca5c 100644 --- a/rspack/solid/package.json +++ b/rspack/solid/package.json @@ -16,6 +16,6 @@ "@rspack/cli": "2.2.8", "@rspack/core": "2.2.8", "@rspack/dev-server": "2.2.1", - "solid-loader": "^1.0.0" + "solid-loader": "^1.0.1" } } diff --git a/rspack/solid/rspack.config.ts b/rspack/solid/rspack.config.ts index 22ad733dd..c60a6a101 100644 --- a/rspack/solid/rspack.config.ts +++ b/rspack/solid/rspack.config.ts @@ -17,20 +17,12 @@ export default defineConfig({ resolve: { fullySpecified: false, }, - }, - { - test: /\.[cm]?[jt]sx?$/, - exclude: /node_modules/, use: [ { loader: 'builtin:swc-loader', options: { detectSyntax: 'auto' }, }, - { - loader: 'solid-loader', - // Leave plain TypeScript to SWC. - options: { scriptRegex: /\.[cm]?(?:jsx?|tsx)$/ }, - }, + 'solid-loader', ], }, {