@embroider/vite 0.2.1-unstable.fad2387 → 0.2.1

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Edward Faulkner
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/index.d.ts

@@ -1,8 +1,6 @@
 export * from './src/resolver.js';
-export * from './src/esbuild-resolver.js';
 export * from './src/hbs.js';
 export * from './src/scripts.js';
 export * from './src/template-tag.js';
+export * from './src/addons.js';
 export * from './src/optimize-deps.js';
-export * from './src/assets.js';
-export * from './src/build.js';

package/index.mjs

@@ -1,9 +1,6 @@
 export * from './src/resolver.js';
-export * from './src/esbuild-resolver.js';
 export * from './src/hbs.js';
 export * from './src/scripts.js';
 export * from './src/template-tag.js';
+export * from './src/addons.js';
 export * from './src/optimize-deps.js';
-export * from './src/build.js';
-export * from './src/assets.js';
-export * from './src/content-for.js';

package/package.json

@@ -1,38 +1,28 @@
 {
   "name": "@embroider/vite",
-  "version": "0.2.1-unstable.fad2387",
+  "version": "0.2.1",
   "main": "index.mjs",
   "peerDependencies": {
-    "@embroider/core": "3.4.8-unstable.fad2387",
-    "vite": "^4.3.9 || ^5.0.0"
-  },
-  "scripts": {
-    "test": "jest"
+    "vite": "^4.3.9",
+    "@embroider/core": "^3.4.17"
   },
   "dependencies": {
-    "@babel/core": "^7.22.9",
-    "@embroider/macros": "1.15.2-unstable.fad2387",
     "@rollup/pluginutils": "^4.1.1",
     "assert-never": "^1.2.1",
     "content-tag": "^2.0.1",
     "debug": "^4.3.2",
-    "esbuild": "^0.17.19",
     "fs-extra": "^10.0.0",
-    "jsdom": "^16.6.0",
+    "jsdom": "^25.0.0",
     "source-map-url": "^0.4.1",
-    "terser": "^5.7.0",
-    "fast-glob": "^3.3.2",
-    "send": "^0.18.0"
+    "terser": "^5.7.0"
   },
   "devDependencies": {
-    "@embroider/core": "3.4.8-unstable.fad2387",
-    "@types/babel__core": "^7.20.1",
-    "@types/send": "^0.17.4",
     "@types/debug": "^4.1.5",
     "@types/jsdom": "^16.2.11",
     "@types/fs-extra": "^9.0.12",
     "rollup": "^3.23.0",
-    "vite": "^4.3.9"
+    "vite": "^4.3.9",
+    "@embroider/core": "^3.4.17"
   },
   "files": [
     "index.mjs",
@@ -40,5 +30,8 @@
     "src/**/*.js",
     "src/**/*.d.ts",
     "src/**/*.js.map"
-  ]
-}
+  ],
+  "scripts": {
+    "test": "jest"
+  }
+}

package/src/addons.d.ts

@@ -0,0 +1 @@
+export declare function addons(root: string): string[];

package/src/addons.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addons = addons;
+const core_1 = require("@embroider/core");
+function addons(root) {
+    let rloader = new core_1.ResolverLoader(root);
+    let { options } = rloader.resolver;
+    let names = new Set();
+    for (let from of Object.keys(options.renameModules)) {
+        let pName = (0, core_1.packageName)(from);
+        if (pName) {
+            names.add(pName);
+        }
+    }
+    for (let from of Object.keys(options.renamePackages)) {
+        names.add(from);
+    }
+    for (let name of Object.keys(options.activeAddons)) {
+        names.add(name);
+    }
+    return [...names];
+}
+//# sourceMappingURL=addons.js.map

package/src/addons.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"addons.js","sourceRoot":"","sources":["addons.ts"],"names":[],"mappings":";;AAEA,wBAiBC;AAnBD,0CAA8D;AAE9D,SAAgB,MAAM,CAAC,IAAY;IACjC,IAAI,OAAO,GAAG,IAAI,qBAAc,CAAC,IAAI,CAAC,CAAC;IACvC,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC;IACnC,IAAI,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;IAC9B,KAAK,IAAI,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;QACpD,IAAI,KAAK,GAAG,IAAA,kBAAW,EAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,KAAK,EAAE,CAAC;YACV,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACnB,CAAC;IACH,CAAC;IACD,KAAK,IAAI,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;QACrD,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAClB,CAAC;IACD,KAAK,IAAI,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;QACnD,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAClB,CAAC;IACD,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC;AACpB,CAAC","sourcesContent":["import { ResolverLoader, packageName } from '@embroider/core';\n\nexport function addons(root: string): string[] {\n  let rloader = new ResolverLoader(root);\n  let { options } = rloader.resolver;\n  let names = new Set<string>();\n  for (let from of Object.keys(options.renameModules)) {\n    let pName = packageName(from);\n    if (pName) {\n      names.add(pName);\n    }\n  }\n  for (let from of Object.keys(options.renamePackages)) {\n    names.add(from);\n  }\n  for (let name of Object.keys(options.activeAddons)) {\n    names.add(name);\n  }\n  return [...names];\n}\n"]}

package/src/hbs.js

@@ -3,25 +3,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hbs = void 0;
+exports.hbs = hbs;
 // TODO: I copied this from @embroider/addon-dev, it needs to be its own package
 // (or be in shared-internals or core)
 const pluginutils_1 = require("@rollup/pluginutils");
+const fs_1 = require("fs");
 const core_1 = require("@embroider/core");
 const assert_never_1 = __importDefault(require("assert-never"));
 const path_1 = require("path");
 const debug_1 = __importDefault(require("debug"));
 const debug = (0, debug_1.default)('embroider:hbs-plugin');
