Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 28 additions & 55 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 4 additions & 6 deletions rspack/solid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.1"
}
}
26 changes: 13 additions & 13 deletions rspack/solid/rspack.config.js → rspack/solid/rspack.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// @ts-check
import { defineConfig } from '@rspack/cli';
import { rspack } from '@rspack/core';

Expand All @@ -9,6 +8,7 @@ export default defineConfig({
},
resolve: {
extensions: ['...', '.ts', '.tsx', '.jsx'],
conditionNames: ['solid', '...'],
},
module: {
rules: [
Expand All @@ -17,6 +17,18 @@ export default defineConfig({
resolve: {
fullySpecified: false,
},
use: [
{
loader: 'builtin:swc-loader',
options: { detectSyntax: 'auto' },
},
'solid-loader',
],
},
{
// Solid loads hydration modules from URLs at runtime.
descriptionData: { name: /^@solidjs\/web$/ },
parser: { importDynamic: false },
},
{
test: /\.css$/,
Expand All @@ -33,18 +45,6 @@ export default defineConfig({
test: /\.svg$/,
type: 'asset/resource',
},
{
test: /\.jsx$/,
use: [
{
loader: 'babel-loader',
options: {
presets: [['solid']],
plugins: ['solid-refresh/babel'],
},
},
],
},
],
},
plugins: [
Expand Down
3 changes: 1 addition & 2 deletions rspack/solid/src/index.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/* @refresh reload */
import { render } from 'solid-js/web';
import { render } from '@solidjs/web';

import './index.css';
import App from './App';
Expand Down
Loading