@remix-run/assets 0.6.0 → 0.7.0

package/dist/lib/scripts/resolve.js

@@ -3,6 +3,7 @@ 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 { isBareImportSpecifier } from './specifiers.js';
 export const resolverExtensionAlias = {
     '.js': ['.js', '.ts', '.tsx', '.jsx'],
     '.jsx': ['.jsx', '.tsx'],
@@ -27,8 +28,10 @@ export async function resolveModule(record, transformed, args) {
         });
     }
     let importsWithPaths = [];
+    let pendingBareImportScopes = [];
     let acceptedDepsWithPaths = [];
     let deps = new Set();
+    let staticDeps = new Set();
     for (let unresolved of transformed.unresolvedImports) {
         let displaySpecifier = getDisplayImportSpecifier(unresolved.specifier);
         let trackedResolution = getTrackedRelativeImportResolution(transformed.importerDir, displaySpecifier, args.isWatchIgnored);
@@ -60,6 +63,8 @@ export async function resolveModule(record, transformed, args) {
             }), trackedFiles, trackedResolutions, transformed.resolvedPath, { isWatchIgnored: args.isWatchIgnored, trackedResolution });
         }
         deps.add(resolvedImport.identityPath);
+        if (!unresolved.dynamic)
+            staticDeps.add(resolvedImport.identityPath);
         if (transformed.packageSpecifiers.includes(unresolved.specifier)) {
             let packageJsonPath = resolvedSpec.packageJsonPath ?? findNearestPackageJsonPath(resolvedImport.resolvedPath);
             if (packageJsonPath && !args.isWatchIgnored(packageJsonPath)) {
@@ -72,12 +77,38 @@ export async function resolveModule(record, transformed, args) {
                 resolvedIdentityPath: resolvedImport.identityPath,
             });
         }
-        importsWithPaths.push({
+        let imported = {
+            compiledSpecifier: unresolved.specifier,
             depPath: resolvedImport.identityPath,
             end: unresolved.end,
             quote: unresolved.quote,
+            specifier: displaySpecifier,
             start: unresolved.start,
-        });
+        };
+        importsWithPaths.push(imported);
+        if (isBareImportSpecifier(displaySpecifier)) {
+            pendingBareImportScopes.push({
+                imported,
+                resolvedIdentityPath: resolvedImport.identityPath,
+                specifier: normalizeSpecifierResolution(unresolved.specifier, transformed.resolvedPath)
+                    .specifier,
+                trackedResolution,
+            });
+        }
+    }
+    if (pendingBareImportScopes.length > 0) {
+        let scopeResults = await resolveBareImportScopes(pendingBareImportScopes, transformed.resolvedPath, args);
+        for (let index = 0; index < scopeResults.length; index++) {
+            let result = scopeResults[index];
+            let pending = pendingBareImportScopes[index];
+            if (!result.ok) {
+                return failResolve(result.error, trackedFiles, trackedResolutions, transformed.resolvedPath, {
+                    isWatchIgnored: args.isWatchIgnored,
+                    trackedResolution: pending.trackedResolution,
+                });
+            }
+            pending.imported.scopePathname = result.scopePathname;
+        }
     }
     for (let unresolved of transformed.hmr.acceptedDeps) {
         if (isBrowserExternalModuleUrl(unresolved.specifier))
@@ -129,9 +160,11 @@ export async function resolveModule(record, transformed, args) {
             });
         }
         acceptedDepsWithPaths.push({
+            compiledSpecifier: unresolved.specifier,
             depPath: resolvedImport.identityPath,
             end: unresolved.end,
             quote: unresolved.quote,
+            specifier: displaySpecifier,
             start: unresolved.start,
         });
     }