-const resolverLoader = new core_1.ResolverLoader(process.cwd());
 function hbs() {
     return {
         name: 'rollup-hbs-plugin',
         enforce: 'pre',
-        async resolveId(source, importer, options) {
-            var _a, _b;
-            if ((_b = (_a = options.custom) === null || _a === void 0 ? void 0 : _a.embroider) === null || _b === void 0 ? void 0 : _b.isExtensionSearch) {
-                return null;
-            }
+        async resolveId(source, importer) {
             let resolution = await this.resolve(source, importer, {
                 skipSelf: true,
             });
@@ -32,14 +28,15 @@ function hbs() {
                 return maybeRewriteHBS(resolution);
             }
         },
-        transform(source, id) {
+        load(id) {
             const meta = getMeta(this, id);
             if (!meta) {
                 return;
             }
             switch (meta.type) {
                 case 'template':
-                    let code = (0, core_1.hbsToJS)(source);
+                    let input = (0, fs_1.readFileSync)(id, 'utf8');
+                    let code = (0, core_1.hbsToJS)(input);
                     return {
                         code,
                     };
@@ -53,7 +50,6 @@ function hbs() {
         },
     };
 }
-exports.hbs = hbs;
 const templateOnlyComponent = `import templateOnly from '@ember/component/template-only';\n` + `export default templateOnly();\n`;
 function getMeta(context, id) {
     var _a, _b;
@@ -84,27 +80,12 @@ async function maybeSynthesizeComponentJS(context, source, importer) {
                 // Currently this guard is only actually exercised in rollup, not in
                 // vite, due to https://github.com/vitejs/vite/issues/13852
                 enableCustomResolver: false,
-                isExtensionSearch: true,
             },
         },
     });
     if (!templateResolution) {
         return null;
     }
-    const resolvedId = templateResolution.id.split('?')[0];
-    templateResolution.id = resolvedId;
-    const pkg = resolverLoader.resolver.packageCache.ownerOfFile(resolvedId);
-    const isInComponents = (pkg === null || pkg === void 0 ? void 0 : pkg.isV2App()) && resolvedId.slice(pkg === null || pkg === void 0 ? void 0 : pkg.root.length).startsWith('/components');
-    if (resolvedId.endsWith('/template.hbs') || !isInComponents) {
-        return {
-            ...templateResolution,
-            meta: {
-                'rollup-hbs-plugin': {
-                    type: 'template',
-                },
-            },
-        };
-    }
     debug(`emitting template only component: %s`, templateResolution.id);
     // we're trying to resolve a JS module but only the corresponding HBS
     // file exists. Synthesize the template-only component JS.
@@ -117,7 +98,7 @@ async function maybeSynthesizeComponentJS(context, source, importer) {
         },
     };
 }
