@remix-run/assets 0.4.3 → 0.5.0

package/dist/lib/scripts/compiler.js

@@ -3,14 +3,14 @@ import * as os from 'node:os';
 import * as path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { IfNoneMatch } from '@remix-run/headers/if-none-match';
-import { createAssetServerCompilationError } from "../compilation-error.js";
-import { createFileMatcher } from "../file-matcher.js";
-import { formatFingerprintedPathname, getFingerprintRequestCacheControl, parseFingerprintSuffix, } from "../fingerprint.js";
-import { emitResolvedModule } from "./emit.js";
-import { normalizeFilePath, resolveFilePath } from "../paths.js";
-import { resolveModule, resolverExtensionAlias, resolverExtensions, supportedScriptExtensions, } from "./resolve.js";
-import { createModuleStore } from "../module-store.js";
-import { createTsconfigTransformOptionsResolver, transformModule } from "./transform.js";
+import { createAssetServerCompilationError } from '../compilation-error.js';
+import { createFileMatcher } from '../file-matcher.js';
+import { formatFingerprintedPathname, getFingerprintRequestCacheControl, parseFingerprintSuffix, } from '../fingerprint.js';
+import { emitResolvedModule } from './emit.js';
+import { normalizeFilePath, resolveFilePath } from '../paths.js';
+import { resolveModule, resolverExtensionAlias, resolverExtensions, supportedScriptExtensions, } from './resolve.js';
+import { createModuleStore } from '../module-store.js';
+import { createTsconfigTransformOptionsResolver, transformModule } from './transform.js';
 import { ResolverFactory } from 'oxc-resolver';
 const supportedScriptExtensionSet = new Set(supportedScriptExtensions);
 const preloadConcurrency = Math.max(1, Math.min(8, os.availableParallelism() - 1));
