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
356 changes: 245 additions & 111 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions rsbuild/solid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@
"preview": "rsbuild preview"
},
"dependencies": {
"@solidjs/web": "^2.0.0-rc.13",
"solid-js": "^2.0.0-rc.13"
"@solidjs/web": "^2.0.0",
"solid-js": "^2.0.0"
},
"devDependencies": {
"@rsbuild/core": "2.2.12",
"@rsbuild/plugin-babel": "^2.1.0",
"@rsbuild/plugin-solid": "^2.0.0-rc.1",
"@rsbuild/plugin-solid": "^2.0.0",
"@types/node": "^24.19.2",
"typescript": "^5.9.3"
}
Expand Down
9 changes: 1 addition & 8 deletions rsbuild/solid/rsbuild.config.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
import { defineConfig } from '@rsbuild/core';
import { pluginBabel } from '@rsbuild/plugin-babel';
import { pluginSolid } from '@rsbuild/plugin-solid';

export default defineConfig({
plugins: [
pluginBabel({
include: /\.(?:jsx|tsx)$/,
exclude: /[\\/]node_modules[\\/]/,
}),
pluginSolid(),
],
plugins: [pluginSolid()],
});
9 changes: 5 additions & 4 deletions rslib/solid-basic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@
"dev": "rslib -w"
},
"devDependencies": {
"@rsbuild/plugin-babel": "^2.1.0",
"@rsbuild/plugin-solid": "^1.2.2",
"@rsbuild/plugin-solid": "^2.0.0",
"@rslib/core": "^1.0.3",
"solid-js": "^1.9.17",
"@solidjs/web": "^2.0.0",
"solid-js": "^2.0.0",
"typescript": "^5.9.3"
},
"peerDependencies": {
"solid-js": "^1.8.0"
"@solidjs/web": "^2.0.0",
"solid-js": "^2.0.0"
}
}
8 changes: 1 addition & 7 deletions rslib/solid-basic/rslib.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { pluginBabel } from '@rsbuild/plugin-babel';
import { pluginSolid } from '@rsbuild/plugin-solid';
import { defineConfig } from '@rslib/core';

