@embroider/vite 0.2.1 → 0.2.2-unstable.aaeb674

package/src/esbuild-resolver.js

@@ -0,0 +1,150 @@
+import { transform } from '@babel/core';
+import core from '@embroider/core';
+const { ResolverLoader, virtualContent, needsSyntheticComponentJS, isInComponents } = core;
+import fs from 'fs-extra';
+const { readFileSync } = fs;
+import { EsBuildModuleRequest } from './esbuild-request.js';
+import { assertNever } from 'assert-never';
+import { hbsToJS } from '@embroider/core';
+import { Preprocessor } from 'content-tag';
+import { extname } from 'path';
+const templateOnlyComponent = `import templateOnly from '@ember/component/template-only';\n` + `export default templateOnly();\n`;
+export function esBuildResolver() {
+    let resolverLoader = new ResolverLoader(process.cwd());
+    let preprocessor = new Preprocessor();
+    function transformAndAssert(src, filename) {
+        const result = transform(src, { filename });
+        if (!result || result.code == null) {
+            throw new Error(`Failed to load file ${filename} in esbuild-hbs-loader`);
+        }
+        return result.code;
+    }
+    function onLoad({ path, namespace }) {
+        let src;
+        if (namespace === 'embroider-template-only-component') {
+            src = templateOnlyComponent;
+        }
+        else if (namespace === 'embroider-virtual') {
+            src = virtualContent(path, resolverLoader.resolver).src;
+        }
+        else {
+            src = readFileSync(path, 'utf8');
+        }
+        if (path.endsWith('.hbs')) {
+            src = hbsToJS(src);
+        }
+        else if (['.gjs', '.gts'].some(ext => path.endsWith(ext))) {
+            src = preprocessor.process(src, { filename: path });
+        }
+        if (['.hbs', '.gjs', '.gts', '.js', '.ts'].some(ext => path.endsWith(ext))) {
+            src = transformAndAssert(src, path);
+        }
+        return { contents: src };
+    }
+    return {
+        name: 'embroider-esbuild-resolver',
+        setup(build) {
+            const phase = detectPhase(build);
+            // Embroider Resolver
+            build.onResolve({ filter: /./ }, async ({ path, importer, pluginData, kind }) => {
+                let request = EsBuildModuleRequest.from(resolverLoader.resolver.packageCache, phase, build, kind, path, importer, pluginData);
+                if (!request) {
+                    return null;
+                }
+                let resolution = await resolverLoader.resolver.resolve(request);
+                switch (resolution.type) {
+                    case 'found':
+                    case 'ignored':
+                        return resolution.result;
+                    case 'not_found':
+                        return resolution.err;
+                    default:
+                        throw assertNever(resolution);
+                }
+            });
+            // template-only-component synthesis
+            build.onResolve({ filter: /./ }, async ({ path, importer, namespace, resolveDir, pluginData, kind }) => {
+                if (pluginData === null || pluginData === void 0 ? void 0 : pluginData.embroiderHBSResolving) {
+                    // reentrance
+                    return null;
+                }
+                let result = await build.resolve(path, {
+                    namespace,
+                    resolveDir,
+                    importer,
+                    kind,
+                    // avoid reentrance
+                    pluginData: { ...pluginData, embroiderHBSResolving: true },
+                });
+                if (result.errors.length === 0 && !result.external) {
+                    let syntheticPath = needsSyntheticComponentJS(path, result.path);
+                    if (syntheticPath && isInComponents(result.path, resolverLoader.resolver.packageCache)) {
+                        return { path: syntheticPath, namespace: 'embroider-template-only-component' };
+                    }
+                }
+                return result;
+            });
+            if (phase === 'bundling') {
+                // during bundling phase, we need to provide our own extension
+                // searching. We do it here in its own resolve plugin so that it's
+                // sitting beneath both embroider resolver and template-only-component
+                // synthesizer, since both expect the ambient system to have extension
+                // search.
+                build.onResolve({ filter: /./ }, async ({ path, importer, namespace, resolveDir, pluginData, kind }) => {
+                    if (pluginData === null || pluginData === void 0 ? void 0 : pluginData.embroiderExtensionResolving) {
+                        // reentrance
+                        return null;
+                    }
+                    let firstResult;
+                    for (let requestName of extensionSearch(path, resolverLoader.resolver.options.resolvableExtensions)) {
+                        let result = await build.resolve(requestName, {
+                            namespace,
+                            resolveDir,
+                            importer,
+                            kind,
+                            // avoid reentrance
+                            pluginData: { ...pluginData, embroiderExtensionResolving: true },
+                        });
+                        if (result.errors.length > 0) {
+                            // if extension search fails, we want to let the first failure be the
+                            // one that propagates, so that the error message makes sense.
+                            firstResult = result;
+                        }
+                        else {
+                            return result;
+                        }
+                    }
+                    return firstResult;
+                });
+            }
+            // we need to handle everything from one of our three special namespaces:
+            build.onLoad({ namespace: 'embroider-template-only-component', filter: /./ }, onLoad);
+            build.onLoad({ namespace: 'embroider-virtual', filter: /./ }, onLoad);
+            build.onLoad({ namespace: 'embroider-template-tag', filter: /./ }, onLoad);
+            // we need to handle all hbs
+            build.onLoad({ filter: /\.hbs$/ }, onLoad);
+            // we need to handle all GJS (to preprocess) and JS (to run macros)
+            build.onLoad({ filter: /\.g?[jt]s$/ }, onLoad);
+        },
+    };
+}
+function detectPhase(build) {
+    var _a;
+    let plugins = ((_a = build.initialOptions.plugins) !== null && _a !== void 0 ? _a : []).map(p => p.name);
+    if (plugins.includes('vite:dep-pre-bundle')) {
+        return 'bundling';
+    }
+    else {
+        return 'other';
+    }
+}
+function* extensionSearch(specifier, extensions) {
+    yield specifier;
+    // when there's no explicit extension, we may do extension search
+    if (extname(specifier) === '') {
+        for (let ext of extensions) {
+            yield specifier + ext;
+        }
+    }
+}
+//# sourceMappingURL=esbuild-resolver.js.map

