@remix-run/assets 0.4.4 → 0.5.0

package/dist/lib/module-store.js

@@ -1,8 +1,12 @@
-import { getFilePathDirectory } from "./paths.js";
+import { getFilePathDirectory } from './paths.js';
 export function createModuleStore(options = {}) {
     let recordsByIdentityPath = new Map();
+    let importersByDepPath = new Map();
+    let acceptedImportersByDepPath = new Map();
     let recordsByTrackedFile = new Map();
     let watchDirectoryRefCountByPath = new Map();
+    let watchFileRefCountByPath = new Map();
+    let emptyImporters = new Set();
     return {
         get(identityPath) {
             let existing = recordsByIdentityPath.get(identityPath);
@@ -11,17 +15,46 @@ export function createModuleStore(options = {}) {
             let record = {
                 identityPath,
                 invalidationVersion: 0,
+                links: createEmptyLinks(),
                 trackedFiles: new Set(),
                 trackedDirectories: new Set(),
             };
             recordsByIdentityPath.set(identityPath, record);
             return record;
         },
+        getAcceptedImporters(identityPath) {
+            return acceptedImportersByDepPath.get(identityPath) ?? emptyImporters;
+        },
+        getHmrUpdateTimestamp(identityPath) {
+            return recordsByIdentityPath.get(identityPath)?.hmrUpdateTimestamp;
+        },
+        getImporters(identityPath) {
+            return importersByDepPath.get(identityPath) ?? emptyImporters;
+        },
+        getLastResolved(identityPath) {
+            return recordsByIdentityPath.get(identityPath)?.lastResolved;
+        },
+        isEmittedFresh(record) {
+            return record.emittedVersion === record.invalidationVersion;
+        },
+        isResolvedFresh(record) {
+            return record.resolvedVersion === record.invalidationVersion;
+        },
+        isTransformedFresh(record) {
+            return record.transformedVersion === record.invalidationVersion;
+        },
+        setHmrUpdateTimestamp(identityPath, timestamp) {
+            let record = getOrCreateMutableRecord(identityPath);
+            record.hmrUpdateTimestamp = timestamp;
+        },
         clearTransformed(identityPath, tracking) {
             let record = getOrCreateMutableRecord(identityPath);
             record.transformed = undefined;
+            record.transformedVersion = undefined;
             record.resolved = undefined;
+            record.resolvedVersion = undefined;
             record.emitted = undefined;
+            record.emittedVersion = undefined;
             record.emittedSnapshot = undefined;
             record.staleEmitted = undefined;
             record.staleEmittedSnapshot = undefined;
@@ -30,8 +63,11 @@ export function createModuleStore(options = {}) {
         setTransformed(identityPath, transformed, tracking) {
             let record = getOrCreateMutableRecord(identityPath);
             record.transformed = transformed;
+            record.transformedVersion = record.invalidationVersion;
             record.resolved = undefined;
+            record.resolvedVersion = undefined;
             record.emitted = undefined;
+            record.emittedVersion = undefined;
             record.emittedSnapshot = undefined;
             record.staleEmitted = undefined;
             record.staleEmittedSnapshot = undefined;
@@ -39,17 +75,25 @@ export function createModuleStore(options = {}) {
         },
         setResolved(identityPath, resolved, tracking) {
             let record = getOrCreateMutableRecord(identityPath);
+            removeResolvedIndexes(record);
             record.resolved = resolved;
+            record.resolvedVersion = record.invalidationVersion;
+            record.lastResolved = resolved;
+            record.links = createLinks(resolved);
             record.emitted = undefined;
+            record.emittedVersion = undefined;
             record.emittedSnapshot = undefined;
             record.staleEmitted = undefined;
             record.staleEmittedSnapshot = undefined;
             setTracking(record, tracking);
+            addResolvedIndexes(record);
         },
         clearResolved(identityPath, tracking) {
             let record = getOrCreateMutableRecord(identityPath);
             record.resolved = undefined;
+            record.resolvedVersion = undefined;
             record.emitted = undefined;
+            record.emittedVersion = undefined;
             record.emittedSnapshot = undefined;
             record.staleEmitted = undefined;
             record.staleEmittedSnapshot = undefined;
@@ -58,6 +102,7 @@ export function createModuleStore(options = {}) {
         setEmitted(identityPath, emitted, snapshot) {
             let record = getOrCreateMutableRecord(identityPath);
             record.emitted = emitted;
+            record.emittedVersion = record.invalidationVersion;
             record.emittedSnapshot = snapshot ?? undefined;
             record.staleEmitted = undefined;
             record.staleEmittedSnapshot = undefined;
@@ -73,19 +118,28 @@ export function createModuleStore(options = {}) {
             }
             for (let identityPath of affected) {
                 let record = recordsByIdentityPath.get(identityPath);
-                if (record)
-                    invalidateRecord(record, { retainStale: event === 'change' });
+                if (record) {
+                    if (event === 'change') {
+                        invalidateContent(record, { retainStale: true });
+                    }
+                    else {
+                        invalidateGraph(record);
+                    }
+                }
             }
             if (event === 'unlink') {
                 let deletedRecord = recordsByIdentityPath.get(filePath);
                 if (deletedRecord) {
+                    if (!affected.has(filePath)) {
+                        invalidateGraph(deletedRecord);
+                    }
                     clearTracking(deletedRecord);
                 }
             }
         },
         invalidateAll() {
             for (let record of recordsByIdentityPath.values()) {
-                invalidateRecord(record, { retainStale: false });
+                invalidateGraph(record);
             }
         },
     };
@@ -96,13 +150,14 @@ export function createModuleStore(options = {}) {
         let record = {
             identityPath,
             invalidationVersion: 0,
+            links: createEmptyLinks(),
             trackedFiles: new Set(),
             trackedDirectories: new Set(),
         };
         recordsByIdentityPath.set(identityPath, record);
         return record;
     }
-    function invalidateRecord(record, options) {
+    function invalidateContent(record, options) {
         if (!options.retainStale) {
             record.staleEmitted = undefined;
             record.staleEmittedSnapshot = undefined;
@@ -115,14 +170,39 @@ export function createModuleStore(options = {}) {
             record.staleEmitted = undefined;
             record.staleEmittedSnapshot = undefined;
         }
-        record.emitted = undefined;
-        record.emittedSnapshot = undefined;
-        record.resolved = undefined;
-        record.transformed = undefined;
         record.invalidationVersion += 1;
     }
+    function invalidateGraph(record) {
+        record.hmrUpdateTimestamp = undefined;
+        invalidateContent(record, { retainStale: false });
+    }
+    function createLinks(resolved) {
+        return {
+            acceptedDependencies: new Set(options.getAcceptedDependencies?.(resolved) ?? []),
+            dependencies: new Set(options.getDependencies?.(resolved) ?? []),
+        };
+    }
+    function createEmptyLinks() {
+        return {
+            acceptedDependencies: new Set(),
+            dependencies: new Set(),
+        };
+    }
+    function addResolvedIndexes(record) {
+        for (let depPath of record.links.dependencies) {
+            addToIndexedSet(importersByDepPath, depPath, record.identityPath);
+        }
+        for (let depPath of record.links.acceptedDependencies) {
+            addToIndexedSet(acceptedImportersByDepPath, depPath, record.identityPath);
+        }
+    }
+    function removeResolvedIndexes(record) {
+        removeFromIndexedSets(importersByDepPath, record.identityPath);
+        removeFromIndexedSets(acceptedImportersByDepPath, record.identityPath);
+    }
     function setTracking(record, tracking) {
         let previousWatchedDirectories = getWatchedDirectories(record);
+        let previousWatchedFiles = new Set(record.trackedFiles);
         removeIndexes(record);
         let normalizedTracking = mergeTracking(tracking);
         record.trackedFiles = normalizedTracking.trackedFiles;
@@ -131,8 +211,10 @@ export function createModuleStore(options = {}) {
             addToIndexedSet(recordsByTrackedFile, trackedFile, record.identityPath);
         }
         let nextWatchedDirectories = getWatchedDirectories(record);
-        let delta = updateWatchDirectoryRefCounts(previousWatchedDirectories, nextWatchedDirectories);
-        emitWatchDirectoryDelta(delta);
+        let directoryDelta = updateWatchDirectoryRefCounts(previousWatchedDirectories, nextWatchedDirectories);
+        let fileDelta = updateWatchFileRefCounts(previousWatchedFiles, record.trackedFiles);
+        emitWatchDirectoryDelta(directoryDelta);
+        emitWatchFileDelta(fileDelta);
     }
     function clearTracking(record) {
         setTracking(record, []);
@@ -170,6 +252,34 @@ export function createModuleStore(options = {}) {
         }
         return { add, remove };
     }
+    function updateWatchFileRefCounts(previousWatchedFiles, nextWatchedFiles) {
+        let add = [];
+        let remove = [];
+        for (let file of previousWatchedFiles) {
+            if (nextWatchedFiles.has(file))
+                continue;
+            let previousCount = watchFileRefCountByPath.get(file);
+            if (!previousCount)
+                continue;
+            if (previousCount === 1) {
+                watchFileRefCountByPath.delete(file);
+                remove.push(file);
+            }
+            else {
+                watchFileRefCountByPath.set(file, previousCount - 1);
+            }
+        }
+        for (let file of nextWatchedFiles) {
+            if (previousWatchedFiles.has(file))
+                continue;
+            let previousCount = watchFileRefCountByPath.get(file) ?? 0;
+            watchFileRefCountByPath.set(file, previousCount + 1);
+            if (previousCount === 0) {
+                add.push(file);
+            }
+        }
+        return { add, remove };
+    }
     function emitWatchDirectoryDelta(delta) {
         if (!options.onWatchDirectoriesChange)
             return;
@@ -177,6 +287,13 @@ export function createModuleStore(options = {}) {
             return;
         options.onWatchDirectoriesChange(delta);
     }
+    function emitWatchFileDelta(delta) {
+        if (!options.onWatchFilesChange)
+            return;
+        if (delta.add.length === 0 && delta.remove.length === 0)
+            return;
+        options.onWatchFilesChange(delta);
+    }
 }
 function addToIndexedSet(map, key, value) {
     let existing = map.get(key) ?? new Set();
@@ -192,6 +309,14 @@ function removeFromIndexedSet(map, key, value) {
         map.delete(key);
     }
 }
+function removeFromIndexedSets(map, value) {
+    for (let [key, values] of map) {
+        values.delete(value);
+        if (values.size === 0) {
+            map.delete(key);
+        }
+    }
+}
 function matchesTrackedDirectory(trackedDirectories, filePath) {
     for (let trackedDirectory of trackedDirectories) {
         if (filePath === trackedDirectory || filePath.startsWith(`${trackedDirectory}/`))

package/dist/lib/routes.js

@@ -1,7 +1,7 @@
 import { getRoutePatternCaptures, RoutePattern, } from '@remix-run/route-pattern';
 import { createHref } from '@remix-run/route-pattern/href';
 import { createMatcher } from '@remix-run/route-pattern/match';
-import { getRelativeFilePath, isAbsoluteFilePath, normalizeFilePath, normalizePathname, resolveFilePath, } from "./paths.js";
+import { getRelativeFilePath, isAbsoluteFilePath, normalizeFilePath, normalizePathname, resolveFilePath, } from './paths.js';
 function normalizeFilePattern(pattern) {
     if (isAbsoluteFilePath(pattern)) {
         throw new Error(`File route patterns must be relative to the asset server root.\nPattern: ${pattern}`);

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

@@ -1,5 +1,6 @@
 import type { CompiledRoutes } from '../routes.ts';
 import type { ResolvedScriptTarget } from '../target.ts';
+import type { ModuleLoader } from '../loaders.ts';
 import type { ModuleWatchEvent } from '../module-store.ts';
 import type { EmittedAsset } from './emit.ts';
 type ScriptCompileResult = {
@@ -24,12 +25,21 @@ type ScriptCompilerOptions = {
     define?: Record<string, string>;
     external: string[];
     fingerprintAssets: boolean;
+    hmr?: {
+        clientPathname: string;
+        send(updates: ScriptHmrUpdate[]): void;
+    };
     isAllowed(absolutePath: string): boolean;
     minify: boolean;
+    loaders: readonly ModuleLoader[];
     onWatchDirectoriesChange?: (delta: {
         add: string[];
         remove: string[];
     }) => void;
+    onWatchFilesChange?: (delta: {
+        add: string[];
+        remove: string[];
+    }) => void;
     rootDir: string;
     routes: CompiledRoutes;
     sourceMapSourcePaths: 'absolute' | 'url';
@@ -42,7 +52,8 @@ type ScriptCompiler = {
     getScript(filePath: string, options: ScriptGetOptions): Promise<ScriptGetResult>;
     getPreloadLayers(filePath: string | readonly string[]): Promise<string[][]>;
     getHref(filePath: string): Promise<string>;
-    handleFileEvent(filePath: string, event: ModuleWatchEvent): Promise<void>;
+    classifyHmrFileEvent(filePath: string, event: ModuleWatchEvent): Promise<ScriptHmrUpdate[]>;
+    invalidateFileEvent(filePath: string, event: ModuleWatchEvent): void;
     parseRequestPathname(pathname: string): ParsedRequestPathname | null;
 };
 type ParsedRequestPathname = {
@@ -51,6 +62,18 @@ type ParsedRequestPathname = {
     isSourceMapRequest: boolean;
     requestedFingerprint: string | null;
 };
+export type ScriptHmrUpdate = {
+    accepted: false;
+    filePath: string;
+    path: string;
+    timestamp: number;
+} | {
+    accepted: true;
+    acceptedPath: string;
+    filePath: string;
+    path: string;
+    timestamp: number;
+};
 export declare function createScriptCompiler(options: ScriptCompilerOptions): ScriptCompiler;
 export declare function createResponseForScript(result: ScriptCompileResult, options: {
     cacheControl: string;

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

@@ -1 +1 @@
-{"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../../../src/lib/scripts/compiler.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AAExD,OAAO,KAAK,EAKV,gBAAgB,EACjB,MAAM,oBAAoB,CAAA;AAI3B,OAAO,KAAK,EAAE,YAAY,EAAiB,MAAM,WAAW,CAAA;AAK5D,KAAK,mBAAmB,GAAG;IACzB,IAAI,EAAE,YAAY,CAAA;IAClB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,SAAS,EAAE,YAAY,GAAG,IAAI,CAAA;CAC/B,CAAA;AAED,KAAK,eAAe,GAChB;IACE,MAAM,EAAE,mBAAmB,CAAA;IAC3B,IAAI,EAAE,QAAQ,CAAA;CACf,GACD;IACE,IAAI,EAAE,cAAc,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAEL,KAAK,gBAAgB,GAAG;IACtB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,kBAAkB,EAAE,OAAO,CAAA;IAC3B,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAA;CACpC,CAAA;AAED,KAAK,qBAAqB,GAAG;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC/B,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,iBAAiB,EAAE,OAAO,CAAA;IAC1B,SAAS,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAA;IACxC,MAAM,EAAE,OAAO,CAAA;IACf,wBAAwB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,GAAG,EAAE,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,KAAK,IAAI,CAAA;IAC/E,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,cAAc,CAAA;IACtB,oBAAoB,EAAE,UAAU,GAAG,KAAK,CAAA;IACxC,UAAU,CAAC,EAAE,UAAU,GAAG,QAAQ,CAAA;IAClC,MAAM,CAAC,EAAE,oBAAoB,CAAA;IAC7B,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAC/B,SAAS,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,KAAK,cAAc,GAAG;IACpB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;IAChF,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAC3E,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAC1C,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACzE,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,qBAAqB,GAAG,IAAI,CAAA;CACrE,CAAA;AAED,KAAK,qBAAqB,GAAG;IAC3B,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,EAAE,MAAM,CAAA;IAChB,kBAAkB,EAAE,OAAO,CAAA;IAC3B,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAA;CACpC,CAAA;AAKD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,qBAAqB,GAAG,cAAc,CAmUnF;AAsLD,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,mBAAmB,EAC3B,OAAO,EAAE;IACP,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,kBAAkB,EAAE,OAAO,CAAA;IAC3B,MAAM,EAAE,MAAM,CAAA;CACf,GACA,QAAQ,CA6BV"}
+{"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../../../src/lib/scripts/compiler.ts"],"names":[],"mappings":"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"}

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'];