Expand All @@ -8,12 +7,7 @@ export default defineConfig({
{
id: 'compiled',
dts: true,
plugins: [
pluginBabel({
include: /\.(?:jsx|tsx)$/,
}),
pluginSolid(),
],
plugins: [pluginSolid()],
},
{
id: 'source',
Expand Down
2 changes: 1 addition & 1 deletion rslib/solid-basic/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"lib": ["DOM", "ES2022"],
"module": "ESNext",
"jsx": "preserve",
"jsxImportSource": "solid-js",
"jsxImportSource": "@solidjs/web",
"strict": true,
"skipLibCheck": true,
"types": ["@rslib/core/types"],
Expand Down
11 changes: 6 additions & 5 deletions rslib/solid-rstest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,18 @@
"test": "rstest"
},
"devDependencies": {
"@rsbuild/plugin-babel": "^2.1.0",
"@rsbuild/plugin-solid": "^1.2.2",
"@rsbuild/plugin-solid": "^2.0.0",
"@rslib/core": "^1.0.3",
"@rstest/adapter-rslib": "^0.12.3",
"@rstest/core": "^0.12.3",
"@solidjs/testing-library": "^0.8.10",
"@solidjs/testing-library": "1.0.0-rc.2",
"@solidjs/web": "^2.0.0",
"happy-dom": "^21.0.0",
"solid-js": "^1.9.17",
"solid-js": "^2.0.0",
"typescript": "^5.9.3"
},
"peerDependencies": {
"solid-js": "^1.8.0"
"@solidjs/web": "^2.0.0",
"solid-js": "^2.0.0"
}
}
8 changes: 1 addition & 7 deletions rslib/solid-rstest/rslib.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { pluginBabel } from '@rsbuild/plugin-babel';
import { pluginSolid } from '@rsbuild/plugin-solid';
import { defineConfig } from '@rslib/core';

Expand All @@ -8,12 +7,7 @@ export default defineConfig({
{
id: 'compiled',
dts: true,
plugins: [
pluginBabel({
include: /\.(?:jsx|tsx)$/,
}),
pluginSolid(),
],
plugins: [pluginSolid()],
},
{
id: 'source',
Expand Down
2 changes: 1 addition & 1 deletion rslib/solid-rstest/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"lib": ["DOM", "ES2022"],
"module": "ESNext",
"jsx": "preserve",
"jsxImportSource": "solid-js",
"jsxImportSource": "@solidjs/web",
"strict": true,
"skipLibCheck": true,
"types": ["@rslib/core/types"],
Expand Down
8 changes: 4 additions & 4 deletions rstest/rsbuild-solid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
},
"devDependencies": {
"@rsbuild/core": "2.2.12",
"@rsbuild/plugin-babel": "^2.1.0",
"@rsbuild/plugin-solid": "^1.2.2",
"@rsbuild/plugin-solid": "^2.0.0",
"@rstest/adapter-rsbuild": "^0.12.3",
"@rstest/core": "^0.12.3",
"@solidjs/web": "^2.0.0",
"@types/node": "^24.19.2",
"happy-dom": "^21.0.0",
"solid-js": "^1.9.17",
"jsdom": "^30.1.2",
"solid-js": "^2.0.0",
"typescript": "^5.9.3"
}
}
9 changes: 1 addition & 8 deletions rstest/rsbuild-solid/rsbuild.config.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
import path from 'node:path';
import { defineConfig } from '@rsbuild/core';
import { pluginBabel } from '@rsbuild/plugin-babel';
import { pluginSolid } from '@rsbuild/plugin-solid';

export default defineConfig({
plugins: [
pluginBabel({
include: /\.(?:jsx|tsx)$/,
exclude: /[\\/]node_modules[\\/]/,
}),
pluginSolid(),
],
plugins: [pluginSolid()],
source: {
entry: {
index: './src/index.tsx',
Expand Down
1 change: 1 addition & 0 deletions rstest/rsbuild-solid/rstest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ import { defineConfig } from '@rstest/core';

export default defineConfig({
extends: withRsbuildConfig(),
testEnvironment: 'jsdom',
});
2 changes: 1 addition & 1 deletion rstest/rsbuild-solid/src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { render } from 'solid-js/web';
import { render } from '@solidjs/web';
import { Counter } from './components/Counter';

const root =
Expand Down
2 changes: 1 addition & 1 deletion rstest/rsbuild-solid/tests/adapter.test.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Counter } from '@components/Counter';
import { afterEach, beforeEach, describe, expect, it } from '@rstest/core';
import { render } from 'solid-js/web';
import { render } from '@solidjs/web';

declare const __APP_VERSION__: string;

Expand Down
5 changes: 4 additions & 1 deletion rstest/rsbuild-solid/tests/counter.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { afterEach, beforeEach, describe, expect, it } from '@rstest/core';
import { render } from 'solid-js/web';
import { render } from '@solidjs/web';
import { flush } from 'solid-js';
import { Counter } from '../src/components/Counter';

describe('pluginSolid - component rendering', () => {
Expand Down Expand Up @@ -30,6 +31,8 @@ describe('pluginSolid - component rendering', () => {
'[data-testid="increment-btn"]',
) as HTMLButtonElement;
incrementButton.click();
// Solid 2 batches reactive updates. Flush before asserting DOM changes.
flush();

expect(container.querySelector('[data-testid="counter-value"]')?.textContent).toBe('1');
});
Expand Down
2 changes: 1 addition & 1 deletion rstest/rsbuild-solid/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"esModuleInterop": true,
"skipLibCheck": true,
"jsx": "preserve",
"jsxImportSource": "solid-js",
"jsxImportSource": "@solidjs/web",
"types": ["@rsbuild/core/types", "node", "@rstest/core"],
"paths": {
"@/*": ["./src/*"],
Expand Down
Loading