package/src/esbuild-resolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"esbuild-resolver.js","sourceRoot":"","sources":["esbuild-resolver.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Plugin as EsBuildPlugin, OnLoadResult, PluginBuild, ResolveResult } from 'esbuild';\nimport { transform } from '@babel/core';\nimport core from '@embroider/core';\nconst { ResolverLoader, virtualContent, needsSyntheticComponentJS, isInComponents } = core;\nimport fs from 'fs-extra';\nconst { readFileSync } = fs;\nimport { EsBuildModuleRequest } from './esbuild-request.js';\nimport { assertNever } from 'assert-never';\nimport { hbsToJS } from '@embroider/core';\nimport { Preprocessor } from 'content-tag';\nimport { extname } from 'path';\n\nconst templateOnlyComponent =\n  `import templateOnly from '@ember/component/template-only';\\n` + `export default templateOnly();\\n`;\n\nexport function esBuildResolver(): EsBuildPlugin {\n  let resolverLoader = new ResolverLoader(process.cwd());\n  let preprocessor = new Preprocessor();\n\n  function transformAndAssert(src: string, filename: string): string {\n    const result = transform(src, { filename });\n    if (!result || result.code == null) {\n      throw new Error(`Failed to load file ${filename} in esbuild-hbs-loader`);\n    }\n    return result.code!;\n  }\n\n  function onLoad({ path, namespace }: { path: string; namespace: string }): OnLoadResult {\n    let src: string;\n    if (namespace === 'embroider-template-only-component') {\n      src = templateOnlyComponent;\n    } else if (namespace === 'embroider-virtual') {\n      src = virtualContent(path, resolverLoader.resolver).src;\n    } else {\n      src = readFileSync(path, 'utf8');\n    }\n    if (path.endsWith('.hbs')) {\n      src = hbsToJS(src);\n    } else if (['.gjs', '.gts'].some(ext => path.endsWith(ext))) {\n      src = preprocessor.process(src, { filename: path });\n    }\n    if (['.hbs', '.gjs', '.gts', '.js', '.ts'].some(ext => path.endsWith(ext))) {\n      src = transformAndAssert(src, path);\n    }\n    return { contents: src };\n  }\n\n  return {\n    name: 'embroider-esbuild-resolver',\n    setup(build) {\n      const phase = detectPhase(build);\n\n      // Embroider Resolver\n      build.onResolve({ filter: /./ }, async ({ path, importer, pluginData, kind }) => {\n        let request = EsBuildModuleRequest.from(\n          resolverLoader.resolver.packageCache,\n          phase,\n          build,\n          kind,\n          path,\n          importer,\n          pluginData\n        );\n        if (!request) {\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 resolution.err;\n          default:\n            throw assertNever(resolution);\n        }\n      });\n\n      // template-only-component synthesis\n      build.onResolve({ filter: /./ }, async ({ path, importer, namespace, resolveDir, pluginData, kind }) => {\n        if (pluginData?.embroiderHBSResolving) {\n          // reentrance\n          return null;\n        }\n\n        let result = await build.resolve(path, {\n          namespace,\n          resolveDir,\n          importer,\n          kind,\n          // avoid reentrance\n          pluginData: { ...pluginData, embroiderHBSResolving: true },\n        });\n\n        if (result.errors.length === 0 && !result.external) {\n          let syntheticPath = needsSyntheticComponentJS(path, result.path);\n          if (syntheticPath && isInComponents(result.path, resolverLoader.resolver.packageCache)) {\n            return { path: syntheticPath, namespace: 'embroider-template-only-component' };\n          }\n        }\n\n        return result;\n      });\n\n      if (phase === 'bundling') {\n        // during bundling phase, we need to provide our own extension\n        // searching. We do it here in its own resolve plugin so that it's\n        // sitting beneath both embroider resolver and template-only-component\n        // synthesizer, since both expect the ambient system to have extension\n        // search.\n        build.onResolve({ filter: /./ }, async ({ path, importer, namespace, resolveDir, pluginData, kind }) => {\n          if (pluginData?.embroiderExtensionResolving) {\n            // reentrance\n            return null;\n          }\n\n          let firstResult: ResolveResult | undefined;\n\n          for (let requestName of extensionSearch(path, resolverLoader.resolver.options.resolvableExtensions)) {\n            let result = await build.resolve(requestName, {\n              namespace,\n              resolveDir,\n              importer,\n              kind,\n              // avoid reentrance\n              pluginData: { ...pluginData, embroiderExtensionResolving: true },\n            });\n\n            if (result.errors.length > 0) {\n              // if extension search fails, we want to let the first failure be the\n              // one that propagates, so that the error message makes sense.\n              firstResult = result;\n            } else {\n              return result;\n            }\n          }\n\n          return firstResult;\n        });\n      }\n\n      // we need to handle everything from one of our three special namespaces:\n      build.onLoad({ namespace: 'embroider-template-only-component', filter: /./ }, onLoad);\n      build.onLoad({ namespace: 'embroider-virtual', filter: /./ }, onLoad);\n      build.onLoad({ namespace: 'embroider-template-tag', filter: /./ }, onLoad);\n\n      // we need to handle all hbs\n      build.onLoad({ filter: /\\.hbs$/ }, onLoad);\n\n      // we need to handle all GJS (to preprocess) and JS (to run macros)\n      build.onLoad({ filter: /\\.g?[jt]s$/ }, onLoad);\n    },\n  };\n}\n\nfunction detectPhase(build: PluginBuild): 'bundling' | 'other' {\n  let plugins = (build.initialOptions.plugins ?? []).map(p => p.name);\n  if (plugins.includes('vite:dep-pre-bundle')) {\n    return 'bundling';\n  } else {\n    return 'other';\n  }\n}\n\nfunction* extensionSearch(specifier: string, extensions: string[]): Generator<string> {\n  yield specifier;\n  // when there's no explicit extension, we may do extension search\n  if (extname(specifier) === '') {\n    for (let ext of extensions) {\n      yield specifier + ext;\n    }\n  }\n}\n"]}

