@remix-run/assets 0.6.0 → 0.7.0

package/dist/lib/asset-server.js

@@ -15,6 +15,7 @@ import { createResponseForStyle, createStyleCompiler, isStyleFilePath } from './
 import { resolveScriptTarget, resolveStyleTarget } from './target.js';
 import { createAssetServerWatcher } from './watch.js';
 import { createAssetInspector } from './inspection.js';
+import { getVirtualStoreMountConfigs } from './virtual-store.js';
 const scriptExtensionSet = new Set(supportedScriptExtensions);
 const defaultMounts = {
     app: 'app',
@@ -32,7 +33,7 @@ export function getInternalWatchTargets(assetServer) {
  * Create an asset server instance
  *
  * Compiles TypeScript/JavaScript scripts and CSS styles on demand with optional
- * source-based URL fingerprinting, caching, and configurable directory mounts.
+ * content-based URL fingerprinting, caching, and configurable directory mounts.
  *
  * @param options Server configuration
  * @returns A {@link AssetServer} with `fetch()`, `getHref()`, and `getPreloads()` methods
@@ -82,8 +83,8 @@ export function createAssetServer(options) {
     });
     let sendHmrPayload = resolvedOptions.hmr ? createHmrPayloadSender() : null;
     let hmrPathnames = getHmrPathnames(resolvedOptions.basePath);
+    let hmrDataKey = `remix/assets@1:${resolvedOptions.basePath}`;
     let scriptCompiler = createScriptCompiler({
-        buildId: resolvedOptions.buildId,
         define: resolvedOptions.define,
         external: resolvedOptions.external,
         fingerprintAssets: resolvedOptions.fingerprintAssets,
@@ -117,7 +118,6 @@ export function createAssetServer(options) {
         watchMode: resolvedOptions.watchOptions !== null,
     });
     let styleCompiler = createStyleCompiler({
-        buildId: resolvedOptions.buildId,
         fingerprintAssets: resolvedOptions.fingerprintAssets,
         getServedFileUrl: (identityPath, options) => {
             if (!fileCompiler) {
@@ -168,8 +168,8 @@ export function createAssetServer(options) {
     });
     if (resolvedOptions.files.extensions.length > 0) {
         fileCompiler = createFileCompiler({
-            buildId: resolvedOptions.buildId,
             cache: resolvedOptions.files.cache,
+            cacheKey: resolvedOptions.files.cacheKey,
             extensions: resolvedOptions.files.extensions,
             fingerprintAssets: resolvedOptions.fingerprintAssets,
             globalTransforms: resolvedOptions.files.globalTransforms,
@@ -217,9 +217,9 @@ export function createAssetServer(options) {
         for (let event of events) {
             let normalizedFilePath = normalizeFilePath(event.filePath);
             let scriptUpdates = await scriptCompiler.classifyHmrFileEvent(normalizedFilePath, event.event);
-            let scriptPayload = createScriptHmrPayload(scriptUpdates);
+            let scriptPayload = await createScriptHmrPayloadWithImportMaps(scriptUpdates);
             if (scriptPayload) {
-                browserHmrEvents.push(createBrowserHmrEvent(scriptPayload, getScriptHmrUpdateFiles(scriptUpdates)));
+                browserHmrEvents.push(createBrowserHmrEvent(scriptPayload, getScriptHmrUpdateFiles(scriptUpdates), hmrDataKey));
             }
             let styleUpdates = await styleCompiler.classifyHmrFileEvent(normalizedFilePath, event.event);
             for (let styleUpdate of styleUpdates) {
@@ -232,11 +232,34 @@ export function createAssetServer(options) {
                             type: 'css',
                         },
                     ],
-                }, [styleUpdate.filePath]));
+                }, [styleUpdate.filePath], hmrDataKey));
             }
             await fileCompiler?.handleFileEvent(normalizedFilePath, event.event);
         }
         return browserHmrEvents;
+        async function createScriptHmrPayloadWithImportMaps(updates) {
+            let payload = createScriptHmrPayload(updates);
+            if (!payload || payload.type === 'browser:reload')
+                return payload;
+            let acceptedUpdates = updates.filter((update) => update.accepted);
+            let importMaps = await Promise.all(acceptedUpdates.map(async (update) => {
+                try {
+                    return await scriptCompiler.getImportMap(update.acceptedFilePath);
+                }
+                catch (error) {
+                    if (!isAssetServerCompilationError(error))
+                        throw error;
+                    return undefined;
+                }
+            }));
+            return {
+                ...payload,
+                updates: payload.updates.map((update, index) => ({
+                    ...update,
+                    ...(importMaps[index] ? { importMap: importMaps[index] } : null),
+                })),
+            };
+        }
     }
     function updateBrowserHmrWatchedFiles(delta) {
         browserHmrChannelPromise
@@ -262,7 +285,7 @@ export function createAssetServer(options) {
                 if (requestPathname === hmrPathnames.client) {
                     let browserHmrChannel = await browserHmrChannelPromise;
                     assertBrowserEventUrl(browserHmrChannel?.url);
-                    return createHmrClientResponse(browserHmrChannel.url, request.method);
+                    return await createHmrClientResponse(browserHmrChannel.url, hmrDataKey, resolvedOptions.hmrModuleImporter, request.method, scriptCompiler);
                 }
             }
             let requestUrl = new URL(request.url);
@@ -292,7 +315,10 @@ export function createAssetServer(options) {
                     }
                     let compiledStyle = styleResult.style;
                     if (parsedRequestPathname.requestedFingerprint !== null) {
-                        if (compiledStyle.fingerprint !== parsedRequestPathname.requestedFingerprint)
+                        let fingerprint = parsedRequestPathname.isSourceMapRequest
+                            ? compiledStyle.sourceMap?.fingerprint
+                            : compiledStyle.fingerprint;
+                        if (fingerprint !== parsedRequestPathname.requestedFingerprint)
                             return null;
                     }
                     return createResponseForStyle(compiledStyle, {
@@ -347,7 +373,10 @@ export function createAssetServer(options) {
                 }
                 let compiledScript = scriptResult.script;
                 if (parsedRequestPathname.requestedFingerprint !== null) {
-                    if (compiledScript.fingerprint !== parsedRequestPathname.requestedFingerprint)
+                    let fingerprint = parsedRequestPathname.isSourceMapRequest
+                        ? compiledScript.sourceMap?.fingerprint
+                        : compiledScript.fingerprint;
+                    if (fingerprint !== parsedRequestPathname.requestedFingerprint)
                         return null;
                 }
                 return createResponseForScript(compiledScript, {
@@ -398,6 +427,14 @@ export function createAssetServer(options) {
             }
             return scriptCompiler.getHref(filePath);
         },
+        async getScriptEntry(filePath) {
+            let [href, preloads, importMap] = await Promise.all([
+                assetServer.getHref(filePath),
+                assetServer.getPreloads(filePath),
+                assetServer.getImportMap(filePath),
+            ]);
+            return { href, preloads, importMap };
+        },
         async getPreloads(filePath) {
             let filePaths = Array.isArray(filePath) ? filePath : [filePath];
             let fileAssetFiles = [];
@@ -452,6 +489,16 @@ export function createAssetServer(options) {
             });
             return mergePreloadLayers(await Promise.all(preloadLayerGroupPromises));
         },
+        async getImportMap(filePath) {
+            let filePaths = Array.isArray(filePath) ? filePath : [filePath];
+            for (let nextFilePath of filePaths) {
+                let typeCheckFilePath = stripFilePathUrlSuffix(nextFilePath);
+                if (!isScriptFilePath(typeCheckFilePath)) {
+                    throw new TypeError(`assetServer.getImportMap() only supports script files: ${nextFilePath}`);
+                }
+            }
+            return scriptCompiler.getImportMap(filePath);
+        },
         async close() {
             if (closed)
                 return;
@@ -508,8 +555,13 @@ function getHmrPathnames(basePath) {
         events: `${hmrBase}/events`,
     };
 }
-function createHmrClientResponse(eventPathname, method) {
-    return new Response(method === 'HEAD' ? null : createHmrClientSource({ eventPathname }), {
+async function createHmrClientResponse(eventPathname, dataKey, moduleImporter, method, scriptCompiler) {
+    let moduleImporterHref = moduleImporter
+        ? await scriptCompiler.resolveSpecifierFromRoot(moduleImporter)
+        : null;
+    return new Response(method === 'HEAD'
+        ? null
+        : createHmrClientSource({ dataKey, eventPathname, moduleImporter: moduleImporterHref }), {
         headers: {
             'Cache-Control': 'no-cache',
             'Content-Type': 'application/javascript; charset=utf-8',
@@ -524,7 +576,7 @@ function assertBrowserEventUrl(url) {
 function createHmrPayloadSender() {
     return () => { };
 }
-function createBrowserHmrEvent(payload, files) {
+function createBrowserHmrEvent(payload, files, dataKey) {
     if (payload.type === 'browser:reload') {
         return {
             ...(files.length === 0 ? {} : { files: [...files] }),
@@ -532,10 +584,14 @@ function createBrowserHmrEvent(payload, files) {
         };
     }
     return {
+        data: {
+            [dataKey]: {
+                timestamp: payload.timestamp,
+                updates: payload.updates,
+            },
+        },
         ...(files.length === 0 ? {} : { files: [...files] }),
-        timestamp: payload.timestamp,
         type: 'update',
-        updates: payload.updates,
     };
 }
 function getScriptHmrUpdateFiles(updates) {
@@ -556,7 +612,9 @@ export function createScriptHmrPayload(updates) {
         timestamp,
         type: 'browser:update',
         updates: acceptedUpdates.map((update) => ({
-            ...(update.acceptedPath === update.path ? {} : { acceptedPath: update.acceptedPath }),
+            ...(update.acceptedUrlPathname === update.path
+                ? {}
+                : { acceptedPath: update.acceptedUrlPathname }),
             path: update.path,
             type: 'js',
         })),
@@ -603,14 +661,14 @@ function resolveAssetServerOptions(options) {
     let rootDir = normalizeFilePath(fs.realpathSync(path.resolve(options.rootDir ?? process.cwd())));
     let basePath = normalizeBasePath(options.basePath);
     let scriptOptions = options.scripts ?? {};
-    let fingerprintOptions = normalizeFingerprintOptions({
+    let fingerprintAssets = normalizeFingerprintOptions({
         fingerprint: options.fingerprint,
         watch: options.watch,
     });
     let watchOptions = normalizeWatchOptions(options.watch);
-    let hmrFactory = normalizeHmrFactory(options.hmr);
+    let hmr = normalizeHmrOptions(options.hmr);
     let mounts = options.mounts ?? defaultMounts;
-    if (hmrFactory && watchOptions === null) {
+    if (hmr.channel && watchOptions === null) {
         throw new TypeError('hmr requires watch mode');
     }
     if (Object.keys(mounts).length === 0) {
@@ -620,13 +678,13 @@ function resolveAssetServerOptions(options) {
         allowFiles: options.allowFiles,
         allowPackages: options.allowPackages,
         basePath,
-        buildId: fingerprintOptions.buildId,
         define: scriptOptions.define,
         denyFiles: options.denyFiles,
         external: scriptOptions.external ?? [],
         files: normalizeFilesOptions(options.files),
-        fingerprintAssets: fingerprintOptions.enabled,
-        hmr: hmrFactory,
+        fingerprintAssets,
+        hmr: hmr.channel,
+        hmrModuleImporter: hmr.moduleImporter,
         minify: options.minify ?? false,
         mounts,
         loaders: scriptOptions.loaders ?? [],
@@ -638,6 +696,7 @@ function resolveAssetServerOptions(options) {
                 rootDir,
             },
             ...getInjectedPackageMountConfigs(),
+            ...getVirtualStoreMountConfigs({ mounts, rootDir }),
         ]),
         sourceMapSourcePaths: options.sourceMapSourcePaths ?? 'url',
         sourceMaps: options.sourceMaps,
@@ -646,13 +705,19 @@ function resolveAssetServerOptions(options) {
         watchOptions,
     };
 }
-function normalizeHmrFactory(factory) {
-    if (factory === undefined)
-        return null;
-    if (typeof factory !== 'function') {
-        throw new TypeError('hmr must be a function');
+function normalizeHmrOptions(options) {
+    if (options === undefined)
+        return { channel: null, moduleImporter: null };
+    if (typeof options === 'function')
+        return { channel: options, moduleImporter: null };
+    if (!options || typeof options !== 'object' || typeof options.channel !== 'function') {
+        throw new TypeError('hmr must be a function or an object with a channel function');
+    }
+    if (options.moduleImporter !== undefined &&
+        (typeof options.moduleImporter !== 'string' || options.moduleImporter.trim().length === 0)) {
+        throw new TypeError('hmr.moduleImporter must be a non-empty string');
     }
-    return factory;
+    return { channel: options.channel, moduleImporter: options.moduleImporter ?? null };
 }
 function createBrowserHmrChannel(createChannel, handleFileEvents, isClosed, setUnsubscribe) {
     if (!createChannel)
@@ -700,24 +765,16 @@ function normalizeBasePath(basePath) {
     return normalizePathname(basePath || '/').replace(/\/+$/, '') || '/';
 }
 function normalizeFingerprintOptions(options) {
-    if (!options.fingerprint) {
-        return {
-            enabled: false,
-        };
-    }
-    if (typeof options.fingerprint.buildId !== 'string') {
-        throw new TypeError('fingerprint.buildId must be a string');
+    if (options.fingerprint !== undefined && typeof options.fingerprint !== 'boolean') {
+        throw new TypeError('fingerprint must be a boolean');
     }
-    if (options.fingerprint.buildId.length === 0) {
-        throw new TypeError('fingerprint.buildId must be a non-empty string');
+    if (!options.fingerprint) {
+        return false;
     }
     if (options.watch !== false) {
         throw new TypeError('fingerprint cannot be used with watch mode');
     }
-    return {
-        enabled: true,
-        buildId: options.fingerprint.buildId,
-    };
+    return true;
 }
 function normalizeWatchOptions(options) {
     if (options === false)

package/dist/lib/compilation-error.d.ts

@@ -1,4 +1,4 @@
-type AssetServerCompilationErrorCode = 'FILE_NOT_FOUND' | 'FILE_NOT_ALLOWED' | 'FILE_NOT_SUPPORTED' | 'FILE_OUTSIDE_MOUNTS' | 'FILE_TRANSFORM_QUERY_INVALID' | 'FILE_TRANSFORM_NOT_SUPPORTED' | 'FILE_TRANSFORM_RESULT_INVALID' | 'FILE_TRANSFORM_FAILED' | 'COMMONJS_NOT_SUPPORTED' | 'TRANSFORM_FAILED' | 'LOADER_FAILED' | 'EMIT_FAILED' | 'IMPORT_RESOLUTION_FAILED' | 'IMPORT_NOT_SUPPORTED' | 'IMPORT_NOT_ALLOWED' | 'IMPORT_OUTSIDE_MOUNTS' | 'URL_RESOLUTION_FAILED' | 'URL_NOT_SUPPORTED' | 'URL_NOT_ALLOWED' | 'URL_OUTSIDE_MOUNTS';
+type AssetServerCompilationErrorCode = 'FILE_NOT_FOUND' | 'FILE_NOT_ALLOWED' | 'FILE_NOT_SUPPORTED' | 'FILE_OUTSIDE_MOUNTS' | 'FILE_TRANSFORM_QUERY_INVALID' | 'FILE_TRANSFORM_NOT_SUPPORTED' | 'FILE_TRANSFORM_RESULT_INVALID' | 'FILE_TRANSFORM_FAILED' | 'COMMONJS_NOT_SUPPORTED' | 'TRANSFORM_FAILED' | 'LOADER_FAILED' | 'EMIT_FAILED' | 'IMPORT_RESOLUTION_FAILED' | 'IMPORT_NOT_SUPPORTED' | 'IMPORT_NOT_ALLOWED' | 'IMPORT_OUTSIDE_MOUNTS' | 'IMPORT_RESOLUTION_NOT_DIRECTORY_UNIFORM' | 'URL_RESOLUTION_FAILED' | 'URL_NOT_SUPPORTED' | 'URL_NOT_ALLOWED' | 'URL_OUTSIDE_MOUNTS';
 /**
  * Internal error used by the request-time asset compilation pipeline.
  */

package/dist/lib/compilation-error.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compilation-error.d.ts","sourceRoot":"","sources":["../../src/lib/compilation-error.ts"],"names":[],"mappings":"AAAA,KAAK,+BAA+B,GAChC,gBAAgB,GAChB,kBAAkB,GAClB,oBAAoB,GACpB,qBAAqB,GACrB,8BAA8B,GAC9B,8BAA8B,GAC9B,+BAA+B,GAC/B,uBAAuB,GACvB,wBAAwB,GACxB,kBAAkB,GAClB,eAAe,GACf,aAAa,GACb,0BAA0B,GAC1B,sBAAsB,GACtB,oBAAoB,GACpB,uBAAuB,GACvB,uBAAuB,GACvB,mBAAmB,GACnB,iBAAiB,GACjB,oBAAoB,CAAA;AAExB;;GAEG;AACH,qBAAa,2BAA4B,SAAQ,KAAK;IACpD,IAAI,EAAE,+BAA+B,CAAA;IAErC,YACE,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;QACP,KAAK,CAAC,EAAE,OAAO,CAAA;QACf,IAAI,EAAE,+BAA+B,CAAA;KACtC,EAKF;CACF;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,2BAA2B,CAEtC;AAED;;;;;;;;GAQG;AACH,wBAAgB,iCAAiC,CAC/C,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IACP,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,IAAI,EAAE,+BAA+B,CAAA;CACtC,GACA,2BAA2B,CAE7B"}
+{"version":3,"file":"compilation-error.d.ts","sourceRoot":"","sources":["../../src/lib/compilation-error.ts"],"names":[],"mappings":"AAAA,KAAK,+BAA+B,GAChC,gBAAgB,GAChB,kBAAkB,GAClB,oBAAoB,GACpB,qBAAqB,GACrB,8BAA8B,GAC9B,8BAA8B,GAC9B,+BAA+B,GAC/B,uBAAuB,GACvB,wBAAwB,GACxB,kBAAkB,GAClB,eAAe,GACf,aAAa,GACb,0BAA0B,GAC1B,sBAAsB,GACtB,oBAAoB,GACpB,uBAAuB,GACvB,yCAAyC,GACzC,uBAAuB,GACvB,mBAAmB,GACnB,iBAAiB,GACjB,oBAAoB,CAAA;AAExB;;GAEG;AACH,qBAAa,2BAA4B,SAAQ,KAAK;IACpD,IAAI,EAAE,+BAA+B,CAAA;IAErC,YACE,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;QACP,KAAK,CAAC,EAAE,OAAO,CAAA;QACf,IAAI,EAAE,+BAA+B,CAAA;KACtC,EAKF;CACF;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,2BAA2B,CAEtC;AAED;;;;;;;;GAQG;AACH,wBAAgB,iCAAiC,CAC/C,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IACP,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,IAAI,EAAE,+BAA+B,CAAA;CACtC,GACA,2BAA2B,CAE7B"}

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

@@ -25,8 +25,8 @@ type FileGetHrefOptions = {
     transform: readonly string[] | null;
 };
 type FileCompilerOptions = {
-    buildId?: string;
     cache?: FileStorage;
+    cacheKey?: string;
     extensions: readonly string[];
     fingerprintAssets: boolean;
     globalTransforms: readonly {

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

@@ -1 +1 @@
-{"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../../../src/lib/files/compiler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../../../src/lib/files/compiler.ts"],"names":[],"mappings":"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"}

package/dist/lib/files/compiler.js

@@ -5,7 +5,7 @@ import { fileURLToPath } from 'node:url';
 import { IfNoneMatch } from '@remix-run/headers/if-none-match';
 import { detectContentType } from '@remix-run/mime';
 import { createAssetServerCompilationError, isAssetServerCompilationError, } from '../compilation-error.js';
-import { formatFingerprintedPathname, generateFingerprint, hashContent } from '../fingerprint.js';
+import { formatFingerprintedPathname, hashContent } from '../fingerprint.js';
 import { normalizeFilePath, resolveFilePath } from '../paths.js';
 import { parseAssetTransformInvocations } from './config.js';
 import { createSourceFileStore } from './store.js';
@@ -19,7 +19,7 @@ export function createFileCompiler(options) {
     let transformedAssetMetadataByCacheKey = new Map();
     let transformedCacheKeysByIdentityPath = new Map();
     let transformedEmitInFlightByCacheKey = new Map();
-    let cacheEpoch = resolvedOptions.buildId ?? crypto.randomUUID();
+    let cacheKey = resolvedOptions.cacheKey ?? crypto.randomUUID();
     let resolveArgs = {
         extensions: resolvedOptions.extensionSet,
         isAllowed: resolvedOptions.isAllowed,
@@ -30,8 +30,8 @@ export function createFileCompiler(options) {
             let resolvedFile = resolveServedFileOrThrow(resolveInputFilePath(filePath), resolveArgs);
             let record = getFreshSourceFileRecord(resolvedFile.identityPath);
             if (shouldUseTransformPipeline(getOptions.transform)) {
-                let cacheKey = getTransformedRecordCacheKey(cacheEpoch, record, getOptions.transform);
-                let notModified = getNotModifiedFile(transformedAssetMetadataByCacheKey.get(cacheKey), getOptions);
+                let transformedCacheKey = getTransformedRecordCacheKey(cacheKey, record, getOptions.transform);
+                let notModified = getNotModifiedFile(transformedAssetMetadataByCacheKey.get(transformedCacheKey), getOptions);
                 if (notModified)
                     return notModified;
                 let transformedFile = await getOrCreateTransformedFile(record, getOptions.transform);
@@ -62,9 +62,13 @@ export function createFileCompiler(options) {
         async getHref(filePath, hrefOptions) {
             let resolvedFile = resolveServedFileOrThrow(resolveInputFilePath(filePath), resolveArgs);
             let record = getFreshSourceFileRecord(resolvedFile.identityPath);
-            let href = resolvedOptions.fingerprintAssets
-                ? formatFingerprintedPathname(resolvedFile.stableUrlPathname, (await getOrCreateSourceFileMetadata(record)).fingerprint)
-                : resolvedFile.stableUrlPathname;
+            let href = resolvedFile.stableUrlPathname;
+            if (resolvedOptions.fingerprintAssets) {
+                let emittedFile = shouldUseTransformPipeline(hrefOptions.transform)
+                    ? await getOrCreateTransformedFile(record, hrefOptions.transform)
+                    : await getOrCreateSourceFile(record);
+                href = formatFingerprintedPathname(href, emittedFile.fingerprint);
+            }
             if (shouldUseTransformPipeline(hrefOptions.transform)) {
                 return appendTransformQuery(href, hrefOptions.transform);
             }
@@ -138,15 +142,15 @@ export function createFileCompiler(options) {
     }
     async function getOrCreateTransformedFile(record, transformQuery) {
         let parsedTransforms = parseRequestTransforms(transformQuery, resolvedOptions.transforms, resolvedOptions.maxRequestTransforms);
-        let cacheKey = getTransformedRecordCacheKey(cacheEpoch, record, transformQuery);
-        let existing = transformedEmitInFlightByCacheKey.get(cacheKey);
+        let transformedCacheKey = getTransformedRecordCacheKey(cacheKey, record, transformQuery);
+        let existing = transformedEmitInFlightByCacheKey.get(transformedCacheKey);
         if (existing)
             return existing;
         let promise = (async () => {
-            let sourceFile = await getOrCreateSourceFile(record);
-            let cachedFile = await getCachedTransformedFile(cacheKey, record.identityPath, sourceFile.fingerprint);
+            let cachedFile = await getCachedTransformedFile(transformedCacheKey, record.identityPath);
             if (cachedFile)
                 return cachedFile;
+            let sourceFile = await getOrCreateSourceFile(record);
             let transformedFile = await applyTransforms(record.identityPath, sourceFile, parsedTransforms);
             if (transformedFile === null) {
                 return sourceFile;
@@ -154,19 +158,18 @@ export function createFileCompiler(options) {
             let emittedFile = await createEmittedFile(transformedFile.body, {
                 extension: transformedFile.extension,
                 filePath: record.identityPath,
-                fingerprint: sourceFile.fingerprint,
             });
-            rememberTransformedAssetMetadata(cacheKey, record.identityPath, toEmittedFileMetadata(emittedFile));
-            await setCachedTransformedFile(cacheKey, record.identityPath, emittedFile);
+            rememberTransformedAssetMetadata(transformedCacheKey, record.identityPath, toEmittedFileMetadata(emittedFile));
+            await setCachedTransformedFile(transformedCacheKey, record.identityPath, emittedFile);
             return emittedFile;
         })();
-        transformedEmitInFlightByCacheKey.set(cacheKey, promise);
+        transformedEmitInFlightByCacheKey.set(transformedCacheKey, promise);
         try {
             return await promise;
         }
         finally {
-            if (transformedEmitInFlightByCacheKey.get(cacheKey) === promise) {
-                transformedEmitInFlightByCacheKey.delete(cacheKey);
+            if (transformedEmitInFlightByCacheKey.get(transformedCacheKey) === promise) {
+                transformedEmitInFlightByCacheKey.delete(transformedCacheKey);
             }
         }
     }
@@ -174,12 +177,6 @@ export function createFileCompiler(options) {
         return createEmittedFile(body, {
             extension: path.extname(identityPath).toLowerCase(),
             filePath: identityPath,
-            fingerprint: resolvedOptions.fingerprintAssets && resolvedOptions.buildId
-                ? await generateFingerprint({
-                    buildId: resolvedOptions.buildId,
-                    content: body,
-                })
-                : null,
         });
     }
     function createEmittedFileFromMetadata(body, metadata) {
@@ -253,7 +250,7 @@ export function createFileCompiler(options) {
             return null;
         return { body: currentBody, extension: currentExtension };
     }
-    async function getCachedTransformedFile(cacheKey, identityPath, fingerprint) {
+    async function getCachedTransformedFile(cacheKey, identityPath) {
         if (!resolvedOptions.cache)
             return null;
         let file = await resolvedOptions.cache.get(cacheKey);
@@ -264,7 +261,6 @@ export function createFileCompiler(options) {
             (await createEmittedFileMetadata(body, {
                 extension: path.extname(file.name).toLowerCase(),
                 filePath: identityPath,
-                fingerprint,
             }));
         rememberTransformedAssetMetadata(cacheKey, identityPath, metadata);
         return {
@@ -303,14 +299,15 @@ export function createFileCompiler(options) {
         transformedCacheKeysByIdentityPath.set(identityPath, cacheKeys);
     }
     async function createEmittedFileMetadata(body, options) {
+        let contentHash = await hashContent(body);
         let contentType = detectContentType(`file${options.extension}`) ??
             detectContentType(options.filePath) ??
             'application/octet-stream';
         return {
             contentType,
-            etag: `W/"${await hashContent(body)}"`,
+            etag: `W/"${contentHash}"`,
             extension: options.extension,
-            fingerprint: options.fingerprint,
+            fingerprint: resolvedOptions.fingerprintAssets ? contentHash : null,
         };
     }
 }
@@ -361,9 +358,9 @@ export function isServedFilePath(filePath, extensions) {
 function getRecordCacheKey(record) {
     return `${record.identityPath}\0${record.invalidationVersion}`;
 }
-function getTransformedRecordCacheKey(cacheEpoch, record, transformQuery) {
+function getTransformedRecordCacheKey(cacheKey, record, transformQuery) {
     return [
-        encodeCacheKeyPart(cacheEpoch),
+        encodeCacheKeyPart(cacheKey),
         encodeCacheKeyPart(record.identityPath),
         String(record.invalidationVersion),
         encodeCacheKeyPart(JSON.stringify(transformQuery ?? [])),

package/dist/lib/files/config.d.ts

@@ -73,9 +73,15 @@ export interface AssetServerFilesOptions<transforms extends AssetRequestTransfor
      * Optional backing store for cached transformed file outputs.
      */
     cache?: FileStorage;
+    /**
+     * Optional namespace for cached transformed file outputs. Use a stable value such as a
+     * commit SHA to reuse transformed files across server restarts for the same deployment.
+     */
+    cacheKey?: string;
 }
 export interface ResolvedAssetServerFilesOptions {
     cache?: FileStorage;
+    cacheKey?: string;
     extensions: readonly string[];
     globalTransforms: readonly ResolvedAssetGlobalTransform[];
     hasTransforms: boolean;

package/dist/lib/files/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/lib/files/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/lib/files/config.ts"],"names":[],"mappings":"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"}

package/dist/lib/files/config.js

@@ -96,8 +96,17 @@ export function normalizeFilesOptions(files) {
             throw new TypeError('files.cache must implement the FileStorage interface');
         }
     }
+    if (files.cacheKey !== undefined) {
+        if (typeof files.cacheKey !== 'string') {
+            throw new TypeError('files.cacheKey must be a string');
+        }
+        if (files.cacheKey.length === 0) {
+            throw new TypeError('files.cacheKey must be a non-empty string');
+        }
+    }
     return {
         cache: files.cache,
+        cacheKey: files.cacheKey,
         extensions: normalizedExtensions,
         globalTransforms: normalizedGlobalTransforms,
         hasTransforms: normalizedTransforms.size > 0 || normalizedGlobalTransforms.length > 0,

package/dist/lib/fingerprint.d.ts

@@ -1,8 +1,4 @@
 export declare function hashContent(content: string | Uint8Array<ArrayBufferLike>): Promise<string>;
-export declare function generateFingerprint(args: {
-    buildId: string;
-    content: string | Uint8Array<ArrayBufferLike>;
-}): Promise<string>;
 export declare function parseFingerprintSuffix(pathname: string): {
     pathname: string;
     requestedFingerprint: string | null;

package/dist/lib/fingerprint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fingerprint.d.ts","sourceRoot":"","sources":["../../src/lib/fingerprint.ts"],"names":[],"mappings":"AAGA,wBAAsB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAIhG;AAED,wBAAsB,mBAAmB,CAAC,IAAI,EAAE;IAC9C,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC,eAAe,CAAC,CAAA;CAC9C,GAAG,OAAO,CAAC,MAAM,CAAC,CAIlB;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG;IACxD,QAAQ,EAAE,MAAM,CAAA;IAChB,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAA;CACpC,CAyBA;AAED,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAahG;AAED,wBAAgB,iCAAiC,CAAC,oBAAoB,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAE7F"}
+{"version":3,"file":"fingerprint.d.ts","sourceRoot":"","sources":["../../src/lib/fingerprint.ts"],"names":[],"mappings":"AAGA,wBAAsB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAIhG;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG;IACxD,QAAQ,EAAE,MAAM,CAAA;IAChB,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAA;CACpC,CAyBA;AAED,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAahG;AAED,wBAAgB,iCAAiC,CAAC,oBAAoB,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAE7F"}

package/dist/lib/fingerprint.js

@@ -5,10 +5,6 @@ export async function hashContent(content) {
     let hashBuffer = await crypto.subtle.digest('SHA-256', bytes);
     return Buffer.from(hashBuffer).toString('base64url').slice(0, 6);
 }
-export async function generateFingerprint(args) {
-    let content = typeof args.content === 'string' ? args.content : Buffer.from(args.content).toString('base64');
-    return hashContent(JSON.stringify([content, args.buildId]));
-}
 export function parseFingerprintSuffix(pathname) {
     let lastSlashIndex = pathname.lastIndexOf('/');
     let directory = lastSlashIndex >= 0 ? pathname.slice(0, lastSlashIndex + 1) : '';

package/dist/lib/hmr.d.ts

@@ -13,6 +13,11 @@ export type HmrPayload = {
     updates: Array<{
         /** Importing module whose dependency-accept handler accepts this update. */
         acceptedPath?: string;
+        /** Import map entries required before this update can be evaluated. */
+        importMap?: {
+            imports: Record<string, string>;
+            scopes?: Record<string, Record<string, string>>;
+        };
         /** Public URL of the changed JavaScript module. */
         path: string;
         /** Identifies a JavaScript module update. */
@@ -32,6 +37,8 @@ export type HmrPayload = {
     type: 'browser:reload';
 };
 export declare function createHmrClientSource(options: {
+    dataKey: string;
     eventPathname: string;
+    moduleImporter: string | null;
 }): string;
 //# sourceMappingURL=hmr.d.ts.map

package/dist/lib/hmr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hmr.d.ts","sourceRoot":"","sources":["../../src/lib/hmr.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,MAAM,UAAU,GAClB;IACE,8DAA8D;IAC9D,IAAI,EAAE,eAAe,CAAA;CACtB,GACD;IACE,iEAAiE;IACjE,OAAO,EAAE,KAAK,CACV;QACE,4EAA4E;QAC5E,YAAY,CAAC,EAAE,MAAM,CAAA;QACrB,mDAAmD;QACnD,IAAI,EAAE,MAAM,CAAA;QACZ,6CAA6C;QAC7C,IAAI,EAAE,IAAI,CAAA;KACX,GACD;QACE,4CAA4C;QAC5C,IAAI,EAAE,MAAM,CAAA;QACZ,sCAAsC;QACtC,IAAI,EAAE,KAAK,CAAA;KACZ,CACJ,CAAA;IACD,uEAAuE;IACvE,SAAS,EAAE,MAAM,CAAA;IACjB,wEAAwE;IACxE,IAAI,EAAE,gBAAgB,CAAA;CACvB,GACD;IACE,mFAAmF;IACnF,IAAI,EAAE,gBAAgB,CAAA;CACvB,CAAA;AAEL,wBAAgB,qBAAqB,CAAC,OAAO,EAAE;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAoWhF"}
+{"version":3,"file":"hmr.d.ts","sourceRoot":"","sources":["../../src/lib/hmr.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,MAAM,UAAU,GAClB;IACE,8DAA8D;IAC9D,IAAI,EAAE,eAAe,CAAA;CACtB,GACD;IACE,iEAAiE;IACjE,OAAO,EAAE,KAAK,CACV;QACE,4EAA4E;QAC5E,YAAY,CAAC,EAAE,MAAM,CAAA;QACrB,uEAAuE;QACvE,SAAS,CAAC,EAAE;YACV,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;YAC/B,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;SAChD,CAAA;QACD,mDAAmD;QACnD,IAAI,EAAE,MAAM,CAAA;QACZ,6CAA6C;QAC7C,IAAI,EAAE,IAAI,CAAA;KACX,GACD;QACE,4CAA4C;QAC5C,IAAI,EAAE,MAAM,CAAA;QACZ,sCAAsC;QACtC,IAAI,EAAE,KAAK,CAAA;KACZ,CACJ,CAAA;IACD,uEAAuE;IACvE,SAAS,EAAE,MAAM,CAAA;IACjB,wEAAwE;IACxE,IAAI,EAAE,gBAAgB,CAAA;CACvB,GACD;IACE,mFAAmF;IACnF,IAAI,EAAE,gBAAgB,CAAA;CACvB,CAAA;AAEL,wBAAgB,qBAAqB,CAAC,OAAO,EAAE;IAC7C,OAAO,EAAE,MAAM,CAAA;IACf,aAAa,EAAE,MAAM,CAAA;IACrB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;CAC9B,GAAG,MAAM,CAmhBT"}