@remix-run/assets 0.2.0 → 0.3.0

package/README.md

@@ -27,9 +27,10 @@ import { createRouter } from 'remix/fetch-router'
 import { createAssetServer } from 'remix/assets'
 
 let assetServer = createAssetServer({
+  basePath: '/assets',
   fileMap: {
-    '/assets/app/*path': 'app/*path',
-    '/assets/npm/*path': 'node_modules/*path',
+    '/app/*path': 'app/*path',
+    '/npm/*path': 'node_modules/*path',
   },
   allow: ['app/assets/**', 'node_modules/**'],
 })
@@ -53,9 +54,10 @@ import { createAssetServer } from 'remix/assets'
 
 let assetServer = createAssetServer({
   rootDir: path.resolve(import.meta.dirname, '..'),
+  basePath: '/assets',
   fileMap: {
-    '/assets/app/*path': 'app/*path',
-    '/assets/npm/*path': 'node_modules/*path',
+    '/app/*path': 'app/*path',
+    '/npm/*path': 'node_modules/*path',
   },
   allow: ['app/assets/**', 'node_modules/**'],
 })
@@ -69,7 +71,8 @@ You must provide an `allow` list to specify which files are allowed to be served
 import { createAssetServer } from 'remix/assets'
 
 let assetServer = createAssetServer({
-  fileMap: { '/assets/app/*path': 'app/*path' },
+  basePath: '/assets',
+  fileMap: { '/app/*path': 'app/*path' },
   allow: ['app/assets/**'],
   deny: ['app/**/*.server.*'],
 })
@@ -79,21 +82,22 @@ Rules for `allow` and `deny` are file paths or globs. Relative values are resolv
 
 ## File Map
 
-Use `fileMap` to map public URLs to file paths on disk. The keys are public URL patterns, and the values are root-relative file path patterns.
+Use `fileMap` to map public URLs to file paths on disk. `basePath` defines the shared public mount point, and the `fileMap` keys are URL patterns relative to that base path. The values are root-relative file path patterns.
 
 ```ts
 import { createAssetServer } from 'remix/assets'
 
 let assetServer = createAssetServer({
+  basePath: '/assets',
   fileMap: {
-    '/assets/app/*path': 'app/*path',
-    '/assets/packages/*path': '../packages/*path',
+    '/app/*path': 'app/*path',
+    '/packages/*path': '../packages/*path',
   },
   allow: ['app/assets/**', '../packages/**'],
 })
 ```
 
