@remix-run/assets 0.3.0 → 0.4.1

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'],
@@ -18,7 +19,10 @@ export async function resolveModule(record, transformed, args) {
     try {
         resolvedImports =
             transformed.unresolvedImports.length > 0
-                ? await batchResolveSpecifiers(getUniqueSpecifiers(transformed.unresolvedImports), transformed.resolvedPath, args.resolverFactory)
+                ? await batchResolveSpecifiers(getUniqueSpecifiers(transformed.unresolvedImports), {
+                    identityPath: transformed.identityPath,
+                    resolvedPath: transformed.resolvedPath,
+                }, args.resolverFactory)
                 : new Map();
     }
     catch (error) {
@@ -60,7 +64,7 @@ export async function resolveModule(record, transformed, args) {
         }
         deps.add(resolvedImport.identityPath);
         if (transformed.packageSpecifiers.includes(unresolved.specifier)) {
-            let packageJsonPath = resolvedSpec.packageJsonPath ?? findNearestPackageJsonPath(resolvedImport.resolvedPath);
+            let packageJsonPath = resolvePackageJsonPath(resolvedSpec.packageJsonPath, resolvedImport.resolvedPath);
             if (packageJsonPath && !args.isWatchIgnored(packageJsonPath)) {
                 trackedFiles.add(packageJsonPath);
             }
@@ -94,6 +98,20 @@ export async function resolveModule(record, transformed, args) {
         },
     };
 }
+function resolvePackageJsonPath(packageJsonPath, resolvedPath) {
+    return ((packageJsonPath ? resolveExistingPath(packageJsonPath) : null) ??
+        findNearestPackageJsonPath(resolvedPath));
+}
+function resolveExistingPath(filePath) {
+    try {
+        return normalizeFilePath(fs.realpathSync(filePath));
+    }
+    catch (error) {
+        if (isNoEntityError(error))
+            return null;
+        throw error;
+    }
+}
 function findNearestPackageJsonPath(filePath) {
     let directory = path.dirname(filePath);
     while (true) {
@@ -107,6 +125,12 @@ function findNearestPackageJsonPath(filePath) {
         directory = parentDirectory;
     }
 }
+function isNoEntityError(error) {
+    return (error instanceof Error &&
+        'code' in error &&
+        (error.code === 'ENOENT' ||
+            error.code === 'ENOTDIR'));
+}
 function isRelativeImportSpecifier(specifier) {
     return specifier.startsWith('./') || specifier.startsWith('../');
 }
@@ -160,13 +184,13 @@ function getTrackedRelativeImportResolution(importerDir, specifier, isWatchIgnor
 function resolveCandidateBasePath(importerDir, specifier) {
     return normalizeFilePath(path.resolve(importerDir, specifier));
 }
-async function batchResolveSpecifiers(specifiers, importerPath, resolverFactory) {
+async function batchResolveSpecifiers(specifiers, importer, resolverFactory) {
     let resolvedBySpecifier = new Map();
     if (specifiers.length === 0)
         return resolvedBySpecifier;
     try {
         for (let specifier of specifiers) {
-            let normalizedResolution = normalizeSpecifierResolution(specifier, importerPath);
+            let normalizedResolution = normalizeSpecifierResolution(specifier, importer);
             let resolutionResult = await resolverFactory.resolveFileAsync(normalizedResolution.importerPath, normalizedResolution.specifier);
             if (resolutionResult.error) {
                 throw createAssetServerCompilationError(normalizedResolution.importerPath === getInjectedPackageImporterPath()
@@ -191,7 +215,7 @@ async function batchResolveSpecifiers(specifiers, importerPath, resolverFactory)
         if (isAssetServerCompilationError(error) && error.code === 'IMPORT_RESOLUTION_FAILED') {
             throw error;
         }
-        throw createAssetServerCompilationError(`Failed to resolve imports in ${importerPath}. ${formatUnknownError(error)}`, {
+        throw createAssetServerCompilationError(`Failed to resolve imports in ${importer.identityPath}. ${formatUnknownError(error)}`, {
             cause: error,
             code: 'IMPORT_RESOLUTION_FAILED',
         });
@@ -204,11 +228,11 @@ function getUniqueSpecifiers(unresolvedImports) {
 function formatUnknownError(error) {
     return error instanceof Error ? error.message : String(error);
 }
-function normalizeSpecifierResolution(specifier, importerPath) {
+function normalizeSpecifierResolution(specifier, importer) {
     let authoredInjectedPackageSpecifier = restoreAuthoredInjectedPackageSpecifier(specifier);
     if (authoredInjectedPackageSpecifier) {
         return {
-            importerPath,
+            importerPath: getSpecifierImporterPath(authoredInjectedPackageSpecifier, importer),
             specifier: authoredInjectedPackageSpecifier,
         };
     }
@@ -219,10 +243,13 @@ function normalizeSpecifierResolution(specifier, importerPath) {
         };
     }
     return {
-        importerPath,
+        importerPath: getSpecifierImporterPath(specifier, importer),
         specifier,
     };
 }
+function getSpecifierImporterPath(specifier, importer) {
+    return isBareImportSpecifier(specifier) ? importer.resolvedPath : importer.identityPath;
+}
 function getDisplayImportSpecifier(specifier) {
     return restoreAuthoredInjectedPackageSpecifier(specifier) ?? specifier;
 }

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.map

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

package/dist/lib/scripts/transform.js

@@ -13,6 +13,7 @@ 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 { isBareImportSpecifier } from "./specifiers.js";
 const scriptModuleTypes = [
     { extension: '.js', lang: 'js' },
     { extension: '.jsx', lang: 'jsx' },
@@ -141,9 +142,9 @@ export async function transformModule(record, args) {
                         content: sourceText,
                     }),
                 identityPath: record.identityPath,
-                importerDir: path.dirname(resolvedPath),
+                importerDir: path.dirname(record.identityPath),
                 packageSpecifiers: analysis.unresolvedImports
-                    .filter((unresolved) => isPackageImportSpecifier(unresolved.specifier))
+                    .filter((unresolved) => isBareImportSpecifier(unresolved.specifier))
                     .map((unresolved) => unresolved.specifier),
                 rawCode: analysis.rawCode,
                 resolvedPath,
@@ -177,9 +178,6 @@ function findNearestTsconfigPath(directory) {
         currentDirectory = parentDirectory;
     }
 }
-function isPackageImportSpecifier(specifier) {
-    return !specifier.startsWith('./') && !specifier.startsWith('../') && !specifier.startsWith('/');
-}
 async function analyzeModuleSource(sourceText, resolvedPath, transformOptions, options) {
     let maskedSourceText = maskAuthoredInjectedPackageImports(sourceText, resolvedPath);
     let transformResult;

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

@@ -21,7 +21,11 @@ type StyleGetOptions = {
 type StyleCompilerOptions = {
     buildId?: string;
     fingerprintAssets: boolean;
+    getServedFileUrl?(identityPath: string, options: {
+        transform: readonly string[] | null;
+    }): Promise<string>;
     isAllowed(absolutePath: string): boolean;
+    isServedFilePath(filePath: string): boolean;
     minify: boolean;
     onWatchDirectoriesChange?: (delta: {
         add: string[];

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":"AASA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAEvD,OAAO,KAAK,EAAE,YAAY,EAAgB,MAAM,WAAW,CAAA;AAS3D,KAAK,kBAAkB,GAAG;IACxB,IAAI,EAAE,YAAY,CAAA;IAClB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,SAAS,EAAE,YAAY,GAAG,IAAI,CAAA;CAC/B,CAAA;AAED,KAAK,cAAc,GACf;IACE,KAAK,EAAE,kBAAkB,CAAA;IACzB,IAAI,EAAE,OAAO,CAAA;CACd,GACD;IACE,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,cAAc,CAAA;CACrB,CAAA;AAEL,KAAK,eAAe,GAAG;IACrB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,kBAAkB,EAAE,OAAO,CAAA;IAC3B,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAA;CACpC,CAAA;AAED,KAAK,oBAAoB,GAAG;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,iBAAiB,EAAE,OAAO,CAAA;IAC1B,SAAS,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAA;IACxC,MAAM,EAAE,OAAO,CAAA;IACf,wBAAwB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,GAAG,EAAE,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,KAAK,IAAI,CAAA;IAC/E,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,cAAc,CAAA;IACtB,oBAAoB,EAAE,UAAU,GAAG,KAAK,CAAA;IACxC,UAAU,CAAC,EAAE,UAAU,GAAG,QAAQ,CAAA;IAClC,OAAO,CAAC,EAAE,mBAAmB,CAAA;IAC7B,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAChC,CAAA;AAED,KAAK,aAAa,GAAG;IACnB,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAC1C,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAC3E,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC,CAAA;IAC7E,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACrF,CAAA;AAKD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,GAAG,aAAa,CAiOhF;AAkED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEzD;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,kBAAkB,EAC1B,OAAO,EAAE;IACP,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,kBAAkB,EAAE,OAAO,CAAA;IAC3B,MAAM,EAAE,MAAM,CAAA;CACf,GACA,QAAQ,CA6BV"}
+{"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../../../src/lib/styles/compiler.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAEvD,OAAO,KAAK,EAAE,YAAY,EAAgB,MAAM,WAAW,CAAA;AAS3D,KAAK,kBAAkB,GAAG;IACxB,IAAI,EAAE,YAAY,CAAA;IAClB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,SAAS,EAAE,YAAY,GAAG,IAAI,CAAA;CAC/B,CAAA;AAED,KAAK,cAAc,GACf;IACE,KAAK,EAAE,kBAAkB,CAAA;IACzB,IAAI,EAAE,OAAO,CAAA;CACd,GACD;IACE,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,cAAc,CAAA;CACrB,CAAA;AAEL,KAAK,eAAe,GAAG;IACrB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,kBAAkB,EAAE,OAAO,CAAA;IAC3B,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAA;CACpC,CAAA;AAED,KAAK,oBAAoB,GAAG;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,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,SAAS,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAA;IACxC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAA;IAC3C,MAAM,EAAE,OAAO,CAAA;IACf,wBAAwB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,GAAG,EAAE,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,KAAK,IAAI,CAAA;IAC/E,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,cAAc,CAAA;IACtB,oBAAoB,EAAE,UAAU,GAAG,KAAK,CAAA;IACxC,UAAU,CAAC,EAAE,UAAU,GAAG,QAAQ,CAAA;IAClC,OAAO,CAAC,EAAE,mBAAmB,CAAA;IAC7B,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAChC,CAAA;AAED,KAAK,aAAa,GAAG;IACnB,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAC1C,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAC3E,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC,CAAA;IAC7E,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACrF,CAAA;AAKD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,GAAG,aAAa,CAmOhF;AAkED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEzD;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,kBAAkB,EAC1B,OAAO,EAAE;IACP,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,kBAAkB,EAAE,OAAO,CAAA;IAC3B,MAAM,EAAE,MAAM,CAAA;CACf,GACA,QAAQ,CA6BV"}

package/dist/lib/styles/compiler.js

@@ -23,6 +23,7 @@ export function createStyleCompiler(options) {
     let emitInFlightByCacheKey = new Map();
     let resolveArgs = {
         isAllowed: resolvedOptions.isAllowed,
+        isServedFilePath: resolvedOptions.isServedFilePath,
         isWatchIgnored,
         routes: resolvedOptions.routes,
     };
@@ -164,6 +165,7 @@ export function createStyleCompiler(options) {
             let startedVersion = record.invalidationVersion;
             let resolvedStyle = await getOrCreateResolvedStyle(record);
             let emitResolvedStyleResult = await emitResolvedStyle(resolvedStyle, {
+                getServedFileUrl: resolvedOptions.getServedFileUrl,
                 getServedUrl,
                 sourceMaps: resolvedOptions.sourceMaps,
             });

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

@@ -18,6 +18,9 @@ type EmitResult = {
     ok: false;
 };
 export declare function emitResolvedStyle(resolvedStyle: ResolvedStyle, options: {
+    getServedFileUrl?(identityPath: string, options: {
+        transform: readonly string[] | null;
+    }): Promise<string>;
     getServedUrl(identityPath: string): Promise<string>;
     sourceMaps?: 'external' | 'inline';
 }): Promise<EmitResult>;

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,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;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"}

package/dist/lib/styles/emit.js

@@ -46,7 +46,11 @@ async function rewriteDependencies(resolvedStyle, options) {
     for (let dependency of resolvedStyle.dependencies) {
         let replacement = dependency.kind === 'external'
             ? dependency.replacement
-            : `${await options.getServedUrl(dependency.depPath)}${dependency.suffix}`;
+            : dependency.kind === 'style'
+                ? `${await options.getServedUrl(dependency.depPath)}${dependency.suffix}`
+                : appendUrlSuffix(await getServedFileUrl(options, resolvedStyle.identityPath, dependency.depPath, {
+                    transform: dependency.requestTransform,
+                }), dependency.suffix);
         let start = resolvedStyle.rawCode.indexOf(dependency.placeholder);
         if (start < 0) {
             throw createAssetServerCompilationError(`Missing dependency placeholder "${dependency.placeholder}" while emitting style ${resolvedStyle.identityPath}.`, {
@@ -62,6 +66,37 @@ async function rewriteDependencies(resolvedStyle, options) {
             : null,
     };
 }
+function appendUrlSuffix(url, suffix) {
+    if (!suffix.startsWith('?') || !url.includes('?')) {
+        return `${url}${suffix}`;
+    }
+    return `${url}&${suffix.slice(1)}`;
+}
+async function getServedFileUrl(options, importerPath, identityPath, request) {
+    if (!options.getServedFileUrl) {
+        throw createAssetServerCompilationError(`Missing file URL resolver for ${identityPath}.`, {
+            code: 'EMIT_FAILED',
+        });
+    }
+    try {
+        return await options.getServedFileUrl(identityPath, request);
+    }
+    catch (error) {
+        if (request.transform !== null &&
+            isAssetServerCompilationError(error) &&
+            error.code === 'FILE_TRANSFORM_QUERY_INVALID') {
+            console.warn(`Invalid file transform request "${request.transform.join(',')}" in CSS asset ${importerPath} for ${identityPath}: ${error.message}`);
+            let href = await options.getServedFileUrl(identityPath, { transform: null });
+            let searchParams = new URLSearchParams();
+            for (let transform of request.transform) {
+                searchParams.append('transform', transform);
+            }
+            let search = searchParams.toString();
+            return search.length > 0 ? `${href}?${search}` : href;
+        }
+        throw error;
+    }
+}
 async function createEmittedAsset(content) {
     return {
         content,

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

@@ -10,9 +10,15 @@ type ResolvedDependency = {
     replacement: string;
 } | {
     depPath: string;
-    kind: 'local';
+    kind: 'style';
     placeholder: string;
     suffix: string;
+} | {
+    depPath: string;
+    kind: 'file';
+    placeholder: string;
+    requestTransform: readonly string[] | null;
+    suffix: string;
 };
 export type ResolvedStyle = {
     dependencies: ResolvedDependency[];
@@ -27,6 +33,7 @@ export type ResolvedStyle = {
 };
 export type ResolveArgs = {
     isAllowed(absolutePath: string): boolean;
+    isServedFilePath(filePath: string): boolean;
     isWatchIgnored(filePath: string): boolean;
     routes: CompiledRoutes;
 };

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":"AAQA,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,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,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;AAED,wBAAsB,YAAY,CAChC,MAAM,EAAE,WAAW,EACnB,WAAW,EAAE,gBAAgB,EAC7B,IAAI,EAAE,WAAW,GAChB,OAAO,CAAC,aAAa,CAAC,CAuDxB;AAED,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,WAAW,GAChB;IACD,YAAY,EAAE,MAAM,CAAA;IACpB,iBAAiB,EAAE,MAAM,CAAA;CAC1B,CA+BA"}
+{"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,CA+BA"}

package/dist/lib/styles/resolve.js

@@ -1,5 +1,6 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
+import { fileURLToPath, pathToFileURL } from 'node:url';
 import { createAssetServerCompilationError, isAssetServerCompilationError, } from "../compilation-error.js";
 import { normalizeFilePath } from "../paths.js";
 export async function resolveStyle(record, transformed, args) {
@@ -9,19 +10,21 @@ export async function resolveStyle(record, transformed, args) {
     for (let unresolved of transformed.unresolvedDependencies) {
         let trackedFile = unresolved.type === 'import'
             ? getTrackedImportFilePath(unresolved.url, transformed.resolvedPath)
-            : null;
+            : getTrackedUrlFilePath(unresolved.url, transformed.resolvedPath);
         if (trackedFile && !args.isWatchIgnored(trackedFile)) {
             trackedFiles.add(trackedFile);
         }
         try {
             let resolved = unresolved.type === 'import'
                 ? resolveImportDependency(unresolved.url, transformed.resolvedPath, unresolved.placeholder, args)
-                : resolveUrlDependency(unresolved.url, unresolved.placeholder);
+                : resolveUrlDependency(unresolved.url, transformed.resolvedPath, unresolved.placeholder, args);
             dependencies.push(resolved);
-            if (resolved.kind === 'local') {
+            if (resolved.kind === 'style' || resolved.kind === 'file') {
                 if (!args.isWatchIgnored(resolved.depPath)) {
                     trackedFiles.add(resolved.depPath);
                 }
+            }
+            if (resolved.kind === 'style') {
                 deps.add(resolved.depPath);
             }
         }
@@ -80,22 +83,16 @@ function resolveImportDependency(url, importerPath, placeholder, args) {
             replacement: url,
         };
     }
-    let { pathname, suffix } = splitUrlSuffix(url);
-    if (pathname.length === 0 || pathname === '#') {
-        return {
-            kind: 'external',
-            placeholder,
-            replacement: url,
-        };
-    }
-    if (pathname.startsWith('/')) {
+    let parsedUrl = parseRelativeUrl(url, importerPath);
+    if (parsedUrl === null) {
         return {
             kind: 'external',
             placeholder,
             replacement: url,
         };
     }
-    let resolvedFilePath = normalizeFilePath(path.resolve(path.dirname(importerPath), pathname));
+    let { hash, resolvedPath, search } = parsedUrl;
+    let resolvedFilePath = resolvedPath;
     let identityPath = resolveExistingFilePath(resolvedFilePath);
     if (!identityPath || !isStyleFilePath(identityPath)) {
         throw createAssetServerCompilationError(`Failed to resolve import "${url}" in ${importerPath}.`, {
@@ -116,16 +113,60 @@ function resolveImportDependency(url, importerPath, placeholder, args) {
     }
     return {
         depPath: identityPath,
-        kind: 'local',
+        kind: 'style',
         placeholder,
-        suffix,
+        suffix: `${search}${hash}`,
     };
 }
-function resolveUrlDependency(url, placeholder) {
+function resolveUrlDependency(url, importerPath, placeholder, args) {
+    if (isExternalUrl(url)) {
+        return {
+            kind: 'external',
+            placeholder,
+            replacement: url,
+        };
+    }
+    let parsedUrl = parseRelativeUrl(url, importerPath);
+    if (parsedUrl === null) {
+        return {
+            kind: 'external',
+            placeholder,
+            replacement: url,
+        };
+    }
+    let { hash, resolvedPath, search } = parsedUrl;
+    let resolvedFilePath = resolvedPath;
+    let identityPath = resolveExistingFilePath(resolvedFilePath);
+    if (!identityPath) {
+        throw createAssetServerCompilationError(`Failed to resolve url("${url}") in ${importerPath}.`, {
+            code: 'URL_RESOLUTION_FAILED',
+        });
+    }
+    if (!args.isServedFilePath(identityPath)) {
+        throw createAssetServerCompilationError(`URL "${url}" in ${importerPath}, resolved to "${identityPath}", is not a supported file asset. ` +
+            `Add the file extension to files.extensions to serve this asset.`, {
+            code: 'URL_NOT_SUPPORTED',
+        });
+    }
+    if (!args.isAllowed(identityPath)) {
+        throw createAssetServerCompilationError(`URL "${url}" in ${importerPath}, resolved to "${identityPath}", is not allowed by the asset server allow/deny configuration. ` +
+            `Add a matching allow rule for this file path or remove a conflicting deny rule for this file path.`, {
+            code: 'URL_NOT_ALLOWED',
+        });
+    }
+    if (!args.routes.toUrlPathname(identityPath)) {
+        throw createAssetServerCompilationError(`URL "${url}" in ${importerPath}, resolved to "${identityPath}", is outside all configured fileMap entries. ` +
+            `Add a matching fileMap entry for this file path.`, {
+            code: 'URL_OUTSIDE_FILE_MAP',
+        });
+    }
+    let parsedRequest = parseResolvedFileRequest({ hash, search });
     return {
-        kind: 'external',
+        depPath: identityPath,
+        kind: 'file',
         placeholder,
-        replacement: url,
+        requestTransform: parsedRequest.transform,
+        suffix: parsedRequest.suffix,
     };
 }
 function resolveExistingFilePath(filePath) {
@@ -138,27 +179,39 @@ function resolveExistingFilePath(filePath) {
         throw error;
     }
 }
-function splitUrlSuffix(url) {
-    let queryIndex = url.indexOf('?');
-    let hashIndex = url.indexOf('#');
-    let endIndex = [queryIndex, hashIndex].filter((index) => index >= 0).sort((a, b) => a - b)[0];
-    if (endIndex == null) {
+function parseRelativeUrl(url, importerPath) {
+    if (url.length === 0 || url.startsWith('?') || url.startsWith('/') || isExternalUrl(url)) {
+        return null;
+    }
+    let parsed = new URL(url, pathToFileURL(importerPath));
+    return {
+        hash: parsed.hash,
+        resolvedPath: normalizeFilePath(fileURLToPath(parsed)),
+        search: parsed.search,
+    };
+}
+function parseResolvedFileRequest(url) {
+    let { hash, search } = url;
+    if (search.length === 0) {
         return {
-            pathname: url,
-            suffix: '',
+            suffix: hash,
+            transform: null,
         };
     }
+    let searchParams = new URLSearchParams(search.slice(1));
+    let transform = searchParams.getAll('transform');
+    searchParams.delete('transform');
+    let remainingSearch = searchParams.toString();
     return {
-        pathname: url.slice(0, endIndex),
-        suffix: url.slice(endIndex),
+        suffix: `${remainingSearch.length > 0 ? `?${remainingSearch}` : ''}${hash}`,
+        transform: transform.length > 0 ? transform : null,
     };
 }
 function getTrackedImportFilePath(specifier, importerPath) {
-    let { pathname } = splitUrlSuffix(specifier);
-    if (pathname.startsWith('./') || pathname.startsWith('../')) {
-        return normalizeFilePath(path.resolve(path.dirname(importerPath), pathname));
-    }
-    return null;
+    return parseRelativeUrl(specifier, importerPath)?.resolvedPath ?? null;
+}
+function getTrackedUrlFilePath(url, importerPath) {
+    return parseRelativeUrl(url, importerPath)?.resolvedPath ?? null;
 }
 function isStyleFilePath(filePath) {
     return path.extname(filePath).toLowerCase() === '.css';

package/dist/lib/watch.d.ts

@@ -15,6 +15,8 @@ export type AssetServerWatcher = {
     updateWatchedDirectories(delta: {
         add: readonly string[];
         remove: readonly string[];
+    }, options?: {
+        includeAncestors?: boolean;
     }): void;
 };
 export declare function createAssetServerWatcher(options: AssetServerWatcherOptions): AssetServerWatcher;

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

@@ -1 +1 @@
-{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../src/lib/watch.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAA;AAI/B,KAAK,yBAAyB,GAAG;IAC/B,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAC1B,wBAAwB,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,CAAA;IAC7D,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1E,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,KAAK,qBAAqB,GAAG,KAAK,GAAG,QAAQ,GAAG,QAAQ,CAAA;AACxD,MAAM,MAAM,eAAe,GAAG,UAAU,CAAC,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAA;AAE/D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACtB,iBAAiB,IAAI,SAAS,MAAM,EAAE,CAAA;IACtC,wBAAwB,CAAC,KAAK,EAAE;QAAE,GAAG,EAAE,SAAS,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,GAAG,IAAI,CAAA;CAC7F,CAAA;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,yBAAyB,GAAG,kBAAkB,CAmD/F"}
+{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../src/lib/watch.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAA;AAI/B,KAAK,yBAAyB,GAAG;IAC/B,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAC1B,wBAAwB,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,CAAA;IAC7D,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1E,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,KAAK,qBAAqB,GAAG,KAAK,GAAG,QAAQ,GAAG,QAAQ,CAAA;AACxD,MAAM,MAAM,eAAe,GAAG,UAAU,CAAC,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAA;AAE/D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACtB,iBAAiB,IAAI,SAAS,MAAM,EAAE,CAAA;IACtC,wBAAwB,CACtB,KAAK,EAAE;QAAE,GAAG,EAAE,SAAS,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,EAC5D,OAAO,CAAC,EAAE;QAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;KAAE,GACvC,IAAI,CAAA;CACR,CAAA;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,yBAAyB,GAAG,kBAAkB,CAiE/F"}

package/dist/lib/watch.js

@@ -7,7 +7,8 @@ export function createAssetServerWatcher(options) {
         ...resolveChokidarWatchOptions(options),
     });
     options.onChokidarWatcherCreated?.(watcher);
-    let watchedDirectories = new Set();
+    let watchedResolutionDirectories = new Set();
+    let watchedFileDirectories = new Set();
     let watchedTargets = new Set();
     for (let event of ['add', 'change', 'unlink']) {
         watcher.on(event, (filePath) => {
@@ -24,15 +25,29 @@ export function createAssetServerWatcher(options) {
         getWatchedTargets() {
             return [...watchedTargets];
         },
-        updateWatchedDirectories(delta) {
-            let nextWatchedDirectories = new Set(watchedDirectories);
+        updateWatchedDirectories(delta, updateOptions = {}) {
+            let includeAncestors = updateOptions.includeAncestors ?? true;
+            let previousDirectories = includeAncestors
+                ? watchedResolutionDirectories
+                : watchedFileDirectories;
+            let nextWatchedDirectories = new Set(previousDirectories);
             for (let directory of delta.add) {
                 nextWatchedDirectories.add(directory);
             }
             for (let directory of delta.remove) {
                 nextWatchedDirectories.delete(directory);
             }
-            let nextTargets = getWatchTargetsForDirectories(options.rootDir, [...nextWatchedDirectories]);
+            if (includeAncestors) {
+                watchedResolutionDirectories = nextWatchedDirectories;
+            }
+            else {
+                watchedFileDirectories = nextWatchedDirectories;
+            }
+            let nextTargets = getWatchTargets({
+                rootDir: options.rootDir,
+                fileDirectories: [...watchedFileDirectories],
+                resolutionDirectories: [...watchedResolutionDirectories],
+            });
             let targetsToAdd = [...nextTargets].filter((target) => !watchedTargets.has(target));
             let targetsToRemove = [...watchedTargets].filter((target) => !nextTargets.has(target));
             if (targetsToRemove.length > 0) {
@@ -41,7 +56,6 @@ export function createAssetServerWatcher(options) {
             if (targetsToAdd.length > 0) {
                 watcher.add(targetsToAdd);
             }
-            watchedDirectories = nextWatchedDirectories;
             watchedTargets = nextTargets;
         },
     };
@@ -58,11 +72,14 @@ function resolveChokidarWatchOptions(options) {
         usePolling: options.poll ?? false,
     };
 }
-function getWatchTargetsForDirectories(rootDir, directories) {
-    let normalizedRootDir = normalizeFilePath(rootDir);
+function getWatchTargets(options) {
+    let normalizedRootDir = normalizeFilePath(options.rootDir);
     let targets = new Set();
     let configAncestors = new Set();
-    for (let directory of directories) {
+    for (let directory of options.fileDirectories) {
+        targets.add(normalizeFilePath(directory).replace(/\/+$/, ''));
+    }
+    for (let directory of options.resolutionDirectories) {
         let normalizedDirectory = normalizeFilePath(directory).replace(/\/+$/, '');
         targets.add(normalizedDirectory);
         if (!isSameOrDescendantPath(normalizedDirectory, normalizedRootDir))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/assets",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "Fetch-based server for compiling browser JS/TS and CSS assets on demand",
   "author": "Michael Jackson <mjijackson@gmail.com>",
   "license": "MIT",
@@ -38,15 +38,17 @@
     "oxc-transform": "^0.121.0",
     "picomatch": "^4.0.4",
     "source-map-js": "^1.2.1",
-    "@remix-run/headers": "0.19.0",
-    "@remix-run/route-pattern": "0.20.1"
+    "@remix-run/file-storage": "0.13.5",
+    "@remix-run/headers": "0.21.0",
+    "@remix-run/route-pattern": "0.21.1",
+    "@remix-run/mime": "0.4.1"
   },
   "devDependencies": {
     "@types/node": "^24.6.0",
     "@types/picomatch": "^4.0.3",
     "@typescript/native-preview": "7.0.0-dev.20251125.1",
-    "@remix-run/assert": "0.2.0",
-    "@remix-run/test": "0.3.0"
+    "@remix-run/assert": "0.2.1",
+    "@remix-run/test": "0.4.1"
   },
   "keywords": [
     "remix",

package/src/assets.ts

@@ -1,2 +1,3 @@
 export { createAssetServer } from './lib/asset-server.ts'
+export { defineFileTransform } from './lib/files/config.ts'
 export type { AssetServer, AssetServerOptions } from './lib/asset-server.ts'