-const hbsFilter = (0, pluginutils_1.createFilter)('**/*.hbs?([?]*)');
+const hbsFilter = (0, pluginutils_1.createFilter)('**/*.hbs');
 function maybeRewriteHBS(resolution) {
     if (!hbsFilter(resolution.id)) {
         return null;

package/src/hbs.js.map

@@ -1 +1 @@
-{"version":3,"file":"hbs.js","sourceRoot":"","sources":["hbs.ts"],"names":[],"mappings":"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","sourcesContent":["// TODO: I copied this from @embroider/addon-dev, it needs to be its own package\n// (or be in shared-internals or core)\nimport { createFilter } from '@rollup/pluginutils';\nimport type { PluginContext, ResolvedId } from 'rollup';\nimport type { Plugin } from 'vite';\nimport { hbsToJS, ResolverLoader } from '@embroider/core';\nimport assertNever from 'assert-never';\nimport { parse as pathParse } from 'path';\nimport makeDebug from 'debug';\n\nconst debug = makeDebug('embroider:hbs-plugin');\nconst resolverLoader = new ResolverLoader(process.cwd());\n\nexport function hbs(): Plugin {\n  return {\n    name: 'rollup-hbs-plugin',\n    enforce: 'pre',\n    async resolveId(source: string, importer: string | undefined, options) {\n      if (options.custom?.embroider?.isExtensionSearch) {\n        return null;\n      }\n      let resolution = await this.resolve(source, importer, {\n        skipSelf: true,\n      });\n\n      if (!resolution) {\n        return maybeSynthesizeComponentJS(this, source, importer);\n      } else {\n        return maybeRewriteHBS(resolution);\n      }\n    },\n\n    transform(source: string, id: string) {\n      const meta = getMeta(this, id);\n      if (!meta) {\n        return;\n      }\n\n      switch (meta.type) {\n        case 'template':\n          let code = hbsToJS(source);\n          return {\n            code,\n          };\n        case 'template-only-component-js':\n          return {\n            code: templateOnlyComponent,\n          };\n        default:\n          assertNever(meta);\n      }\n    },\n  };\n}\n\nconst templateOnlyComponent =\n  `import templateOnly from '@ember/component/template-only';\\n` + `export default templateOnly();\\n`;\n\ntype Meta =\n  | {\n      type: 'template';\n    }\n  | {\n      type: 'template-only-component-js';\n    };\n\nfunction getMeta(context: PluginContext, id: string): Meta | null {\n  const meta = context.getModuleInfo(id)?.meta?.['rollup-hbs-plugin'];\n  if (meta) {\n    return meta as Meta;\n  } else {\n    return null;\n  }\n}\n\nfunction correspondingTemplate(filename: string): string {\n  let { ext } = pathParse(filename);\n  return filename.slice(0, filename.length - ext.length) + '.hbs';\n}\n\nasync function maybeSynthesizeComponentJS(context: PluginContext, source: string, importer: string | undefined) {\n  debug(`checking for template-only component: %s`, source);\n  let templateResolution = await context.resolve(correspondingTemplate(source), importer, {\n    skipSelf: true,\n    custom: {\n      embroider: {\n        // we don't want to recurse into the whole embroider compatbility\n        // resolver here. It has presumably already steered our request to the\n        // correct place. All we want to do is slightly modify the request we\n        // were given (changing the extension) and check if that would resolve\n        // instead.\n        //\n        // Currently this guard is only actually exercised in rollup, not in\n        // vite, due to https://github.com/vitejs/vite/issues/13852\n        enableCustomResolver: false,\n        isExtensionSearch: true,\n      },\n    },\n  });\n  if (!templateResolution) {\n    return null;\n  }\n\n  const resolvedId = templateResolution.id.split('?')[0];\n  templateResolution.id = resolvedId;\n\n  const pkg = resolverLoader.resolver.packageCache.ownerOfFile(resolvedId);\n  const isInComponents = pkg?.isV2App() && resolvedId.slice(pkg?.root.length).startsWith('/components');\n\n  if (resolvedId.endsWith('/template.hbs') || !isInComponents) {\n    return {\n      ...templateResolution,\n      meta: {\n        'rollup-hbs-plugin': {\n          type: 'template',\n        },\n      },\n    };\n  }\n\n  debug(`emitting template only component: %s`, templateResolution.id);\n\n  // we're trying to resolve a JS module but only the corresponding HBS\n  // file exists. Synthesize the template-only component JS.\n  return {\n    id: templateResolution.id.replace(/\\.hbs$/, '.js'),\n    meta: {\n      'rollup-hbs-plugin': {\n        type: 'template-only-component-js',\n      },\n    },\n  };\n}\n\nconst hbsFilter = createFilter('**/*.hbs?([?]*)');\n\nfunction maybeRewriteHBS(resolution: ResolvedId) {\n  if (!hbsFilter(resolution.id)) {\n    return null;\n  }\n  debug('emitting hbs rewrite: %s', resolution.id);\n  return {\n    ...resolution,\n    meta: {\n      'rollup-hbs-plugin': {\n        type: 'template',\n      },\n    },\n  };\n}\n"]}
+{"version":3,"file":"hbs.js","sourceRoot":"","sources":["hbs.ts"],"names":[],"mappings":"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","sourcesContent":["// TODO: I copied this from @embroider/addon-dev, it needs to be its own package\n// (or be in shared-internals or core)\nimport { createFilter } from '@rollup/pluginutils';\nimport type { PluginContext, ResolvedId } from 'rollup';\nimport type { Plugin } from 'vite';\nimport { readFileSync } from 'fs';\nimport { hbsToJS } from '@embroider/core';\nimport assertNever from 'assert-never';\nimport { parse as pathParse } from 'path';\nimport makeDebug from 'debug';\n\nconst debug = makeDebug('embroider:hbs-plugin');\n\nexport function hbs(): Plugin {\n  return {\n    name: 'rollup-hbs-plugin',\n    enforce: 'pre',\n    async resolveId(source: string, importer: string | undefined) {\n      let resolution = await this.resolve(source, importer, {\n        skipSelf: true,\n      });\n\n      if (!resolution) {\n        return maybeSynthesizeComponentJS(this, source, importer);\n      } else {\n        return maybeRewriteHBS(resolution);\n      }\n    },\n\n    load(id: string) {\n      const meta = getMeta(this, id);\n      if (!meta) {\n        return;\n      }\n\n      switch (meta.type) {\n        case 'template':\n          let input = readFileSync(id, 'utf8');\n          let code = hbsToJS(input);\n          return {\n            code,\n          };\n        case 'template-only-component-js':\n          return {\n            code: templateOnlyComponent,\n          };\n        default:\n          assertNever(meta);\n      }\n    },\n  };\n}\n\nconst templateOnlyComponent =\n  `import templateOnly from '@ember/component/template-only';\\n` + `export default templateOnly();\\n`;\n\ntype Meta =\n  | {\n      type: 'template';\n    }\n  | {\n      type: 'template-only-component-js';\n    };\n\nfunction getMeta(context: PluginContext, id: string): Meta | null {\n  const meta = context.getModuleInfo(id)?.meta?.['rollup-hbs-plugin'];\n  if (meta) {\n    return meta as Meta;\n  } else {\n    return null;\n  }\n}\n\nfunction correspondingTemplate(filename: string): string {\n  let { ext } = pathParse(filename);\n  return filename.slice(0, filename.length - ext.length) + '.hbs';\n}\n\nasync function maybeSynthesizeComponentJS(context: PluginContext, source: string, importer: string | undefined) {\n  debug(`checking for template-only component: %s`, source);\n  let templateResolution = await context.resolve(correspondingTemplate(source), importer, {\n    skipSelf: true,\n    custom: {\n      embroider: {\n        // we don't want to recurse into the whole embroider compatbility\n        // resolver here. It has presumably already steered our request to the\n        // correct place. All we want to do is slightly modify the request we\n        // were given (changing the extension) and check if that would resolve\n        // instead.\n        //\n        // Currently this guard is only actually exercised in rollup, not in\n        // vite, due to https://github.com/vitejs/vite/issues/13852\n        enableCustomResolver: false,\n      },\n    },\n  });\n  if (!templateResolution) {\n    return null;\n  }\n  debug(`emitting template only component: %s`, templateResolution.id);\n\n  // we're trying to resolve a JS module but only the corresponding HBS\n  // file exists. Synthesize the template-only component JS.\n  return {\n    id: templateResolution.id.replace(/\\.hbs$/, '.js'),\n    meta: {\n      'rollup-hbs-plugin': {\n        type: 'template-only-component-js',\n      },\n    },\n  };\n}\n\nconst hbsFilter = createFilter('**/*.hbs');\n\nfunction maybeRewriteHBS(resolution: ResolvedId) {\n  if (!hbsFilter(resolution.id)) {\n    return null;\n  }\n  debug('emitting hbs rewrite: %s', resolution.id);\n  return {\n    ...resolution,\n    meta: {\n      'rollup-hbs-plugin': {\n        type: 'template',\n      },\n    },\n  };\n}\n"]}

package/src/optimize-deps.js

@@ -1,15 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.optimizeDeps = void 0;
-const esbuild_resolver_1 = require("./esbuild-resolver");
+exports.optimizeDeps = optimizeDeps;
 function optimizeDeps() {
     return {
         exclude: ['@embroider/macros'],
-        extensions: ['.hbs', '.gjs', '.gts'],
-        esbuildOptions: {
-            plugins: [(0, esbuild_resolver_1.esBuildResolver)()],
-        },
     };
 }
-exports.optimizeDeps = optimizeDeps;
 //# sourceMappingURL=optimize-deps.js.map

package/src/optimize-deps.js.map

@@ -1 +1 @@
-{"version":3,"file":"optimize-deps.js","sourceRoot":"","sources":["optimize-deps.ts"],"names":[],"mappings":";;;AAAA,yDAAqD;AAOrD,SAAgB,YAAY;IAC1B,OAAO;QACL,OAAO,EAAE,CAAC,mBAAmB,CAAC;QAC9B,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;QACpC,cAAc,EAAE;YACd,OAAO,EAAE,CAAC,IAAA,kCAAe,GAAE,CAAC;SAC7B;KACF,CAAC;AACJ,CAAC;AARD,oCAQC","sourcesContent":["import { esBuildResolver } from './esbuild-resolver';\n\nexport interface OptimizeDeps {\n  exclude?: string[];\n  [key: string]: unknown;\n}\n\nexport function optimizeDeps(): OptimizeDeps {\n  return {\n    exclude: ['@embroider/macros'],\n    extensions: ['.hbs', '.gjs', '.gts'],\n    esbuildOptions: {\n      plugins: [esBuildResolver()],\n    },\n  };\n}\n"]}
+{"version":3,"file":"optimize-deps.js","sourceRoot":"","sources":["optimize-deps.ts"],"names":[],"mappings":";;AAKA,oCAIC;AAJD,SAAgB,YAAY;IAC1B,OAAO;QACL,OAAO,EAAE,CAAC,mBAAmB,CAAC;KAC/B,CAAC;AACJ,CAAC","sourcesContent":["export interface OptimizeDeps {\n  exclude?: string[];\n  [key: string]: unknown;\n}\n\nexport function optimizeDeps(): OptimizeDeps {\n  return {\n    exclude: ['@embroider/macros'],\n  };\n}\n"]}

package/src/request.d.ts

@@ -1,26 +1,14 @@
-import type { ModuleRequest, Resolution } from '@embroider/core';
-import type { PluginContext, ResolveIdResult } from 'rollup';
+import type { ModuleRequest } from '@embroider/core';
 export declare const virtualPrefix = "embroider_virtual:";
 export declare class RollupModuleRequest implements ModuleRequest {
-    private context;
     readonly specifier: string;
     readonly fromFile: string;
     readonly meta: Record<string, any> | undefined;
-    readonly isNotFound: boolean;
-    readonly resolvedTo: Resolution<ResolveIdResult> | undefined;
-    private queryParams;
-    private importerQueryParams;
-    static from(context: PluginContext, source: string, importer: string | undefined, custom: Record<string, any> | undefined): RollupModuleRequest | undefined;
+    static from(source: string, importer: string | undefined, custom: Record<string, any> | undefined): RollupModuleRequest | undefined;
     private constructor();
-    get debugType(): string;
     get isVirtual(): boolean;
-    private get specifierWithQueryParams();
-    private get fromFileWithQueryParams();
     alias(newSpecifier: string): this;
     rehome(newFromFile: string): this;
     virtualize(filename: string): this;
     withMeta(meta: Record<string, any> | undefined): this;
-    notFound(): this;
-    defaultResolve(): Promise<Resolution<ResolveIdResult>>;
-    resolveTo(resolution: Resolution<ResolveIdResult>): this;
 }

package/src/request.js

@@ -4,14 +4,11 @@ exports.RollupModuleRequest = exports.virtualPrefix = void 0;
 const core_1 = require("@embroider/core");
 exports.virtualPrefix = 'embroider_virtual:';
 class RollupModuleRequest {
-    static from(context, source, importer, custom) {
+    static from(source, importer, custom) {
         var _a, _b, _c;
         if (!((_b = (_a = custom === null || custom === void 0 ? void 0 : custom.embroider) === null || _a === void 0 ? void 0 : _a.enableCustomResolver) !== null && _b !== void 0 ? _b : true)) {
             return;
         }
-        if (custom === null || custom === void 0 ? void 0 : custom.depScan) {
-            return;
-        }
         if (source && importer && source[0] !== '\0') {
             let nonVirtual;
             if (importer.startsWith(exports.virtualPrefix)) {
@@ -22,92 +19,33 @@ class RollupModuleRequest {
             }
             // strip query params off the importer
             let fromFile = (0, core_1.cleanUrl)(nonVirtual);
-            let importerQueryParams = (0, core_1.getUrlQueryParams)(nonVirtual);
-            // strip query params off the source but keep track of them
-            // we use regexp-based methods over a URL object because the
-            // source can be a relative path.
-            let cleanSource = (0, core_1.cleanUrl)(source, true);
-            let queryParams = (0, core_1.getUrlQueryParams)(source, true);
-            return new RollupModuleRequest(context, cleanSource, fromFile, (_c = custom === null || custom === void 0 ? void 0 : custom.embroider) === null || _c === void 0 ? void 0 : _c.meta, false, undefined, queryParams, importerQueryParams);
+            return new RollupModuleRequest(source, fromFile, (_c = custom === null || custom === void 0 ? void 0 : custom.embroider) === null || _c === void 0 ? void 0 : _c.meta);
         }
     }
-    constructor(context, specifier, fromFile, meta, isNotFound, resolvedTo, queryParams, importerQueryParams) {
-        this.context = context;
+    constructor(specifier, fromFile, meta) {
         this.specifier = specifier;
         this.fromFile = fromFile;
         this.meta = meta;
-        this.isNotFound = isNotFound;
-        this.resolvedTo = resolvedTo;
-        this.queryParams = queryParams;
-        this.importerQueryParams = importerQueryParams;
-    }
-    get debugType() {
-        return 'rollup';
     }
     get isVirtual() {
         return this.specifier.startsWith(exports.virtualPrefix);
     }
-    get specifierWithQueryParams() {
-        return `${this.specifier}${this.queryParams}`;
-    }
-    get fromFileWithQueryParams() {
-        return `${this.fromFile}${this.importerQueryParams}`;
-    }
     alias(newSpecifier) {
-        return new RollupModuleRequest(this.context, newSpecifier, this.fromFile, this.meta, false, undefined, this.queryParams, this.importerQueryParams);
+        return new RollupModuleRequest(newSpecifier, this.fromFile, this.meta);
     }
     rehome(newFromFile) {
         if (this.fromFile === newFromFile) {
             return this;
         }
         else {
-            return new RollupModuleRequest(this.context, this.specifier, newFromFile, this.meta, false, undefined, this.queryParams, this.importerQueryParams);
+            return new RollupModuleRequest(this.specifier, newFromFile, this.meta);
         }
     }
     virtualize(filename) {
-        return new RollupModuleRequest(this.context, exports.virtualPrefix + filename, this.fromFile, this.meta, false, undefined, this.queryParams, this.importerQueryParams);
+        return new RollupModuleRequest(exports.virtualPrefix + filename, this.fromFile, this.meta);
     }
     withMeta(meta) {
-        return new RollupModuleRequest(this.context, this.specifier, this.fromFile, meta, this.isNotFound, this.resolvedTo, this.queryParams, this.importerQueryParams);
-    }
-    notFound() {
-        return new RollupModuleRequest(this.context, this.specifier, this.fromFile, this.meta, true, undefined, this.queryParams, this.importerQueryParams);
-    }
-    async defaultResolve() {
-        if (this.isVirtual) {
-            return {
-                type: 'found',
-                filename: this.specifier,
-                result: { id: this.specifierWithQueryParams, resolvedBy: this.fromFileWithQueryParams },
-                isVirtual: this.isVirtual,
-            };
-        }
-        if (this.isNotFound) {
-            // TODO: we can make sure this looks correct in rollup & vite output when a
-            // user encounters it
-            let err = new Error(`module not found ${this.specifierWithQueryParams}`);
-            err.code = 'MODULE_NOT_FOUND';
-            return { type: 'not_found', err };
-        }
-        let result = await this.context.resolve(this.specifierWithQueryParams, this.fromFileWithQueryParams, {
-            skipSelf: true,
-            custom: {
-                embroider: {
-                    enableCustomResolver: false,
-                    meta: this.meta,
-                },
-            },
-        });
-        if (result) {
-            let { pathname } = new URL(result.id, 'http://example.com');
-            return { type: 'found', filename: pathname, result, isVirtual: this.isVirtual };
-        }
-        else {
-            return { type: 'not_found', err: undefined };
-        }
-    }
-    resolveTo(resolution) {
-        return new RollupModuleRequest(this.context, this.specifier, this.fromFile, this.meta, this.isNotFound, resolution, this.queryParams, this.importerQueryParams);
+        return new RollupModuleRequest(this.specifier, this.fromFile, meta);
     }
 }
 exports.RollupModuleRequest = RollupModuleRequest;

package/src/request.js.map

@@ -1 +1 @@
-{"version":3,"file":"request.js","sourceRoot":"","sources":["request.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ModuleRequest, Resolution } from '@embroider/core';\nimport { cleanUrl, getUrlQueryParams } from '@embroider/core';\nimport type { PluginContext, ResolveIdResult } from 'rollup';\n\nexport const virtualPrefix = 'embroider_virtual:';\n\nexport class RollupModuleRequest implements ModuleRequest {\n  static from(\n    context: PluginContext,\n    source: string,\n    importer: string | undefined,\n    custom: Record<string, any> | undefined\n  ): RollupModuleRequest | undefined {\n    if (!(custom?.embroider?.enableCustomResolver ?? true)) {\n      return;\n    }\n    if (custom?.depScan) {\n      return;\n    }\n\n    if (source && importer && source[0] !== '\\0') {\n      let nonVirtual: string;\n      if (importer.startsWith(virtualPrefix)) {\n        nonVirtual = importer.slice(virtualPrefix.length);\n      } else {\n        nonVirtual = importer;\n      }\n\n      // strip query params off the importer\n      let fromFile = cleanUrl(nonVirtual);\n      let importerQueryParams = getUrlQueryParams(nonVirtual);\n\n      // strip query params off the source but keep track of them\n      // we use regexp-based methods over a URL object because the\n      // source can be a relative path.\n      let cleanSource = cleanUrl(source, true);\n      let queryParams = getUrlQueryParams(source, true);\n\n      return new RollupModuleRequest(\n        context,\n        cleanSource,\n        fromFile,\n        custom?.embroider?.meta,\n        false,\n        undefined,\n        queryParams,\n        importerQueryParams\n      );\n    }\n  }\n\n  private constructor(\n    private context: PluginContext,\n    readonly specifier: string,\n    readonly fromFile: string,\n    readonly meta: Record<string, any> | undefined,\n    readonly isNotFound: boolean,\n    readonly resolvedTo: Resolution<ResolveIdResult> | undefined,\n    private queryParams: string,\n    private importerQueryParams: string\n  ) {}\n\n  get debugType() {\n    return 'rollup';\n  }\n\n  get isVirtual(): boolean {\n    return this.specifier.startsWith(virtualPrefix);\n  }\n\n  private get specifierWithQueryParams(): string {\n    return `${this.specifier}${this.queryParams}`;\n  }\n\n  private get fromFileWithQueryParams(): string {\n    return `${this.fromFile}${this.importerQueryParams}`;\n  }\n\n  alias(newSpecifier: string) {\n    return new RollupModuleRequest(\n      this.context,\n      newSpecifier,\n      this.fromFile,\n      this.meta,\n      false,\n      undefined,\n      this.queryParams,\n      this.importerQueryParams\n    ) as this;\n  }\n  rehome(newFromFile: string) {\n    if (this.fromFile === newFromFile) {\n      return this;\n    } else {\n      return new RollupModuleRequest(\n        this.context,\n        this.specifier,\n        newFromFile,\n        this.meta,\n        false,\n        undefined,\n        this.queryParams,\n        this.importerQueryParams\n      ) as this;\n    }\n  }\n  virtualize(filename: string) {\n    return new RollupModuleRequest(\n      this.context,\n      virtualPrefix + filename,\n      this.fromFile,\n      this.meta,\n      false,\n      undefined,\n      this.queryParams,\n      this.importerQueryParams\n    ) as this;\n  }\n  withMeta(meta: Record<string, any> | undefined): this {\n    return new RollupModuleRequest(\n      this.context,\n      this.specifier,\n      this.fromFile,\n      meta,\n      this.isNotFound,\n      this.resolvedTo,\n      this.queryParams,\n      this.importerQueryParams\n    ) as this;\n  }\n  notFound(): this {\n    return new RollupModuleRequest(\n      this.context,\n      this.specifier,\n      this.fromFile,\n      this.meta,\n      true,\n      undefined,\n      this.queryParams,\n      this.importerQueryParams\n    ) as this;\n  }\n  async defaultResolve(): Promise<Resolution<ResolveIdResult>> {\n    if (this.isVirtual) {\n      return {\n        type: 'found',\n        filename: this.specifier,\n        result: { id: this.specifierWithQueryParams, resolvedBy: this.fromFileWithQueryParams },\n        isVirtual: this.isVirtual,\n      };\n    }\n    if (this.isNotFound) {\n      // TODO: we can make sure this looks correct in rollup & vite output when a\n      // user encounters it\n      let err = new Error(`module not found ${this.specifierWithQueryParams}`);\n      (err as any).code = 'MODULE_NOT_FOUND';\n      return { type: 'not_found', err };\n    }\n    let result = await this.context.resolve(this.specifierWithQueryParams, this.fromFileWithQueryParams, {\n      skipSelf: true,\n      custom: {\n        embroider: {\n          enableCustomResolver: false,\n          meta: this.meta,\n        },\n      },\n    });\n    if (result) {\n      let { pathname } = new URL(result.id, 'http://example.com');\n      return { type: 'found', filename: pathname, result, isVirtual: this.isVirtual };\n    } else {\n      return { type: 'not_found', err: undefined };\n    }\n  }\n\n  resolveTo(resolution: Resolution<ResolveIdResult>): this {\n    return new RollupModuleRequest(\n      this.context,\n      this.specifier,\n      this.fromFile,\n      this.meta,\n      this.isNotFound,\n      resolution,\n      this.queryParams,\n      this.importerQueryParams\n    ) as this;\n  }\n}\n"]}
+{"version":3,"file":"request.js","sourceRoot":"","sources":["request.ts"],"names":[],"mappings":";;;AACA,0CAA2C;AAE9B,QAAA,aAAa,GAAG,oBAAoB,CAAC;AAElD,MAAa,mBAAmB;IAC9B,MAAM,CAAC,IAAI,CACT,MAAc,EACd,QAA4B,EAC5B,MAAuC;;QAEvC,IAAI,CAAC,CAAC,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,0CAAE,oBAAoB,mCAAI,IAAI,CAAC,EAAE,CAAC;YACvD,OAAO;QACT,CAAC;QAED,IAAI,MAAM,IAAI,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;YAC7C,IAAI,UAAkB,CAAC;YACvB,IAAI,QAAQ,CAAC,UAAU,CAAC,qBAAa,CAAC,EAAE,CAAC;gBACvC,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,qBAAa,CAAC,MAAM,CAAC,CAAC;YACpD,CAAC;iBAAM,CAAC;gBACN,UAAU,GAAG,QAAQ,CAAC;YACxB,CAAC;YAED,sCAAsC;YACtC,IAAI,QAAQ,GAAG,IAAA,eAAQ,EAAC,UAAU,CAAC,CAAC;YACpC,OAAO,IAAI,mBAAmB,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,0CAAE,IAAI,CAAC,CAAC;QAC5E,CAAC;IACH,CAAC;IAED,YACW,SAAiB,EACjB,QAAgB,EAChB,IAAqC;QAFrC,cAAS,GAAT,SAAS,CAAQ;QACjB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,SAAI,GAAJ,IAAI,CAAiC;IAC7C,CAAC;IAEJ,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,qBAAa,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,YAAoB;QACxB,OAAO,IAAI,mBAAmB,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAS,CAAC;IACjF,CAAC;IACD,MAAM,CAAC,WAAmB;QACxB,IAAI,IAAI,CAAC,QAAQ,KAAK,WAAW,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC;QACd,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,mBAAmB,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAS,CAAC;QACjF,CAAC;IACH,CAAC;IACD,UAAU,CAAC,QAAgB;QACzB,OAAO,IAAI,mBAAmB,CAAC,qBAAa,GAAG,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAS,CAAC;IAC7F,CAAC;IACD,QAAQ,CAAC,IAAqC;QAC5C,OAAO,IAAI,mBAAmB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAS,CAAC;IAC9E,CAAC;CACF;AAlDD,kDAkDC","sourcesContent":["import type { ModuleRequest } from '@embroider/core';\nimport { cleanUrl } from '@embroider/core';\n\nexport const virtualPrefix = 'embroider_virtual:';\n\nexport class RollupModuleRequest implements ModuleRequest {\n  static from(\n    source: string,\n    importer: string | undefined,\n    custom: Record<string, any> | undefined\n  ): RollupModuleRequest | undefined {\n    if (!(custom?.embroider?.enableCustomResolver ?? true)) {\n      return;\n    }\n\n    if (source && importer && source[0] !== '\\0') {\n      let nonVirtual: string;\n      if (importer.startsWith(virtualPrefix)) {\n        nonVirtual = importer.slice(virtualPrefix.length);\n      } else {\n        nonVirtual = importer;\n      }\n\n      // strip query params off the importer\n      let fromFile = cleanUrl(nonVirtual);\n      return new RollupModuleRequest(source, fromFile, custom?.embroider?.meta);\n    }\n  }\n\n  private constructor(\n    readonly specifier: string,\n    readonly fromFile: string,\n    readonly meta: Record<string, any> | undefined\n  ) {}\n\n  get isVirtual(): boolean {\n    return this.specifier.startsWith(virtualPrefix);\n  }\n\n  alias(newSpecifier: string) {\n    return new RollupModuleRequest(newSpecifier, this.fromFile, this.meta) as this;\n  }\n  rehome(newFromFile: string) {\n    if (this.fromFile === newFromFile) {\n      return this;\n    } else {\n      return new RollupModuleRequest(this.specifier, newFromFile, this.meta) as this;\n    }\n  }\n  virtualize(filename: string) {\n    return new RollupModuleRequest(virtualPrefix + filename, this.fromFile, this.meta) as this;\n  }\n  withMeta(meta: Record<string, any> | undefined): this {\n    return new RollupModuleRequest(this.specifier, this.fromFile, meta) as this;\n  }\n}\n"]}

package/src/resolver.js

@@ -3,47 +3,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolver = void 0;
+exports.resolver = resolver;
+const path_1 = require("path");
 const core_1 = require("@embroider/core");
+const fs_extra_1 = require("fs-extra");
 const request_1 = require("./request");
 const assert_never_1 = __importDefault(require("assert-never"));
-const debug_1 = __importDefault(require("debug"));
-const path_1 = require("path");
-const debug = (0, debug_1.default)('embroider:vite');
 function resolver() {
-    let resolverLoader = new core_1.ResolverLoader(process.cwd());
-    let server;
-    let virtualDeps = new Map();
+    let resolverOptions = (0, fs_extra_1.readJSONSync)((0, path_1.join)((0, core_1.locateEmbroiderWorkingDir)(process.cwd()), 'resolver.json'));
+    let resolver = new core_1.Resolver(resolverOptions);
     return {
         name: 'embroider-resolver',
         enforce: 'pre',
-        configureServer(s) {
-            server = s;
-            server.watcher.on('all', (_eventName, path) => {
-                for (let [id, watches] of virtualDeps) {
-                    for (let watch of watches) {
-                        if (path.startsWith(watch)) {
-                            debug('Invalidate %s because %s', id, path);
-                            server.moduleGraph.onFileChange(id);
-                            let m = server.moduleGraph.getModuleById(id);
-                            if (m) {
-                                server.reloadModule(m);
-                            }
-                        }
-                    }
-                }
-            });
-        },
         async resolveId(source, importer, options) {
-            let request = request_1.RollupModuleRequest.from(this, source, importer, options.custom);
+            let request = request_1.RollupModuleRequest.from(source, importer, options.custom);
             if (!request) {
                 // fallthrough to other rollup plugins
                 return null;
             }
-            let resolution = await resolverLoader.resolver.resolve(request);
+            let resolution = await resolver.resolve(request, defaultResolve(this));
             switch (resolution.type) {
                 case 'found':
-                case 'ignored':
                     return resolution.result;
                 case 'not_found':
                     return null;
@@ -53,21 +33,33 @@ function resolver() {
         },
         load(id) {
             if (id.startsWith(request_1.virtualPrefix)) {
-                let { pathname } = new URL(id, 'http://example.com');
-                let { src, watches } = (0, core_1.virtualContent)(pathname.slice(request_1.virtualPrefix.length + 1), resolverLoader.resolver);
-                virtualDeps.set(id, watches);
-                server === null || server === void 0 ? void 0 : server.watcher.add(watches);
-                return src;
+                return (0, core_1.virtualContent)(id.slice(request_1.virtualPrefix.length), resolver);
             }
         },
-        buildEnd() {
-            this.emitFile({
-                type: 'asset',
-                fileName: '@embroider/core/test-support.js',
-                source: (0, core_1.virtualContent)((0, path_1.resolve)(resolverLoader.resolver.options.engines[0].root, '-embroider-test-support.js'), resolverLoader.resolver).src,
-            });
-        },
     };
 }
-exports.resolver = resolver;
+function defaultResolve(context) {
+    return async (request) => {
+        if (request.isVirtual) {
+            return {
+                type: 'found',
+                result: { id: request.specifier, resolvedBy: request.fromFile },
+            };
+        }
+        let result = await context.resolve(request.specifier, request.fromFile, {
+            skipSelf: true,
+            custom: {
+                embroider: {
+                    meta: request.meta,
+                },
+            },
+        });
+        if (result) {
+            return { type: 'found', result };
+        }
+        else {
+            return { type: 'not_found', err: undefined };
+        }
+    };
+}
 //# sourceMappingURL=resolver.js.map

package/src/resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolver.js","sourceRoot":"","sources":["resolver.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Plugin, ViteDevServer } from 'vite';\nimport { virtualContent, ResolverLoader } from '@embroider/core';\nimport { RollupModuleRequest, virtualPrefix } from './request';\nimport assertNever from 'assert-never';\nimport makeDebug from 'debug';\nimport { resolve } from 'path';\n\nconst debug = makeDebug('embroider:vite');\n\nexport function resolver(): Plugin {\n  let resolverLoader = new ResolverLoader(process.cwd());\n  let server: ViteDevServer;\n  let virtualDeps: Map<string, string[]> = new Map();\n\n  return {\n    name: 'embroider-resolver',\n    enforce: 'pre',\n\n    configureServer(s) {\n      server = s;\n      server.watcher.on('all', (_eventName, path) => {\n        for (let [id, watches] of virtualDeps) {\n          for (let watch of watches) {\n            if (path.startsWith(watch)) {\n              debug('Invalidate %s because %s', id, path);\n              server.moduleGraph.onFileChange(id);\n              let m = server.moduleGraph.getModuleById(id);\n              if (m) {\n                server.reloadModule(m);\n              }\n            }\n          }\n        }\n      });\n    },\n\n    async resolveId(source, importer, options) {\n      let request = RollupModuleRequest.from(this, source, importer, options.custom);\n      if (!request) {\n        // fallthrough to other rollup plugins\n        return null;\n      }\n      let resolution = await resolverLoader.resolver.resolve(request);\n      switch (resolution.type) {\n        case 'found':\n        case 'ignored':\n          return resolution.result;\n        case 'not_found':\n          return null;\n        default:\n          throw assertNever(resolution);\n      }\n    },\n    load(id) {\n      if (id.startsWith(virtualPrefix)) {\n        let { pathname } = new URL(id, 'http://example.com');\n        let { src, watches } = virtualContent(pathname.slice(virtualPrefix.length + 1), resolverLoader.resolver);\n        virtualDeps.set(id, watches);\n        server?.watcher.add(watches);\n        return src;\n      }\n    },\n    buildEnd() {\n      this.emitFile({\n        type: 'asset',\n        fileName: '@embroider/core/test-support.js',\n        source: virtualContent(\n          resolve(resolverLoader.resolver.options.engines[0].root, '-embroider-test-support.js'),\n          resolverLoader.resolver\n        ).src,\n      });\n    },\n  };\n}\n"]}
+{"version":3,"file":"resolver.js","sourceRoot":"","sources":["resolver.ts"],"names":[],"mappings":";;;;;AASA,4BA6BC;AApCD,+BAA4B;AAE5B,0CAAsF;AACtF,uCAAwC;AACxC,uCAA+D;AAC/D,gEAAuC;AAEvC,SAAgB,QAAQ;IACtB,IAAI,eAAe,GAAoB,IAAA,uBAAY,EAAC,IAAA,WAAI,EAAC,IAAA,gCAAyB,EAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC;IACrH,IAAI,QAAQ,GAAG,IAAI,eAAQ,CAAC,eAAe,CAAC,CAAC;IAE7C,OAAO;QACL,IAAI,EAAE,oBAAoB;QAC1B,OAAO,EAAE,KAAK;QACd,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO;YACvC,IAAI,OAAO,GAAG,6BAAmB,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YACzE,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,sCAAsC;gBACtC,OAAO,IAAI,CAAC;YACd,CAAC;YACD,IAAI,UAAU,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;YACvE,QAAQ,UAAU,CAAC,IAAI,EAAE,CAAC;gBACxB,KAAK,OAAO;oBACV,OAAO,UAAU,CAAC,MAAM,CAAC;gBAC3B,KAAK,WAAW;oBACd,OAAO,IAAI,CAAC;gBACd;oBACE,MAAM,IAAA,sBAAW,EAAC,UAAU,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;QACD,IAAI,CAAC,EAAE;YACL,IAAI,EAAE,CAAC,UAAU,CAAC,uBAAa,CAAC,EAAE,CAAC;gBACjC,OAAO,IAAA,qBAAc,EAAC,EAAE,CAAC,KAAK,CAAC,uBAAa,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC;YAClE,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,OAAsB;IAC5C,OAAO,KAAK,EAAE,OAA4B,EAAE,EAAE;QAC5C,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YACtB,OAAO;gBACL,IAAI,EAAE,OAAO;gBACb,MAAM,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,SAAS,EAAE,UAAU,EAAE,OAAO,CAAC,QAAQ,EAAE;aAChE,CAAC;QACJ,CAAC;QACD,IAAI,MAAM,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,QAAQ,EAAE;YACtE,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE;gBACN,SAAS,EAAE;oBACT,IAAI,EAAE,OAAO,CAAC,IAAI;iBACnB;aACF;SACF,CAAC,CAAC;QACH,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QACnC,CAAC;aAAM,CAAC;YACN,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC;QAC/C,CAAC;IACH,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import type { PluginContext, ResolveIdResult } from 'rollup';\nimport type { Plugin } from 'vite';\nimport { join } from 'path';\nimport type { Resolution, ResolverFunction, ResolverOptions } from '@embroider/core';\nimport { Resolver, locateEmbroiderWorkingDir, virtualContent } from '@embroider/core';\nimport { readJSONSync } from 'fs-extra';\nimport { RollupModuleRequest, virtualPrefix } from './request';\nimport assertNever from 'assert-never';\n\nexport function resolver(): Plugin {\n  let resolverOptions: ResolverOptions = readJSONSync(join(locateEmbroiderWorkingDir(process.cwd()), 'resolver.json'));\n  let resolver = new Resolver(resolverOptions);\n\n  return {\n    name: 'embroider-resolver',\n    enforce: 'pre',\n    async resolveId(source, importer, options) {\n      let request = RollupModuleRequest.from(source, importer, options.custom);\n      if (!request) {\n        // fallthrough to other rollup plugins\n        return null;\n      }\n      let resolution = await resolver.resolve(request, defaultResolve(this));\n      switch (resolution.type) {\n        case 'found':\n          return resolution.result;\n        case 'not_found':\n          return null;\n        default:\n          throw assertNever(resolution);\n      }\n    },\n    load(id) {\n      if (id.startsWith(virtualPrefix)) {\n        return virtualContent(id.slice(virtualPrefix.length), resolver);\n      }\n    },\n  };\n}\n\nfunction defaultResolve(context: PluginContext): ResolverFunction<RollupModuleRequest, Resolution<ResolveIdResult>> {\n  return async (request: RollupModuleRequest) => {\n    if (request.isVirtual) {\n      return {\n        type: 'found',\n        result: { id: request.specifier, resolvedBy: request.fromFile },\n      };\n    }\n    let result = await context.resolve(request.specifier, request.fromFile, {\n      skipSelf: true,\n      custom: {\n        embroider: {\n          meta: request.meta,\n        },\n      },\n    });\n    if (result) {\n      return { type: 'found', result };\n    } else {\n      return { type: 'not_found', err: undefined };\n    }\n  };\n}\n"]}

package/src/scripts.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.scripts = void 0;
+exports.scripts = scripts;
 const jsdom_1 = require("jsdom");
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
@@ -65,22 +65,16 @@ function scripts(params) {
         },
     };
 }
-exports.scripts = scripts;
 class ScriptOptimizer {
     constructor(rootDir) {
         this.rootDir = rootDir;
         this.emitted = new Map();
     }
     async optimizedScript(script) {
-        let fullName = (0, path_1.resolve)(this.rootDir, script.slice(1));
-        if (!(0, fs_extra_1.existsSync)(fullName)) {
-            // in prod builds, test-support.js isn't going to exist (for example)
-            return [];
-        }
         // loading these lazily here so they never load in non-production builds.
         // The node cache will ensures we only load them once.
         const [Terser, srcURL] = await Promise.all([Promise.resolve().then(() => __importStar(require('terser'))), Promise.resolve().then(() => __importStar(require('source-map-url')))]);
-        let inCode = (0, fs_extra_1.readFileSync)(fullName, 'utf8');
+        let inCode = (0, fs_extra_1.readFileSync)((0, path_1.resolve)(this.rootDir, script.slice(1)), 'utf8');
         let terserOpts = {};
         let fileRelativeSourceMapURL;
         let appRelativeSourceMapURL;