@remix-run/assets 0.5.0 → 0.7.0

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,
@@ -70,8 +69,8 @@ export function resolveServedStyleOrThrow(filePath, args) {
     }
     let stableUrlPathname = args.routes.toUrlPathname(identityPath);
     if (!stableUrlPathname) {
-        throw createAssetServerCompilationError(`File ${identityPath} is outside all configured fileMap entries.`, {
-            code: 'FILE_OUTSIDE_FILE_MAP',
+        throw createAssetServerCompilationError(`File ${identityPath} is outside all configured mounts.`, {
+            code: 'FILE_OUTSIDE_MOUNTS',
         });
     }
     return { identityPath, stableUrlPathname };
@@ -107,9 +106,9 @@ function resolveImportDependency(url, importerPath, placeholder, args) {
         });
     }
     if (!args.routes.toUrlPathname(identityPath)) {
-        throw createAssetServerCompilationError(`Import "${url}" in ${importerPath}, resolved to "${identityPath}", is outside all configured fileMap entries. ` +
-            `Add a matching fileMap entry for this file path, or mark this import as external.`, {
-            code: 'IMPORT_OUTSIDE_FILE_MAP',
+        throw createAssetServerCompilationError(`Import "${url}" in ${importerPath}, resolved to "${identityPath}", is outside all configured mounts. ` +
+            `Add a matching mount for this file path, or mark this import as external.`, {
+            code: 'IMPORT_OUTSIDE_MOUNTS',
         });
     }
     return {
@@ -156,9 +155,9 @@ function resolveUrlDependency(url, importerPath, placeholder, args) {
         });
     }
     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',
+        throw createAssetServerCompilationError(`URL "${url}" in ${importerPath}, resolved to "${identityPath}", is outside all configured mounts. ` +
+            `Add a matching mount for this file path.`, {
+            code: 'URL_OUTSIDE_MOUNTS',
         });
     }
     let parsedRequest = parseResolvedFileRequest({ hash, search });

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

package/dist/lib/styles/transform.js

@@ -1,7 +1,6 @@
 import * as fs from 'node:fs/promises';
 import { transform } from 'lightningcss';
 import { createAssetServerCompilationError, isAssetServerCompilationError, } from '../compilation-error.js';
