@remix-run/assets 0.6.0 → 0.7.0

package/dist/lib/scripts/compiler.js

@@ -3,17 +3,19 @@ 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 { getTsconfig } from 'get-tsconfig';
 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 { isBareImportSpecifier } from './specifiers.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));
+const scriptConcurrency = Math.max(1, Math.min(8, os.availableParallelism() - 1));
 export function createScriptCompiler(options) {
     let resolvedOptions = {
         ...options,
@@ -31,18 +33,21 @@ export function createScriptCompiler(options) {
         onWatchFilesChange: options.onWatchFilesChange,
     });
     let tsconfigTransformOptionsResolver = createTsconfigTransformOptionsResolver();
-    let resolverFactory = new ResolverFactory({
+    let resolverOptions = {
         aliasFields: [['browser']],
         conditionNames: ['browser', 'import', 'module', 'default'],
         extensionAlias: resolverExtensionAlias,
         extensions: resolverExtensions,
         mainFields: ['browser', 'module', 'main'],
-        tsconfig: 'auto',
-    });
+    };
+    let resolverFactory = new ResolverFactory({ ...resolverOptions, tsconfig: 'auto' });
+    let directoryResolverByTsconfig = new Map();
+    let tsconfigByDirectory = new Map();
+    let directoryResolutionIdentityByCacheKey = new Map();
     let resolveInFlightByCacheKey = new Map();
     let emitInFlightByCacheKey = new Map();
+    let hasResolvedScripts = false;
     let transformArgs = {
-        buildId: resolvedOptions.buildId ?? null,
         define: resolvedOptions.define ?? null,
         externalSet: resolvedOptions.externalSet,
         isWatchIgnored,
@@ -56,10 +61,13 @@ export function createScriptCompiler(options) {
         tsconfigTransformOptionsResolver,
     };
     let resolveArgs = {
+        concurrency: scriptConcurrency,
+        isDirectoryResolutionFileIndependent,
         isAllowed: resolvedOptions.isAllowed,
         isWatchIgnored,
         resolveModulePath,
         resolverFactory,
+        resolveDirectorySpecifierIdentity,
         routes: resolvedOptions.routes,
     };
     return {
@@ -76,14 +84,7 @@ export function createScriptCompiler(options) {
             };
         },
         async getPreloadLayers(filePath) {
-            let resolvedEntries = [];
-            let seen = new Set();
-            for (let resolvedModule of (Array.isArray(filePath) ? filePath : [filePath]).map((nextPath) => resolveServedScriptOrThrow(resolveInputFilePath(nextPath)))) {
-                if (seen.has(resolvedModule.identityPath))
-                    continue;
-                seen.add(resolvedModule.identityPath);
-                resolvedEntries.push(resolvedModule.identityPath);
-            }
+            let resolvedEntries = resolveInputScriptRoots(filePath);
             let visited = new Set(resolvedEntries);
             let queue = [...resolvedEntries];
             let layers = [];
@@ -93,8 +94,8 @@ export function createScriptCompiler(options) {
                 let resolvedModules = await getOrCreateResolvedScripts(frontier.map((identityPath) => scriptStore.get(identityPath)));
                 let layer = [];
                 for (let resolvedModule of resolvedModules) {
-                    layer.push(getServedUrlForResolvedScript(resolvedModule));
-                    for (let dep of resolvedModule.deps) {
+                    layer.push(await getServedUrl(resolvedModule.identityPath));
+                    for (let dep of resolvedModule.staticDeps) {
                         if (visited.has(dep))
                             continue;
                         visited.add(dep);
@@ -105,10 +106,66 @@ export function createScriptCompiler(options) {
             }
             return layers;
         },
+        async getImportMap(filePath) {
+            let resolvedEntries = resolveInputScriptRoots(filePath);
+            let resolvedEntrySet = new Set(resolvedEntries);
+            let visited = new Set();
+            let queue = [...resolvedEntries];
+            let imports = {};
+            let scopes = {};
+            while (queue.length > 0) {
+                let frontier = queue;
+                queue = [];
+                let resolvedModules = await getOrCreateResolvedScripts(frontier.map((identityPath) => scriptStore.get(identityPath)));
+                for (let resolvedModule of resolvedModules) {
+                    if (visited.has(resolvedModule.identityPath))
+                        continue;
+                    visited.add(resolvedModule.identityPath);
+                    if (!resolvedEntrySet.has(resolvedModule.identityPath)) {
+                        addImportMapEntry(imports, resolvedModule.stableUrlPathname, await getServedUrl(resolvedModule.identityPath));
+                    }
+                    for (let imported of resolvedModule.imports) {
+                        let depUrl = await getServedUrl(imported.depPath);
+                        if (isBareImportSpecifier(imported.specifier)) {
+                            let scopePathname = imported.scopePathname;
+                            if (!scopePathname) {
+                                throw new Error(`Expected import map scope for bare import "${imported.specifier}" in ${resolvedModule.identityPath}`);
+                            }
+                            let scopeImports = (scopes[scopePathname] ??= {});
+                            addImportMapEntry(scopeImports, imported.specifier, depUrl);
+                        }
+                        else {
+                            let browserResolvedSpecifier = resolveImportMapUrlSpecifier(imported.specifier, resolvedModule.stableUrlPathname);
+                            addImportMapEntry(imports, browserResolvedSpecifier, depUrl);
+                        }
+                    }
+                    for (let dep of resolvedModule.deps) {
+                        if (!visited.has(dep)) {
+                            queue.push(dep);
+                        }
+                    }
+                }
+            }
+            for (let [scopePathname, scopeImports] of Object.entries(scopes)) {
+                if (Object.keys(scopeImports).length === 0) {
+                    delete scopes[scopePathname];
+                }
+            }
+            return Object.keys(scopes).length > 0 ? { imports, scopes } : { imports };
+        },
         async getHref(filePath) {
             let resolvedModule = resolveServedScriptOrThrow(resolveInputFilePath(filePath));
             return getServedUrl(resolvedModule.identityPath);
         },
+        async resolveSpecifierFromRoot(specifier) {
+            let importerPath = path.join(resolvedOptions.rootDir, '__remix_virtual_entry__.js');
+            let resolutionResult = await resolverFactory.resolveFileAsync(importerPath, specifier);
+            if (resolutionResult.error || !resolutionResult.path) {
+                throw createAssetServerCompilationError(`Failed to resolve browser module "${specifier}" from asset server root.`, { code: 'IMPORT_RESOLUTION_FAILED' });
+            }
+            let resolvedModule = resolveServedScriptOrThrow(resolutionResult.path);
+            return getServedUrl(resolvedModule.identityPath);
+        },
         async classifyHmrFileEvent(filePath, event) {
             let normalizedFilePath = normalizeFilePath(filePath);
             if (isWatchIgnored(normalizedFilePath))
@@ -116,7 +173,20 @@ export function createScriptCompiler(options) {
             let timestamp = Date.now();
             let previousResolvedModule = scriptStore.getLastResolved(normalizedFilePath);
             let updatePathname = previousResolvedModule?.stableUrlPathname;
+            let resolutionMetadataChanged = isPackageJsonPath(normalizedFilePath) || isTsconfigPath(normalizedFilePath);
             invalidateScriptFileEvent(normalizedFilePath, event);
+            if (resolutionMetadataChanged && hasResolvedScripts) {
+                let hmrUpdate = [
+                    {
+                        accepted: false,
+                        filePath: normalizedFilePath,
+                        path: normalizedFilePath,
+                        timestamp,
+                    },
+                ];
+                resolvedOptions.hmr?.send(hmrUpdate);
+                return hmrUpdate;
+            }
             let resolvedModule = event === 'change' && updatePathname
                 ? await tryGetOrCreateResolvedScript(scriptStore.get(normalizedFilePath))
                 : undefined;
@@ -160,6 +230,11 @@ export function createScriptCompiler(options) {
             return;
         if (shouldClearResolverCacheForFileEvent(normalizedFilePath, event)) {
             resolverFactory.clearCache();
+            for (let directoryResolver of directoryResolverByTsconfig.values()) {
+                directoryResolver.clearCache();
+            }
+            tsconfigByDirectory.clear();
+            directoryResolutionIdentityByCacheKey.clear();
         }
         if (isTsconfigPath(normalizedFilePath)) {
             tsconfigTransformOptionsResolver.clear();
@@ -172,6 +247,44 @@ export function createScriptCompiler(options) {
         }
         scriptStore.invalidateForFileEvent(normalizedFilePath, event);
     }
+    function isDirectoryResolutionFileIndependent(directory) {
+        return getDirectoryTsconfig(directory).fileIndependent;
+    }
+    function getDirectoryTsconfig(directory) {
+        let existing = tsconfigByDirectory.get(directory);
+        if (existing)
+            return existing;
+        let tsconfig = getTsconfig(directory);
+        let result = {
+            fileIndependent: !tsconfig?.config.references?.length,
+            path: tsconfig?.path ?? null,
+        };
+        tsconfigByDirectory.set(directory, result);
+        return result;
+    }
+    async function resolveDirectorySpecifierIdentity(directory, specifier) {
+        let cacheKey = `${directory}\0${specifier}`;
+        let existing = directoryResolutionIdentityByCacheKey.get(cacheKey);
+        if (existing)
+            return existing;
+        let promise = (async () => {
+            let tsconfigPath = getDirectoryTsconfig(directory).path;
+            let directoryResolver = directoryResolverByTsconfig.get(tsconfigPath);
+            if (!directoryResolver) {
+                directoryResolver = new ResolverFactory({
+                    ...resolverOptions,
+                    tsconfig: tsconfigPath ? { configFile: tsconfigPath } : undefined,
+                });
+                directoryResolverByTsconfig.set(tsconfigPath, directoryResolver);
+            }
+            let result = await directoryResolver.async(directory, specifier);
+            if (!result.path || !path.isAbsolute(result.path))
+                return null;
+            return resolveModulePath(normalizeFilePath(result.path))?.identityPath ?? null;
+        })();
+        directoryResolutionIdentityByCacheKey.set(cacheKey, promise);
+        return promise;
+    }
     function resolveServedScriptOrThrow(absolutePath) {
         let resolvedModule = resolveModulePath(absolutePath);
         if (!resolvedModule) {
@@ -187,6 +300,18 @@ export function createScriptCompiler(options) {
         }
         return resolvedModule;
     }
+    function resolveInputScriptRoots(filePath) {
+        let resolvedEntries = [];
+        let seen = new Set();
+        for (let nextPath of Array.isArray(filePath) ? filePath : [filePath]) {
+            let resolvedModule = resolveServedScriptOrThrow(resolveInputFilePath(nextPath));
+            if (seen.has(resolvedModule.identityPath))
+                continue;
+            seen.add(resolvedModule.identityPath);
+            resolvedEntries.push(resolvedModule.identityPath);
+        }
+        return resolvedEntries;
+    }
     function getNotModifiedScript(record, options) {
         if (hasHmrTimestampedDependency(record.resolved)) {
             return null;
@@ -202,7 +327,7 @@ export function createScriptCompiler(options) {
         return getNotModifiedResult(record.staleEmitted, options);
     }
     async function getOrCreateResolvedScripts(records) {
-        return mapWithConcurrency(records, preloadConcurrency, (record) => getOrCreateResolvedScript(record));
+        return mapWithConcurrency(records, scriptConcurrency, (record) => getOrCreateResolvedScript(record));
     }
     async function getOrCreateResolvedScript(record) {
         if (record.resolved && scriptStore.isResolvedFresh(record))
@@ -230,6 +355,7 @@ export function createScriptCompiler(options) {
                     resolveModuleResult.tracking,
                 ]);
             }
+            hasResolvedScripts = true;
             return resolveModuleResult.value;
         })();
         resolveInFlightByCacheKey.set(cacheKey, promise);
@@ -281,10 +407,12 @@ export function createScriptCompiler(options) {
         let promise = (async () => {
             let startedVersion = record.invalidationVersion;
             let resolvedModule = await getOrCreateResolvedScript(record);
+            await resolveScriptGraph(resolvedModule);
             let emitResolvedModuleResult = await emitResolvedModule(resolvedModule, {
+                fingerprintAssets: resolvedOptions.fingerprintAssets,
+                getHmrImportTimestamp,
                 getServedUrl,
                 getStableUrl,
-                getHmrImportTimestamp,
                 hmrClientPathname: resolvedOptions.hmr?.clientPathname,
                 sourceMaps: resolvedOptions.sourceMaps,
             });
@@ -306,11 +434,33 @@ export function createScriptCompiler(options) {
             }
         }
     }
-    async function getServedUrl(identityPath) {
-        return getServedUrlForResolvedScript(await getOrCreateResolvedScript(scriptStore.get(identityPath)));
+    async function resolveScriptGraph(root) {
+        let visited = new Set([root.identityPath]);
+        let queue = [...root.deps];
+        while (queue.length > 0) {
+            let frontier = queue;
+            queue = [];
+            let resolvedModules = await getOrCreateResolvedScripts(frontier
+                .filter((identityPath) => !visited.has(identityPath))
+                .map((identityPath) => scriptStore.get(identityPath)));
+            for (let resolvedModule of resolvedModules) {
+                if (visited.has(resolvedModule.identityPath))
+                    continue;
+                visited.add(resolvedModule.identityPath);
+                for (let dep of resolvedModule.deps) {
+                    if (!visited.has(dep))
+                        queue.push(dep);
+                }
+            }
+        }
     }
-    function getServedUrlForResolvedScript(resolvedModule) {
-        return formatFingerprintedPathname(resolvedModule.stableUrlPathname, resolvedOptions.fingerprintAssets ? resolvedModule.fingerprint : null);
+    async function getServedUrl(identityPath) {
+        let resolvedModule = await getOrCreateResolvedScript(scriptStore.get(identityPath));
+        if (!resolvedOptions.fingerprintAssets) {
+            return resolvedModule.stableUrlPathname;
+        }
+        let emittedModule = await getOrCreateEmittedScript(scriptStore.get(identityPath));
+        return formatFingerprintedPathname(resolvedModule.stableUrlPathname, emittedModule.fingerprint);
     }
     function getStableUrl(identityPath) {
         let stableUrlPathname = resolvedOptions.routes.toUrlPathname(identityPath);
@@ -335,7 +485,8 @@ export function createScriptCompiler(options) {
             return [
                 {
                     accepted: true,
-                    acceptedPath: updatePathname,
+                    acceptedFilePath: resolvedModule.identityPath,
+                    acceptedUrlPathname: updatePathname,
                     filePath: resolvedModule.identityPath,
                     path: updatePathname,
                     timestamp,
@@ -347,7 +498,8 @@ export function createScriptCompiler(options) {
         if (sourceFilePath !== undefined && boundaries) {
             return dedupeHmrBoundaries(boundaries).map(({ acceptedModule, boundaryModule }) => ({
                 accepted: true,
-                acceptedPath: acceptedModule.stableUrlPathname,
+                acceptedFilePath: acceptedModule.identityPath,
+                acceptedUrlPathname: acceptedModule.stableUrlPathname,
                 filePath: sourceFilePath,
                 path: boundaryModule.stableUrlPathname,
                 timestamp,
@@ -409,6 +561,14 @@ export function createScriptCompiler(options) {
         return resolvedOptions.watchIgnoreMatchers.some((matcher) => matcher(filePath));
     }
 }
+function resolveImportMapUrlSpecifier(specifier, importerUrlPathname) {
+    return new URL(specifier, `http://localhost${importerUrlPathname}`).pathname;
+}
+function addImportMapEntry(imports, specifier, url) {
+    if (specifier === url)
+        return;
+    imports[specifier] = url;
+}
 function dedupeHmrBoundaries(boundaries) {
     let seen = new Set();
     let result = [];
@@ -430,13 +590,12 @@ function isFresh(record, version) {
 function getNotModifiedResult(emittedModule, options) {
     if (!emittedModule || options.ifNoneMatch === null)
         return null;
-    if (options.requestedFingerprint !== null &&
-        emittedModule.fingerprint !== options.requestedFingerprint) {
-        return null;
-    }
     let asset = getEmittedAssetForRequest(emittedModule, 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 { type: 'not-modified', etag: asset.etag };
@@ -548,15 +707,6 @@ function resolveActualPath(identityPath) {
         throw error;
     }
 }
-function isBareImportSpecifier(specifier) {
-    return (!specifier.startsWith('./') &&
-        !specifier.startsWith('../') &&
-        !specifier.startsWith('/') &&
-        !specifier.startsWith('file:') &&
-        !specifier.startsWith('data:') &&
-        !specifier.startsWith('http://') &&
-        !specifier.startsWith('https://'));
-}
 function isNoEntityError(error) {
     return (error instanceof Error &&
         'code' in error &&

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

@@ -3,11 +3,11 @@ import type { AssetServerCompilationError } from '../compilation-error.ts';
 export type EmittedAsset = {
     content: string;
     etag: string;
+    fingerprint: string;
 };
 export type EmittedModule = {
     code: EmittedAsset;
     fingerprint: string | null;
-    importUrls: string[];
     sourceMap: EmittedAsset | null;
 };
 type EmitResult = {
@@ -18,6 +18,7 @@ type EmitResult = {
     error: AssetServerCompilationError;
 };
 export declare function emitResolvedModule(resolvedModule: ResolvedModule, options: {
+    fingerprintAssets: boolean;
     getHmrImportTimestamp(identityPath: string): number | null;
     getServedUrl(identityPath: string): Promise<string>;
     getStableUrl(identityPath: string): string;

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

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

package/dist/lib/scripts/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 emitResolvedModule(resolvedModule, options) {
     try {
-        let importUrls = await Promise.all(resolvedModule.deps.map((depPath) => options.getServedUrl(depPath)));
         let rewriteResult = await rewriteImports(resolvedModule, options);
         let finalCode = prependHmrContext(resolvedModule, rewriteResult.code, options);
+        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(resolvedModule.identityPath)}.map`;
+                finalCode += `\n//# sourceMappingURL=${formatFingerprintedPathname(resolvedModule.stableUrlPathname, options.fingerprintAssets && sourceMap ? sourceMap.fingerprint : null)}.map`;
             }
         }
+        let code = await createEmittedAsset(finalCode);
         return {
             ok: true,
             value: {
-                code: await createEmittedAsset(finalCode),
-                fingerprint: resolvedModule.fingerprint,
-                importUrls,
-                sourceMap: rewriteResult.sourceMap
-                    ? await createEmittedAsset(rewriteResult.sourceMap)
-                    : null,
+                code,
+                fingerprint: options.fingerprintAssets ? code.fingerprint : null,
+                sourceMap,
             },
         };
     }
@@ -37,21 +37,28 @@ export async function emitResolvedModule(resolvedModule, options) {
 }
 async function rewriteImports(resolvedModule, options) {
     let rewrittenSource = new MagicString(resolvedModule.rawCode);
+    let changed = false;
     for (let imported of resolvedModule.imports) {
-        let url = await options.getServedUrl(imported.depPath);
         let hmrImportTimestamp = options.getHmrImportTimestamp(imported.depPath);
+        let replacementSpecifier = imported.specifier;
         if (hmrImportTimestamp !== null) {
-            url = addTimestampQuery(url, hmrImportTimestamp);
+            replacementSpecifier = addTimestampQuery(await options.getServedUrl(imported.depPath), hmrImportTimestamp);
         }
-        rewrittenSource.overwrite(imported.start, imported.end, imported.quote ? `${imported.quote}${url}${imported.quote}` : url);
+        else if (imported.compiledSpecifier === imported.specifier) {
+            continue;
+        }
+        rewrittenSource.overwrite(imported.start, imported.end, imported.quote
+            ? `${imported.quote}${replacementSpecifier}${imported.quote}`
+            : replacementSpecifier);
+        changed = true;
     }
     for (let acceptedDep of resolvedModule.hmr.acceptedDeps) {
         let url = options.getStableUrl(acceptedDep.depPath);
         rewrittenSource.overwrite(acceptedDep.start, acceptedDep.end, acceptedDep.quote ? `${acceptedDep.quote}${url}${acceptedDep.quote}` : url);
+        changed = true;
     }
-    let code = rewrittenSource.toString();
-    let sourceMap = resolvedModule.sourceMap &&
-        (resolvedModule.imports.length > 0 || resolvedModule.hmr.acceptedDeps.length > 0)
+    let code = changed ? rewrittenSource.toString() : resolvedModule.rawCode;
+    let sourceMap = resolvedModule.sourceMap && changed
         ? composeSourceMaps(rewrittenSource.generateMap({ hires: true }).toString(), resolvedModule.sourceMap)
         : resolvedModule.sourceMap;
     return { code, sourceMap };
@@ -67,9 +74,11 @@ function prependHmrContext(resolvedModule, code, options) {
         code);
 }
 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/scripts/resolve.d.ts

@@ -13,15 +13,17 @@ export declare const resolverExtensionAlias: {
 export declare const resolverExtensions: string[];
 export declare const supportedScriptExtensions: string[];
 type ResolvedImport = {
+    compiledSpecifier: string;
     depPath: string;
     end: number;
     quote?: '"' | "'" | '`';
+    scopePathname?: string;
+    specifier: string;
     start: number;
 };
 type ResolvedHmrAcceptedDependency = ResolvedImport;
 export type ResolvedModule = {
     deps: string[];
-    fingerprint: string | null;
     hmr: Omit<TransformedModule['hmr'], 'acceptedDeps'> & {
         acceptedDeps: ResolvedHmrAcceptedDependency[];
     };
@@ -31,6 +33,7 @@ export type ResolvedModule = {
     rawCode: string;
     resolvedPath: string;
     sourceMap: string | null;
+    staticDeps: string[];
     stableUrlPathname: string;
 };
 type ResolveResult = {
@@ -43,10 +46,13 @@ type ResolveResult = {
     error: AssetServerCompilationError;
 });
 export type ResolveArgs = {
+    concurrency: number;
+    isDirectoryResolutionFileIndependent(directory: string): boolean;
     isAllowed(absolutePath: string): boolean;
     isWatchIgnored(filePath: string): boolean;
     resolveModulePath(absolutePath: string): ResolveModuleResult | null;
     resolverFactory: ResolverFactory;
+    resolveDirectorySpecifierIdentity(directory: string, specifier: string): Promise<string | null>;
     routes: CompiledRoutes;
 };
 export declare function resolveModule(record: ScriptRecord, transformed: TransformedModule, args: ResolveArgs): Promise<ResolveResult>;

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

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