package/src/hbs.js

@@ -1,56 +1,81 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-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');
-function hbs() {
+import { createFilter } from '@rollup/pluginutils';
+import { hbsToJS, ResolverLoader, needsSyntheticComponentJS, isInComponents, templateOnlyComponentSource, syntheticJStoHBS, } from '@embroider/core';
+const resolverLoader = new ResolverLoader(process.cwd());
+const hbsFilter = createFilter('**/*.hbs?([?]*)');
+export function hbs() {
     return {
         name: 'rollup-hbs-plugin',
         enforce: 'pre',
-        async resolveId(source, importer) {
+        async resolveId(source, importer, options) {
+            var _a, _b, _c;
+            if ((_a = options.custom) === null || _a === void 0 ? void 0 : _a.depScan) {
+                // during depscan we have a corresponding esbuild plugin that is
+                // responsible for this stuff instead. We don't want to fight with it.
+                return null;
+            }
+            if ((_c = (_b = options.custom) === null || _b === void 0 ? void 0 : _b.embroider) === null || _c === void 0 ? void 0 : _c.isExtensionSearch) {
+                return null;
+            }
             let resolution = await this.resolve(source, importer, {
                 skipSelf: true,
             });
             if (!resolution) {
-                return maybeSynthesizeComponentJS(this, source, importer);
+                // vite already has extension search fallback for extensionless imports.
+                // This is different, it covers an explicit .js import fallback to the
+                // corresponding hbs.
+                let hbsSource = syntheticJStoHBS(source);
+                if (hbsSource) {
+                    resolution = await this.resolve(hbsSource, importer, {
+                        skipSelf: true,
+                        custom: {
+                            embroider: {
+                                // we don't want to recurse into the whole embroider compatbility
+                                // resolver here. It has presumably already steered our request to the
+                                // correct place. All we want to do is slightly modify the request we
+                                // were given (changing the extension) and check if that would resolve
+                                // instead.
+                                //
+                                // 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 (!resolution) {
+                    return null;
+                }
             }
-            else {
-                return maybeRewriteHBS(resolution);
+            let syntheticId = needsSyntheticComponentJS(source, resolution.id);
+            if (syntheticId && isInComponents(resolution.id, resolverLoader.resolver.packageCache)) {
+                return {
+                    id: syntheticId,
+                    meta: {
+                        'rollup-hbs-plugin': {
+                            type: 'template-only-component-js',
+                        },
+                    },
+                };
             }
+            return resolution;
         },
         load(id) {
-            const meta = getMeta(this, id);
-            if (!meta) {
-                return;
+            var _a;
+            if (((_a = getMeta(this, id)) === null || _a === void 0 ? void 0 : _a.type) === 'template-only-component-js') {
+                return {
+                    code: templateOnlyComponentSource(),
+                };
             }
-            switch (meta.type) {
-                case 'template':
-                    let input = (0, fs_1.readFileSync)(id, 'utf8');
-                    let code = (0, core_1.hbsToJS)(input);
-                    return {
-                        code,
-                    };
-                case 'template-only-component-js':
-                    return {
-                        code: templateOnlyComponent,
-                    };
-                default:
-                    (0, assert_never_1.default)(meta);
+        },
+        transform(code, id) {
+            if (!hbsFilter(id)) {
+                return null;
             }
+            return hbsToJS(code);
         },
     };
 }
-const templateOnlyComponent = `import templateOnly from '@ember/component/template-only';\n` + `export default templateOnly();\n`;
 function getMeta(context, id) {
     var _a, _b;
     const meta = (_b = (_a = context.getModuleInfo(id)) === null || _a === void 0 ? void 0 : _a.meta) === null || _b === void 0 ? void 0 : _b['rollup-hbs-plugin'];
@@ -61,56 +86,4 @@ function getMeta(context, id) {
         return null;
     }
 }
-function correspondingTemplate(filename) {
-    let { ext } = (0, path_1.parse)(filename);
-    return filename.slice(0, filename.length - ext.length) + '.hbs';
-}
-async function maybeSynthesizeComponentJS(context, source, importer) {
-    debug(`checking for template-only component: %s`, source);
-    let templateResolution = await context.resolve(correspondingTemplate(source), importer, {
-        skipSelf: true,
-        custom: {
-            embroider: {
-                // we don't want to recurse into the whole embroider compatbility
-                // resolver here. It has presumably already steered our request to the
-                // correct place. All we want to do is slightly modify the request we
-                // were given (changing the extension) and check if that would resolve
-                // instead.
-                //
-                // Currently this guard is only actually exercised in rollup, not in
-                // vite, due to https://github.com/vitejs/vite/issues/13852
-                enableCustomResolver: false,
-            },
-        },
-    });
-    if (!templateResolution) {
-        return null;
-    }
-    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.
-    return {
-        id: templateResolution.id.replace(/\.hbs$/, '.js'),
-        meta: {
-            'rollup-hbs-plugin': {
-                type: 'template-only-component-js',
-            },
-        },
-    };
-}
-const hbsFilter = (0, pluginutils_1.createFilter)('**/*.hbs');
-function maybeRewriteHBS(resolution) {
-    if (!hbsFilter(resolution.id)) {
-        return null;
-    }
-    debug('emitting hbs rewrite: %s', resolution.id);
-    return {
-        ...resolution,
-        meta: {
-            'rollup-hbs-plugin': {
-                type: 'template',
-            },
-        },
-    };
-}
 //# sourceMappingURL=hbs.js.map

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 { 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"]}
+{"version":3,"file":"hbs.js","sourceRoot":"","sources":["hbs.ts"],"names":[],"mappings":"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","sourcesContent":["import { createFilter } from '@rollup/pluginutils';\nimport type { PluginContext } from 'rollup';\nimport type { Plugin } from 'vite';\nimport {\n  hbsToJS,\n  ResolverLoader,\n  needsSyntheticComponentJS,\n  isInComponents,\n  templateOnlyComponentSource,\n  syntheticJStoHBS,\n} from '@embroider/core';\n\nconst resolverLoader = new ResolverLoader(process.cwd());\nconst hbsFilter = createFilter('**/*.hbs?([?]*)');\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?.depScan) {\n        // during depscan we have a corresponding esbuild plugin that is\n        // responsible for this stuff instead. We don't want to fight with it.\n        return null;\n      }\n\n      if (options.custom?.embroider?.isExtensionSearch) {\n        return null;\n      }\n\n      let resolution = await this.resolve(source, importer, {\n        skipSelf: true,\n      });\n\n      if (!resolution) {\n        // vite already has extension search fallback for extensionless imports.\n        // This is different, it covers an explicit .js import fallback to the\n        // corresponding hbs.\n        let hbsSource = syntheticJStoHBS(source);\n        if (hbsSource) {\n          resolution = await this.resolve(hbsSource, 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        }\n\n        if (!resolution) {\n          return null;\n        }\n      }\n\n      let syntheticId = needsSyntheticComponentJS(source, resolution.id);\n      if (syntheticId && isInComponents(resolution.id, resolverLoader.resolver.packageCache)) {\n        return {\n          id: syntheticId,\n          meta: {\n            'rollup-hbs-plugin': {\n              type: 'template-only-component-js',\n            },\n          },\n        };\n      }\n\n      return resolution;\n    },\n\n    load(id: string) {\n      if (getMeta(this, id)?.type === 'template-only-component-js') {\n        return {\n          code: templateOnlyComponentSource(),\n        };\n      }\n    },\n\n    transform(code: string, id: string) {\n      if (!hbsFilter(id)) {\n        return null;\n      }\n      return hbsToJS(code);\n    },\n  };\n}\n\ntype Meta = {\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"]}

package/src/optimize-deps.js

@@ -1,9 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.optimizeDeps = optimizeDeps;
-function optimizeDeps() {
+import { esBuildResolver } from './esbuild-resolver.js';
+export function optimizeDeps() {
     return {
         exclude: ['@embroider/macros'],
+        extensions: ['.hbs', '.gjs', '.gts'],
+        esbuildOptions: {
+            plugins: [esBuildResolver()],
+        },
     };
 }
 //# 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":";;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"]}
+{"version":3,"file":"optimize-deps.js","sourceRoot":"","sources":["optimize-deps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAOxD,MAAM,UAAU,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,eAAe,EAAE,CAAC;SAC7B;KACF,CAAC;AACJ,CAAC","sourcesContent":["import { esBuildResolver } from './esbuild-resolver.js';\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"]}

package/src/request.d.ts

@@ -1,14 +1,26 @@
-import type { ModuleRequest } from '@embroider/core';
+import type { ModuleRequest, Resolution } from '@embroider/core';
+import type { PluginContext, ResolveIdResult } from 'rollup';
 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;
-    static from(source: string, importer: string | undefined, custom: Record<string, any> | undefined): RollupModuleRequest | 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;
     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

@@ -1,52 +1,108 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RollupModuleRequest = exports.virtualPrefix = void 0;
-const core_1 = require("@embroider/core");
-exports.virtualPrefix = 'embroider_virtual:';
-class RollupModuleRequest {
-    static from(source, importer, custom) {
+import core from '@embroider/core';
+const { cleanUrl, getUrlQueryParams } = core;
+export const virtualPrefix = 'embroider_virtual:';
+export class RollupModuleRequest {
+    static from(context, 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 (source && importer && source[0] !== '\0') {
             let nonVirtual;
-            if (importer.startsWith(exports.virtualPrefix)) {
-                nonVirtual = importer.slice(exports.virtualPrefix.length);
+            if (importer.startsWith(virtualPrefix)) {
+                nonVirtual = importer.slice(virtualPrefix.length);
             }
             else {
                 nonVirtual = importer;
             }
             // strip query params off the importer
-            let fromFile = (0, core_1.cleanUrl)(nonVirtual);
-            return new RollupModuleRequest(source, fromFile, (_c = custom === null || custom === void 0 ? void 0 : custom.embroider) === null || _c === void 0 ? void 0 : _c.meta);
+            let fromFile = cleanUrl(nonVirtual);
+            let importerQueryParams = 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 = cleanUrl(source);
+            let queryParams = getUrlQueryParams(source);
+            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);
         }
     }
-    constructor(specifier, fromFile, meta) {
+    constructor(context, specifier, fromFile, meta, isNotFound, resolvedTo, queryParams, importerQueryParams) {
+        this.context = context;
         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);
+        return this.specifier.startsWith(virtualPrefix);
+    }
+    get specifierWithQueryParams() {
+        return `${this.specifier}${this.queryParams}`;
+    }
+    get fromFileWithQueryParams() {
+        return `${this.fromFile}${this.importerQueryParams}`;
     }
     alias(newSpecifier) {
-        return new RollupModuleRequest(newSpecifier, this.fromFile, this.meta);
+        return new RollupModuleRequest(this.context, newSpecifier, this.fromFile, this.meta, false, undefined, this.queryParams, this.importerQueryParams);
     }
     rehome(newFromFile) {
         if (this.fromFile === newFromFile) {
             return this;
         }
         else {
-            return new RollupModuleRequest(this.specifier, newFromFile, this.meta);
+            return new RollupModuleRequest(this.context, this.specifier, newFromFile, this.meta, false, undefined, this.queryParams, this.importerQueryParams);
         }
     }
     virtualize(filename) {
-        return new RollupModuleRequest(exports.virtualPrefix + filename, this.fromFile, this.meta);
+        return new RollupModuleRequest(this.context, virtualPrefix + filename, this.fromFile, this.meta, false, undefined, this.queryParams, this.importerQueryParams);
     }
     withMeta(meta) {
-        return new RollupModuleRequest(this.specifier, this.fromFile, 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);
     }
 }
-exports.RollupModuleRequest = RollupModuleRequest;
 //# sourceMappingURL=request.js.map

package/src/request.js.map

@@ -1 +1 @@
-{"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"]}
+{"version":3,"file":"request.js","sourceRoot":"","sources":["request.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ModuleRequest, Resolution } from '@embroider/core';\nimport core from '@embroider/core';\nconst { cleanUrl, getUrlQueryParams } = 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 (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);\n      let queryParams = getUrlQueryParams(source);\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"]}