@@ -21,7 +21,14 @@ export function createScriptCompiler(options) {
         watchIgnoreMatchers: (options.watchIgnore ?? []).map((pattern) => createFileMatcher(pattern, options.rootDir)),
     };
     let scriptStore = createModuleStore({
+        getAcceptedDependencies(resolvedModule) {
+            return resolvedModule.hmr.acceptedDeps.map((acceptedDep) => acceptedDep.depPath);
+        },
+        getDependencies(resolvedModule) {
+            return resolvedModule.deps;
+        },
         onWatchDirectoriesChange: options.onWatchDirectoriesChange,
+        onWatchFilesChange: options.onWatchFilesChange,
     });
     let tsconfigTransformOptionsResolver = createTsconfigTransformOptionsResolver();
     let resolverFactory = new ResolverFactory({
@@ -40,6 +47,7 @@ export function createScriptCompiler(options) {
         externalSet: resolvedOptions.externalSet,
         isWatchIgnored,
         minify: resolvedOptions.minify,
+        loaders: resolvedOptions.loaders,
         resolveActualPath,
         routes: resolvedOptions.routes,
         sourceMapSourcePaths: resolvedOptions.sourceMapSourcePaths,
@@ -101,23 +109,27 @@ export function createScriptCompiler(options) {
             let resolvedModule = resolveServedScriptOrThrow(resolveInputFilePath(filePath));
             return getServedUrl(resolvedModule.identityPath);
         },
-        async handleFileEvent(filePath, event) {
+        async classifyHmrFileEvent(filePath, event) {
             let normalizedFilePath = normalizeFilePath(filePath);
             if (isWatchIgnored(normalizedFilePath))
-                return;
-            if (shouldClearResolverCacheForFileEvent(normalizedFilePath, event)) {
-                resolverFactory.clearCache();
-            }
-            if (isTsconfigPath(normalizedFilePath)) {
-                tsconfigTransformOptionsResolver.clear();
-                scriptStore.invalidateAll();
-                return;
-            }
-            if (isPackageJsonPath(normalizedFilePath)) {
-                scriptStore.invalidateAll();
-                return;
+                return [];
+            let timestamp = Date.now();
+            let previousResolvedModule = scriptStore.getLastResolved(normalizedFilePath);
+            let updatePathname = previousResolvedModule?.stableUrlPathname;
+            invalidateScriptFileEvent(normalizedFilePath, event);
+            let resolvedModule = event === 'change' && updatePathname
+                ? await tryGetOrCreateResolvedScript(scriptStore.get(normalizedFilePath))
+                : undefined;
+            let hmrUpdate = event === 'change' && updatePathname
+                ? getHmrUpdatesForChange(resolvedModule ?? previousResolvedModule, previousResolvedModule, updatePathname, timestamp)
+                : [];
+            if (hmrUpdate.length > 0) {
+                resolvedOptions.hmr?.send(hmrUpdate);
             }
-            scriptStore.invalidateForFileEvent(normalizedFilePath, event);
+            return hmrUpdate;
+        },
+        invalidateFileEvent(filePath, event) {
+            invalidateScriptFileEvent(normalizeFilePath(filePath), event);
         },
         parseRequestPathname(pathname) {
             let parsedPathname = parseServedPathname(pathname);
@@ -143,6 +155,23 @@ export function createScriptCompiler(options) {
         }
         return resolveFilePath(resolvedOptions.rootDir, filePath);
     }
+    function invalidateScriptFileEvent(normalizedFilePath, event) {
+        if (isWatchIgnored(normalizedFilePath))
+            return;
+        if (shouldClearResolverCacheForFileEvent(normalizedFilePath, event)) {
+            resolverFactory.clearCache();
+        }
+        if (isTsconfigPath(normalizedFilePath)) {
+            tsconfigTransformOptionsResolver.clear();
+            scriptStore.invalidateAll();
+            return;
+        }
+        if (isPackageJsonPath(normalizedFilePath)) {
+            scriptStore.invalidateAll();
+            return;
+        }
+        scriptStore.invalidateForFileEvent(normalizedFilePath, event);
+    }
     function resolveServedScriptOrThrow(absolutePath) {
         let resolvedModule = resolveModulePath(absolutePath);
         if (!resolvedModule) {
@@ -151,16 +180,22 @@ export function createScriptCompiler(options) {
             });
         }
         if (!resolvedOptions.isAllowed(resolvedModule.identityPath)) {
-            throw createAssetServerCompilationError(`File is not allowed: ${resolvedModule.identityPath}`, {
+            throw createAssetServerCompilationError(`File "${resolvedModule.identityPath}" is not allowed by the asset server access configuration. ` +
+                `Add a matching allowFiles or allowPackages rule, or remove a conflicting denyFiles rule.`, {
                 code: 'FILE_NOT_ALLOWED',
             });
         }
         return resolvedModule;
     }
     function getNotModifiedScript(record, options) {
-        let current = getNotModifiedResult(record.emitted, options);
-        if (current)
-            return current;
+        if (hasHmrTimestampedDependency(record.resolved)) {
+            return null;
+        }
+        if (scriptStore.isEmittedFresh(record)) {
+            let current = getNotModifiedResult(record.emitted, options);
+            if (current)
+                return current;
+        }
         if (!record.staleEmittedSnapshot || !isModuleSnapshotFresh(record.staleEmittedSnapshot)) {
             return null;
         }
@@ -170,7 +205,7 @@ export function createScriptCompiler(options) {
         return mapWithConcurrency(records, preloadConcurrency, (record) => getOrCreateResolvedScript(record));
     }
     async function getOrCreateResolvedScript(record) {
-        if (record.resolved)
+        if (record.resolved && scriptStore.isResolvedFresh(record))
             return record.resolved;
         let cacheKey = getRecordCacheKey(record);
         let existing = resolveInFlightByCacheKey.get(cacheKey);
@@ -207,8 +242,16 @@ export function createScriptCompiler(options) {
             }
         }
     }
+    async function tryGetOrCreateResolvedScript(record) {
+        try {
+            return await getOrCreateResolvedScript(record);
+        }
+        catch {
+            return undefined;
+        }
+    }
     async function getOrCreateTransformedScript(record) {
-        if (record.transformed)
+        if (record.transformed && scriptStore.isTransformedFresh(record))
             return record.transformed;
         let startedVersion = record.invalidationVersion;
         let transformModuleResult = await transformModule(record, transformArgs);
@@ -226,8 +269,11 @@ export function createScriptCompiler(options) {
         return transformModuleResult.value;
     }
     async function getOrCreateEmittedScript(record) {
-        if (record.emitted)
+        if (record.emitted &&
+            scriptStore.isEmittedFresh(record) &&
+            !hasHmrTimestampedDependency(record.resolved)) {
             return record.emitted;
+        }
         let cacheKey = getRecordCacheKey(record);
         let existing = emitInFlightByCacheKey.get(cacheKey);
         if (existing)
@@ -237,6 +283,9 @@ export function createScriptCompiler(options) {
             let resolvedModule = await getOrCreateResolvedScript(record);
             let emitResolvedModuleResult = await emitResolvedModule(resolvedModule, {
                 getServedUrl,
+                getStableUrl,
+                getHmrImportTimestamp,
+                hmrClientPathname: resolvedOptions.hmr?.clientPathname,
                 sourceMaps: resolvedOptions.sourceMaps,
             });
             if (!emitResolvedModuleResult.ok) {
@@ -263,10 +312,115 @@ export function createScriptCompiler(options) {
     function getServedUrlForResolvedScript(resolvedModule) {
         return formatFingerprintedPathname(resolvedModule.stableUrlPathname, resolvedOptions.fingerprintAssets ? resolvedModule.fingerprint : null);
     }
+    function getStableUrl(identityPath) {
+        let stableUrlPathname = resolvedOptions.routes.toUrlPathname(identityPath);
+        if (!stableUrlPathname) {
+            throw createAssetServerCompilationError(`File ${identityPath} is outside all configured fileMap entries.`, {
+                code: 'FILE_OUTSIDE_FILE_MAP',
+            });
+        }
+        return stableUrlPathname;
+    }
+    function getHmrImportTimestamp(identityPath) {
+        return scriptStore.getHmrUpdateTimestamp(identityPath) ?? null;
+    }
+    function hasHmrTimestampedDependency(resolvedModule) {
+        return resolvedModule?.deps.some((depPath) => getHmrImportTimestamp(depPath) !== null) === true;
+    }
+    function getHmrUpdatesForChange(resolvedModule, previousResolvedModule, updatePathname, timestamp) {
+        if (resolvedModule) {
+            scriptStore.setHmrUpdateTimestamp(resolvedModule.identityPath, timestamp);
+        }
+        if (resolvedModule?.hmr.selfAccepting === true) {
+            return [
+                {
+                    accepted: true,
+                    acceptedPath: updatePathname,
+                    filePath: resolvedModule.identityPath,
+                    path: updatePathname,
+                    timestamp,
+                },
+            ];
+        }
+        let sourceFilePath = resolvedModule?.identityPath;
+        let boundaries = findHmrBoundaries(sourceFilePath);
+        if (sourceFilePath !== undefined && boundaries) {
+            return dedupeHmrBoundaries(boundaries).map(({ acceptedModule, boundaryModule }) => ({
+                accepted: true,
+                acceptedPath: acceptedModule.stableUrlPathname,
+                filePath: sourceFilePath,
+                path: boundaryModule.stableUrlPathname,
+                timestamp,
+            }));
+        }
+        return [
+            {
+                accepted: false,
+                filePath: resolvedModule?.identityPath ?? previousResolvedModule?.identityPath ?? updatePathname,
+                path: updatePathname,
+                timestamp,
+            },
+        ];
+    }
+    function findHmrBoundaries(identityPath) {
+        if (identityPath === undefined)
+            return null;
+        return propagateHmrUpdate(identityPath, new Set());
+    }
+    function propagateHmrUpdate(identityPath, traversed) {
+        if (traversed.has(identityPath))
+            return [];
+        traversed.add(identityPath);
+        let resolvedModule = scriptStore.getLastResolved(identityPath);
+        if (!resolvedModule)
+            return null;
+        if (resolvedModule.hmr.selfAccepting) {
+            return [
+                {
+                    acceptedModule: resolvedModule,
+                    boundaryModule: resolvedModule,
+                },
+            ];
+        }
+        let importerPaths = scriptStore.getImporters(identityPath);
+        if (!importerPaths || importerPaths.size === 0)
+            return null;
+        let acceptedImporterPaths = scriptStore.getAcceptedImporters(identityPath);
+        let boundaries = [];
+        for (let importerPath of importerPaths) {
+            let importer = scriptStore.getLastResolved(importerPath);
+            if (!importer)
+                return null;
+            if (acceptedImporterPaths?.has(importerPath)) {
+                boundaries.push({
+                    acceptedModule: resolvedModule,
+                    boundaryModule: importer,
+                });
+                continue;
+            }
+            let importerBoundaries = propagateHmrUpdate(importerPath, traversed);
+            if (!importerBoundaries)
+                return null;
+            boundaries.push(...importerBoundaries);
+        }
+        return boundaries;
+    }
     function isWatchIgnored(filePath) {
         return resolvedOptions.watchIgnoreMatchers.some((matcher) => matcher(filePath));
     }
 }
+function dedupeHmrBoundaries(boundaries) {
+    let seen = new Set();
+    let result = [];
+    for (let boundary of boundaries) {
+        let key = `${boundary.boundaryModule.identityPath}\0${boundary.acceptedModule.identityPath}`;
+        if (seen.has(key))
+            continue;
+        seen.add(key);
+        result.push(boundary);
+    }
+    return result;
+}
 function getRecordCacheKey(record) {
     return `${record.identityPath}\0${record.invalidationVersion}`;
 }

package/dist/lib/scripts/conditions.d.ts

@@ -0,0 +1,2 @@
+export declare const scriptLoaderConditions: readonly ['browser', 'import', 'module', 'default'];
+//# sourceMappingURL=conditions.d.ts.map

package/dist/lib/scripts/conditions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conditions.d.ts","sourceRoot":"","sources":["../../../src/lib/scripts/conditions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,sBAAsB,YAAI,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAU,CAAA"}

package/dist/lib/scripts/conditions.js

@@ -0,0 +1 @@
+export const scriptLoaderConditions = ['browser', 'import', 'module', 'default'];

package/dist/lib/scripts/emit.d.ts

@@ -18,7 +18,10 @@ type EmitResult = {
     error: AssetServerCompilationError;
 };
 export declare function emitResolvedModule(resolvedModule: ResolvedModule, options: {
+    getHmrImportTimestamp(identityPath: string): number | null;
     getServedUrl(identityPath: string): Promise<string>;
+    getStableUrl(identityPath: string): string;
+    hmrClientPathname?: string;
     sourceMaps?: 'external' | 'inline';
 }): Promise<EmitResult>;
 export {};

package/dist/lib/scripts/emit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"emit.d.ts","sourceRoot":"","sources":["../../../src/lib/scripts/emit.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAElD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAA;AAE1E,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,YAAY,CAAA;IAClB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,SAAS,EAAE,YAAY,GAAG,IAAI,CAAA;CAC/B,CAAA;AAED,KAAK,UAAU,GACX;IACE,EAAE,EAAE,IAAI,CAAA;IACR,KAAK,EAAE,aAAa,CAAA;CACrB,GACD;IACE,EAAE,EAAE,KAAK,CAAA;IACT,KAAK,EAAE,2BAA2B,CAAA;CACnC,CAAA;AAEL,wBAAsB,kBAAkB,CACtC,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE;IACP,YAAY,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IACnD,UAAU,CAAC,EAAE,UAAU,GAAG,QAAQ,CAAA;CACnC,GACA,OAAO,CAAC,UAAU,CAAC,CAkCrB"}
+{"version":3,"file":"emit.d.ts","sourceRoot":"","sources":["../../../src/lib/scripts/emit.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAElD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAA;AAE1E,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,YAAY,CAAA;IAClB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,SAAS,EAAE,YAAY,GAAG,IAAI,CAAA;CAC/B,CAAA;AAED,KAAK,UAAU,GACX;IACE,EAAE,EAAE,IAAI,CAAA;IACR,KAAK,EAAE,aAAa,CAAA;CACrB,GACD;IACE,EAAE,EAAE,KAAK,CAAA;IACT,KAAK,EAAE,2BAA2B,CAAA;CACnC,CAAA;AAQL,wBAAsB,kBAAkB,CACtC,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE;IACP,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;IAC1D,YAAY,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IACnD,YAAY,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAAA;IAC1C,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,UAAU,CAAC,EAAE,UAAU,GAAG,QAAQ,CAAA;CACnC,GACA,OAAO,CAAC,UAAU,CAAC,CAkCrB"}

package/dist/lib/scripts/emit.js

@@ -1,12 +1,12 @@
 import MagicString from 'magic-string';
-import { createAssetServerCompilationError, isAssetServerCompilationError, } from "../compilation-error.js";
-import { hashContent } from "../fingerprint.js";
-import { composeSourceMaps } from "../source-maps.js";
+import { createAssetServerCompilationError, isAssetServerCompilationError, } from '../compilation-error.js';
+import { hashContent } from '../fingerprint.js';
+import { composeSourceMaps } from '../source-maps.js';
 export async function emitResolvedModule(resolvedModule, options) {
     try {
         let importUrls = await Promise.all(resolvedModule.deps.map((depPath) => options.getServedUrl(depPath)));
         let rewriteResult = await rewriteImports(resolvedModule, options);
-        let finalCode = rewriteResult.code;
+        let finalCode = prependHmrContext(resolvedModule, rewriteResult.code, options);
         if (rewriteResult.sourceMap) {
             if (options.sourceMaps === 'inline') {
                 let encoded = Buffer.from(rewriteResult.sourceMap).toString('base64');
@@ -39,14 +39,33 @@ async function rewriteImports(resolvedModule, options) {
     let rewrittenSource = new MagicString(resolvedModule.rawCode);
     for (let imported of resolvedModule.imports) {
         let url = await options.getServedUrl(imported.depPath);
+        let hmrImportTimestamp = options.getHmrImportTimestamp(imported.depPath);
+        if (hmrImportTimestamp !== null) {
+            url = addTimestampQuery(url, hmrImportTimestamp);
+        }
         rewrittenSource.overwrite(imported.start, imported.end, imported.quote ? `${imported.quote}${url}${imported.quote}` : url);
     }
+    for (let acceptedDep of resolvedModule.hmr.acceptedDeps) {
+        let url = options.getStableUrl(acceptedDep.depPath);
+        rewrittenSource.overwrite(acceptedDep.start, acceptedDep.end, acceptedDep.quote ? `${acceptedDep.quote}${url}${acceptedDep.quote}` : url);
+    }
     let code = rewrittenSource.toString();
-    let sourceMap = resolvedModule.sourceMap && resolvedModule.imports.length > 0
+    let sourceMap = resolvedModule.sourceMap &&
+        (resolvedModule.imports.length > 0 || resolvedModule.hmr.acceptedDeps.length > 0)
         ? composeSourceMaps(rewrittenSource.generateMap({ hires: true }).toString(), resolvedModule.sourceMap)
         : resolvedModule.sourceMap;
     return { code, sourceMap };
 }
+function addTimestampQuery(pathname, timestamp) {
+    return `${pathname}${pathname.includes('?') ? '&' : '?'}t=${timestamp}`;
+}
+function prependHmrContext(resolvedModule, code, options) {
+    if (!options.hmrClientPathname || !resolvedModule.hmr.usesImportMetaHot)
+        return code;
+    return (`import { createHotContext as __remixCreateHotContext } from ${JSON.stringify(options.hmrClientPathname)};\n` +
+        `import.meta.hot = __remixCreateHotContext(${JSON.stringify(resolvedModule.stableUrlPathname)});\n` +
+        code);
+}
 async function createEmittedAsset(content) {
     return {
         content,

package/dist/lib/scripts/resolve.d.ts

@@ -18,9 +18,13 @@ type ResolvedImport = {
     quote?: '"' | "'" | '`';
     start: number;
 };
+type ResolvedHmrAcceptedDependency = ResolvedImport;
 export type ResolvedModule = {
     deps: string[];
     fingerprint: string | null;
+    hmr: Omit<TransformedModule['hmr'], 'acceptedDeps'> & {
+        acceptedDeps: ResolvedHmrAcceptedDependency[];
+    };
     identityPath: string;
     imports: ResolvedImport[];
     trackedFiles: string[];

package/dist/lib/scripts/resolve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../../src/lib/scripts/resolve.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAMnD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAA;AAM1E,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAEtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,KAAK,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAC5E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAE9C,KAAK,YAAY,GAAG,YAAY,CAAC,iBAAiB,EAAE,cAAc,EAAE,aAAa,CAAC,CAAA;AAElF,eAAO,MAAM,sBAAsB;;;;CAIC,CAAA;AAEpC,eAAO,MAAM,kBAAkB,UAAiD,CAAA;AAChF,eAAO,MAAM,yBAAyB,UAAiD,CAAA;AAGvF,KAAK,cAAc,GAAG;IACpB,OAAO,EAAE,MAAM,CAAA;IACf,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,CAAC,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAYD,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,EAAE,CAAA;IACd,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,YAAY,EAAE,MAAM,CAAA;IACpB,OAAO,EAAE,cAAc,EAAE,CAAA;IACzB,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,iBAAiB,EAAE,MAAM,CAAA;CAC1B,CAAA;AAED,KAAK,aAAa,GAAG;IACnB,QAAQ,EAAE,cAAc,CAAA;CACzB,GAAG,CACA;IACE,EAAE,EAAE,IAAI,CAAA;IACR,KAAK,EAAE,cAAc,CAAA;CACtB,GACD;IACE,EAAE,EAAE,KAAK,CAAA;IACT,KAAK,EAAE,2BAA2B,CAAA;CACnC,CACJ,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAA;IACxC,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAA;IACzC,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,mBAAmB,GAAG,IAAI,CAAA;IACnE,eAAe,EAAE,eAAe,CAAA;IAChC,MAAM,EAAE,cAAc,CAAA;CACvB,CAAA;AAaD,wBAAsB,aAAa,CACjC,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,iBAAiB,EAC9B,IAAI,EAAE,WAAW,GAChB,OAAO,CAAC,aAAa,CAAC,CA0IxB"}
+{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../../src/lib/scripts/resolve.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAMnD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAA;AAM1E,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAEtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,KAAK,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAC5E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAE9C,KAAK,YAAY,GAAG,YAAY,CAAC,iBAAiB,EAAE,cAAc,EAAE,aAAa,CAAC,CAAA;AAElF,eAAO,MAAM,sBAAsB;;;;CAIC,CAAA;AAEpC,eAAO,MAAM,kBAAkB,UAAiD,CAAA;AAChF,eAAO,MAAM,yBAAyB,UAAiD,CAAA;AAGvF,KAAK,cAAc,GAAG;IACpB,OAAO,EAAE,MAAM,CAAA;IACf,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,CAAC,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,KAAK,6BAA6B,GAAG,cAAc,CAAA;AAYnD,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,EAAE,CAAA;IACd,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,GAAG,EAAE,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC,GAAG;QACpD,YAAY,EAAE,6BAA6B,EAAE,CAAA;KAC9C,CAAA;IACD,YAAY,EAAE,MAAM,CAAA;IACpB,OAAO,EAAE,cAAc,EAAE,CAAA;IACzB,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,iBAAiB,EAAE,MAAM,CAAA;CAC1B,CAAA;AAED,KAAK,aAAa,GAAG;IACnB,QAAQ,EAAE,cAAc,CAAA;CACzB,GAAG,CACA;IACE,EAAE,EAAE,IAAI,CAAA;IACR,KAAK,EAAE,cAAc,CAAA;CACtB,GACD;IACE,EAAE,EAAE,KAAK,CAAA;IACT,KAAK,EAAE,2BAA2B,CAAA;CACnC,CACJ,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAA;IACxC,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAA;IACzC,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,mBAAmB,GAAG,IAAI,CAAA;IACnE,eAAe,EAAE,eAAe,CAAA;IAChC,MAAM,EAAE,cAAc,CAAA;CACvB,CAAA;AAaD,wBAAsB,aAAa,CACjC,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,iBAAiB,EAC9B,IAAI,EAAE,WAAW,GAChB,OAAO,CAAC,aAAa,CAAC,CA2PxB"}

package/dist/lib/scripts/resolve.js

@@ -1,8 +1,8 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
-import { createAssetServerCompilationError, isAssetServerCompilationError, } from "../compilation-error.js";
-import { getInjectedPackageNameForSpecifier, getInjectedPackageImporterPath, restoreAuthoredInjectedPackageSpecifier, } from "../injected-packages.js";
-import { normalizeFilePath } from "../paths.js";
+import { createAssetServerCompilationError, isAssetServerCompilationError, } from '../compilation-error.js';
+import { getInjectedPackageNameForSpecifier, getInjectedPackageImporterPath, restoreAuthoredInjectedPackageSpecifier, } from '../injected-packages.js';
+import { normalizeFilePath } from '../paths.js';
 export const resolverExtensionAlias = {
     '.js': ['.js', '.ts', '.tsx', '.jsx'],
     '.jsx': ['.jsx', '.tsx'],
@@ -27,6 +27,7 @@ export async function resolveModule(record, transformed, args) {
         });
     }
     let importsWithPaths = [];
+    let acceptedDepsWithPaths = [];
     let deps = new Set();
     for (let unresolved of transformed.unresolvedImports) {
         let displaySpecifier = getDisplayImportSpecifier(unresolved.specifier);
@@ -46,8 +47,8 @@ export async function resolveModule(record, transformed, args) {
             }), trackedFiles, trackedResolutions, transformed.resolvedPath, { isWatchIgnored: args.isWatchIgnored, trackedResolution });
         }
         if (!args.isAllowed(resolvedImport.identityPath)) {
-            return failResolve(createAssetServerCompilationError(`Import "${displaySpecifier}" in ${transformed.resolvedPath}, resolved to "${resolvedImport.identityPath}", is not allowed by the asset server allow/deny configuration. ` +
-                `Add a matching allow rule for this file path, remove a conflicting deny rule for this file path, or mark this import as external.`, {
+            return failResolve(createAssetServerCompilationError(`Import "${displaySpecifier}" in ${transformed.resolvedPath}, resolved to "${resolvedImport.identityPath}", is not allowed by the asset server access configuration. ` +
+                `Add a matching allowFiles or allowPackages rule, remove a conflicting denyFiles rule, or mark this import as external.`, {
                 code: 'IMPORT_NOT_ALLOWED',
             }), trackedFiles, trackedResolutions, transformed.resolvedPath, { isWatchIgnored: args.isWatchIgnored, trackedResolution });
         }
@@ -78,12 +79,73 @@ export async function resolveModule(record, transformed, args) {
             start: unresolved.start,
         });
     }
+    for (let unresolved of transformed.hmr.acceptedDeps) {
+        if (isBrowserExternalModuleUrl(unresolved.specifier))
+            continue;
+        let displaySpecifier = getDisplayImportSpecifier(unresolved.specifier);
+        let trackedResolution = getTrackedRelativeImportResolution(transformed.importerDir, displaySpecifier, args.isWatchIgnored);
+        let resolvedSpec = resolvedImports.get(unresolved.specifier);
+        if (!resolvedSpec?.absolutePath) {
+            try {
+                resolvedSpec = await batchResolveSpecifiers([unresolved.specifier], transformed.resolvedPath, args.resolverFactory).then((resolved) => resolved.get(unresolved.specifier));
+            }
+            catch (error) {
+                return failResolve(error, trackedFiles, trackedResolutions, transformed.resolvedPath, {
+                    isWatchIgnored: args.isWatchIgnored,
+                    trackedResolution,
+                });
+            }
+        }
+        if (!resolvedSpec?.absolutePath) {
+            return failResolve(createAssetServerCompilationError(`Failed to resolve accepted HMR dependency "${displaySpecifier}" in ${transformed.resolvedPath}. ` +
+                `Ensure it resolves to a file within the configured asset server fileMap, or mark it as external.`, {
+                code: 'IMPORT_RESOLUTION_FAILED',
+            }), trackedFiles, trackedResolutions, transformed.resolvedPath, { isWatchIgnored: args.isWatchIgnored, trackedResolution });
+        }
+        let resolvedImport = args.resolveModulePath(resolvedSpec.absolutePath);
+        if (!resolvedImport) {
+            return failResolve(createAssetServerCompilationError(`Accepted HMR dependency "${displaySpecifier}" in ${transformed.resolvedPath}, resolved to "${resolvedSpec.absolutePath}", is not a supported script file. ` +
+                `Supported extensions are ${supportedScriptExtensions.join(', ')}.`, {
+                code: 'IMPORT_NOT_SUPPORTED',
+            }), trackedFiles, trackedResolutions, transformed.resolvedPath, { isWatchIgnored: args.isWatchIgnored, trackedResolution });
+        }
+        if (!args.isAllowed(resolvedImport.identityPath)) {
+            return failResolve(createAssetServerCompilationError(`Accepted HMR dependency "${displaySpecifier}" in ${transformed.resolvedPath}, resolved to "${resolvedImport.identityPath}", is not allowed by the asset server allow/deny configuration. ` +
+                `Add a matching allow rule for this file path, remove a conflicting deny rule for this file path, or mark this import as external.`, {
+                code: 'IMPORT_NOT_ALLOWED',
+            }), trackedFiles, trackedResolutions, transformed.resolvedPath, { isWatchIgnored: args.isWatchIgnored, trackedResolution });
+        }
+        let stableUrlPathname = args.routes.toUrlPathname(resolvedImport.identityPath);
+        if (!stableUrlPathname) {
+            return failResolve(createAssetServerCompilationError(`Accepted HMR dependency "${displaySpecifier}" in ${transformed.resolvedPath}, resolved to "${resolvedImport.identityPath}", is outside all configured fileMap entries. ` +
+                `Add a matching fileMap entry for this file path, or mark this import as external.`, {
+                code: 'IMPORT_OUTSIDE_FILE_MAP',
+            }), trackedFiles, trackedResolutions, transformed.resolvedPath, { isWatchIgnored: args.isWatchIgnored, trackedResolution });
+        }
+        if (trackedResolution) {
+            trackedResolutions.push({
+                ...trackedResolution,
+                resolvedIdentityPath: resolvedImport.identityPath,
+            });
+        }
+        acceptedDepsWithPaths.push({
+            depPath: resolvedImport.identityPath,
+            end: unresolved.end,
+            quote: unresolved.quote,
+            start: unresolved.start,
+        });
+    }
     return {
         ok: true,
         tracking: toResolveTracking(trackedFiles, trackedResolutions),
         value: {
             deps: [...deps],
             fingerprint: transformed.fingerprint,
+            hmr: {
+                acceptedDeps: acceptedDepsWithPaths,
+                selfAccepting: transformed.hmr.selfAccepting,
+                usesImportMetaHot: transformed.hmr.usesImportMetaHot,
+            },
             identityPath: record.identityPath,
             imports: importsWithPaths,
             trackedFiles: [...trackedFiles],
@@ -226,6 +288,9 @@ function normalizeSpecifierResolution(specifier, importerPath) {
 function getDisplayImportSpecifier(specifier) {
     return restoreAuthoredInjectedPackageSpecifier(specifier) ?? specifier;
 }
+function isBrowserExternalModuleUrl(url) {
+    return url.startsWith('data:') || url.startsWith('http://') || url.startsWith('https://');
+}
 function failResolve(error, trackedFiles, trackedResolutions, importerPath, options = {}) {
     return {
         ok: false,

package/dist/lib/scripts/transform.d.ts

@@ -1,6 +1,7 @@
 import type { TsConfigJsonResolved } from 'get-tsconfig';
 import type { AssetServerCompilationError } from '../compilation-error.ts';
 import type { ModuleRecord, ModuleTracking } from '../module-store.ts';
+import type { ModuleLoader } from '../loaders.ts';
 import type { CompiledRoutes } from '../routes.ts';
 import type { EmittedModule } from './emit.ts';
 import type { ResolvedScriptTarget } from '../target.ts';
@@ -16,8 +17,14 @@ type UnresolvedImport = {
     specifier: string;
     start: number;
 };
+type HmrAcceptedDependency = UnresolvedImport;
 export type TransformedModule = {
     fingerprint: string | null;
+    hmr: {
+        acceptedDeps: HmrAcceptedDependency[];
+        selfAccepting: boolean;
+        usesImportMetaHot: boolean;
+    };
     identityPath: string;
     importerDir: string;
     packageSpecifiers: string[];
@@ -48,6 +55,7 @@ export type TransformArgs = {
     externalSet: ReadonlySet<string>;
     isWatchIgnored(filePath: string): boolean;
     minify: boolean;
+    loaders: readonly ModuleLoader[];
     resolveActualPath(identityPath: string): string | null;
     routes: CompiledRoutes;
     sourceMapSourcePaths: 'absolute' | 'url';
@@ -60,5 +68,6 @@ export declare function createTsconfigTransformOptionsResolver(): {
     getTransformOptions(filePath: string, isWatchIgnored: (filePath: string) => boolean): TsconfigTransformOptions;
 };
 export declare function transformModule(record: ScriptRecord, args: TransformArgs): Promise<TransformResult>;
+export declare function getHmrAnalysis(rawCode: string): TransformedModule['hmr'];
 export {};
 //# sourceMappingURL=transform.d.ts.map

package/dist/lib/scripts/transform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../../src/lib/scripts/transform.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAS,oBAAoB,EAAE,MAAM,cAAc,CAAA;AAS/D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAA;AAO1E,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAEtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAElD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAC9C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAElD,KAAK,YAAY,GAAG,YAAY,CAAC,iBAAiB,EAAE,cAAc,EAAE,aAAa,CAAC,CAAA;AA4BlF,MAAM,MAAM,mBAAmB,GAAG;IAChC,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,KAAK,gBAAgB,GAAG;IACtB,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,CAAC,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,CAAA;IACvB,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,MAAM,CAAA;IACnB,iBAAiB,EAAE,MAAM,EAAE,CAAA;IAC3B,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,iBAAiB,EAAE,MAAM,CAAA;IACzB,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,iBAAiB,EAAE,gBAAgB,EAAE,CAAA;CACtC,CAAA;AAED,KAAK,eAAe,GAAG;IACrB,QAAQ,EAAE,cAAc,CAAA;CACzB,GAAG,CACA;IACE,EAAE,EAAE,IAAI,CAAA;IACR,KAAK,EAAE,iBAAiB,CAAA;CACzB,GACD;IACE,EAAE,EAAE,KAAK,CAAA;IACT,KAAK,EAAE,2BAA2B,CAAA;CACnC,CACJ,CAAA;AAED,KAAK,wBAAwB,GAAG;IAC9B,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,WAAW,CAAC,EAAE,oBAAoB,CAAA;CACnC,CAAA;AAED,KAAK,gCAAgC,GAAG,UAAU,CAAC,OAAO,sCAAsC,CAAC,CAAA;AAEjG,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IACtB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAA;IACrC,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;IAChC,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAA;IACzC,MAAM,EAAE,OAAO,CAAA;IACf,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;IACtD,MAAM,EAAE,cAAc,CAAA;IACtB,oBAAoB,EAAE,UAAU,GAAG,KAAK,CAAA;IACxC,UAAU,EAAE,UAAU,GAAG,QAAQ,GAAG,IAAI,CAAA;IACxC,MAAM,EAAE,oBAAoB,GAAG,IAAI,CAAA;IACnC,gCAAgC,EAAE,gCAAgC,CAAA;CACnE,CAAA;AAED,wBAAgB,sCAAsC;;;EAkCrD;AAED,wBAAsB,eAAe,CACnC,MAAM,EAAE,YAAY,EACpB,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,eAAe,CAAC,CA6H1B"}
+{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../../src/lib/scripts/transform.ts"],"names":[],"mappings":"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"}