Open
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
2 changes: 2 additions & 0 deletions examples/vite-3/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-3/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
2 changes: 2 additions & 0 deletions examples/vite-4/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-4/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
2 changes: 2 additions & 0 deletions examples/vite-5/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-5/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
2 changes: 2 additions & 0 deletions examples/vite-6/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-6/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
4 changes: 4 additions & 0 deletions examples/vite-6/tests/App.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,10 @@ import App from '../src/App.jsx';
test('App', async () => {
const root = page.elementLocator(render(() => <App />).baseElement);

// Label is a .jsx component — verifies the plugin processes .jsx files correctly
const label = root.getByTestId('label');
await expect.element(label).toHaveTextContent('solid');

const count = root.getByText('Count:');
await expect.element(count).toHaveTextContent('Count: 0');

Expand Down
2 changes: 2 additions & 0 deletions examples/vite-7/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-7/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
4 changes: 4 additions & 0 deletions examples/vite-7/tests/App.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,10 @@ import App from '../src/App.jsx';
test('App', async () => {
const root = page.elementLocator(render(() => <App />).baseElement);

// Label is a .jsx component — verifies the plugin processes .jsx files correctly
const label = root.getByTestId('label');
await expect.element(label).toHaveTextContent('solid');

const count = root.getByText('Count:');
await expect.element(count).toHaveTextContent('Count: 0');

Expand Down
2 changes: 2 additions & 0 deletions examples/vite-8/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-8/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
4 changes: 4 additions & 0 deletions examples/vite-8/tests/App.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,10 @@ import App from '../src/App.jsx';
test('App', async () => {
const root = page.elementLocator(render(() => <App />).baseElement);

// Label is a .jsx component — verifies the plugin processes .jsx files correctly
const label = root.getByTestId('label');
await expect.element(label).toHaveTextContent('solid');

const count = root.getByText('Count:');
await expect.element(count).toHaveTextContent('Count: 0');

Expand Down
6 changes: 5 additions & 1 deletion pnpm-workspace.yaml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
packages:
- '.'
- "examples/*"
allowBuilds:
cypress: set this to true or false
esbuild: set this to true or false
msw: set this to true or false
catalog:
"solid-js": ^1.9.4
"solid-js": ^1.9.4
183 changes: 103 additions & 80 deletions src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { crawlFrameworkPkgs } from 'vitefu';
const require = createRequire(import.meta.url);

const runtimePublicPath = '/@solid-refresh';
const runtimePublicPathFilter = /^\/@solid-refresh$/;
const runtimeFilePath = require.resolve('solid-refresh/dist/solid-refresh.mjs');
const runtimeCode = readFileSync(runtimeFilePath, 'utf-8');

Expand DownExpand Up@@ -332,103 +333,125 @@ export default function solidPlugin(options: Partial<Options> = {}): Plugin {
needHmr = config.command === 'serve' && config.mode !== 'production' && options.hot !== false;
},

resolveId(id) {
if (id === runtimePublicPath) return id;
resolveId: {
// Filter is used by Rolldown and newer Rollup/Vite versions (Vite >= 6.3.0) to skip
// unnecessary Rust-to-JS calls. The inner check is kept for backward compatibility
// with older versions that ignore hook filters and call the handler for every module.
// @ts-ignore filter is not yet in Vite's type definitions but is supported at runtime
filter: { id: runtimePublicPathFilter },
handler(id) {
if (id === runtimePublicPath) return id;
},
},

load(id) {
if (id === runtimePublicPath) return runtimeCode;
load: {
// Same backward-compatibility strategy as resolveId above.
// @ts-ignore filter is not yet in Vite's type definitions but is supported at runtime
filter: { id: runtimePublicPathFilter },
handler(id) {
if (id === runtimePublicPath) return runtimeCode;
},
},

async transform(source, id, transformOptions) {
const isSsr = this.environment
? this.environment.config.consumer === 'server'
: Boolean(transformOptions?.ssr);
const currentFileExtension = getExtension(id);

const extensionsToWatch = options.extensions || [];
const allExtensions = extensionsToWatch.map((extension) =>
// An extension can be a string or a tuple [extension, options]
typeof extension === 'string' ? extension : extension[0],
);

if (!filter(id)) {
return null;
}
transform: {
// Limit invocations to files that could contain Solid JSX. Custom extensions
// (options.extensions) cannot be represented as a static regex, so they are
// still handled by the inner extension check below — this filter covers the
// common case and is the source of the largest performance win.
// The inner checks (filter(id) / extension regex) are kept as-is so that the
// hook behaves correctly on older Vite/Rollup versions that ignore hook filters.
// @ts-ignore filter is not yet in Vite's type definitions but is supported at runtime
filter: { id: /\.[mc]?[tj]sx$/i },
async handler(source, id, transformOptions) {
const isSsr = this.environment
? this.environment.config.consumer === 'server'
: Boolean(transformOptions?.ssr);
const currentFileExtension = getExtension(id);

const extensionsToWatch = options.extensions || [];
const allExtensions = extensionsToWatch.map((extension) =>
// An extension can be a string or a tuple [extension, options]
typeof extension === 'string' ? extension : extension[0],
);

if (!filter(id)) {
return null;
}

id = id.replace(/\?.*$/, '');
id = id.replace(/\?.*$/, '');

if (!(/\.[mc]?[tj]sx$/i.test(id) || allExtensions.includes(currentFileExtension))) {
return null;
}
if (!(/\.[mc]?[tj]sx$/i.test(id) || allExtensions.includes(currentFileExtension))) {
return null;
}

const inNodeModules = /node_modules/.test(id);
const inNodeModules = /node_modules/.test(id);

let solidOptions: { generate: 'ssr' | 'dom'; hydratable: boolean };
let solidOptions: { generate: 'ssr' | 'dom'; hydratable: boolean };

if (options.ssr) {
if (isSsr) {
solidOptions = { generate: 'ssr', hydratable: true };
if (options.ssr) {
if (isSsr) {
solidOptions = { generate: 'ssr', hydratable: true };
} else {
solidOptions = { generate: 'dom', hydratable: true };
}
} else {
solidOptions = { generate: 'dom', hydratable: true };
solidOptions = { generate: 'dom', hydratable: false };
}
} else {
solidOptions = { generate: 'dom', hydratable: false };
}

// We need to know if the current file extension has a typescript options tied to it
const shouldBeProcessedWithTypescript =
/\.[mc]?tsx$/i.test(id) ||
extensionsToWatch.some((extension) => {
if (typeof extension === 'string') {
return extension.includes('tsx');
}

const [extensionName, extensionOptions] = extension;
if (extensionName !== currentFileExtension) return false;

return extensionOptions.typescript;
});
const plugins: NonNullable<NonNullable<babel.TransformOptions['parserOpts']>['plugins']> = [
'jsx',
];

if (shouldBeProcessedWithTypescript) {
plugins.push('typescript');
}

const opts: babel.TransformOptions = {
root: projectRoot,
filename: id,
sourceFileName: id,
presets: [[solid, { ...solidOptions, ...(options.solid || {}) }]],
plugins: needHmr && !isSsr && !inNodeModules ? [[solidRefresh, { bundler: 'vite' }]] : [],
ast: false,
sourceMaps: true,
configFile: false,
babelrc: false,
parserOpts: {
plugins,
},
};

// Default value for babel user options
let babelUserOptions: babel.TransformOptions = {};
// We need to know if the current file extension has a typescript options tied to it
const shouldBeProcessedWithTypescript =
/\.[mc]?tsx$/i.test(id) ||
extensionsToWatch.some((extension) => {
if (typeof extension === 'string') {
return extension.includes('tsx');
}

const [extensionName, extensionOptions] = extension;
if (extensionName !== currentFileExtension) return false;

return extensionOptions.typescript;
});
const plugins: NonNullable<NonNullable<babel.TransformOptions['parserOpts']>['plugins']> = [
'jsx',
];

if (shouldBeProcessedWithTypescript) {
plugins.push('typescript');
}

if (options.babel) {
if (typeof options.babel === 'function') {
const babelOptions = options.babel(source, id, isSsr);
babelUserOptions = babelOptions instanceof Promise ? await babelOptions : babelOptions;
} else {
babelUserOptions = options.babel;
const opts: babel.TransformOptions = {
root: projectRoot,
filename: id,
sourceFileName: id,
presets: [[solid, { ...solidOptions, ...(options.solid || {}) }]],
plugins: needHmr && !isSsr && !inNodeModules ? [[solidRefresh, { bundler: 'vite' }]] : [],
ast: false,
sourceMaps: true,
configFile: false,
babelrc: false,
parserOpts: {
plugins,
},
};

// Default value for babel user options
let babelUserOptions: babel.TransformOptions = {};

if (options.babel) {
if (typeof options.babel === 'function') {
const babelOptions = options.babel(source, id, isSsr);
babelUserOptions = babelOptions instanceof Promise ? await babelOptions : babelOptions;
} else {
babelUserOptions = options.babel;
}
}
}

const babelOptions = mergeAndConcat(babelUserOptions, opts) as babel.TransformOptions;
const babelOptions = mergeAndConcat(babelUserOptions, opts) as babel.TransformOptions;

const { code, map } = await babel.transformAsync(source, babelOptions);
const { code, map } = await babel.transformAsync(source, babelOptions);

return { code, map };
return { code, map };
},
},
};
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Open
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
2 changes: 2 additions & 0 deletions examples/vite-3/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-3/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
2 changes: 2 additions & 0 deletions examples/vite-4/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-4/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
2 changes: 2 additions & 0 deletions examples/vite-5/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-5/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
2 changes: 2 additions & 0 deletions examples/vite-6/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-6/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
4 changes: 4 additions & 0 deletions examples/vite-6/tests/App.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,10 @@ import App from '../src/App.jsx';
test('App', async () => {
const root = page.elementLocator(render(() => <App />).baseElement);

// Label is a .jsx component — verifies the plugin processes .jsx files correctly
const label = root.getByTestId('label');
await expect.element(label).toHaveTextContent('solid');

const count = root.getByText('Count:');
await expect.element(count).toHaveTextContent('Count: 0');

Expand Down
2 changes: 2 additions & 0 deletions examples/vite-7/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-7/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
4 changes: 4 additions & 0 deletions examples/vite-7/tests/App.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,10 @@ import App from '../src/App.jsx';
test('App', async () => {
const root = page.elementLocator(render(() => <App />).baseElement);

// Label is a .jsx component — verifies the plugin processes .jsx files correctly
const label = root.getByTestId('label');
await expect.element(label).toHaveTextContent('solid');

const count = root.getByText('Count:');
await expect.element(count).toHaveTextContent('Count: 0');

Expand Down
2 changes: 2 additions & 0 deletions examples/vite-8/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-8/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
4 changes: 4 additions & 0 deletions examples/vite-8/tests/App.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,10 @@ import App from '../src/App.jsx';
test('App', async () => {
const root = page.elementLocator(render(() => <App />).baseElement);

// Label is a .jsx component — verifies the plugin processes .jsx files correctly
const label = root.getByTestId('label');
await expect.element(label).toHaveTextContent('solid');

const count = root.getByText('Count:');
await expect.element(count).toHaveTextContent('Count: 0');

Expand Down
6 changes: 5 additions & 1 deletion pnpm-workspace.yaml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
packages:
- '.'
- "examples/*"
allowBuilds:
cypress: set this to true or false
esbuild: set this to true or false
msw: set this to true or false
catalog:
"solid-js": ^1.9.4
"solid-js": ^1.9.4
183 changes: 103 additions & 80 deletions src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { crawlFrameworkPkgs } from 'vitefu';
const require = createRequire(import.meta.url);

const runtimePublicPath = '/@solid-refresh';
const runtimePublicPathFilter = /^\/@solid-refresh$/;
const runtimeFilePath = require.resolve('solid-refresh/dist/solid-refresh.mjs');
const runtimeCode = readFileSync(runtimeFilePath, 'utf-8');

Expand DownExpand Up@@ -332,103 +333,125 @@ export default function solidPlugin(options: Partial<Options> = {}): Plugin {
needHmr = config.command === 'serve' && config.mode !== 'production' && options.hot !== false;
},

resolveId(id) {
if (id === runtimePublicPath) return id;
resolveId: {
// Filter is used by Rolldown and newer Rollup/Vite versions (Vite >= 6.3.0) to skip
// unnecessary Rust-to-JS calls. The inner check is kept for backward compatibility
// with older versions that ignore hook filters and call the handler for every module.
// @ts-ignore filter is not yet in Vite's type definitions but is supported at runtime
filter: { id: runtimePublicPathFilter },
handler(id) {
if (id === runtimePublicPath) return id;
},
},

load(id) {
if (id === runtimePublicPath) return runtimeCode;
load: {
// Same backward-compatibility strategy as resolveId above.
// @ts-ignore filter is not yet in Vite's type definitions but is supported at runtime
filter: { id: runtimePublicPathFilter },
handler(id) {
if (id === runtimePublicPath) return runtimeCode;
},
},

async transform(source, id, transformOptions) {
const isSsr = this.environment
? this.environment.config.consumer === 'server'
: Boolean(transformOptions?.ssr);
const currentFileExtension = getExtension(id);

const extensionsToWatch = options.extensions || [];
const allExtensions = extensionsToWatch.map((extension) =>
// An extension can be a string or a tuple [extension, options]
typeof extension === 'string' ? extension : extension[0],
);

if (!filter(id)) {
return null;
}
transform: {
// Limit invocations to files that could contain Solid JSX. Custom extensions
// (options.extensions) cannot be represented as a static regex, so they are
// still handled by the inner extension check below — this filter covers the
// common case and is the source of the largest performance win.
// The inner checks (filter(id) / extension regex) are kept as-is so that the
// hook behaves correctly on older Vite/Rollup versions that ignore hook filters.
// @ts-ignore filter is not yet in Vite's type definitions but is supported at runtime
filter: { id: /\.[mc]?[tj]sx$/i },
async handler(source, id, transformOptions) {
const isSsr = this.environment
? this.environment.config.consumer === 'server'
: Boolean(transformOptions?.ssr);
const currentFileExtension = getExtension(id);

const extensionsToWatch = options.extensions || [];
const allExtensions = extensionsToWatch.map((extension) =>
// An extension can be a string or a tuple [extension, options]
typeof extension === 'string' ? extension : extension[0],
);

if (!filter(id)) {
return null;
}

id = id.replace(/\?.*$/, '');
id = id.replace(/\?.*$/, '');

if (!(/\.[mc]?[tj]sx$/i.test(id) || allExtensions.includes(currentFileExtension))) {
return null;
}
if (!(/\.[mc]?[tj]sx$/i.test(id) || allExtensions.includes(currentFileExtension))) {
return null;
}

const inNodeModules = /node_modules/.test(id);
const inNodeModules = /node_modules/.test(id);

let solidOptions: { generate: 'ssr' | 'dom'; hydratable: boolean };
let solidOptions: { generate: 'ssr' | 'dom'; hydratable: boolean };

if (options.ssr) {
if (isSsr) {
solidOptions = { generate: 'ssr', hydratable: true };
if (options.ssr) {
if (isSsr) {
solidOptions = { generate: 'ssr', hydratable: true };
} else {
solidOptions = { generate: 'dom', hydratable: true };
}
} else {
solidOptions = { generate: 'dom', hydratable: true };
solidOptions = { generate: 'dom', hydratable: false };
}
} else {
solidOptions = { generate: 'dom', hydratable: false };
}

// We need to know if the current file extension has a typescript options tied to it
const shouldBeProcessedWithTypescript =
/\.[mc]?tsx$/i.test(id) ||
extensionsToWatch.some((extension) => {
if (typeof extension === 'string') {
return extension.includes('tsx');
}

const [extensionName, extensionOptions] = extension;
if (extensionName !== currentFileExtension) return false;

return extensionOptions.typescript;
});
const plugins: NonNullable<NonNullable<babel.TransformOptions['parserOpts']>['plugins']> = [
'jsx',
];

if (shouldBeProcessedWithTypescript) {
plugins.push('typescript');
}

const opts: babel.TransformOptions = {
root: projectRoot,
filename: id,
sourceFileName: id,
presets: [[solid, { ...solidOptions, ...(options.solid || {}) }]],
plugins: needHmr && !isSsr && !inNodeModules ? [[solidRefresh, { bundler: 'vite' }]] : [],
ast: false,
sourceMaps: true,
configFile: false,
babelrc: false,
parserOpts: {
plugins,
},
};

// Default value for babel user options
let babelUserOptions: babel.TransformOptions = {};
// We need to know if the current file extension has a typescript options tied to it
const shouldBeProcessedWithTypescript =
/\.[mc]?tsx$/i.test(id) ||
extensionsToWatch.some((extension) => {
if (typeof extension === 'string') {
return extension.includes('tsx');
}

const [extensionName, extensionOptions] = extension;
if (extensionName !== currentFileExtension) return false;

return extensionOptions.typescript;
});
const plugins: NonNullable<NonNullable<babel.TransformOptions['parserOpts']>['plugins']> = [
'jsx',
];

if (shouldBeProcessedWithTypescript) {
plugins.push('typescript');
}

if (options.babel) {
if (typeof options.babel === 'function') {
const babelOptions = options.babel(source, id, isSsr);
babelUserOptions = babelOptions instanceof Promise ? await babelOptions : babelOptions;
} else {
babelUserOptions = options.babel;
const opts: babel.TransformOptions = {
root: projectRoot,
filename: id,
sourceFileName: id,
presets: [[solid, { ...solidOptions, ...(options.solid || {}) }]],
plugins: needHmr && !isSsr && !inNodeModules ? [[solidRefresh, { bundler: 'vite' }]] : [],
ast: false,
sourceMaps: true,
configFile: false,
babelrc: false,
parserOpts: {
plugins,
},
};

// Default value for babel user options
let babelUserOptions: babel.TransformOptions = {};

if (options.babel) {
if (typeof options.babel === 'function') {
const babelOptions = options.babel(source, id, isSsr);
babelUserOptions = babelOptions instanceof Promise ? await babelOptions : babelOptions;
} else {
babelUserOptions = options.babel;
}
}
}

const babelOptions = mergeAndConcat(babelUserOptions, opts) as babel.TransformOptions;
const babelOptions = mergeAndConcat(babelUserOptions, opts) as babel.TransformOptions;

const { code, map } = await babel.transformAsync(source, babelOptions);
const { code, map } = await babel.transformAsync(source, babelOptions);

return { code, map };
return { code, map };
},
},
};
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
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
2 changes: 2 additions & 0 deletions examples/vite-3/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-3/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
2 changes: 2 additions & 0 deletions examples/vite-4/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-4/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
2 changes: 2 additions & 0 deletions examples/vite-5/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-5/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
2 changes: 2 additions & 0 deletions examples/vite-6/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-6/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
4 changes: 4 additions & 0 deletions examples/vite-6/tests/App.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,10 @@ import App from '../src/App.jsx';
test('App', async () => {
const root = page.elementLocator(render(() => <App />).baseElement);

// Label is a .jsx component — verifies the plugin processes .jsx files correctly
const label = root.getByTestId('label');
await expect.element(label).toHaveTextContent('solid');

const count = root.getByText('Count:');
await expect.element(count).toHaveTextContent('Count: 0');

Expand Down
2 changes: 2 additions & 0 deletions examples/vite-7/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-7/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
4 changes: 4 additions & 0 deletions examples/vite-7/tests/App.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,10 @@ import App from '../src/App.jsx';
test('App', async () => {
const root = page.elementLocator(render(() => <App />).baseElement);

// Label is a .jsx component — verifies the plugin processes .jsx files correctly
const label = root.getByTestId('label');
await expect.element(label).toHaveTextContent('solid');

const count = root.getByText('Count:');
await expect.element(count).toHaveTextContent('Count: 0');

Expand Down
2 changes: 2 additions & 0 deletions examples/vite-8/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-8/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
4 changes: 4 additions & 0 deletions examples/vite-8/tests/App.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,10 @@ import App from '../src/App.jsx';
test('App', async () => {
const root = page.elementLocator(render(() => <App />).baseElement);

// Label is a .jsx component — verifies the plugin processes .jsx files correctly
const label = root.getByTestId('label');
await expect.element(label).toHaveTextContent('solid');

const count = root.getByText('Count:');
await expect.element(count).toHaveTextContent('Count: 0');

Expand Down
6 changes: 5 additions & 1 deletion pnpm-workspace.yaml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
packages:
- '.'
- "examples/*"
allowBuilds:
cypress: set this to true or false
esbuild: set this to true or false
msw: set this to true or false
catalog:
"solid-js": ^1.9.4
"solid-js": ^1.9.4
183 changes: 103 additions & 80 deletions src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { crawlFrameworkPkgs } from 'vitefu';
const require = createRequire(import.meta.url);

const runtimePublicPath = '/@solid-refresh';
const runtimePublicPathFilter = /^\/@solid-refresh$/;
const runtimeFilePath = require.resolve('solid-refresh/dist/solid-refresh.mjs');
const runtimeCode = readFileSync(runtimeFilePath, 'utf-8');

Expand DownExpand Up@@ -332,103 +333,125 @@ export default function solidPlugin(options: Partial<Options> = {}): Plugin {
needHmr = config.command === 'serve' && config.mode !== 'production' && options.hot !== false;
},

resolveId(id) {
if (id === runtimePublicPath) return id;
resolveId: {
// Filter is used by Rolldown and newer Rollup/Vite versions (Vite >= 6.3.0) to skip
// unnecessary Rust-to-JS calls. The inner check is kept for backward compatibility
// with older versions that ignore hook filters and call the handler for every module.
// @ts-ignore filter is not yet in Vite's type definitions but is supported at runtime
filter: { id: runtimePublicPathFilter },
handler(id) {
if (id === runtimePublicPath) return id;
},
},

load(id) {
if (id === runtimePublicPath) return runtimeCode;
load: {
// Same backward-compatibility strategy as resolveId above.
// @ts-ignore filter is not yet in Vite's type definitions but is supported at runtime
filter: { id: runtimePublicPathFilter },
handler(id) {
if (id === runtimePublicPath) return runtimeCode;
},
},

async transform(source, id, transformOptions) {
const isSsr = this.environment
? this.environment.config.consumer === 'server'
: Boolean(transformOptions?.ssr);
const currentFileExtension = getExtension(id);

const extensionsToWatch = options.extensions || [];
const allExtensions = extensionsToWatch.map((extension) =>
// An extension can be a string or a tuple [extension, options]
typeof extension === 'string' ? extension : extension[0],
);

if (!filter(id)) {
return null;
}
transform: {
// Limit invocations to files that could contain Solid JSX. Custom extensions
// (options.extensions) cannot be represented as a static regex, so they are
// still handled by the inner extension check below — this filter covers the
// common case and is the source of the largest performance win.
// The inner checks (filter(id) / extension regex) are kept as-is so that the
// hook behaves correctly on older Vite/Rollup versions that ignore hook filters.
// @ts-ignore filter is not yet in Vite's type definitions but is supported at runtime
filter: { id: /\.[mc]?[tj]sx$/i },
async handler(source, id, transformOptions) {
const isSsr = this.environment
? this.environment.config.consumer === 'server'
: Boolean(transformOptions?.ssr);
const currentFileExtension = getExtension(id);

const extensionsToWatch = options.extensions || [];
const allExtensions = extensionsToWatch.map((extension) =>
// An extension can be a string or a tuple [extension, options]
typeof extension === 'string' ? extension : extension[0],
);

if (!filter(id)) {
return null;
}

id = id.replace(/\?.*$/, '');
id = id.replace(/\?.*$/, '');

if (!(/\.[mc]?[tj]sx$/i.test(id) || allExtensions.includes(currentFileExtension))) {
return null;
}
if (!(/\.[mc]?[tj]sx$/i.test(id) || allExtensions.includes(currentFileExtension))) {
return null;
}

const inNodeModules = /node_modules/.test(id);
const inNodeModules = /node_modules/.test(id);

let solidOptions: { generate: 'ssr' | 'dom'; hydratable: boolean };
let solidOptions: { generate: 'ssr' | 'dom'; hydratable: boolean };

if (options.ssr) {
if (isSsr) {
solidOptions = { generate: 'ssr', hydratable: true };
if (options.ssr) {
if (isSsr) {
solidOptions = { generate: 'ssr', hydratable: true };
} else {
solidOptions = { generate: 'dom', hydratable: true };
}
} else {
solidOptions = { generate: 'dom', hydratable: true };
solidOptions = { generate: 'dom', hydratable: false };
}
} else {
solidOptions = { generate: 'dom', hydratable: false };
}

// We need to know if the current file extension has a typescript options tied to it
const shouldBeProcessedWithTypescript =
/\.[mc]?tsx$/i.test(id) ||
extensionsToWatch.some((extension) => {
if (typeof extension === 'string') {
return extension.includes('tsx');
}

const [extensionName, extensionOptions] = extension;
if (extensionName !== currentFileExtension) return false;

return extensionOptions.typescript;
});
const plugins: NonNullable<NonNullable<babel.TransformOptions['parserOpts']>['plugins']> = [
'jsx',
];

if (shouldBeProcessedWithTypescript) {
plugins.push('typescript');
}

const opts: babel.TransformOptions = {
root: projectRoot,
filename: id,
sourceFileName: id,
presets: [[solid, { ...solidOptions, ...(options.solid || {}) }]],
plugins: needHmr && !isSsr && !inNodeModules ? [[solidRefresh, { bundler: 'vite' }]] : [],
ast: false,
sourceMaps: true,
configFile: false,
babelrc: false,
parserOpts: {
plugins,
},
};

// Default value for babel user options
let babelUserOptions: babel.TransformOptions = {};
// We need to know if the current file extension has a typescript options tied to it
const shouldBeProcessedWithTypescript =
/\.[mc]?tsx$/i.test(id) ||
extensionsToWatch.some((extension) => {
if (typeof extension === 'string') {
return extension.includes('tsx');
}

const [extensionName, extensionOptions] = extension;
if (extensionName !== currentFileExtension) return false;

return extensionOptions.typescript;
});
const plugins: NonNullable<NonNullable<babel.TransformOptions['parserOpts']>['plugins']> = [
'jsx',
];

if (shouldBeProcessedWithTypescript) {
plugins.push('typescript');
}

if (options.babel) {
if (typeof options.babel === 'function') {
const babelOptions = options.babel(source, id, isSsr);
babelUserOptions = babelOptions instanceof Promise ? await babelOptions : babelOptions;
} else {
babelUserOptions = options.babel;
const opts: babel.TransformOptions = {
root: projectRoot,
filename: id,
sourceFileName: id,
presets: [[solid, { ...solidOptions, ...(options.solid || {}) }]],
plugins: needHmr && !isSsr && !inNodeModules ? [[solidRefresh, { bundler: 'vite' }]] : [],
ast: false,
sourceMaps: true,
configFile: false,
babelrc: false,
parserOpts: {
plugins,
},
};

// Default value for babel user options
let babelUserOptions: babel.TransformOptions = {};

if (options.babel) {
if (typeof options.babel === 'function') {
const babelOptions = options.babel(source, id, isSsr);
babelUserOptions = babelOptions instanceof Promise ? await babelOptions : babelOptions;
} else {
babelUserOptions = options.babel;
}
}
}

const babelOptions = mergeAndConcat(babelUserOptions, opts) as babel.TransformOptions;
const babelOptions = mergeAndConcat(babelUserOptions, opts) as babel.TransformOptions;

const { code, map } = await babel.transformAsync(source, babelOptions);
const { code, map } = await babel.transformAsync(source, babelOptions);

return { code, map };
return { code, map };
},
},
};
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
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
2 changes: 2 additions & 0 deletions examples/vite-3/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-3/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
2 changes: 2 additions & 0 deletions examples/vite-4/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-4/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
2 changes: 2 additions & 0 deletions examples/vite-5/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-5/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
2 changes: 2 additions & 0 deletions examples/vite-6/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-6/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
4 changes: 4 additions & 0 deletions examples/vite-6/tests/App.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,10 @@ import App from '../src/App.jsx';
test('App', async () => {
const root = page.elementLocator(render(() => <App />).baseElement);

// Label is a .jsx component — verifies the plugin processes .jsx files correctly
const label = root.getByTestId('label');
await expect.element(label).toHaveTextContent('solid');

const count = root.getByText('Count:');
await expect.element(count).toHaveTextContent('Count: 0');

Expand Down
2 changes: 2 additions & 0 deletions examples/vite-7/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-7/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
4 changes: 4 additions & 0 deletions examples/vite-7/tests/App.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,10 @@ import App from '../src/App.jsx';
test('App', async () => {
const root = page.elementLocator(render(() => <App />).baseElement);

// Label is a .jsx component — verifies the plugin processes .jsx files correctly
const label = root.getByTestId('label');
await expect.element(label).toHaveTextContent('solid');

const count = root.getByText('Count:');
await expect.element(count).toHaveTextContent('Count: 0');

Expand Down
2 changes: 2 additions & 0 deletions examples/vite-8/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-8/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
4 changes: 4 additions & 0 deletions examples/vite-8/tests/App.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,10 @@ import App from '../src/App.jsx';
test('App', async () => {
const root = page.elementLocator(render(() => <App />).baseElement);

// Label is a .jsx component — verifies the plugin processes .jsx files correctly
const label = root.getByTestId('label');
await expect.element(label).toHaveTextContent('solid');

const count = root.getByText('Count:');
await expect.element(count).toHaveTextContent('Count: 0');

Expand Down
6 changes: 5 additions & 1 deletion pnpm-workspace.yaml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
packages:
- '.'
- "examples/*"
allowBuilds:
cypress: set this to true or false
esbuild: set this to true or false
msw: set this to true or false
catalog:
"solid-js": ^1.9.4
"solid-js": ^1.9.4
183 changes: 103 additions & 80 deletions src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { crawlFrameworkPkgs } from 'vitefu';
const require = createRequire(import.meta.url);

const runtimePublicPath = '/@solid-refresh';
const runtimePublicPathFilter = /^\/@solid-refresh$/;
const runtimeFilePath = require.resolve('solid-refresh/dist/solid-refresh.mjs');
const runtimeCode = readFileSync(runtimeFilePath, 'utf-8');

Expand DownExpand Up@@ -332,103 +333,125 @@ export default function solidPlugin(options: Partial<Options> = {}): Plugin {
needHmr = config.command === 'serve' && config.mode !== 'production' && options.hot !== false;
},

resolveId(id) {
if (id === runtimePublicPath) return id;
resolveId: {
// Filter is used by Rolldown and newer Rollup/Vite versions (Vite >= 6.3.0) to skip
// unnecessary Rust-to-JS calls. The inner check is kept for backward compatibility
// with older versions that ignore hook filters and call the handler for every module.
// @ts-ignore filter is not yet in Vite's type definitions but is supported at runtime
filter: { id: runtimePublicPathFilter },
handler(id) {
if (id === runtimePublicPath) return id;
},
},

load(id) {
if (id === runtimePublicPath) return runtimeCode;
load: {
// Same backward-compatibility strategy as resolveId above.
// @ts-ignore filter is not yet in Vite's type definitions but is supported at runtime
filter: { id: runtimePublicPathFilter },
handler(id) {
if (id === runtimePublicPath) return runtimeCode;
},
},

async transform(source, id, transformOptions) {
const isSsr = this.environment
? this.environment.config.consumer === 'server'
: Boolean(transformOptions?.ssr);
const currentFileExtension = getExtension(id);

const extensionsToWatch = options.extensions || [];
const allExtensions = extensionsToWatch.map((extension) =>
// An extension can be a string or a tuple [extension, options]
typeof extension === 'string' ? extension : extension[0],
);

if (!filter(id)) {
return null;
}
transform: {
// Limit invocations to files that could contain Solid JSX. Custom extensions
// (options.extensions) cannot be represented as a static regex, so they are
// still handled by the inner extension check below — this filter covers the
// common case and is the source of the largest performance win.
// The inner checks (filter(id) / extension regex) are kept as-is so that the
// hook behaves correctly on older Vite/Rollup versions that ignore hook filters.
// @ts-ignore filter is not yet in Vite's type definitions but is supported at runtime
filter: { id: /\.[mc]?[tj]sx$/i },
async handler(source, id, transformOptions) {
const isSsr = this.environment
? this.environment.config.consumer === 'server'
: Boolean(transformOptions?.ssr);
const currentFileExtension = getExtension(id);

const extensionsToWatch = options.extensions || [];
const allExtensions = extensionsToWatch.map((extension) =>
// An extension can be a string or a tuple [extension, options]
typeof extension === 'string' ? extension : extension[0],
);

if (!filter(id)) {
return null;
}

id = id.replace(/\?.*$/, '');
id = id.replace(/\?.*$/, '');

if (!(/\.[mc]?[tj]sx$/i.test(id) || allExtensions.includes(currentFileExtension))) {
return null;
}
if (!(/\.[mc]?[tj]sx$/i.test(id) || allExtensions.includes(currentFileExtension))) {
return null;
}

const inNodeModules = /node_modules/.test(id);
const inNodeModules = /node_modules/.test(id);

let solidOptions: { generate: 'ssr' | 'dom'; hydratable: boolean };
let solidOptions: { generate: 'ssr' | 'dom'; hydratable: boolean };

if (options.ssr) {
if (isSsr) {
solidOptions = { generate: 'ssr', hydratable: true };
if (options.ssr) {
if (isSsr) {
solidOptions = { generate: 'ssr', hydratable: true };
} else {
solidOptions = { generate: 'dom', hydratable: true };
}
} else {
solidOptions = { generate: 'dom', hydratable: true };
solidOptions = { generate: 'dom', hydratable: false };
}
} else {
solidOptions = { generate: 'dom', hydratable: false };
}

// We need to know if the current file extension has a typescript options tied to it
const shouldBeProcessedWithTypescript =
/\.[mc]?tsx$/i.test(id) ||
extensionsToWatch.some((extension) => {
if (typeof extension === 'string') {
return extension.includes('tsx');
}

const [extensionName, extensionOptions] = extension;
if (extensionName !== currentFileExtension) return false;

return extensionOptions.typescript;
});
const plugins: NonNullable<NonNullable<babel.TransformOptions['parserOpts']>['plugins']> = [
'jsx',
];

if (shouldBeProcessedWithTypescript) {
plugins.push('typescript');
}

const opts: babel.TransformOptions = {
root: projectRoot,
filename: id,
sourceFileName: id,
presets: [[solid, { ...solidOptions, ...(options.solid || {}) }]],
plugins: needHmr && !isSsr && !inNodeModules ? [[solidRefresh, { bundler: 'vite' }]] : [],
ast: false,
sourceMaps: true,
configFile: false,
babelrc: false,
parserOpts: {
plugins,
},
};

// Default value for babel user options
let babelUserOptions: babel.TransformOptions = {};
// We need to know if the current file extension has a typescript options tied to it
const shouldBeProcessedWithTypescript =
/\.[mc]?tsx$/i.test(id) ||
extensionsToWatch.some((extension) => {
if (typeof extension === 'string') {
return extension.includes('tsx');
}

const [extensionName, extensionOptions] = extension;
if (extensionName !== currentFileExtension) return false;

return extensionOptions.typescript;
});
const plugins: NonNullable<NonNullable<babel.TransformOptions['parserOpts']>['plugins']> = [
'jsx',
];

if (shouldBeProcessedWithTypescript) {
plugins.push('typescript');
}

if (options.babel) {
if (typeof options.babel === 'function') {
const babelOptions = options.babel(source, id, isSsr);
babelUserOptions = babelOptions instanceof Promise ? await babelOptions : babelOptions;
} else {
babelUserOptions = options.babel;
const opts: babel.TransformOptions = {
root: projectRoot,
filename: id,
sourceFileName: id,
presets: [[solid, { ...solidOptions, ...(options.solid || {}) }]],
plugins: needHmr && !isSsr && !inNodeModules ? [[solidRefresh, { bundler: 'vite' }]] : [],
ast: false,
sourceMaps: true,
configFile: false,
babelrc: false,
parserOpts: {
plugins,
},
};

// Default value for babel user options
let babelUserOptions: babel.TransformOptions = {};

if (options.babel) {
if (typeof options.babel === 'function') {
const babelOptions = options.babel(source, id, isSsr);
babelUserOptions = babelOptions instanceof Promise ? await babelOptions : babelOptions;
} else {
babelUserOptions = options.babel;
}
}
}

const babelOptions = mergeAndConcat(babelUserOptions, opts) as babel.TransformOptions;
const babelOptions = mergeAndConcat(babelUserOptions, opts) as babel.TransformOptions;

const { code, map } = await babel.transformAsync(source, babelOptions);
const { code, map } = await babel.transformAsync(source, babelOptions);

return { code, map };
return { code, map };
},
},
};
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Open
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
2 changes: 2 additions & 0 deletions examples/vite-3/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-3/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
2 changes: 2 additions & 0 deletions examples/vite-4/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-4/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
2 changes: 2 additions & 0 deletions examples/vite-5/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-5/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
2 changes: 2 additions & 0 deletions examples/vite-6/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-6/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
4 changes: 4 additions & 0 deletions examples/vite-6/tests/App.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,10 @@ import App from '../src/App.jsx';
test('App', async () => {
const root = page.elementLocator(render(() => <App />).baseElement);

// Label is a .jsx component — verifies the plugin processes .jsx files correctly
const label = root.getByTestId('label');
await expect.element(label).toHaveTextContent('solid');

const count = root.getByText('Count:');
await expect.element(count).toHaveTextContent('Count: 0');

Expand Down
2 changes: 2 additions & 0 deletions examples/vite-7/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-7/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
4 changes: 4 additions & 0 deletions examples/vite-7/tests/App.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,10 @@ import App from '../src/App.jsx';
test('App', async () => {
const root = page.elementLocator(render(() => <App />).baseElement);

// Label is a .jsx component — verifies the plugin processes .jsx files correctly
const label = root.getByTestId('label');
await expect.element(label).toHaveTextContent('solid');

const count = root.getByText('Count:');
await expect.element(count).toHaveTextContent('Count: 0');

Expand Down
2 changes: 2 additions & 0 deletions examples/vite-8/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-8/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
4 changes: 4 additions & 0 deletions examples/vite-8/tests/App.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,10 @@ import App from '../src/App.jsx';
test('App', async () => {
const root = page.elementLocator(render(() => <App />).baseElement);

// Label is a .jsx component — verifies the plugin processes .jsx files correctly
const label = root.getByTestId('label');
await expect.element(label).toHaveTextContent('solid');

const count = root.getByText('Count:');
await expect.element(count).toHaveTextContent('Count: 0');

Expand Down
6 changes: 5 additions & 1 deletion pnpm-workspace.yaml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
packages:
- '.'
- "examples/*"
allowBuilds:
cypress: set this to true or false
esbuild: set this to true or false
msw: set this to true or false
catalog:
"solid-js": ^1.9.4
"solid-js": ^1.9.4
183 changes: 103 additions & 80 deletions src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { crawlFrameworkPkgs } from 'vitefu';
const require = createRequire(import.meta.url);

const runtimePublicPath = '/@solid-refresh';
const runtimePublicPathFilter = /^\/@solid-refresh$/;
const runtimeFilePath = require.resolve('solid-refresh/dist/solid-refresh.mjs');
const runtimeCode = readFileSync(runtimeFilePath, 'utf-8');

Expand DownExpand Up@@ -332,103 +333,125 @@ export default function solidPlugin(options: Partial<Options> = {}): Plugin {
needHmr = config.command === 'serve' && config.mode !== 'production' && options.hot !== false;
},

resolveId(id) {
if (id === runtimePublicPath) return id;
resolveId: {
// Filter is used by Rolldown and newer Rollup/Vite versions (Vite >= 6.3.0) to skip
// unnecessary Rust-to-JS calls. The inner check is kept for backward compatibility
// with older versions that ignore hook filters and call the handler for every module.
// @ts-ignore filter is not yet in Vite's type definitions but is supported at runtime
filter: { id: runtimePublicPathFilter },
handler(id) {
if (id === runtimePublicPath) return id;
},
},

load(id) {
if (id === runtimePublicPath) return runtimeCode;
load: {
// Same backward-compatibility strategy as resolveId above.
// @ts-ignore filter is not yet in Vite's type definitions but is supported at runtime
filter: { id: runtimePublicPathFilter },
handler(id) {
if (id === runtimePublicPath) return runtimeCode;
},
},

async transform(source, id, transformOptions) {
const isSsr = this.environment
? this.environment.config.consumer === 'server'
: Boolean(transformOptions?.ssr);
const currentFileExtension = getExtension(id);

const extensionsToWatch = options.extensions || [];
const allExtensions = extensionsToWatch.map((extension) =>
// An extension can be a string or a tuple [extension, options]
typeof extension === 'string' ? extension : extension[0],
);

if (!filter(id)) {
return null;
}
transform: {
// Limit invocations to files that could contain Solid JSX. Custom extensions
// (options.extensions) cannot be represented as a static regex, so they are
// still handled by the inner extension check below — this filter covers the
// common case and is the source of the largest performance win.
// The inner checks (filter(id) / extension regex) are kept as-is so that the
// hook behaves correctly on older Vite/Rollup versions that ignore hook filters.
// @ts-ignore filter is not yet in Vite's type definitions but is supported at runtime
filter: { id: /\.[mc]?[tj]sx$/i },
async handler(source, id, transformOptions) {
const isSsr = this.environment
? this.environment.config.consumer === 'server'
: Boolean(transformOptions?.ssr);
const currentFileExtension = getExtension(id);

const extensionsToWatch = options.extensions || [];
const allExtensions = extensionsToWatch.map((extension) =>
// An extension can be a string or a tuple [extension, options]
typeof extension === 'string' ? extension : extension[0],
);

if (!filter(id)) {
return null;
}

id = id.replace(/\?.*$/, '');
id = id.replace(/\?.*$/, '');

if (!(/\.[mc]?[tj]sx$/i.test(id) || allExtensions.includes(currentFileExtension))) {
return null;
}
if (!(/\.[mc]?[tj]sx$/i.test(id) || allExtensions.includes(currentFileExtension))) {
return null;
}

const inNodeModules = /node_modules/.test(id);
const inNodeModules = /node_modules/.test(id);

let solidOptions: { generate: 'ssr' | 'dom'; hydratable: boolean };
let solidOptions: { generate: 'ssr' | 'dom'; hydratable: boolean };

if (options.ssr) {
if (isSsr) {
solidOptions = { generate: 'ssr', hydratable: true };
if (options.ssr) {
if (isSsr) {
solidOptions = { generate: 'ssr', hydratable: true };
} else {
solidOptions = { generate: 'dom', hydratable: true };
}
} else {
solidOptions = { generate: 'dom', hydratable: true };
solidOptions = { generate: 'dom', hydratable: false };
}
} else {
solidOptions = { generate: 'dom', hydratable: false };
}

// We need to know if the current file extension has a typescript options tied to it
const shouldBeProcessedWithTypescript =
/\.[mc]?tsx$/i.test(id) ||
extensionsToWatch.some((extension) => {
if (typeof extension === 'string') {
return extension.includes('tsx');
}

const [extensionName, extensionOptions] = extension;
if (extensionName !== currentFileExtension) return false;

return extensionOptions.typescript;
});
const plugins: NonNullable<NonNullable<babel.TransformOptions['parserOpts']>['plugins']> = [
'jsx',
];

if (shouldBeProcessedWithTypescript) {
plugins.push('typescript');
}

const opts: babel.TransformOptions = {
root: projectRoot,
filename: id,
sourceFileName: id,
presets: [[solid, { ...solidOptions, ...(options.solid || {}) }]],
plugins: needHmr && !isSsr && !inNodeModules ? [[solidRefresh, { bundler: 'vite' }]] : [],
ast: false,
sourceMaps: true,
configFile: false,
babelrc: false,
parserOpts: {
plugins,
},
};

// Default value for babel user options
let babelUserOptions: babel.TransformOptions = {};
// We need to know if the current file extension has a typescript options tied to it
const shouldBeProcessedWithTypescript =
/\.[mc]?tsx$/i.test(id) ||
extensionsToWatch.some((extension) => {
if (typeof extension === 'string') {
return extension.includes('tsx');
}

const [extensionName, extensionOptions] = extension;
if (extensionName !== currentFileExtension) return false;

return extensionOptions.typescript;
});
const plugins: NonNullable<NonNullable<babel.TransformOptions['parserOpts']>['plugins']> = [
'jsx',
];

if (shouldBeProcessedWithTypescript) {
plugins.push('typescript');
}

if (options.babel) {
if (typeof options.babel === 'function') {
const babelOptions = options.babel(source, id, isSsr);
babelUserOptions = babelOptions instanceof Promise ? await babelOptions : babelOptions;
} else {
babelUserOptions = options.babel;
const opts: babel.TransformOptions = {
root: projectRoot,
filename: id,
sourceFileName: id,
presets: [[solid, { ...solidOptions, ...(options.solid || {}) }]],
plugins: needHmr && !isSsr && !inNodeModules ? [[solidRefresh, { bundler: 'vite' }]] : [],
ast: false,
sourceMaps: true,
configFile: false,
babelrc: false,
parserOpts: {
plugins,
},
};

// Default value for babel user options
let babelUserOptions: babel.TransformOptions = {};

if (options.babel) {
if (typeof options.babel === 'function') {
const babelOptions = options.babel(source, id, isSsr);
babelUserOptions = babelOptions instanceof Promise ? await babelOptions : babelOptions;
} else {
babelUserOptions = options.babel;
}
}
}

const babelOptions = mergeAndConcat(babelUserOptions, opts) as babel.TransformOptions;
const babelOptions = mergeAndConcat(babelUserOptions, opts) as babel.TransformOptions;

const { code, map } = await babel.transformAsync(source, babelOptions);
const { code, map } = await babel.transformAsync(source, babelOptions);

return { code, map };
return { code, map };
},
},
};
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
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
2 changes: 2 additions & 0 deletions examples/vite-3/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-3/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
2 changes: 2 additions & 0 deletions examples/vite-4/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-4/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
2 changes: 2 additions & 0 deletions examples/vite-5/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-5/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
2 changes: 2 additions & 0 deletions examples/vite-6/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-6/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
4 changes: 4 additions & 0 deletions examples/vite-6/tests/App.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,10 @@ import App from '../src/App.jsx';
test('App', async () => {
const root = page.elementLocator(render(() => <App />).baseElement);

// Label is a .jsx component — verifies the plugin processes .jsx files correctly
const label = root.getByTestId('label');
await expect.element(label).toHaveTextContent('solid');

const count = root.getByText('Count:');
await expect.element(count).toHaveTextContent('Count: 0');

Expand Down
2 changes: 2 additions & 0 deletions examples/vite-7/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-7/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
4 changes: 4 additions & 0 deletions examples/vite-7/tests/App.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,10 @@ import App from '../src/App.jsx';
test('App', async () => {
const root = page.elementLocator(render(() => <App />).baseElement);

// Label is a .jsx component — verifies the plugin processes .jsx files correctly
const label = root.getByTestId('label');
await expect.element(label).toHaveTextContent('solid');

const count = root.getByText('Count:');
await expect.element(count).toHaveTextContent('Count: 0');

Expand Down
2 changes: 2 additions & 0 deletions examples/vite-8/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-8/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
4 changes: 4 additions & 0 deletions examples/vite-8/tests/App.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,10 @@ import App from '../src/App.jsx';
test('App', async () => {
const root = page.elementLocator(render(() => <App />).baseElement);

// Label is a .jsx component — verifies the plugin processes .jsx files correctly
const label = root.getByTestId('label');
await expect.element(label).toHaveTextContent('solid');

const count = root.getByText('Count:');
await expect.element(count).toHaveTextContent('Count: 0');

Expand Down
6 changes: 5 additions & 1 deletion pnpm-workspace.yaml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
packages:
- '.'
- "examples/*"
allowBuilds:
cypress: set this to true or false
esbuild: set this to true or false
msw: set this to true or false
catalog:
"solid-js": ^1.9.4
"solid-js": ^1.9.4
183 changes: 103 additions & 80 deletions src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { crawlFrameworkPkgs } from 'vitefu';
const require = createRequire(import.meta.url);

const runtimePublicPath = '/@solid-refresh';
const runtimePublicPathFilter = /^\/@solid-refresh$/;
const runtimeFilePath = require.resolve('solid-refresh/dist/solid-refresh.mjs');
const runtimeCode = readFileSync(runtimeFilePath, 'utf-8');

Expand DownExpand Up@@ -332,103 +333,125 @@ export default function solidPlugin(options: Partial<Options> = {}): Plugin {
needHmr = config.command === 'serve' && config.mode !== 'production' && options.hot !== false;
},

resolveId(id) {
if (id === runtimePublicPath) return id;
resolveId: {
// Filter is used by Rolldown and newer Rollup/Vite versions (Vite >= 6.3.0) to skip
// unnecessary Rust-to-JS calls. The inner check is kept for backward compatibility
// with older versions that ignore hook filters and call the handler for every module.
// @ts-ignore filter is not yet in Vite's type definitions but is supported at runtime
filter: { id: runtimePublicPathFilter },
handler(id) {
if (id === runtimePublicPath) return id;
},
},

load(id) {
if (id === runtimePublicPath) return runtimeCode;
load: {
// Same backward-compatibility strategy as resolveId above.
// @ts-ignore filter is not yet in Vite's type definitions but is supported at runtime
filter: { id: runtimePublicPathFilter },
handler(id) {
if (id === runtimePublicPath) return runtimeCode;
},
},

async transform(source, id, transformOptions) {
const isSsr = this.environment
? this.environment.config.consumer === 'server'
: Boolean(transformOptions?.ssr);
const currentFileExtension = getExtension(id);

const extensionsToWatch = options.extensions || [];
const allExtensions = extensionsToWatch.map((extension) =>
// An extension can be a string or a tuple [extension, options]
typeof extension === 'string' ? extension : extension[0],
);

if (!filter(id)) {
return null;
}
transform: {
// Limit invocations to files that could contain Solid JSX. Custom extensions
// (options.extensions) cannot be represented as a static regex, so they are
// still handled by the inner extension check below — this filter covers the
// common case and is the source of the largest performance win.
// The inner checks (filter(id) / extension regex) are kept as-is so that the
// hook behaves correctly on older Vite/Rollup versions that ignore hook filters.
// @ts-ignore filter is not yet in Vite's type definitions but is supported at runtime
filter: { id: /\.[mc]?[tj]sx$/i },
async handler(source, id, transformOptions) {
const isSsr = this.environment
? this.environment.config.consumer === 'server'
: Boolean(transformOptions?.ssr);
const currentFileExtension = getExtension(id);

const extensionsToWatch = options.extensions || [];
const allExtensions = extensionsToWatch.map((extension) =>
// An extension can be a string or a tuple [extension, options]
typeof extension === 'string' ? extension : extension[0],
);

if (!filter(id)) {
return null;
}

id = id.replace(/\?.*$/, '');
id = id.replace(/\?.*$/, '');

if (!(/\.[mc]?[tj]sx$/i.test(id) || allExtensions.includes(currentFileExtension))) {
return null;
}
if (!(/\.[mc]?[tj]sx$/i.test(id) || allExtensions.includes(currentFileExtension))) {
return null;
}

const inNodeModules = /node_modules/.test(id);
const inNodeModules = /node_modules/.test(id);

let solidOptions: { generate: 'ssr' | 'dom'; hydratable: boolean };
let solidOptions: { generate: 'ssr' | 'dom'; hydratable: boolean };

if (options.ssr) {
if (isSsr) {
solidOptions = { generate: 'ssr', hydratable: true };
if (options.ssr) {
if (isSsr) {
solidOptions = { generate: 'ssr', hydratable: true };
} else {
solidOptions = { generate: 'dom', hydratable: true };
}
} else {
solidOptions = { generate: 'dom', hydratable: true };
solidOptions = { generate: 'dom', hydratable: false };
}
} else {
solidOptions = { generate: 'dom', hydratable: false };
}

// We need to know if the current file extension has a typescript options tied to it
const shouldBeProcessedWithTypescript =
/\.[mc]?tsx$/i.test(id) ||
extensionsToWatch.some((extension) => {
if (typeof extension === 'string') {
return extension.includes('tsx');
}

const [extensionName, extensionOptions] = extension;
if (extensionName !== currentFileExtension) return false;

return extensionOptions.typescript;
});
const plugins: NonNullable<NonNullable<babel.TransformOptions['parserOpts']>['plugins']> = [
'jsx',
];

if (shouldBeProcessedWithTypescript) {
plugins.push('typescript');
}

const opts: babel.TransformOptions = {
root: projectRoot,
filename: id,
sourceFileName: id,
presets: [[solid, { ...solidOptions, ...(options.solid || {}) }]],
plugins: needHmr && !isSsr && !inNodeModules ? [[solidRefresh, { bundler: 'vite' }]] : [],
ast: false,
sourceMaps: true,
configFile: false,
babelrc: false,
parserOpts: {
plugins,
},
};

// Default value for babel user options
let babelUserOptions: babel.TransformOptions = {};
// We need to know if the current file extension has a typescript options tied to it
const shouldBeProcessedWithTypescript =
/\.[mc]?tsx$/i.test(id) ||
extensionsToWatch.some((extension) => {
if (typeof extension === 'string') {
return extension.includes('tsx');
}

const [extensionName, extensionOptions] = extension;
if (extensionName !== currentFileExtension) return false;

return extensionOptions.typescript;
});
const plugins: NonNullable<NonNullable<babel.TransformOptions['parserOpts']>['plugins']> = [
'jsx',
];

if (shouldBeProcessedWithTypescript) {
plugins.push('typescript');
}

if (options.babel) {
if (typeof options.babel === 'function') {
const babelOptions = options.babel(source, id, isSsr);
babelUserOptions = babelOptions instanceof Promise ? await babelOptions : babelOptions;
} else {
babelUserOptions = options.babel;
const opts: babel.TransformOptions = {
root: projectRoot,
filename: id,
sourceFileName: id,
presets: [[solid, { ...solidOptions, ...(options.solid || {}) }]],
plugins: needHmr && !isSsr && !inNodeModules ? [[solidRefresh, { bundler: 'vite' }]] : [],
ast: false,
sourceMaps: true,
configFile: false,
babelrc: false,
parserOpts: {
plugins,
},
};

// Default value for babel user options
let babelUserOptions: babel.TransformOptions = {};

if (options.babel) {
if (typeof options.babel === 'function') {
const babelOptions = options.babel(source, id, isSsr);
babelUserOptions = babelOptions instanceof Promise ? await babelOptions : babelOptions;
} else {
babelUserOptions = options.babel;
}
}
}

const babelOptions = mergeAndConcat(babelUserOptions, opts) as babel.TransformOptions;
const babelOptions = mergeAndConcat(babelUserOptions, opts) as babel.TransformOptions;

const { code, map } = await babel.transformAsync(source, babelOptions);
const { code, map } = await babel.transformAsync(source, babelOptions);

return { code, map };
return { code, map };
},
},
};
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
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
2 changes: 2 additions & 0 deletions examples/vite-3/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-3/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
2 changes: 2 additions & 0 deletions examples/vite-4/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-4/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
2 changes: 2 additions & 0 deletions examples/vite-5/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-5/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
2 changes: 2 additions & 0 deletions examples/vite-6/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-6/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
4 changes: 4 additions & 0 deletions examples/vite-6/tests/App.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,10 @@ import App from '../src/App.jsx';
test('App', async () => {
const root = page.elementLocator(render(() => <App />).baseElement);

// Label is a .jsx component — verifies the plugin processes .jsx files correctly
const label = root.getByTestId('label');
await expect.element(label).toHaveTextContent('solid');

const count = root.getByText('Count:');
await expect.element(count).toHaveTextContent('Count: 0');

Expand Down
2 changes: 2 additions & 0 deletions examples/vite-7/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-7/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
4 changes: 4 additions & 0 deletions examples/vite-7/tests/App.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,10 @@ import App from '../src/App.jsx';
test('App', async () => {
const root = page.elementLocator(render(() => <App />).baseElement);

// Label is a .jsx component — verifies the plugin processes .jsx files correctly
const label = root.getByTestId('label');
await expect.element(label).toHaveTextContent('solid');

const count = root.getByText('Count:');
await expect.element(count).toHaveTextContent('Count: 0');

Expand Down
2 changes: 2 additions & 0 deletions examples/vite-8/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-8/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
4 changes: 4 additions & 0 deletions examples/vite-8/tests/App.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,10 @@ import App from '../src/App.jsx';
test('App', async () => {
const root = page.elementLocator(render(() => <App />).baseElement);

// Label is a .jsx component — verifies the plugin processes .jsx files correctly
const label = root.getByTestId('label');
await expect.element(label).toHaveTextContent('solid');

const count = root.getByText('Count:');
await expect.element(count).toHaveTextContent('Count: 0');

Expand Down
6 changes: 5 additions & 1 deletion pnpm-workspace.yaml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
packages:
- '.'
- "examples/*"
allowBuilds:
cypress: set this to true or false
esbuild: set this to true or false
msw: set this to true or false
catalog:
"solid-js": ^1.9.4
"solid-js": ^1.9.4
183 changes: 103 additions & 80 deletions src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { crawlFrameworkPkgs } from 'vitefu';
const require = createRequire(import.meta.url);

const runtimePublicPath = '/@solid-refresh';
const runtimePublicPathFilter = /^\/@solid-refresh$/;
const runtimeFilePath = require.resolve('solid-refresh/dist/solid-refresh.mjs');
const runtimeCode = readFileSync(runtimeFilePath, 'utf-8');

Expand DownExpand Up@@ -332,103 +333,125 @@ export default function solidPlugin(options: Partial<Options> = {}): Plugin {
needHmr = config.command === 'serve' && config.mode !== 'production' && options.hot !== false;
},

resolveId(id) {
if (id === runtimePublicPath) return id;
resolveId: {
// Filter is used by Rolldown and newer Rollup/Vite versions (Vite >= 6.3.0) to skip
// unnecessary Rust-to-JS calls. The inner check is kept for backward compatibility
// with older versions that ignore hook filters and call the handler for every module.
// @ts-ignore filter is not yet in Vite's type definitions but is supported at runtime
filter: { id: runtimePublicPathFilter },
handler(id) {
if (id === runtimePublicPath) return id;
},
},

load(id) {
if (id === runtimePublicPath) return runtimeCode;
load: {
// Same backward-compatibility strategy as resolveId above.
// @ts-ignore filter is not yet in Vite's type definitions but is supported at runtime
filter: { id: runtimePublicPathFilter },
handler(id) {
if (id === runtimePublicPath) return runtimeCode;
},
},

async transform(source, id, transformOptions) {
const isSsr = this.environment
? this.environment.config.consumer === 'server'
: Boolean(transformOptions?.ssr);
const currentFileExtension = getExtension(id);

const extensionsToWatch = options.extensions || [];
const allExtensions = extensionsToWatch.map((extension) =>
// An extension can be a string or a tuple [extension, options]
typeof extension === 'string' ? extension : extension[0],
);

if (!filter(id)) {
return null;
}
transform: {
// Limit invocations to files that could contain Solid JSX. Custom extensions
// (options.extensions) cannot be represented as a static regex, so they are
// still handled by the inner extension check below — this filter covers the
// common case and is the source of the largest performance win.
// The inner checks (filter(id) / extension regex) are kept as-is so that the
// hook behaves correctly on older Vite/Rollup versions that ignore hook filters.
// @ts-ignore filter is not yet in Vite's type definitions but is supported at runtime
filter: { id: /\.[mc]?[tj]sx$/i },
async handler(source, id, transformOptions) {
const isSsr = this.environment
? this.environment.config.consumer === 'server'
: Boolean(transformOptions?.ssr);
const currentFileExtension = getExtension(id);

const extensionsToWatch = options.extensions || [];
const allExtensions = extensionsToWatch.map((extension) =>
// An extension can be a string or a tuple [extension, options]
typeof extension === 'string' ? extension : extension[0],
);

if (!filter(id)) {
return null;
}

id = id.replace(/\?.*$/, '');
id = id.replace(/\?.*$/, '');

if (!(/\.[mc]?[tj]sx$/i.test(id) || allExtensions.includes(currentFileExtension))) {
return null;
}
if (!(/\.[mc]?[tj]sx$/i.test(id) || allExtensions.includes(currentFileExtension))) {
return null;
}

const inNodeModules = /node_modules/.test(id);
const inNodeModules = /node_modules/.test(id);

let solidOptions: { generate: 'ssr' | 'dom'; hydratable: boolean };
let solidOptions: { generate: 'ssr' | 'dom'; hydratable: boolean };

if (options.ssr) {
if (isSsr) {
solidOptions = { generate: 'ssr', hydratable: true };
if (options.ssr) {
if (isSsr) {
solidOptions = { generate: 'ssr', hydratable: true };
} else {
solidOptions = { generate: 'dom', hydratable: true };
}
} else {
solidOptions = { generate: 'dom', hydratable: true };
solidOptions = { generate: 'dom', hydratable: false };
}
} else {
solidOptions = { generate: 'dom', hydratable: false };
}

// We need to know if the current file extension has a typescript options tied to it
const shouldBeProcessedWithTypescript =
/\.[mc]?tsx$/i.test(id) ||
extensionsToWatch.some((extension) => {
if (typeof extension === 'string') {
return extension.includes('tsx');
}

const [extensionName, extensionOptions] = extension;
if (extensionName !== currentFileExtension) return false;

return extensionOptions.typescript;
});
const plugins: NonNullable<NonNullable<babel.TransformOptions['parserOpts']>['plugins']> = [
'jsx',
];

if (shouldBeProcessedWithTypescript) {
plugins.push('typescript');
}

const opts: babel.TransformOptions = {
root: projectRoot,
filename: id,
sourceFileName: id,
presets: [[solid, { ...solidOptions, ...(options.solid || {}) }]],
plugins: needHmr && !isSsr && !inNodeModules ? [[solidRefresh, { bundler: 'vite' }]] : [],
ast: false,
sourceMaps: true,
configFile: false,
babelrc: false,
parserOpts: {
plugins,
},
};

// Default value for babel user options
let babelUserOptions: babel.TransformOptions = {};
// We need to know if the current file extension has a typescript options tied to it
const shouldBeProcessedWithTypescript =
/\.[mc]?tsx$/i.test(id) ||
extensionsToWatch.some((extension) => {
if (typeof extension === 'string') {
return extension.includes('tsx');
}

const [extensionName, extensionOptions] = extension;
if (extensionName !== currentFileExtension) return false;

return extensionOptions.typescript;
});
const plugins: NonNullable<NonNullable<babel.TransformOptions['parserOpts']>['plugins']> = [
'jsx',
];

if (shouldBeProcessedWithTypescript) {
plugins.push('typescript');
}

if (options.babel) {
if (typeof options.babel === 'function') {
const babelOptions = options.babel(source, id, isSsr);
babelUserOptions = babelOptions instanceof Promise ? await babelOptions : babelOptions;
} else {
babelUserOptions = options.babel;
const opts: babel.TransformOptions = {
root: projectRoot,
filename: id,
sourceFileName: id,
presets: [[solid, { ...solidOptions, ...(options.solid || {}) }]],
plugins: needHmr && !isSsr && !inNodeModules ? [[solidRefresh, { bundler: 'vite' }]] : [],
ast: false,
sourceMaps: true,
configFile: false,
babelrc: false,
parserOpts: {
plugins,
},
};

// Default value for babel user options
let babelUserOptions: babel.TransformOptions = {};

if (options.babel) {
if (typeof options.babel === 'function') {
const babelOptions = options.babel(source, id, isSsr);
babelUserOptions = babelOptions instanceof Promise ? await babelOptions : babelOptions;
} else {
babelUserOptions = options.babel;
}
}
}

const babelOptions = mergeAndConcat(babelUserOptions, opts) as babel.TransformOptions;
const babelOptions = mergeAndConcat(babelUserOptions, opts) as babel.TransformOptions;

const { code, map } = await babel.transformAsync(source, babelOptions);
const { code, map } = await babel.transformAsync(source, babelOptions);

return { code, map };
return { code, map };
},
},
};
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Open
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
2 changes: 2 additions & 0 deletions examples/vite-3/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-3/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
2 changes: 2 additions & 0 deletions examples/vite-4/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-4/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
2 changes: 2 additions & 0 deletions examples/vite-5/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-5/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
2 changes: 2 additions & 0 deletions examples/vite-6/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-6/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
4 changes: 4 additions & 0 deletions examples/vite-6/tests/App.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,10 @@ import App from '../src/App.jsx';
test('App', async () => {
const root = page.elementLocator(render(() => <App />).baseElement);

// Label is a .jsx component — verifies the plugin processes .jsx files correctly
const label = root.getByTestId('label');
await expect.element(label).toHaveTextContent('solid');

const count = root.getByText('Count:');
await expect.element(count).toHaveTextContent('Count: 0');

Expand Down
2 changes: 2 additions & 0 deletions examples/vite-7/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-7/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
4 changes: 4 additions & 0 deletions examples/vite-7/tests/App.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,10 @@ import App from '../src/App.jsx';
test('App', async () => {
const root = page.elementLocator(render(() => <App />).baseElement);

// Label is a .jsx component — verifies the plugin processes .jsx files correctly
const label = root.getByTestId('label');
await expect.element(label).toHaveTextContent('solid');

const count = root.getByText('Count:');
await expect.element(count).toHaveTextContent('Count: 0');

Expand Down
2 changes: 2 additions & 0 deletions examples/vite-8/src/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { onCleanup, onMount } from "solid-js";
import { CounterProvider, useCounter } from "./CounterContext";
import { Label } from "./Label.jsx";

const title = 'Count';

Expand DownExpand Up@@ -56,6 +57,7 @@ export default function App() {

return (
<CounterProvider>
<Label text="solid" />
<Count />
<Increment />
<Decrement />
Expand Down
3 changes: 3 additions & 0 deletions examples/vite-8/src/Label.jsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
export function Label(props) {
return <span data-testid="label">{props.text}</span>;
}
4 changes: 4 additions & 0 deletions examples/vite-8/tests/App.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,10 @@ import App from '../src/App.jsx';
test('App', async () => {
const root = page.elementLocator(render(() => <App />).baseElement);

// Label is a .jsx component — verifies the plugin processes .jsx files correctly
const label = root.getByTestId('label');
await expect.element(label).toHaveTextContent('solid');

const count = root.getByText('Count:');
await expect.element(count).toHaveTextContent('Count: 0');

Expand Down
6 changes: 5 additions & 1 deletion pnpm-workspace.yaml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
packages:
- '.'
- "examples/*"
allowBuilds:
cypress: set this to true or false
esbuild: set this to true or false
msw: set this to true or false
catalog:
"solid-js": ^1.9.4
"solid-js": ^1.9.4
183 changes: 103 additions & 80 deletions src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { crawlFrameworkPkgs } from 'vitefu';
const require = createRequire(import.meta.url);

const runtimePublicPath = '/@solid-refresh';
const runtimePublicPathFilter = /^\/@solid-refresh$/;
const runtimeFilePath = require.resolve('solid-refresh/dist/solid-refresh.mjs');
const runtimeCode = readFileSync(runtimeFilePath, 'utf-8');

Expand DownExpand Up@@ -332,103 +333,125 @@ export default function solidPlugin(options: Partial<Options> = {}): Plugin {
needHmr = config.command === 'serve' && config.mode !== 'production' && options.hot !== false;
},

resolveId(id) {
if (id === runtimePublicPath) return id;
resolveId: {
// Filter is used by Rolldown and newer Rollup/Vite versions (Vite >= 6.3.0) to skip
// unnecessary Rust-to-JS calls. The inner check is kept for backward compatibility
// with older versions that ignore hook filters and call the handler for every module.
// @ts-ignore filter is not yet in Vite's type definitions but is supported at runtime
filter: { id: runtimePublicPathFilter },
handler(id) {
if (id === runtimePublicPath) return id;
},
},

load(id) {
if (id === runtimePublicPath) return runtimeCode;
load: {
// Same backward-compatibility strategy as resolveId above.
// @ts-ignore filter is not yet in Vite's type definitions but is supported at runtime
filter: { id: runtimePublicPathFilter },
handler(id) {
if (id === runtimePublicPath) return runtimeCode;
},
},

async transform(source, id, transformOptions) {
const isSsr = this.environment
? this.environment.config.consumer === 'server'
: Boolean(transformOptions?.ssr);
const currentFileExtension = getExtension(id);

const extensionsToWatch = options.extensions || [];
const allExtensions = extensionsToWatch.map((extension) =>
// An extension can be a string or a tuple [extension, options]
typeof extension === 'string' ? extension : extension[0],
);

if (!filter(id)) {
return null;
}
transform: {
// Limit invocations to files that could contain Solid JSX. Custom extensions
// (options.extensions) cannot be represented as a static regex, so they are
// still handled by the inner extension check below — this filter covers the
// common case and is the source of the largest performance win.
// The inner checks (filter(id) / extension regex) are kept as-is so that the
// hook behaves correctly on older Vite/Rollup versions that ignore hook filters.
// @ts-ignore filter is not yet in Vite's type definitions but is supported at runtime
filter: { id: /\.[mc]?[tj]sx$/i },
async handler(source, id, transformOptions) {
const isSsr = this.environment
? this.environment.config.consumer === 'server'
: Boolean(transformOptions?.ssr);
const currentFileExtension = getExtension(id);

const extensionsToWatch = options.extensions || [];
const allExtensions = extensionsToWatch.map((extension) =>
// An extension can be a string or a tuple [extension, options]
typeof extension === 'string' ? extension : extension[0],
);

if (!filter(id)) {
return null;
}

id = id.replace(/\?.*$/, '');
id = id.replace(/\?.*$/, '');

if (!(/\.[mc]?[tj]sx$/i.test(id) || allExtensions.includes(currentFileExtension))) {
return null;
}
if (!(/\.[mc]?[tj]sx$/i.test(id) || allExtensions.includes(currentFileExtension))) {
return null;
}

const inNodeModules = /node_modules/.test(id);
const inNodeModules = /node_modules/.test(id);

let solidOptions: { generate: 'ssr' | 'dom'; hydratable: boolean };
let solidOptions: { generate: 'ssr' | 'dom'; hydratable: boolean };

if (options.ssr) {
if (isSsr) {
solidOptions = { generate: 'ssr', hydratable: true };
if (options.ssr) {
if (isSsr) {
solidOptions = { generate: 'ssr', hydratable: true };
} else {
solidOptions = { generate: 'dom', hydratable: true };
}
} else {
solidOptions = { generate: 'dom', hydratable: true };
solidOptions = { generate: 'dom', hydratable: false };
}
} else {
solidOptions = { generate: 'dom', hydratable: false };
}

// We need to know if the current file extension has a typescript options tied to it
const shouldBeProcessedWithTypescript =
/\.[mc]?tsx$/i.test(id) ||
extensionsToWatch.some((extension) => {
if (typeof extension === 'string') {
return extension.includes('tsx');
}

const [extensionName, extensionOptions] = extension;
if (extensionName !== currentFileExtension) return false;

return extensionOptions.typescript;
});
const plugins: NonNullable<NonNullable<babel.TransformOptions['parserOpts']>['plugins']> = [
'jsx',
];

if (shouldBeProcessedWithTypescript) {
plugins.push('typescript');
}

const opts: babel.TransformOptions = {
root: projectRoot,
filename: id,
sourceFileName: id,
presets: [[solid, { ...solidOptions, ...(options.solid || {}) }]],
plugins: needHmr && !isSsr && !inNodeModules ? [[solidRefresh, { bundler: 'vite' }]] : [],
ast: false,
sourceMaps: true,
configFile: false,
babelrc: false,
parserOpts: {
plugins,
},
};

// Default value for babel user options
let babelUserOptions: babel.TransformOptions = {};
// We need to know if the current file extension has a typescript options tied to it
const shouldBeProcessedWithTypescript =
/\.[mc]?tsx$/i.test(id) ||
extensionsToWatch.some((extension) => {
if (typeof extension === 'string') {
return extension.includes('tsx');
}

const [extensionName, extensionOptions] = extension;
if (extensionName !== currentFileExtension) return false;

return extensionOptions.typescript;
});
const plugins: NonNullable<NonNullable<babel.TransformOptions['parserOpts']>['plugins']> = [
'jsx',
];

if (shouldBeProcessedWithTypescript) {
plugins.push('typescript');
}

if (options.babel) {
if (typeof options.babel === 'function') {
const babelOptions = options.babel(source, id, isSsr);
babelUserOptions = babelOptions instanceof Promise ? await babelOptions : babelOptions;
} else {
babelUserOptions = options.babel;
const opts: babel.TransformOptions = {
root: projectRoot,
filename: id,
sourceFileName: id,
presets: [[solid, { ...solidOptions, ...(options.solid || {}) }]],
plugins: needHmr && !isSsr && !inNodeModules ? [[solidRefresh, { bundler: 'vite' }]] : [],
ast: false,
sourceMaps: true,
configFile: false,
babelrc: false,
parserOpts: {
plugins,
},
};

// Default value for babel user options
let babelUserOptions: babel.TransformOptions = {};

if (options.babel) {
if (typeof options.babel === 'function') {
const babelOptions = options.babel(source, id, isSsr);
babelUserOptions = babelOptions instanceof Promise ? await babelOptions : babelOptions;
} else {
babelUserOptions = options.babel;
}
}
}

const babelOptions = mergeAndConcat(babelUserOptions, opts) as babel.TransformOptions;
const babelOptions = mergeAndConcat(babelUserOptions, opts) as babel.TransformOptions;

const { code, map } = await babel.transformAsync(source, babelOptions);
const { code, map } = await babel.transformAsync(source, babelOptions);

return { code, map };
return { code, map };
},
},
};
}
Expand Down