@@ -140,7 +173,6 @@ export async function resolveModule(record, transformed, args) {
         tracking: toResolveTracking(trackedFiles, trackedResolutions),
         value: {
             deps: [...deps],
-            fingerprint: transformed.fingerprint,
             hmr: {
                 acceptedDeps: acceptedDepsWithPaths,
                 selfAccepting: transformed.hmr.selfAccepting,
@@ -152,10 +184,85 @@ export async function resolveModule(record, transformed, args) {
             rawCode: transformed.rawCode,
             resolvedPath: transformed.resolvedPath,
             sourceMap: transformed.sourceMap,
+            staticDeps: [...staticDeps],
             stableUrlPathname: transformed.stableUrlPathname,
         },
     };
 }
+async function resolveBareImportScopes(pendingScopes, importerPath, args) {
+    let results = new Array(pendingScopes.length);
+    let nextIndex = 0;
+    async function worker() {
+        while (nextIndex < pendingScopes.length) {
+            let index = nextIndex++;
+            let pending = pendingScopes[index];
+            try {
+                results[index] = {
+                    ok: true,
+                    scopePathname: await getBareImportScopePathname({
+                        importerPath,
+                        resolvedIdentityPath: pending.resolvedIdentityPath,
+                        specifier: pending.specifier,
+                        ...args,
+                    }),
+                };
+            }
+            catch (error) {
+                results[index] = {
+                    ok: false,
+                    error: isAssetServerCompilationError(error)
+                        ? error
+                        : createAssetServerCompilationError(`Failed to determine an import map scope for "${pending.imported.specifier}" in ${importerPath}. ${formatUnknownError(error)}`, { cause: error, code: 'IMPORT_RESOLUTION_FAILED' }),
+                };
+            }
+        }
+    }
+    if (pendingScopes.length === 1) {
+        await worker();
+    }
+    else {
+        await Promise.all(Array.from({ length: Math.min(args.concurrency, pendingScopes.length) }, () => worker()));
+    }
+    return results;
+}
+async function getBareImportScopePathname(args) {
+    let importerDirectory = normalizeFilePath(path.dirname(args.importerPath));
+    let importerScopePathname = args.routes.toUrlPathname(importerDirectory);
+    if (!importerScopePathname) {
+        throw new Error(`Expected a URL pathname for ${importerDirectory}`);
+    }
+    let importerDirectoryResolution = args.resolvedIdentityPath;
+    if (!args.isDirectoryResolutionFileIndependent(importerDirectory)) {
+        importerDirectoryResolution = await args.resolveDirectorySpecifierIdentity(importerDirectory, args.specifier);
+        if (importerDirectoryResolution !== args.resolvedIdentityPath) {
+            throw createAssetServerCompilationError(`Bare import "${args.specifier}" in ${args.importerPath} resolves differently based on the importer file. ` +
+                `Browser module resolution must be uniform for all files in the same directory.`, { code: 'IMPORT_RESOLUTION_NOT_DIRECTORY_UNIFORM' });
+        }
+    }
+    let directory = importerDirectory;
+    let scopePathname = importerScopePathname;
+    let broadestScopePathname = importerScopePathname;
+    while (true) {
+        let resolvedIdentityPath = directory === importerDirectory
+            ? importerDirectoryResolution
+            : await args.resolveDirectorySpecifierIdentity(directory, args.specifier);
+        if (resolvedIdentityPath !== args.resolvedIdentityPath)
+            break;
+        broadestScopePathname = scopePathname;
+        let parentDirectory = normalizeFilePath(path.dirname(directory));
+        if (parentDirectory === directory)
+            break;
+        let parentScopePathname = args.routes.toUrlPathname(parentDirectory);
+        if (!parentScopePathname)
+            break;
+        directory = parentDirectory;
+        scopePathname = parentScopePathname;
+    }
+    return ensureTrailingSlash(broadestScopePathname);
+}
+function ensureTrailingSlash(value) {
+    return value.endsWith('/') ? value : `${value}/`;
+}
 function findNearestPackageJsonPath(filePath) {
     let directory = path.dirname(filePath);
     while (true) {

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

@@ -0,0 +1,2 @@
+export declare function isBareImportSpecifier(specifier: string): boolean;
+//# sourceMappingURL=specifiers.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"specifiers.d.ts","sourceRoot":"","sources":["../../../src/lib/scripts/specifiers.ts"],"names":[],"mappings":"AAAA,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAUhE"}

package/dist/lib/scripts/specifiers.js

@@ -0,0 +1,9 @@
+export function isBareImportSpecifier(specifier) {
+    return (!specifier.startsWith('./') &&
+        !specifier.startsWith('../') &&
+        !specifier.startsWith('/') &&
+        !specifier.startsWith('file:') &&
+        !specifier.startsWith('data:') &&
+        !specifier.startsWith('http://') &&
+        !specifier.startsWith('https://'));
+}

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

@@ -12,14 +12,14 @@ export type ResolveModuleResult = {
     resolvedPath: string;
 };
 type UnresolvedImport = {
+    dynamic: boolean;
     end: number;
     quote?: '"' | "'" | '`';
     specifier: string;
     start: number;
 };
-type HmrAcceptedDependency = UnresolvedImport;
+type HmrAcceptedDependency = Omit<UnresolvedImport, 'dynamic'>;
 export type TransformedModule = {
-    fingerprint: string | null;
     hmr: {
         acceptedDeps: HmrAcceptedDependency[];
         selfAccepting: boolean;
@@ -50,7 +50,6 @@ type TsconfigTransformOptions = {
 };
 type TsconfigTransformOptionsResolver = ReturnType<typeof createTsconfigTransformOptionsResolver>;
 export type TransformArgs = {
-    buildId: string | null;
     define: Record<string, string> | null;
     externalSet: ReadonlySet<string>;
     isWatchIgnored(filePath: string): boolean;

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

package/dist/lib/scripts/transform.js

@@ -10,11 +10,11 @@ import { transform as oxcTransform } from 'oxc-transform';
 import { init as esModuleLexerInit, parse as esModuleLexer } from 'es-module-lexer';
 import { isCommonJS, mayContainCommonJSModuleGlobals } from './cjs-check.js';
 import { createAssetServerCompilationError, isAssetServerCompilationError, } from '../compilation-error.js';
-import { generateFingerprint } from '../fingerprint.js';
 import { maskAuthoredInjectedPackageSpecifier, mayContainInjectedPackageSpecifier, restoreAuthoredInjectedPackageSpecifier, } from '../injected-packages.js';
 import { normalizeFilePath } from '../paths.js';
 import { composeSourceMaps, rewriteSourceMapSources, stringifySourceMap } from '../source-maps.js';
 import { scriptLoaderConditions } from './conditions.js';
+import { isBareImportSpecifier } from './specifiers.js';
 const scriptModuleTypes = [
     { extension: '.js', lang: 'js' },
     { extension: '.jsx', lang: 'jsx' },
@@ -138,12 +138,6 @@ export async function transformModule(record, args) {
                 trackedFiles,
             },
             value: {
-                fingerprint: args.buildId === null
-                    ? null
-                    : await generateFingerprint({
-                        buildId: args.buildId,
-                        content: sourceText,
-                    }),
                 hmr: getHmrAnalysis(analysis.rawCode),
                 identityPath: record.identityPath,
                 importerDir: path.dirname(resolvedPath),
@@ -281,15 +275,6 @@ function findNearestTsconfigPath(directory) {
         currentDirectory = parentDirectory;
     }
 }
-function isBareImportSpecifier(specifier) {
-    return (!specifier.startsWith('./') &&
-        !specifier.startsWith('../') &&
-        !specifier.startsWith('/') &&
-        !specifier.startsWith('file:') &&
-        !specifier.startsWith('data:') &&
-        !specifier.startsWith('http://') &&
-        !specifier.startsWith('https://'));
-}
 async function analyzeModuleSource(sourceText, resolvedPath, transformOptions, options) {
     let maskedSourceText = maskAuthoredInjectedPackageImports(sourceText, resolvedPath);
     let transformResult;
@@ -533,6 +518,7 @@ async function getUnresolvedImportsFromLexer(rawCode) {
         if (specifier == null || isBrowserExternalModuleUrl(specifier))
             continue;
         unresolvedImports.push({
+            dynamic: imported.d !== -1,
             specifier,
             start: imported.s,
             end: imported.e,

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

@@ -19,7 +19,6 @@ type StyleGetOptions = {
     requestedFingerprint: string | null;
 };
 type StyleCompilerOptions = {
-    buildId?: string;
     fingerprintAssets: boolean;
     getServedFileUrl?(identityPath: string, options: {
         transform: readonly string[] | null;

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

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

package/dist/lib/styles/compiler.js

@@ -2,6 +2,7 @@ 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 } from '../fingerprint.js';
 import { createModuleStore } from '../module-store.js';
@@ -32,7 +33,6 @@ export function createStyleCompiler(options) {
         routes: resolvedOptions.routes,
     };
     let transformArgs = {
-        buildId: resolvedOptions.buildId ?? null,
         isWatchIgnored,
         minify: resolvedOptions.minify,
         routes: resolvedOptions.routes,
@@ -43,7 +43,8 @@ export function createStyleCompiler(options) {
     return {
         async getHref(filePath) {
             let resolvedStyle = resolveServedStyleOrThrow(resolveInputFilePath(filePath), resolveArgs);
-            return getServedUrl(resolvedStyle.identityPath);
+            let graph = await resolveStyleGraph(resolvedStyle.identityPath);
+            return getServedUrlFromGraph(resolvedStyle.identityPath, graph);
         },
         async getPreloadLayers(filePath) {
             let resolvedEntries = [];
@@ -57,13 +58,17 @@ export function createStyleCompiler(options) {
             let visited = new Set(resolvedEntries);
             let queue = [...resolvedEntries];
             let layers = [];
+            let graph = await resolveStyleGraph(resolvedEntries);
             while (queue.length > 0) {
                 let frontier = queue;
                 queue = [];
-                let resolvedStyles = await getOrCreateResolvedStyles(frontier.map((identityPath) => styleStore.get(identityPath)));
                 let layer = [];
-                for (let resolvedStyle of resolvedStyles) {
-                    layer.push(getServedUrlForResolvedStyle(resolvedStyle));
+                for (let identityPath of frontier) {
+                    let graphEntry = graph.get(identityPath);
+                    if (!graphEntry)
+                        throw new Error(`Missing resolved style ${identityPath}`);
+                    let resolvedStyle = graphEntry.resolvedStyle;
+                    layer.push(await getServedUrlFromGraph(identityPath, graph));
                     for (let dep of resolvedStyle.deps) {
                         if (visited.has(dep))
                             continue;
@@ -119,9 +124,6 @@ export function createStyleCompiler(options) {
         }
         return resolveFilePath(resolvedOptions.rootDir, filePath);
     }
-    async function getOrCreateResolvedStyles(records) {
-        return mapWithConcurrency(records, preloadConcurrency, (record) => getOrCreateResolvedStyle(record));
-    }
     async function getOrCreateResolvedStyle(record) {
         if (record.resolved && styleStore.isResolvedFresh(record))
             return record.resolved;
@@ -180,22 +182,37 @@ export function createStyleCompiler(options) {
             !hasHmrTimestampedDependency(record.resolved)) {
             return record.emitted;
         }
-        let cacheKey = getRecordCacheKey(record);
+        let graph = await resolveStyleGraph(record.identityPath);
+        return getOrCreateEmittedStyleFromGraph(record, graph);
+    }
+    async function getOrCreateEmittedStyleFromGraph(record, graph) {
+        let graphEntry = graph.get(record.identityPath);
+        if (!graphEntry) {
+            throw new Error(`Missing resolved style ${record.identityPath}`);
+        }
+        if (record.invalidationVersion === graphEntry.invalidationVersion &&
+            record.emitted &&
+            styleStore.isEmittedFresh(record) &&
+            !hasHmrTimestampedDependency(record.resolved)) {
+            return record.emitted;
+        }
+        let cacheKey = getCacheKey(record.identityPath, graphEntry.invalidationVersion);
         let existing = emitInFlightByCacheKey.get(cacheKey);
         if (existing)
             return existing;
         let promise = (async () => {
-            let startedVersion = record.invalidationVersion;
-            let resolvedStyle = await getOrCreateResolvedStyle(record);
-            let emitResolvedStyleResult = await emitResolvedStyle(resolvedStyle, {
+            let emitResolvedStyleResult = await emitResolvedStyle(graphEntry.resolvedStyle, {
+                fingerprintAssets: resolvedOptions.fingerprintAssets,
                 getServedFileUrl: resolvedOptions.getServedFileUrl,
-                getServedUrl,
+                getServedUrl(identityPath) {
+                    return getServedUrlFromGraph(identityPath, graph);
+                },
                 sourceMaps: resolvedOptions.sourceMaps,
             });
             if (!emitResolvedStyleResult.ok) {
                 throw emitResolvedStyleResult.error;
             }
-            if (isFresh(record, startedVersion)) {
+            if (isFresh(record, graphEntry.invalidationVersion)) {
                 styleStore.setEmitted(record.identityPath, emitResolvedStyleResult.value, null);
             }
             return emitResolvedStyleResult.value;
@@ -210,14 +227,75 @@ export function createStyleCompiler(options) {
             }
         }
     }
-    async function getServedUrl(identityPath) {
-        return getServedUrlForResolvedStyle(await getOrCreateResolvedStyle(styleStore.get(identityPath)));
-    }
-    function getServedUrlForResolvedStyle(resolvedStyle) {
-        let pathname = formatFingerprintedPathname(resolvedStyle.stableUrlPathname, resolvedOptions.fingerprintAssets ? resolvedStyle.fingerprint : null);
-        let timestamp = styleStore.getHmrUpdateTimestamp(resolvedStyle.identityPath);
+    async function getServedUrlFromGraph(identityPath, graph) {
+        let graphEntry = graph.get(identityPath);
+        if (!graphEntry)
+            throw new Error(`Missing resolved style ${identityPath}`);
+        let pathname = graphEntry.resolvedStyle.stableUrlPathname;
+        if (resolvedOptions.fingerprintAssets) {
+            let emittedStyle = await getOrCreateEmittedStyleFromGraph(styleStore.get(identityPath), graph);
+            pathname = formatFingerprintedPathname(graphEntry.resolvedStyle.stableUrlPathname, emittedStyle.fingerprint);
+        }
+        let timestamp = styleStore.getHmrUpdateTimestamp(graphEntry.resolvedStyle.identityPath);
         return timestamp ? appendTimestamp(pathname, timestamp) : pathname;
     }
+    async function resolveStyleGraph(rootPath) {
+        let resolvedByPath = new Map();
+        let rootPaths = Array.isArray(rootPath) ? rootPath : [rootPath];
+        let discovered = new Set(rootPaths);
+        let queue = [...rootPaths];
+        while (queue.length > 0) {
+            let frontier = queue;
+            queue = [];
+            let graphEntries = await mapWithConcurrency(frontier, preloadConcurrency, async (identityPath) => {
+                let record = styleStore.get(identityPath);
+                let invalidationVersion = record.invalidationVersion;
+                let resolvedStyle = await getOrCreateResolvedStyle(record);
+                return {
+                    invalidationVersion,
+                    resolvedStyle,
+                };
+            });
+            for (let [index, identityPath] of frontier.entries()) {
+                let graphEntry = graphEntries[index];
+                resolvedByPath.set(identityPath, graphEntry);
+                for (let depPath of graphEntry.resolvedStyle.deps) {
+                    if (discovered.has(depPath))
+                        continue;
+                    discovered.add(depPath);
+                    queue.push(depPath);
+                }
+            }
+        }
+        assertNoCircularImports(resolvedByPath, rootPaths);
+        return resolvedByPath;
+    }
+    function assertNoCircularImports(graph, rootPaths) {
+        let visited = new Set();
+        let path = [];
+        let pathIndexByIdentity = new Map();
+        function visit(identityPath) {
+            let cycleStart = pathIndexByIdentity.get(identityPath);
+            if (cycleStart !== undefined) {
+                let cycle = [...path.slice(cycleStart), identityPath];
+                throw createAssetServerCompilationError(`Circular CSS imports are not supported: ${cycle.join(' -> ')}`, { code: 'EMIT_FAILED' });
+            }
+            if (visited.has(identityPath))
+                return;
+            let graphEntry = graph.get(identityPath);
+            if (!graphEntry)
+                throw new Error(`Missing resolved style ${identityPath}`);
+            pathIndexByIdentity.set(identityPath, path.length);
+            path.push(identityPath);
+            for (let depPath of graphEntry.resolvedStyle.deps)
+                visit(depPath);
+            path.pop();
+            pathIndexByIdentity.delete(identityPath);
+            visited.add(identityPath);
+        }
+        for (let identityPath of rootPaths)
+            visit(identityPath);
+    }
     function getHmrUpdatePathnames(identityPath, timestamp) {
         let resolvedStyles = findHmrUpdateStyles(identityPath, new Set());
         // Mark update timestamps before invalidating so re-emitted importer stylesheets
@@ -251,7 +329,10 @@ export function createStyleCompiler(options) {
     }
 }
 function getRecordCacheKey(record) {
-    return `${record.identityPath}\0${record.invalidationVersion}`;
+    return getCacheKey(record.identityPath, record.invalidationVersion);
+}
+function getCacheKey(identityPath, version) {
+    return `${identityPath}\0${version}`;
 }
 function isFresh(record, version) {
     return record.invalidationVersion === version;
@@ -264,13 +345,12 @@ function getNotModifiedStyle(record, styleStore, options, hasHmrTimestampedDepen
     let emittedStyle = record.emitted;
     if (!emittedStyle || options.ifNoneMatch === null)
         return null;
-    if (options.requestedFingerprint !== null &&
-        emittedStyle.fingerprint !== options.requestedFingerprint) {
-        return null;
-    }
     let asset = getEmittedAssetForRequest(emittedStyle, options.isSourceMapRequest);
     if (!asset)
         return null;
+    if (options.requestedFingerprint !== null && asset.fingerprint !== options.requestedFingerprint) {
+        return null;
+    }
     if (!IfNoneMatch.from(options.ifNoneMatch).matches(asset.etag))
         return null;
     return { etag: asset.etag, type: 'not-modified' };

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

@@ -3,11 +3,11 @@ import type { ResolvedStyle } from './resolve.ts';
 export type EmittedAsset = {
     content: string;
     etag: string;
+    fingerprint: string;
 };
 export type EmittedStyle = {
     code: EmittedAsset;
     fingerprint: string | null;
-    importUrls: string[];
     sourceMap: EmittedAsset | null;
 };
 type EmitResult = {
@@ -18,6 +18,7 @@ type EmitResult = {
     ok: false;
 };
 export declare function emitResolvedStyle(resolvedStyle: ResolvedStyle, options: {
+    fingerprintAssets: boolean;
     getServedFileUrl?(identityPath: string, options: {
         transform: readonly string[] | null;
     }): Promise<string>;

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

@@ -1 +1 @@
-{"version":3,"file":"emit.d.ts","sourceRoot":"","sources":["../../../src/lib/styles/emit.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAA;AAC1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAEjD,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,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,YAAY,CAAA;CACpB,GACD;IACE,KAAK,EAAE,2BAA2B,CAAA;IAClC,EAAE,EAAE,KAAK,CAAA;CACV,CAAA;AAEL,wBAAsB,iBAAiB,CACrC,aAAa,EAAE,aAAa,EAC5B,OAAO,EAAE;IACP,gBAAgB,CAAC,CACf,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE;QACP,SAAS,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAA;KACpC,GACA,OAAO,CAAC,MAAM,CAAC,CAAA;IAClB,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/styles/emit.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAA;AAC1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAEjD,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,YAAY,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,UAAU,GACX;IACE,EAAE,EAAE,IAAI,CAAA;IACR,KAAK,EAAE,YAAY,CAAA;CACpB,GACD;IACE,KAAK,EAAE,2BAA2B,CAAA;IAClC,EAAE,EAAE,KAAK,CAAA;CACV,CAAA;AAEL,wBAAsB,iBAAiB,CACrC,aAAa,EAAE,aAAa,EAC5B,OAAO,EAAE;IACP,iBAAiB,EAAE,OAAO,CAAA;IAC1B,gBAAgB,CAAC,CACf,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE;QACP,SAAS,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAA;KACpC,GACA,OAAO,CAAC,MAAM,CAAC,CAAA;IAClB,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,CAoCrB"}

package/dist/lib/styles/emit.js

@@ -1,30 +1,30 @@
 import MagicString from 'magic-string';
 import { createAssetServerCompilationError, isAssetServerCompilationError, } from '../compilation-error.js';
-import { hashContent } from '../fingerprint.js';
+import { formatFingerprintedPathname, hashContent } from '../fingerprint.js';
 import { composeSourceMaps } from '../source-maps.js';
 export async function emitResolvedStyle(resolvedStyle, options) {
     try {
-        let importUrls = await Promise.all(resolvedStyle.deps.map((depPath) => options.getServedUrl(depPath)));
         let rewriteResult = await rewriteDependencies(resolvedStyle, options);
         let finalCode = rewriteResult.code;
+        let sourceMap = rewriteResult.sourceMap
+            ? await createEmittedAsset(rewriteResult.sourceMap)
+            : null;
         if (rewriteResult.sourceMap) {
             if (options.sourceMaps === 'inline') {
                 let encoded = Buffer.from(rewriteResult.sourceMap).toString('base64');
                 finalCode += `\n/*# sourceMappingURL=data:application/json;base64,${encoded} */`;
             }
             else if (options.sourceMaps === 'external') {
-                finalCode += `\n/*# sourceMappingURL=${await options.getServedUrl(resolvedStyle.identityPath)}.map */`;
+                finalCode += `\n/*# sourceMappingURL=${formatFingerprintedPathname(resolvedStyle.stableUrlPathname, options.fingerprintAssets && sourceMap ? sourceMap.fingerprint : null)}.map */`;
             }
         }
+        let code = await createEmittedAsset(finalCode);
         return {
             ok: true,
             value: {
-                code: await createEmittedAsset(finalCode),
-                fingerprint: resolvedStyle.fingerprint,
-                importUrls,
-                sourceMap: rewriteResult.sourceMap
-                    ? await createEmittedAsset(rewriteResult.sourceMap)
-                    : null,
+                code,
+                fingerprint: options.fingerprintAssets ? code.fingerprint : null,
+                sourceMap,
             },
         };
     }
@@ -98,9 +98,11 @@ async function getServedFileUrl(options, importerPath, identityPath, request) {
     }
 }
 async function createEmittedAsset(content) {
+    let fingerprint = await hashContent(content);
     return {
         content,
-        etag: `W/"${await hashContent(content)}"`,
+        etag: `W/"${fingerprint}"`,
+        fingerprint,
     };
 }
 function toEmitError(error, identityPath) {

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

@@ -23,7 +23,6 @@ type ResolvedDependency = {
 export type ResolvedStyle = {
     dependencies: ResolvedDependency[];
     deps: string[];
-    fingerprint: string | null;
     identityPath: string;
     rawCode: string;
     resolvedPath: string;

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

@@ -1 +1 @@
-{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../../src/lib/styles/resolve.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAA;AAC1E,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAC7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAEtD,KAAK,WAAW,GAAG,YAAY,CAAC,gBAAgB,EAAE,aAAa,EAAE,YAAY,CAAC,CAAA;AAE9E,KAAK,kBAAkB,GACnB;IACE,IAAI,EAAE,UAAU,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,MAAM,CAAA;CACpB,GACD;IACE,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,OAAO,CAAA;IACb,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;CACf,GACD;IACE,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,gBAAgB,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAA;IAC1C,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAEL,MAAM,MAAM,aAAa,GAAG;IAC1B,YAAY,EAAE,kBAAkB,EAAE,CAAA;IAClC,IAAI,EAAE,MAAM,EAAE,CAAA;IACd,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,YAAY,EAAE,MAAM,CAAA;IACpB,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;CACvB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAA;IACxC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAA;IAC3C,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAA;IACzC,MAAM,EAAE,cAAc,CAAA;CACvB,CAAA;AAED,KAAK,aAAa,GAAG;IACnB,QAAQ,EAAE,cAAc,CAAA;CACzB,GAAG,CACA;IACE,EAAE,EAAE,IAAI,CAAA;IACR,KAAK,EAAE,aAAa,CAAA;CACrB,GACD;IACE,KAAK,EAAE,2BAA2B,CAAA;IAClC,EAAE,EAAE,KAAK,CAAA;CACV,CACJ,CAAA;AAQD,wBAAsB,YAAY,CAChC,MAAM,EAAE,WAAW,EACnB,WAAW,EAAE,gBAAgB,EAC7B,IAAI,EAAE,WAAW,GAChB,OAAO,CAAC,aAAa,CAAC,CA+DxB;AAED,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,WAAW,GAChB;IACD,YAAY,EAAE,MAAM,CAAA;IACpB,iBAAiB,EAAE,MAAM,CAAA;CAC1B,CAmCA"}
+{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../../src/lib/styles/resolve.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAA;AAC1E,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAC7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAEtD,KAAK,WAAW,GAAG,YAAY,CAAC,gBAAgB,EAAE,aAAa,EAAE,YAAY,CAAC,CAAA;AAE9E,KAAK,kBAAkB,GACnB;IACE,IAAI,EAAE,UAAU,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,MAAM,CAAA;CACpB,GACD;IACE,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,OAAO,CAAA;IACb,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;CACf,GACD;IACE,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,gBAAgB,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAA;IAC1C,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAEL,MAAM,MAAM,aAAa,GAAG;IAC1B,YAAY,EAAE,kBAAkB,EAAE,CAAA;IAClC,IAAI,EAAE,MAAM,EAAE,CAAA;IACd,YAAY,EAAE,MAAM,CAAA;IACpB,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;CACvB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAA;IACxC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAA;IAC3C,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAA;IACzC,MAAM,EAAE,cAAc,CAAA;CACvB,CAAA;AAED,KAAK,aAAa,GAAG;IACnB,QAAQ,EAAE,cAAc,CAAA;CACzB,GAAG,CACA;IACE,EAAE,EAAE,IAAI,CAAA;IACR,KAAK,EAAE,aAAa,CAAA;CACrB,GACD;IACE,KAAK,EAAE,2BAA2B,CAAA;IAClC,EAAE,EAAE,KAAK,CAAA;CACV,CACJ,CAAA;AAQD,wBAAsB,YAAY,CAChC,MAAM,EAAE,WAAW,EACnB,WAAW,EAAE,gBAAgB,EAC7B,IAAI,EAAE,WAAW,GAChB,OAAO,CAAC,aAAa,CAAC,CA8DxB;AAED,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,WAAW,GAChB;IACD,YAAY,EAAE,MAAM,CAAA;IACpB,iBAAiB,EAAE,MAAM,CAAA;CAC1B,CAmCA"}

package/dist/lib/styles/resolve.js

@@ -40,7 +40,6 @@ export async function resolveStyle(record, transformed, args) {
         value: {
             dependencies,
             deps: [...deps],
-            fingerprint: transformed.fingerprint,
             identityPath: record.identityPath,
             rawCode: transformed.rawCode,
             resolvedPath: transformed.resolvedPath,

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

@@ -12,7 +12,6 @@ type TransformedStyleDependency = {
     url: string;
 };
 export type TransformedStyle = {
-    fingerprint: string | null;
     identityPath: string;
     rawCode: string;
     resolvedPath: string;
@@ -31,7 +30,6 @@ type TransformResult = {
     ok: false;
 });
 export type TransformArgs = {
-    buildId: string | null;
     isWatchIgnored(filePath: string): boolean;
     minify: boolean;
     routes: CompiledRoutes;

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

@@ -1 +1 @@
-{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../../src/lib/styles/transform.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAExD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAA;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAEvD,KAAK,0BAA0B,GAC3B;IACE,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,QAAQ,CAAA;IACd,GAAG,EAAE,MAAM,CAAA;CACZ,GACD;IACE,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,KAAK,CAAA;IACX,GAAG,EAAE,MAAM,CAAA;CACZ,CAAA;AAEL,MAAM,MAAM,gBAAgB,GAAG;IAC7B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,YAAY,EAAE,MAAM,CAAA;IACpB,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,sBAAsB,EAAE,0BAA0B,EAAE,CAAA;CACrD,CAAA;AAED,KAAK,eAAe,GAAG;IACrB,QAAQ,EAAE,cAAc,CAAA;CACzB,GAAG,CACA;IACE,EAAE,EAAE,IAAI,CAAA;IACR,KAAK,EAAE,gBAAgB,CAAA;CACxB,GACD;IACE,KAAK,EAAE,2BAA2B,CAAA;IAClC,EAAE,EAAE,KAAK,CAAA;CACV,CACJ,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IACtB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAA;IACzC,MAAM,EAAE,OAAO,CAAA;IACf,MAAM,EAAE,cAAc,CAAA;IACtB,UAAU,EAAE,UAAU,GAAG,QAAQ,GAAG,IAAI,CAAA;IACxC,oBAAoB,EAAE,UAAU,GAAG,KAAK,CAAA;IACxC,OAAO,EAAE,mBAAmB,GAAG,IAAI,CAAA;CACpC,CAAA;AAED,KAAK,eAAe,GAAG;IACrB,YAAY,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,wBAAsB,cAAc,CAClC,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,eAAe,CAAC,CA6G1B"}
+{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../../src/lib/styles/transform.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAExD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAA;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAEvD,KAAK,0BAA0B,GAC3B;IACE,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,QAAQ,CAAA;IACd,GAAG,EAAE,MAAM,CAAA;CACZ,GACD;IACE,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,KAAK,CAAA;IACX,GAAG,EAAE,MAAM,CAAA;CACZ,CAAA;AAEL,MAAM,MAAM,gBAAgB,GAAG;IAC7B,YAAY,EAAE,MAAM,CAAA;IACpB,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,sBAAsB,EAAE,0BAA0B,EAAE,CAAA;CACrD,CAAA;AAED,KAAK,eAAe,GAAG;IACrB,QAAQ,EAAE,cAAc,CAAA;CACzB,GAAG,CACA;IACE,EAAE,EAAE,IAAI,CAAA;IACR,KAAK,EAAE,gBAAgB,CAAA;CACxB,GACD;IACE,KAAK,EAAE,2BAA2B,CAAA;IAClC,EAAE,EAAE,KAAK,CAAA;CACV,CACJ,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAA;IACzC,MAAM,EAAE,OAAO,CAAA;IACf,MAAM,EAAE,cAAc,CAAA;IACtB,UAAU,EAAE,UAAU,GAAG,QAAQ,GAAG,IAAI,CAAA;IACxC,oBAAoB,EAAE,UAAU,GAAG,KAAK,CAAA;IACxC,OAAO,EAAE,mBAAmB,GAAG,IAAI,CAAA;CACpC,CAAA;AAED,KAAK,eAAe,GAAG;IACrB,YAAY,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,wBAAsB,cAAc,CAClC,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,eAAe,CAAC,CAsG1B"}