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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions src/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const mergeSourceMaps = (
) as RawSourceMap;
};

const NODE_MODULES_REGEX = /[\\/]node_modules[\\/]/;
export const NODE_MODULES_REGEX = /[\\/]node_modules[\\/]/;

export async function applyRefresh(
source: string,
Expand All @@ -48,10 +48,6 @@ export async function applyRefresh(
granular,
}: { filename?: string; granular?: boolean } = {},
) {
if (NODE_MODULES_REGEX.test(context.resourcePath)) {
return { code: source, map: sourceMap };
}

const { transformRefreshAsync } = await import('@solidjs/compiler');
const result = await transformRefreshAsync(source, {
filename: getTransformFilename(filename),
Expand Down
6 changes: 4 additions & 2 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
applyRefresh,
getTransformFilename,
mergeSourceMaps,
NODE_MODULES_REGEX,
normalizeSourceMap,
} from './helpers.js';
import type { SolidCompiler, SolidPresetOptions } from './types.js';
Expand All @@ -27,6 +28,7 @@ export type SolidLoaderOptions = {
const solidLoader: LoaderDefinition<SolidLoaderOptions> = async function (
source,
sourceMap,
additionalData,
): Promise<void> {
const callback = this.async();
const options = this.getOptions();
Expand All @@ -37,7 +39,7 @@ const solidLoader: LoaderDefinition<SolidLoaderOptions> = async function (
options.scriptRegex &&
resourceFilename.search(options.scriptRegex) === -1
) {
callback(null, source, sourceMap);
callback(null, source, sourceMap, additionalData);
return;
}

Expand All @@ -52,7 +54,7 @@ const solidLoader: LoaderDefinition<SolidLoaderOptions> = async function (
solid.generate !== 'ssr');

try {
if (refresh) {
if (refresh && !NODE_MODULES_REGEX.test(sourceFilename)) {
const result = await applyRefresh(source, sourceMap, this, {
filename: resourceFilename,
});
Expand Down
9 changes: 7 additions & 2 deletions src/refresh.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
import type { LoaderDefinition } from '@rspack/core';
import { applyRefresh } from './helpers.js';
import { applyRefresh, NODE_MODULES_REGEX } from './helpers.js';

export type SolidRefreshLoaderOptions = {
granular?: boolean;
};

const solidRefreshLoader: LoaderDefinition<SolidRefreshLoaderOptions> =
async function (source, sourceMap): Promise<void> {
async function (source, sourceMap, additionalData): Promise<void> {
const callback = this.async();

if (NODE_MODULES_REGEX.test(this.resourcePath)) {
callback(null, source, sourceMap, additionalData);
return;
}

try {
const { granular } = this.getOptions();
const result = await applyRefresh(source, sourceMap, this, { granular });
Expand Down