-import { generateFingerprint } from '../fingerprint.js';
 import { rewriteSourceMapSources, stringifySourceMap } from '../source-maps.js';
 export async function transformStyle(record, args) {
     let resolvedPath = record.identityPath;
@@ -34,8 +33,8 @@ export async function transformStyle(record, args) {
     try {
         let stableUrlPathname = args.routes.toUrlPathname(record.identityPath);
         if (!stableUrlPathname) {
-            throw createAssetServerCompilationError(`File ${record.identityPath} is outside all configured fileMap entries.`, {
-                code: 'FILE_OUTSIDE_FILE_MAP',
+            throw createAssetServerCompilationError(`File ${record.identityPath} is outside all configured mounts.`, {
+                code: 'FILE_OUTSIDE_MOUNTS',
             });
         }
         let transformResult = runLightningTransform(resolvedPath, rawBytes, {
@@ -72,12 +71,6 @@ export async function transformStyle(record, args) {
                 trackedFiles,
             },
             value: {
-                fingerprint: args.buildId === null
-                    ? null
-                    : await generateFingerprint({
-                        buildId: args.buildId,
-                        content: sourceText,
-                    }),
                 identityPath: record.identityPath,
                 rawCode: Buffer.from(transformResult.code).toString('utf8'),
                 resolvedPath,

package/dist/lib/virtual-store.d.ts

@@ -0,0 +1,8 @@
+export declare function getVirtualStoreMountConfigs(options: {
+    mounts: Readonly<Record<string, string>>;
+    rootDir: string;
+}): {
+    mounts: Record<string, string>;
+    rootDir: string;
+}[];
+//# sourceMappingURL=virtual-store.d.ts.map

package/dist/lib/virtual-store.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"virtual-store.d.ts","sourceRoot":"","sources":["../../src/lib/virtual-store.ts"],"names":[],"mappings":"AAkBA,wBAAgB,2BAA2B,CAAC,OAAO,EAAE;IACnD,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IACxC,OAAO,EAAE,MAAM,CAAA;CAChB,GAAG;IACF,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC9B,OAAO,EAAE,MAAM,CAAA;CAChB,EAAE,CAcF"}

package/dist/lib/virtual-store.js

@@ -0,0 +1,100 @@
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { getFilePathBaseName, getFilePathDirectory, normalizeFilePath, resolveFilePath, } from './paths.js';
+import { resolveMountFileRoot } from './routes.js';
+const modulesStateFileName = '.modules.yaml';
+const virtualStoreBasePath = '/__@remix/virtual-store';
+const virtualStoreDirLineRE = /^virtualStoreDir:[ \t]*(.+)$/m;
+// pnpm's global virtual store links packages from a machine-wide directory, so package realpaths
+// land outside `rootDir` and would otherwise have no public URL. The store location comes from
+// `node_modules/.modules.yaml`, which pnpm rewrites on every install.
+export function getVirtualStoreMountConfigs(options) {
+    let virtualStoreDir = findVirtualStoreDir(options.rootDir);
+    if (virtualStoreDir === null)
+        return [];
+    // A store inside a mount, such as pnpm's default `node_modules/.pnpm`, already has URLs.
+    if (isWithinMounts(virtualStoreDir, options))
+        return [];
+    return [
+        {
+            mounts: {
+                [virtualStoreBasePath]: getFilePathBaseName(virtualStoreDir),
+            },
+            rootDir: getFilePathDirectory(virtualStoreDir),
+        },
+    ];
+}
+function findVirtualStoreDir(rootDir) {
+    let directory = normalizeFilePath(rootDir);
+    // Workspace members share the workspace root's file, so walk up to the nearest one.
+    while (true) {
+        let modulesDir = `${directory}/node_modules`;
+        let modulesState = readModulesState(`${modulesDir}/${modulesStateFileName}`);
+        if (modulesState !== null) {
+            let virtualStoreDir = readVirtualStoreDir(modulesState);
+            if (virtualStoreDir === null)
+                return null;
+            return realpathDirectory(resolveFilePath(modulesDir, virtualStoreDir));
+        }
+        let parentDirectory = normalizeFilePath(path.dirname(directory));
+        if (parentDirectory === directory)
+            return null;
+        directory = parentDirectory;
+    }
+}
+function readVirtualStoreDir(modulesState) {
+    // pnpm 10.34 and later write JSON, earlier versions write YAML, and package managers that
+    // mirror the global virtual store write either one. Reading the one scalar this needs keeps
+    // both formats working without a YAML parser.
+    try {
+        let parsedState = JSON.parse(modulesState);
+        if (parsedState === null || typeof parsedState !== 'object')
+            return null;
+        let virtualStoreDir = parsedState.virtualStoreDir;
+        return typeof virtualStoreDir === 'string' ? virtualStoreDir : null;
+    }
+    catch {
+        let match = virtualStoreDirLineRE.exec(modulesState);
+        return match === null ? null : unquoteScalar(match[1].trim());
+    }
+}
+function unquoteScalar(value) {
+    let quote = value[0];
+    if (value.length > 1 && (quote === "'" || quote === '"') && value.endsWith(quote)) {
+        return value.slice(1, -1);
+    }
+    return value;
+}
+function isWithinMounts(directory, options) {
+    return Object.values(options.mounts).some((fileRoot) => {
+        let mountRoot = resolveMountFileRoot(options.rootDir, fileRoot);
+        return directory === mountRoot || directory.startsWith(`${mountRoot}/`);
+    });
+}
+function readModulesState(filePath) {
+    try {
+        return fs.readFileSync(filePath, 'utf-8');
+    }
+    catch (error) {
+        if (isPathNotFoundError(error))
+            return null;
+        throw error;
+    }
+}
+function realpathDirectory(filePath) {
+    try {
+        let realPath = fs.realpathSync(filePath);
+        return fs.statSync(realPath).isDirectory() ? normalizeFilePath(realPath) : null;
+    }
+    catch (error) {
+        if (isPathNotFoundError(error))
+            return null;
+        throw error;
+    }
+}
+function isPathNotFoundError(error) {
+    return (error instanceof Error &&
+        'code' in error &&
+        (error.code === 'ENOENT' ||
+            error.code === 'ENOTDIR'));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/assets",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "description": "Fetch-based server for compiling browser JS/TS and CSS assets on demand",
   "author": "Michael Jackson <mjijackson@gmail.com>",
   "license": "MIT",
@@ -41,20 +41,20 @@
     "oxc-transform": "^0.121.0",
     "picomatch": "^4.0.4",
     "source-map-js": "^1.2.1",
-    "@remix-run/file-storage": "^0.13.7",
-    "@remix-run/headers": "^0.21.1",
     "@remix-run/mime": "^0.4.2",
-    "@remix-run/route-pattern": "^0.24.0"
+    "@remix-run/file-storage": "^0.13.7",
+    "@remix-run/headers": "^0.21.1"
   },
   "devDependencies": {
     "@types/node": "^24.6.0",
     "@types/picomatch": "^4.0.3",
+    "playwright": "^1.60.0",
     "typescript": "^7.0.2",
     "@remix-run/assert": "0.3.0",
-    "@remix-run/node-hmr": "^0.1.0",
     "@remix-run/node-tsx": "^0.1.1",
+    "@remix-run/node-hmr": "^0.2.0",
     "@remix-run/test": "0.6.0",
-    "@remix-run/ui": "0.5.0"
+    "@remix-run/ui": "0.9.0"
   },
   "keywords": [
     "remix",

package/src/assets.ts

@@ -1,4 +1,12 @@
 export { createAssetServer } from './lib/asset-server.ts'
 export { defineFileTransform } from './lib/files/config.ts'
-export type { AssetServer, AssetServerOptions, BrowserHmrChannel } from './lib/asset-server.ts'
+export type { AssetAccessDetails, AssetAccessRule } from './lib/access.ts'
+export type {
+  AssetServer,
+  AssetServerOptions,
+  BrowserHmrChannel,
+  ScriptEntry,
+} from './lib/asset-server.ts'
+export type { AssetDetails, AssetKind, AssetStatus } from './lib/inspection.ts'
+export type { ScriptImportMap } from './lib/scripts/compiler.ts'
 export type { ModuleLoader } from './lib/loaders.ts'

package/src/lib/access.ts

@@ -4,9 +4,30 @@ import { createFileMatcher } from './file-matcher.ts'
 import { isInjectedPackageFilePath } from './injected-packages.ts'
 import { normalizeFilePath } from './paths.ts'
 
-type AccessPolicy = {
+/** Access-policy result for an inspected asset file. */
+export interface AssetAccessDetails {
+  /** Whether the asset server may serve the file. */
+  allowed: boolean
+  /** The first configured rule that allowed the file, when one matched. */
+  allowedBy?: AssetAccessRule
+  /** The first matching `denyFiles` pattern, when access was denied. */
+  deniedBy?: string
+}
+
+/** Rule that allows an inspected asset file to be served. */
+export type AssetAccessRule =
+  /** A matching `allowFiles` entry. */
+  | { kind: 'file'; value: string }
+  /** A runtime file provided internally by the asset server. */
+  | { kind: 'injected'; value: string }
+  /** A matching `allowPackages` entry. */
+  | { kind: 'package'; value: string }
+
+export type AccessPolicy = {
+  getAllowedPackageRoots(): readonly string[]
   getPackageWatchDirectories(): readonly string[]
   handleFileEvent(filePath: string): void
+  inspect(filePath: string): AssetAccessDetails
   isAllowed(filePath: string): boolean
 }
 
@@ -29,13 +50,15 @@ export function createAccessPolicy(options: {
   packageSearchRoots?: readonly string[]
   rootDir: string
 }): AccessPolicy {
-  let allowMatchers = options.allowFiles.map((pattern) =>
-    createFileMatcher(pattern, options.rootDir),
-  )
+  let allowMatchers = options.allowFiles.map((pattern) => ({
+    matcher: createFileMatcher(pattern, options.rootDir),
+    pattern,
+  }))
   let allowPackageNames = normalizePackageNames(options.allowPackages, 'allowPackages')
-  let denyMatchers = (options.denyFiles ?? []).map((pattern) =>
-    createFileMatcher(pattern, options.rootDir),
-  )
+  let denyMatchers = (options.denyFiles ?? []).map((pattern) => ({
+    matcher: createFileMatcher(pattern, options.rootDir),
+    pattern,
+  }))
   let packageSearchRoots = [options.rootDir, ...(options.packageSearchRoots ?? [])]
   let packageRootPaths = createPackageRootPaths({
     allowPackageNames,
@@ -57,14 +80,44 @@ export function createAccessPolicy(options: {
     packageRootsDirty = false
   }
 
-  function isAllowedPackage(filePath: string): boolean {
-    if (allowPackageNames.size === 0) return false
+  function getAllowedPackageName(filePath: string): string | undefined {
+    if (allowPackageNames.size === 0) return undefined
     refreshPackageRootPathTries()
 
-    return isPathInPackageRootPathTrie(filePath, allowPackageRootPathTrie)
+    return getPackageNameFromRootPathTrie(filePath, allowPackageRootPathTrie)
+  }
+
+  function inspect(filePath: string): AssetAccessDetails {
+    if (isInjectedPackageFilePath(filePath)) {
+      return { allowed: true, allowedBy: { kind: 'injected', value: '@remix-run/assets' } }
+    }
+
+    let allowedBy: AssetAccessRule | undefined
+    let allowMatch = allowMatchers.find(({ matcher }) => matcher(filePath))
+    if (allowMatch) {
+      allowedBy = { kind: 'file', value: allowMatch.pattern }
+    } else {
+      let packageName = getAllowedPackageName(filePath)
+      if (packageName !== undefined) {
+        allowedBy = { kind: 'package', value: packageName }
+      }
+    }
+
+    if (!allowedBy) return { allowed: false }
+
+    let denyMatch = denyMatchers.find(({ matcher }) => matcher(filePath))
+    if (denyMatch) {
+      return { allowed: false, allowedBy, deniedBy: denyMatch.pattern }
+    }
+
+    return { allowed: true, allowedBy }
   }
 
   return {
+    getAllowedPackageRoots() {
+      refreshPackageRootPathTries()
+      return [...packageRootPaths.keys()]
+    },
     getPackageWatchDirectories() {
       if (allowPackageNames.size === 0) return []
       return packageStateDirectories
@@ -75,13 +128,9 @@ export function createAccessPolicy(options: {
 
       packageRootsDirty = true
     },
+    inspect,
     isAllowed(filePath) {
-      if (isInjectedPackageFilePath(filePath)) return true
-      if (!allowMatchers.some((matcher) => matcher(filePath)) && !isAllowedPackage(filePath)) {
-        return false
-      }
-      if (denyMatchers.length > 0 && denyMatchers.some((matcher) => matcher(filePath))) return false
-      return true
+      return inspect(filePath).allowed
     },
   }
 }
@@ -121,7 +170,7 @@ type PackageJson = {
 
 type PackageRootPathTrie = {
   children: Map<string, PackageRootPathTrie>
-  packageRoot: boolean
+  packageName?: string
 }
 
 type PackageRootQueueItem = {
@@ -132,8 +181,8 @@ type PackageRootQueueItem = {
 function createPackageRootPaths(options: {
   allowPackageNames: ReadonlySet<string>
   searchRoots: readonly string[]
-}): Set<string> {
-  let allowPackageRootPaths = new Set<string>()
+}): Map<string, string> {
+  let allowPackageRootPaths = new Map<string, string>()
   let allowQueue: PackageRootQueueItem[] = []
   let seenAllowedPackageRoots = new Set<string>()
   let searchRoots = normalizePackageSearchRoots(options.searchRoots)
@@ -155,13 +204,13 @@ function createPackageRootPaths(options: {
   }
 
   while (allowQueue.length > 0) {
-    let { packageJsonPath } = allowQueue.shift()!
+    let { packageJsonPath, packageName } = allowQueue.shift()!
     let packageRootPath = normalizeFilePath(path.dirname(packageJsonPath))
     if (seenAllowedPackageRoots.has(packageRootPath)) continue
     seenAllowedPackageRoots.add(packageRootPath)
 
     let packageJson = readPackageJson(packageJsonPath)
-    allowPackageRootPaths.add(packageRootPath)
+    allowPackageRootPaths.set(packageRootPath, packageName)
 
     for (let dependencyName of Object.keys(packageJson.dependencies ?? {})) {
       validatePackageName(
@@ -197,10 +246,12 @@ function createPackageRootPaths(options: {
   return allowPackageRootPaths
 }
 
-function createPackageRootPathTrie(packageRootPaths: ReadonlySet<string>): PackageRootPathTrie {
+function createPackageRootPathTrie(
+  packageRootPaths: ReadonlyMap<string, string>,
+): PackageRootPathTrie {
   let rootNode = createPackageRootPathTrieNode()
 
-  for (let packageRootPath of packageRootPaths) {
+  for (let [packageRootPath, packageName] of packageRootPaths) {
     let node = rootNode
     for (let segment of getFilePathSegments(packageRootPath)) {
       let childNode = node.children.get(segment)
@@ -210,7 +261,7 @@ function createPackageRootPathTrie(packageRootPaths: ReadonlySet<string>): Packa
       }
       node = childNode
     }
-    node.packageRoot = true
+    node.packageName = packageName
   }
 
   return rootNode
@@ -219,22 +270,24 @@ function createPackageRootPathTrie(packageRootPaths: ReadonlySet<string>): Packa
 function createPackageRootPathTrieNode(): PackageRootPathTrie {
   return {
     children: new Map(),
-    packageRoot: false,
   }
 }
 
-function isPathInPackageRootPathTrie(filePath: string, trie: PackageRootPathTrie): boolean {
+function getPackageNameFromRootPathTrie(
+  filePath: string,
+  trie: PackageRootPathTrie,
+): string | undefined {
   let node = trie
-  if (node.packageRoot) return true
+  if (node.packageName !== undefined) return node.packageName
 
   for (let segment of getFilePathSegments(filePath)) {
     let childNode = node.children.get(segment)
-    if (!childNode) return false
-    if (childNode.packageRoot) return true
+    if (!childNode) return undefined
+    if (childNode.packageName !== undefined) return childNode.packageName
     node = childNode
   }
 
-  return false
+  return undefined
 }
 
 function getFilePathSegments(filePath: string): string[] {