-`fileMap` entries use [`route-pattern`](https://github.com/remix-run/remix/tree/main/packages/route-pattern) syntax for both URL and file patterns. Wildcards must be named, and the same params must appear in both patterns so imports can be rewritten back to public URLs.
+`fileMap` entries use [`route-pattern`](https://github.com/remix-run/remix/tree/main/packages/route-pattern) syntax for both URL and file patterns. Wildcards must be named, and the same params must appear in both patterns so imports can be rewritten back to public URLs. For example, with `basePath: '/assets'`, a `fileMap` key of `'/app/*path'` is served at `/assets/app/*path`.
 
 ### File watching
 
@@ -103,7 +107,8 @@ The file system is watched by default so source changes are picked up without re
 import { createAssetServer } from 'remix/assets'
 
 let assetServer = createAssetServer({
-  fileMap: { '/assets/app/*path': 'app/*path' },
+  basePath: '/assets',
+  fileMap: { '/app/*path': 'app/*path' },
   allow: ['app/assets/**', 'app/node_modules/**'],
 })
 ```
@@ -120,7 +125,8 @@ You can disable file watching if the files on disk won't change, or if watching
 import { createAssetServer } from 'remix/assets'
 
 let assetServer = createAssetServer({
-  fileMap: { '/assets/app/*path': 'app/*path' },
+  basePath: '/assets',
+  fileMap: { '/app/*path': 'app/*path' },
   allow: ['app/assets/**', 'app/node_modules/**'],
   watch: false,
 })
@@ -132,7 +138,8 @@ You can optionally provide an array of glob patterns to the `watch.ignore` optio
 import { createAssetServer } from 'remix/assets'
 
 let assetServer = createAssetServer({
-  fileMap: { '/assets/app/*path': 'app/*path' },
+  basePath: '/assets',
+  fileMap: { '/app/*path': 'app/*path' },
   allow: ['app/assets/**', 'app/node_modules/**'],
   watch: {
     ignore: ['**/node_modules/**'],
@@ -174,7 +181,8 @@ If you want clients to cache assets aggressively without revalidation, you can o
 import { createAssetServer } from 'remix/assets'
 
 let assetServer = createAssetServer({
-  fileMap: { '/assets/app/*path': 'app/*path' },
+  basePath: '/assets',
+  fileMap: { '/app/*path': 'app/*path' },
   allow: ['app/assets/**'],
   watch: false,
   fingerprint: {
@@ -195,7 +203,8 @@ Use `target` to lower emitted syntax to a specific browser support policy and/or
 import { createAssetServer } from 'remix/assets'
 
 let assetServer = createAssetServer({
-  fileMap: { '/assets/app/*path': 'app/*path' },
+  basePath: '/assets',
+  fileMap: { '/app/*path': 'app/*path' },
   allow: ['app/assets/**'],
   target: {
     chrome: '109',
@@ -215,7 +224,8 @@ Enable sourcemaps with either `'external'` or `'inline'` using `sourceMaps`:
 import { createAssetServer } from 'remix/assets'
 
 let assetServer = createAssetServer({
-  fileMap: { '/assets/app/*path': 'app/*path' },
+  basePath: '/assets',
+  fileMap: { '/app/*path': 'app/*path' },
   allow: ['app/assets/**'],
   sourceMaps: 'external',
 })
@@ -227,7 +237,8 @@ By default, sourcemap `sources` use URLs so they're presented alongside the comp
 import { createAssetServer } from 'remix/assets'
 
 let assetServer = createAssetServer({
-  fileMap: { '/assets/app/*path': 'app/*path' },
+  basePath: '/assets',
+  fileMap: { '/app/*path': 'app/*path' },
   allow: ['app/assets/**'],
   sourceMaps: 'inline',
   sourceMapSourcePaths: 'absolute',
@@ -242,7 +253,8 @@ Enable minification with `minify`:
 import { createAssetServer } from 'remix/assets'
 
 let assetServer = createAssetServer({
-  fileMap: { '/assets/app/*path': 'app/*path' },
+  basePath: '/assets',
+  fileMap: { '/app/*path': 'app/*path' },
   allow: ['app/assets/**'],
   minify: true,
 })
@@ -258,7 +270,8 @@ Use `scripts.define` to replace global identifiers with constant expressions.
 import { createAssetServer } from 'remix/assets'
 
 let assetServer = createAssetServer({
-  fileMap: { '/assets/app/*path': 'app/*path' },
+  basePath: '/assets',
+  fileMap: { '/app/*path': 'app/*path' },
   allow: ['app/assets/**', 'app/node_modules/**'],
   scripts: {
     define: {
@@ -278,7 +291,8 @@ Use `scripts.external` to leave specific import specifiers unchanged by providin
 import { createAssetServer } from 'remix/assets'
 
 let assetServer = createAssetServer({
-  fileMap: { '/assets/app/*path': 'app/*path' },
+  basePath: '/assets',
+  fileMap: { '/app/*path': 'app/*path' },
   allow: ['app/assets/**'],
   scripts: {
     external: ['my-external-import'],
@@ -305,7 +319,8 @@ Use `onError` to report unexpected compilation failures and/or return a custom r
 import { createAssetServer } from 'remix/assets'
 
 let assetServer = createAssetServer({
-  fileMap: { '/assets/app/*path': 'app/*path' },
+  basePath: '/assets',
+  fileMap: { '/app/*path': 'app/*path' },
   allow: ['app/assets/**'],
   onError(error) {
     console.error('Failed to build client assets', error)

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

@@ -1 +1 @@
-{"version":3,"file":"access.d.ts","sourceRoot":"","sources":["../../src/lib/access.ts"],"names":[],"mappings":"AAEA,KAAK,YAAY,GAAG;IAClB,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAA;CACrC,CAAA;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE;IAC1C,KAAK,EAAE,SAAS,MAAM,EAAE,CAAA;IACxB,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACxB,OAAO,EAAE,MAAM,CAAA;CAChB,GAAG,YAAY,CAaf"}
+{"version":3,"file":"access.d.ts","sourceRoot":"","sources":["../../src/lib/access.ts"],"names":[],"mappings":"AAGA,KAAK,YAAY,GAAG;IAClB,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAA;CACrC,CAAA;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE;IAC1C,KAAK,EAAE,SAAS,MAAM,EAAE,CAAA;IACxB,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACxB,OAAO,EAAE,MAAM,CAAA;CAChB,GAAG,YAAY,CAcf"}

package/dist/lib/access.js

@@ -1,9 +1,12 @@
 import { createFileMatcher } from "./file-matcher.js";
+import { isInjectedPackageFilePath } from "./injected-packages.js";
 export function createAccessPolicy(options) {
     let allowMatchers = options.allow.map((pattern) => createFileMatcher(pattern, options.rootDir));
     let denyMatchers = (options.deny ?? []).map((pattern) => createFileMatcher(pattern, options.rootDir));
     return {
         isAllowed(filePath) {
+            if (isInjectedPackageFilePath(filePath))
+                return true;
             if (!allowMatchers.some((matcher) => matcher(filePath)))
                 return false;
             if (denyMatchers.length > 0 && denyMatchers.some((matcher) => matcher(filePath)))

package/dist/lib/asset-server.d.ts

@@ -34,7 +34,9 @@ interface AssetServerScriptOptions {
     external?: string[];
 }
 export interface AssetServerOptions {
-    /** File patterns keyed by public URL patterns. */
+    /** Public mount path for this asset server, e.g. `'/assets'`. */
+    basePath: string;
+    /** File patterns keyed by public URL patterns relative to `basePath`. */
     fileMap: Readonly<Record<string, string>>;
     /**
      * Root directory used to resolve relative file paths. Defaults to `process.cwd()`.
@@ -125,8 +127,9 @@ export declare function getInternalWatchTargets(assetServer: AssetServer): reado
  * @example
  * ```ts
  * let assetServer = createAssetServer({
+ *   basePath: '/assets',
  *   fileMap: {
- *     '/assets/app/*path': 'app/*path',
+ *     '/app/*path': 'app/*path',
  *   },
  *   allow: ['app/**'],
  * })

package/dist/lib/asset-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"asset-server.d.ts","sourceRoot":"","sources":["../../src/lib/asset-server.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,WAAW,EAA6C,MAAM,aAAa,CAAA;AAEzF,OAAO,KAAK,EAAsB,eAAe,EAAE,MAAM,YAAY,CAAA;AAErE,UAAU,uBAAuB;IAC/B;;;OAGG;IACH,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAC1B;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAA;IACd;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,UAAU,kBAAkB;IAC1B;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,KAAK,eAAe,GAAG,QAAQ,GAAG,UAAU,CAAA;AAC5C,KAAK,yBAAyB,GAAG,KAAK,GAAG,UAAU,CAAA;AAEnD,UAAU,wBAAwB;IAChC;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC/B,kFAAkF;IAClF,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CACpB;AAID,MAAM,WAAW,kBAAkB;IACjC,kDAAkD;IAClD,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IACzC;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB;;OAEG;IACH,KAAK,EAAE,SAAS,MAAM,EAAE,CAAA;IACxB;;OAEG;IACH,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACxB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,kBAAkB,CAAA;IAChC;;;OAGG;IACH,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB;;;;OAIG;IACH,UAAU,CAAC,EAAE,eAAe,CAAA;IAC5B;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,yBAAyB,CAAA;IAChD;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB;;OAEG;IACH,OAAO,CAAC,EAAE,wBAAwB,CAAA;IAClC;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,GAAG,uBAAuB,CAAA;IACzC;;;OAGG;IACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,GAAG,QAAQ,GAAG,OAAO,CAAC,IAAI,GAAG,QAAQ,CAAC,CAAA;CACzE;AAED,MAAM,WAAW,WAAW;IAC1B;;;OAGG;IACH,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAA;IACjD;;OAEG;IACH,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAC1C;;OAEG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAA;IACpE;;OAEG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CACvB;AAuBD,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,WAAW,GAAG,eAAe,GAAG,SAAS,CAEhG;AAED,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,WAAW,GAAG,SAAS,MAAM,EAAE,CAEnF;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,GAAG,WAAW,CAqN1E"}
+{"version":3,"file":"asset-server.d.ts","sourceRoot":"","sources":["../../src/lib/asset-server.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAA6C,MAAM,aAAa,CAAA;AAEzF,OAAO,KAAK,EAAsB,eAAe,EAAE,MAAM,YAAY,CAAA;AAErE,UAAU,uBAAuB;IAC/B;;;OAGG;IACH,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAC1B;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAA;IACd;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,UAAU,kBAAkB;IAC1B;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,KAAK,eAAe,GAAG,QAAQ,GAAG,UAAU,CAAA;AAC5C,KAAK,yBAAyB,GAAG,KAAK,GAAG,UAAU,CAAA;AAEnD,UAAU,wBAAwB;IAChC;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC/B,kFAAkF;IAClF,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CACpB;AAID,MAAM,WAAW,kBAAkB;IACjC,iEAAiE;IACjE,QAAQ,EAAE,MAAM,CAAA;IAChB,yEAAyE;IACzE,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IACzC;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB;;OAEG;IACH,KAAK,EAAE,SAAS,MAAM,EAAE,CAAA;IACxB;;OAEG;IACH,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACxB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,kBAAkB,CAAA;IAChC;;;OAGG;IACH,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB;;;;OAIG;IACH,UAAU,CAAC,EAAE,eAAe,CAAA;IAC5B;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,yBAAyB,CAAA;IAChD;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB;;OAEG;IACH,OAAO,CAAC,EAAE,wBAAwB,CAAA;IAClC;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,GAAG,uBAAuB,CAAA;IACzC;;;OAGG;IACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,GAAG,QAAQ,GAAG,OAAO,CAAC,IAAI,GAAG,QAAQ,CAAC,CAAA;CACzE;AAED,MAAM,WAAW,WAAW;IAC1B;;;OAGG;IACH,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAA;IACjD;;OAEG;IACH,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAC1C;;OAEG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAA;IACpE;;OAEG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CACvB;AAwBD,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,WAAW,GAAG,eAAe,GAAG,SAAS,CAEhG;AAED,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,WAAW,GAAG,SAAS,MAAM,EAAE,CAEnF;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,GAAG,WAAW,CAqN1E"}

package/dist/lib/asset-server.js

@@ -3,7 +3,8 @@ import * as fs from 'node:fs';
 import { createAccessPolicy } from "./access.js";
 import { isAssetServerCompilationError } from "./compilation-error.js";
 import { getFingerprintRequestCacheControl, parseFingerprintSuffix } from "./fingerprint.js";
-import { normalizeFilePath } from "./paths.js";
+import { getInjectedPackageRouteConfigs } from "./injected-packages.js";
+import { normalizeFilePath, normalizePathname } from "./paths.js";
 import { compileRoutes } from "./routes.js";
 import { createResponseForScript, createScriptCompiler } from "./scripts/compiler.js";
 import { supportedScriptExtensions } from "./scripts/resolve.js";
@@ -31,8 +32,9 @@ export function getInternalWatchTargets(assetServer) {
  * @example
  * ```ts
  * let assetServer = createAssetServer({
+ *   basePath: '/assets',
  *   fileMap: {
- *     '/assets/app/*path': 'app/*path',
+ *     '/app/*path': 'app/*path',
  *   },
  *   allow: ['app/**'],
  * })
@@ -264,6 +266,7 @@ function defaultErrorHandler(error) {
 }
 function resolveAssetServerOptions(options) {
     let rootDir = normalizeFilePath(fs.realpathSync(path.resolve(options.rootDir ?? process.cwd())));
+    let basePath = normalizeBasePath(options.basePath);
     let scriptOptions = options.scripts ?? {};
     let fingerprintOptions = normalizeFingerprintOptions({
         fingerprint: options.fingerprint,
@@ -271,6 +274,7 @@ function resolveAssetServerOptions(options) {
     });
     return {
         allow: options.allow,
+        basePath,
         buildId: fingerprintOptions.buildId,
         define: scriptOptions.define,
         deny: options.deny,
@@ -279,10 +283,13 @@ function resolveAssetServerOptions(options) {
         minify: options.minify ?? false,
         onError: options.onError ?? defaultErrorHandler,
         rootDir,
-        routes: compileRoutes({
-            fileMap: options.fileMap,
-            rootDir,
-        }),
+        routes: compileRoutes(basePath, [
+            {
+                fileMap: options.fileMap,
+                rootDir,
+            },
+            ...getInjectedPackageRouteConfigs(),
+        ]),
         sourceMapSourcePaths: options.sourceMapSourcePaths ?? 'url',
         sourceMaps: options.sourceMaps,
         scriptsTarget: resolveScriptTarget(options.target),
@@ -290,6 +297,12 @@ function resolveAssetServerOptions(options) {
         watchOptions: normalizeWatchOptions(options.watch),
     };
 }
+function normalizeBasePath(basePath) {
+    if (typeof basePath !== 'string') {
+        throw new TypeError('basePath must be a string');
+    }
+    return normalizePathname(basePath || '/').replace(/\/+$/, '') || '/';
+}
 function normalizeFingerprintOptions(options) {
     if (!options.fingerprint) {
         return {

package/dist/lib/injected-packages.d.ts

@@ -0,0 +1,11 @@
+export declare function isInjectedPackageFilePath(filePath: string): boolean;
+export declare function getInjectedPackageRouteConfigs(): {
+    fileMap: Record<string, string>;
+    rootDir: string;
+}[];
+export declare function getInjectedPackageNameForSpecifier(specifier: string): string | null;
+export declare function mayContainInjectedPackageSpecifier(sourceText: string): boolean;
+export declare function maskAuthoredInjectedPackageSpecifier(specifier: string): string | null;
+export declare function restoreAuthoredInjectedPackageSpecifier(specifier: string): string | null;
+export declare function getInjectedPackageImporterPath(): string;
+//# sourceMappingURL=injected-packages.d.ts.map

package/dist/lib/injected-packages.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"injected-packages.d.ts","sourceRoot":"","sources":["../../src/lib/injected-packages.ts"],"names":[],"mappings":"AAeA,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAWnE;AAED,wBAAgB,8BAA8B,IAAI;IAChD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC/B,OAAO,EAAE,MAAM,CAAA;CAChB,EAAE,CAWF;AAED,wBAAgB,kCAAkC,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQnF;AAED,wBAAgB,kCAAkC,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAE9E;AAED,wBAAgB,oCAAoC,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAMrF;AAED,wBAAgB,uCAAuC,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAYxF;AAMD,wBAAgB,8BAA8B,IAAI,MAAM,CAEvD"}

package/dist/lib/injected-packages.js

@@ -0,0 +1,86 @@
+import * as fs from 'node:fs';
+import { fileURLToPath } from 'node:url';
+import { getFilePathDirectory, normalizeFilePath } from "./paths.js";
+const injectedPackageNames = ['@oxc-project/runtime'];
+const injectedPackagesBasePath = '/__@remix/injected';
+const resolvedInjectedPackages = new Map();
+export function isInjectedPackageFilePath(filePath) {
+    let normalizedFilePath = normalizeFilePath(filePath);
+    for (let packageName of injectedPackageNames) {
+        let packageRoot = getResolvedInjectedPackage(packageName).packageRoot;
+        if (normalizedFilePath === packageRoot || normalizedFilePath.startsWith(`${packageRoot}/`)) {
+            return true;
+        }
+    }
+    return false;
+}
+export function getInjectedPackageRouteConfigs() {
+    return injectedPackageNames.map((packageName) => {
+        let { packageRoot } = getResolvedInjectedPackage(packageName);
+        return {
+            fileMap: {
+                [getInjectedPackageRoutePattern(packageName)]: `${packageName}/*path`,
+            },
+            rootDir: getInjectedPackageRouteRoot(packageRoot, packageName),
+        };
+    });
+}
+export function getInjectedPackageNameForSpecifier(specifier) {
+    for (let packageName of injectedPackageNames) {
+        if (specifier === packageName || specifier.startsWith(`${packageName}/`)) {
+            return packageName;
+        }
+    }
+    return null;
+}
+export function mayContainInjectedPackageSpecifier(sourceText) {
+    return injectedPackageNames.some((packageName) => sourceText.includes(packageName));
+}
+export function maskAuthoredInjectedPackageSpecifier(specifier) {
+    let packageName = getInjectedPackageNameForSpecifier(specifier);
+    if (!packageName)
+        return null;
+    let maskedPackageName = getMaskedInjectedPackageName(packageName);
+    return `${maskedPackageName}${specifier.slice(packageName.length)}`;
+}
+export function restoreAuthoredInjectedPackageSpecifier(specifier) {
+    for (let packageName of injectedPackageNames) {
+        let maskedPackageName = getMaskedInjectedPackageName(packageName);
+        if (specifier === maskedPackageName) {
+            return packageName;
+        }
+        if (specifier.startsWith(`${maskedPackageName}/`)) {
+            return `${packageName}${specifier.slice(maskedPackageName.length)}`;
+        }
+    }
+    return null;
+}
+function getMaskedInjectedPackageName(packageName) {
+    return `~${packageName.slice(1)}`;
+}
+export function getInjectedPackageImporterPath() {
+    return normalizeFilePath(fileURLToPath(import.meta.url));
+}
+function getResolvedInjectedPackage(packageName) {
+    let existing = resolvedInjectedPackages.get(packageName);
+    if (existing)
+        return existing;
+    let packageJsonUrl = import.meta.resolve(`${packageName}/package.json`);
+    let packageJsonPath = normalizeFilePath(fs.realpathSync(fileURLToPath(packageJsonUrl)));
+    let resolvedInjectedPackage = {
+        packageJsonPath,
+        packageRoot: normalizeFilePath(fs.realpathSync(getFilePathDirectory(packageJsonPath))),
+    };
+    resolvedInjectedPackages.set(packageName, resolvedInjectedPackage);
+    return resolvedInjectedPackage;
+}
+function getInjectedPackageRoutePattern(packageName) {
+    return `${injectedPackagesBasePath}/${packageName}/*path`;
+}
+function getInjectedPackageRouteRoot(packageRoot, packageName) {
+    let routeRoot = packageRoot;
+    for (let _segment of packageName.split('/')) {
+        routeRoot = getFilePathDirectory(routeRoot);
+    }
+    return routeRoot;
+}

package/dist/lib/paths.d.ts

@@ -4,5 +4,6 @@ export declare function isAbsoluteFilePath(filePath: string): boolean;
 export declare function normalizeFilePath(filePath: string): string;
 export declare function resolveFilePath(rootDir: string, filePath: string): string;
 export declare function getFilePathDirectory(filePath: string): string;
+export declare function getRelativeFilePath(fromPath: string, toPath: string): string;
 export declare function getFilePathBaseName(filePath: string): string;
 //# sourceMappingURL=paths.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../src/lib/paths.ts"],"names":[],"mappings":"AAKA,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAI7D;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAQ1D;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAG5D;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAmB1D;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAMzE;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAE5D"}
+{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../src/lib/paths.ts"],"names":[],"mappings":"AAKA,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAI7D;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAQ1D;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAG5D;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAmB1D;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAMzE;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CA0B5E;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAE5D"}

package/dist/lib/paths.js

@@ -42,6 +42,18 @@ export function resolveFilePath(rootDir, filePath) {
 export function getFilePathDirectory(filePath) {
     return path.posix.dirname(normalizeWindowsPath(filePath));
 }
+export function getRelativeFilePath(fromPath, toPath) {
+    let normalizedFromPath = normalizeFilePath(fromPath);
+    let normalizedToPath = normalizeFilePath(toPath);
+    if (normalizedFromPath.startsWith('//') || normalizedToPath.startsWith('//')) {
+        return normalizeWindowsPath(path.win32.relative(normalizedFromPath.replace(/\//g, '\\'), normalizedToPath.replace(/\//g, '\\')));
+    }
+    if (windowsDriveLetterRE.test(normalizedFromPath) ||
+        windowsDriveLetterRE.test(normalizedToPath)) {
+        return normalizeWindowsPath(path.win32.relative(normalizedFromPath.replace(/\//g, '\\'), normalizedToPath.replace(/\//g, '\\')));
+    }
+    return path.posix.relative(normalizedFromPath, normalizedToPath);
+}
 export function getFilePathBaseName(filePath) {
     return path.posix.basename(normalizeWindowsPath(filePath));
 }

package/dist/lib/routes.d.ts

@@ -1,13 +1,11 @@
-export interface AssetRouteDefinition {
-    urlPattern: string;
-    filePattern: string;
+interface RouteConfig {
+    fileMap: Readonly<Record<string, string>>;
+    rootDir: string;
 }
 export interface CompiledRoutes {
     resolveUrlPathname(pathname: string): string | null;
     toUrlPathname(filePath: string): string | null;
 }
-export declare function compileRoutes(options: {
-    fileMap: Readonly<Record<string, string>>;
-    rootDir: string;
-}): CompiledRoutes;
+export declare function compileRoutes(basePath: string, routeConfigs: readonly RouteConfig[]): CompiledRoutes;
+export {};
 //# sourceMappingURL=routes.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../src/lib/routes.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,oBAAoB;IACnC,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,EAAE,MAAM,CAAA;CACpB;AAQD,MAAM,WAAW,cAAc;IAC7B,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;IACnD,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;CAC/C;AAYD,wBAAgB,aAAa,CAAC,OAAO,EAAE;IACrC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IACzC,OAAO,EAAE,MAAM,CAAA;CAChB,GAAG,cAAc,CA0CjB"}
+{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../src/lib/routes.ts"],"names":[],"mappings":"AAeA,UAAU,WAAW;IACnB,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IACzC,OAAO,EAAE,MAAM,CAAA;CAChB;AAQD,MAAM,WAAW,cAAc;IAC7B,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;IACnD,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;CAC/C;AAYD,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,SAAS,WAAW,EAAE,GACnC,cAAc,CA8ChB"}

package/dist/lib/routes.js

@@ -1,20 +1,22 @@
-import * as path from 'node:path';
 import { RoutePattern } from '@remix-run/route-pattern';
-import { isAbsoluteFilePath, normalizeFilePath, normalizePathname, resolveFilePath, } from "./paths.js";
+import { getRelativeFilePath, isAbsoluteFilePath, normalizeFilePath, normalizePathname, resolveFilePath, } from "./paths.js";
 function normalizeFilePattern(pattern) {
     if (isAbsoluteFilePath(pattern)) {
         throw new Error(`File route patterns must be relative to the asset server root.\nPattern: ${pattern}`);
     }
     return normalizePathname(pattern);
 }
-export function compileRoutes(options) {
-    if (Object.keys(options.fileMap).length === 0) {
+export function compileRoutes(basePath, routeConfigs) {
+    if (routeConfigs.every((routeConfig) => Object.keys(routeConfig.fileMap).length === 0)) {
         throw new Error('createAssetServer() requires at least one configured fileMap entry.');
     }
-    let compiledRoutes = Object.entries(options.fileMap).map(([urlPattern, filePattern]) => compileRoute({
-        urlPattern,
+    let compiledRoutes = routeConfigs.flatMap((routeConfig) => Object.entries(routeConfig.fileMap).map(([urlPattern, filePattern]) => compileRoute({
         filePattern,
-    }, { rootDir: options.rootDir }));
+        urlPattern,
+    }, {
+        basePath,
+        rootDir: routeConfig.rootDir,
+    })));
     return {
         resolveUrlPathname(pathname) {
             let normalizedPathname = normalizePathname(pathname);
@@ -30,9 +32,7 @@ export function compileRoutes(options) {
         toUrlPathname(filePath) {
             let normalizedFilePath = normalizeFilePath(filePath);
             for (let route of compiledRoutes) {
-                let relativeFilePath = getRelativeFilePath(normalizedFilePath, route.rootDir);
-                if (relativeFilePath === null)
-                    continue;
+                let relativeFilePath = getRelativeFilePath(route.rootDir, normalizedFilePath);
                 let match = route.filePattern.ast.pathname.match(relativeFilePath);
                 if (!match)
                     continue;
@@ -43,7 +43,9 @@ export function compileRoutes(options) {
     };
 }
 function compileRoute(route, options) {
-    let urlPatternSource = normalizePathname(route.urlPattern);
+    let basePath = normalizePathname(options.basePath).replace(/\/+$/, '') || '/';
+    let relativeUrlPattern = normalizePathname(route.urlPattern);
+    let urlPatternSource = normalizePathname(`${basePath.replace(/\/+$/, '')}/${relativeUrlPattern.replace(/^\/+/, '')}`);
     let filePatternSource = normalizeFilePattern(route.filePattern);
     let urlPattern = new RoutePattern(urlPatternSource);
     let filePattern = new RoutePattern(filePatternSource);
@@ -56,11 +58,6 @@ function compileRoute(route, options) {
         filePattern,
     };
 }
-function getRelativeFilePath(filePath, rootDir) {
-    if (filePath[1] === ':' && rootDir[1] === ':' && filePath[0] !== rootDir[0])
-        return null;
-    return path.posix.relative(rootDir, filePath);
-}
 function getPathnameParams(pattern, match) {
     let params = {};
     for (let param of pattern.ast.pathname.params) {

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;AAC1E,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;AAYD,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,EAAE,CAAA;IACd,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,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;AAQD,wBAAsB,aAAa,CACjC,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,iBAAiB,EAC9B,IAAI,EAAE,WAAW,GAChB,OAAO,CAAC,aAAa,CAAC,CAyIxB"}
+{"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;AAYD,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,EAAE,CAAA;IACd,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,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,CA0IxB"}

package/dist/lib/scripts/resolve.js

@@ -1,6 +1,7 @@
 import * as fs from 'node:fs';
 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";
 export const resolverExtensionAlias = {
     '.js': ['.js', '.ts', '.tsx', '.jsx'],
@@ -28,30 +29,31 @@ export async function resolveModule(record, transformed, args) {
     let importsWithPaths = [];
     let deps = new Set();
     for (let unresolved of transformed.unresolvedImports) {
-        let trackedResolution = getTrackedRelativeImportResolution(transformed.importerDir, unresolved.specifier, args.isWatchIgnored);
+        let displaySpecifier = getDisplayImportSpecifier(unresolved.specifier);
+        let trackedResolution = getTrackedRelativeImportResolution(transformed.importerDir, displaySpecifier, args.isWatchIgnored);
         let resolvedSpec = resolvedImports.get(unresolved.specifier);
         if (!resolvedSpec?.absolutePath) {
-            return failResolve(createAssetServerCompilationError(`Failed to resolve import "${unresolved.specifier}" in ${transformed.resolvedPath}. ` +
+            return failResolve(createAssetServerCompilationError(`Failed to resolve import "${displaySpecifier}" in ${transformed.resolvedPath}. ` +
                 `Ensure it resolves to a file within the configured asset server fileMap, or mark it as external.`, {
                 code: 'IMPORT_RESOLUTION_FAILED',
             }), trackedFiles, trackedResolutions, transformed.resolvedPath, { isWatchIgnored: args.isWatchIgnored, trackedResolution });
         }
         let resolvedImport = args.resolveModulePath(resolvedSpec.absolutePath);
         if (!resolvedImport) {
-            return failResolve(createAssetServerCompilationError(`Import "${unresolved.specifier}" in ${transformed.resolvedPath}, resolved to "${resolvedSpec.absolutePath}", is not a supported script file. ` +
+            return failResolve(createAssetServerCompilationError(`Import "${displaySpecifier}" in ${transformed.resolvedPath}, resolved to "${resolvedSpec.absolutePath}", is not a supported script file. ` +
                 `Supported extensions are ${supportedScriptExtensions.join(', ')}.`, {
                 code: 'IMPORT_NOT_SUPPORTED',
             }), trackedFiles, trackedResolutions, transformed.resolvedPath, { isWatchIgnored: args.isWatchIgnored, trackedResolution });
         }
         if (!args.isAllowed(resolvedImport.identityPath)) {
-            return failResolve(createAssetServerCompilationError(`Import "${unresolved.specifier}" in ${transformed.resolvedPath}, resolved to "${resolvedImport.identityPath}", is not allowed by the asset server allow/deny configuration. ` +
+            return failResolve(createAssetServerCompilationError(`Import "${displaySpecifier}" in ${transformed.resolvedPath}, resolved to "${resolvedImport.identityPath}", is not allowed by the asset server allow/deny configuration. ` +
                 `Add a matching allow rule for this file path, remove a conflicting deny rule for this file path, or mark this import as external.`, {
                 code: 'IMPORT_NOT_ALLOWED',
             }), trackedFiles, trackedResolutions, transformed.resolvedPath, { isWatchIgnored: args.isWatchIgnored, trackedResolution });
         }
         let stableUrlPathname = args.routes.toUrlPathname(resolvedImport.identityPath);
         if (!stableUrlPathname) {
-            return failResolve(createAssetServerCompilationError(`Import "${unresolved.specifier}" in ${transformed.resolvedPath}, resolved to "${resolvedImport.identityPath}", is outside all configured fileMap entries. ` +
+            return failResolve(createAssetServerCompilationError(`Import "${displaySpecifier}" in ${transformed.resolvedPath}, resolved to "${resolvedImport.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',
             }), trackedFiles, trackedResolutions, transformed.resolvedPath, { isWatchIgnored: args.isWatchIgnored, trackedResolution });
@@ -164,10 +166,13 @@ async function batchResolveSpecifiers(specifiers, importerPath, resolverFactory)
         return resolvedBySpecifier;
     try {
         for (let specifier of specifiers) {
-            let resolutionResult = await resolverFactory.resolveFileAsync(importerPath, specifier);
+            let normalizedResolution = normalizeSpecifierResolution(specifier, importerPath);
+            let resolutionResult = await resolverFactory.resolveFileAsync(normalizedResolution.importerPath, normalizedResolution.specifier);
             if (resolutionResult.error) {
-                throw createAssetServerCompilationError(`Failed to resolve import "${specifier}" in ${importerPath}. ` +
-                    `Ensure it resolves to a file within the configured asset server fileMap, or mark it as external.`, {
+                throw createAssetServerCompilationError(normalizedResolution.importerPath === getInjectedPackageImporterPath()
+                    ? `Failed to resolve injected import "${specifier}" from asset server.`
+                    : `Failed to resolve import "${normalizedResolution.specifier}" in ${normalizedResolution.importerPath}. ` +
+                        `Ensure it resolves to a file within the configured asset server fileMap, or mark it as external.`, {
                     code: 'IMPORT_RESOLUTION_FAILED',
                 });
             }
@@ -199,6 +204,28 @@ function getUniqueSpecifiers(unresolvedImports) {
 function formatUnknownError(error) {
     return error instanceof Error ? error.message : String(error);
 }
+function normalizeSpecifierResolution(specifier, importerPath) {
+    let authoredInjectedPackageSpecifier = restoreAuthoredInjectedPackageSpecifier(specifier);
+    if (authoredInjectedPackageSpecifier) {
+        return {
+            importerPath,
+            specifier: authoredInjectedPackageSpecifier,
+        };
+    }
+    if (getInjectedPackageNameForSpecifier(specifier)) {
+        return {
+            importerPath: getInjectedPackageImporterPath(),
+            specifier,
+        };
+    }
+    return {
+        importerPath,
+        specifier,
+    };
+}
+function getDisplayImportSpecifier(specifier) {
+    return restoreAuthoredInjectedPackageSpecifier(specifier) ?? specifier;
+}
 function failResolve(error, trackedFiles, trackedResolutions, importerPath, options = {}) {
     return {
         ok: false,

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":"AAOA,OAAO,KAAK,EAAS,oBAAoB,EAAE,MAAM,cAAc,CAAA;AAQ/D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAA;AAE1E,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;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"}