@embroider/vite 0.2.1-unstable.6c2f482 → 0.2.1-unstable.6d64eff

package/index.d.ts

@@ -1,6 +1,7 @@
 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';

package/index.mjs

@@ -1,6 +1,7 @@
 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';

package/package.json

@@ -1,26 +1,30 @@
 {
   "name": "@embroider/vite",
-  "version": "0.2.1-unstable.6c2f482",
+  "version": "0.2.1-unstable.6d64eff",
   "main": "index.mjs",
   "peerDependencies": {
-    "@embroider/core": "3.4.1-unstable.6c2f482",
-    "vite": "^4.3.9"
+    "@embroider/core": "3.4.6-unstable.6d64eff",
+    "vite": "^4.3.9 || ^5.0.0"
   },
   "scripts": {
     "test": "jest"
   },
   "dependencies": {
+    "@babel/core": "^7.22.9",
+    "@embroider/macros": "1.14.1-unstable.6d64eff",
     "@rollup/pluginutils": "^4.1.1",
     "assert-never": "^1.2.1",
-    "content-tag": "^1.1.2",
+    "content-tag": "^2.0.1",
     "debug": "^4.3.2",
+    "esbuild": "^0.17.19",
     "fs-extra": "^10.0.0",
     "jsdom": "^16.6.0",
     "source-map-url": "^0.4.1",
     "terser": "^5.7.0"
   },
   "devDependencies": {
-    "@embroider/core": "3.4.1-unstable.6c2f482",
+    "@embroider/core": "3.4.6-unstable.6d64eff",
+    "@types/babel__core": "^7.20.1",
     "@types/debug": "^4.1.5",
     "@types/jsdom": "^16.2.11",
     "@types/fs-extra": "^9.0.12",

package/src/build.d.ts

@@ -0,0 +1,3 @@
+import type { Plugin } from 'vite';
+export declare function emberBuild(mode: string): Promise<void>;
+export declare function compatPrebuild(): Plugin;

package/src/build.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compatPrebuild = exports.emberBuild = void 0;
+const child_process_1 = require("child_process");
+function emberBuild(mode) {
+    if (mode === 'build') {
+        return new Promise((resolve, reject) => {
+            const child = (0, child_process_1.fork)('./node_modules/ember-cli/bin/ember', ['build', '--production']);
+            child.on('exit', code => (code === 0 ? resolve() : reject()));
+        });
+    }
+    return new Promise((resolve, reject) => {
+        const child = (0, child_process_1.fork)('./node_modules/ember-cli/bin/ember', ['build', '--watch'], { silent: true });
+        child.on('exit', code => (code === 0 ? resolve() : reject(new Error('ember build --watch failed'))));
+        child.on('spawn', () => {
+            var _a;
+            (_a = child.stderr) === null || _a === void 0 ? void 0 : _a.on('data', data => {
+                console.error(data.toString());
+            });
+            child.stdout.on('data', data => {
+                console.log(data.toString());
+                if (data.toString().includes('Build successful')) {
+                    resolve();
+                }
+            });
+        });
+    });
+}
+exports.emberBuild = emberBuild;
+function compatPrebuild() {
+    let mode = 'build';
+    return {
+        name: 'embroider-builder',
+        enforce: 'pre',
+        configureServer() {
+            mode = 'development';
+        },
+        async buildStart() {
+            await emberBuild(mode);
+        },
+    };
+}
+exports.compatPrebuild = compatPrebuild;
+//# sourceMappingURL=build.js.map

package/src/build.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"build.js","sourceRoot":"","sources":["build.ts"],"names":[],"mappings":";;;AAAA,iDAAqC;AAGrC,SAAgB,UAAU,CAAC,IAAY;IACrC,IAAI,IAAI,KAAK,OAAO,EAAE;QACpB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,KAAK,GAAG,IAAA,oBAAI,EAAC,oCAAoC,EAAE,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;YACpF,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;KACJ;IACD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,KAAK,GAAG,IAAA,oBAAI,EAAC,oCAAoC,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QACjG,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC,CAAC,CAAC,CAAC;QACrG,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;;YACrB,MAAA,KAAK,CAAC,MAAM,0CAAE,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE;gBAC9B,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YACjC,CAAC,CAAC,CAAC;YACH,KAAK,CAAC,MAAO,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE;gBAC9B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC7B,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE;oBAChD,OAAO,EAAE,CAAC;iBACX;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAtBD,gCAsBC;AAED,SAAgB,cAAc;IAC5B,IAAI,IAAI,GAAG,OAAO,CAAC;IACnB,OAAO;QACL,IAAI,EAAE,mBAAmB;QACzB,OAAO,EAAE,KAAK;QACd,eAAe;YACb,IAAI,GAAG,aAAa,CAAC;QACvB,CAAC;QACD,KAAK,CAAC,UAAU;YACd,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;KACF,CAAC;AACJ,CAAC;AAZD,wCAYC","sourcesContent":["import { fork } from 'child_process';\nimport type { Plugin } from 'vite';\n\nexport function emberBuild(mode: string): Promise<void> {\n  if (mode === 'build') {\n    return new Promise((resolve, reject) => {\n      const child = fork('./node_modules/ember-cli/bin/ember', ['build', '--production']);\n      child.on('exit', code => (code === 0 ? resolve() : reject()));\n    });\n  }\n  return new Promise((resolve, reject) => {\n    const child = fork('./node_modules/ember-cli/bin/ember', ['build', '--watch'], { silent: true });\n    child.on('exit', code => (code === 0 ? resolve() : reject(new Error('ember build --watch failed'))));\n    child.on('spawn', () => {\n      child.stderr?.on('data', data => {\n        console.error(data.toString());\n      });\n      child.stdout!.on('data', data => {\n        console.log(data.toString());\n        if (data.toString().includes('Build successful')) {\n          resolve();\n        }\n      });\n    });\n  });\n}\n\nexport function compatPrebuild(): Plugin {\n  let mode = 'build';\n  return {\n    name: 'embroider-builder',\n    enforce: 'pre',\n    configureServer() {\n      mode = 'development';\n    },\n    async buildStart() {\n      await emberBuild(mode);\n    },\n  };\n}\n"]}

package/src/esbuild-request.d.ts

@@ -0,0 +1,23 @@
+import { type ModuleRequest } from '@embroider/core';
+import type { ImportKind, OnResolveResult, PluginBuild } from 'esbuild';
+import type { Resolution } from '@embroider/core';
+export declare class EsBuildModuleRequest implements ModuleRequest {
+    private context;
+    private kind;
+    readonly specifier: string;
+    readonly fromFile: string;
+    readonly meta: Record<string, any> | undefined;
+    readonly isVirtual: boolean;
+    readonly isNotFound: boolean;
+    readonly resolvedTo: Resolution<OnResolveResult, OnResolveResult> | undefined;
+    static from(context: PluginBuild, kind: ImportKind, source: string, importer: string | undefined, pluginData: Record<string, any> | undefined): EsBuildModuleRequest | undefined;
+    private constructor();
+    get debugType(): string;
+    alias(newSpecifier: string): this;
+    rehome(newFromFile: string): this;
+    virtualize(filename: string): this;
+    withMeta(meta: Record<string, any> | undefined): this;
+    notFound(): this;
+    resolveTo(resolution: Resolution<OnResolveResult, OnResolveResult>): this;
+    defaultResolve(): Promise<Resolution<OnResolveResult, OnResolveResult>>;
+}

package/src/esbuild-request.js

@@ -0,0 +1,95 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EsBuildModuleRequest = void 0;
+const core_1 = require("@embroider/core");
+const path_1 = require("path");
+class EsBuildModuleRequest {
+    static from(context, kind, source, importer, pluginData) {
+        var _a, _b, _c;
+        if (!((_b = (_a = pluginData === null || pluginData === void 0 ? void 0 : pluginData.embroider) === null || _a === void 0 ? void 0 : _a.enableCustomResolver) !== null && _b !== void 0 ? _b : true)) {
+            return;
+        }
+        if (source && importer && source[0] !== '\0') {
+            let fromFile = (0, core_1.cleanUrl)(importer);
+            return new EsBuildModuleRequest(context, kind, source, fromFile, (_c = pluginData === null || pluginData === void 0 ? void 0 : pluginData.embroider) === null || _c === void 0 ? void 0 : _c.meta, false, false, undefined);
+        }
+    }
+    constructor(context, kind, specifier, fromFile, meta, isVirtual, isNotFound, resolvedTo) {
+        this.context = context;
+        this.kind = kind;
+        this.specifier = specifier;
+        this.fromFile = fromFile;
+        this.meta = meta;
+        this.isVirtual = isVirtual;
+        this.isNotFound = isNotFound;
+        this.resolvedTo = resolvedTo;
+    }
+    get debugType() {
+        return 'esbuild';
+    }
+    alias(newSpecifier) {
+        return new EsBuildModuleRequest(this.context, this.kind, newSpecifier, this.fromFile, this.meta, this.isVirtual, false, undefined);
+    }
+    rehome(newFromFile) {
+        if (this.fromFile === newFromFile) {
+            return this;
+        }
+        else {
+            return new EsBuildModuleRequest(this.context, this.kind, this.specifier, newFromFile, this.meta, this.isVirtual, false, undefined);
+        }
+    }
+    virtualize(filename) {
+        return new EsBuildModuleRequest(this.context, this.kind, filename, this.fromFile, this.meta, true, false, undefined);
+    }
+    withMeta(meta) {
+        return new EsBuildModuleRequest(this.context, this.kind, this.specifier, this.fromFile, meta, this.isVirtual, this.isNotFound, this.resolvedTo);
+    }
+    notFound() {
+        return new EsBuildModuleRequest(this.context, this.kind, this.specifier, this.fromFile, this.meta, this.isVirtual, true, undefined);
+    }
+    resolveTo(resolution) {
+        return new EsBuildModuleRequest(this.context, this.kind, this.specifier, this.fromFile, this.meta, this.isVirtual, this.isNotFound, resolution);
+    }
+    async defaultResolve() {
+        const request = this;
+        if (request.isVirtual) {
+            return {
+                type: 'found',
+                filename: request.specifier,
+                result: { path: request.specifier, namespace: 'embroider' },
+                isVirtual: this.isVirtual,
+            };
+        }
+        if (request.isNotFound) {
+            // todo: make sure this looks correct to users
+            return {
+                type: 'not_found',
+                err: {
+                    errors: [{ text: `module not found ${request.specifier}` }],
+                },
+            };
+        }
+        let result = await this.context.resolve(request.specifier, {
+            importer: request.fromFile,
+            resolveDir: (0, path_1.dirname)(request.fromFile),
+            kind: this.kind,
+            pluginData: {
+                embroider: {
+                    enableCustomResolver: false,
+                    meta: request.meta,
+                },
+            },
+        });
+        if (result.errors.length > 0) {
+            return { type: 'not_found', err: result };
+        }
+        else if (result.external) {
+            return { type: 'ignored', result };
+        }
+        else {
+            return { type: 'found', filename: result.path, result, isVirtual: this.isVirtual };
+        }
+    }
+}
+exports.EsBuildModuleRequest = EsBuildModuleRequest;
+//# sourceMappingURL=esbuild-request.js.map

package/src/esbuild-request.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"esbuild-request.js","sourceRoot":"","sources":["esbuild-request.ts"],"names":[],"mappings":"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","sourcesContent":["import { type ModuleRequest, cleanUrl } from '@embroider/core';\nimport type { ImportKind, OnResolveResult, PluginBuild } from 'esbuild';\nimport { dirname } from 'path';\n\nimport type { Resolution } from '@embroider/core';\n\nexport class EsBuildModuleRequest implements ModuleRequest {\n  static from(\n    context: PluginBuild,\n    kind: ImportKind,\n    source: string,\n    importer: string | undefined,\n    pluginData: Record<string, any> | undefined\n  ): EsBuildModuleRequest | undefined {\n    if (!(pluginData?.embroider?.enableCustomResolver ?? true)) {\n      return;\n    }\n\n    if (source && importer && source[0] !== '\\0') {\n      let fromFile = cleanUrl(importer);\n      return new EsBuildModuleRequest(\n        context,\n        kind,\n        source,\n        fromFile,\n        pluginData?.embroider?.meta,\n        false,\n        false,\n        undefined\n      );\n    }\n  }\n\n  private constructor(\n    private context: PluginBuild,\n    private kind: ImportKind,\n    readonly specifier: string,\n    readonly fromFile: string,\n    readonly meta: Record<string, any> | undefined,\n    readonly isVirtual: boolean,\n    readonly isNotFound: boolean,\n    readonly resolvedTo: Resolution<OnResolveResult, OnResolveResult> | undefined\n  ) {}\n\n  get debugType() {\n    return 'esbuild';\n  }\n\n  alias(newSpecifier: string) {\n    return new EsBuildModuleRequest(\n      this.context,\n      this.kind,\n      newSpecifier,\n      this.fromFile,\n      this.meta,\n      this.isVirtual,\n      false,\n      undefined\n    ) as this;\n  }\n  rehome(newFromFile: string) {\n    if (this.fromFile === newFromFile) {\n      return this;\n    } else {\n      return new EsBuildModuleRequest(\n        this.context,\n        this.kind,\n        this.specifier,\n        newFromFile,\n        this.meta,\n        this.isVirtual,\n        false,\n        undefined\n      ) as this;\n    }\n  }\n  virtualize(filename: string) {\n    return new EsBuildModuleRequest(\n      this.context,\n      this.kind,\n      filename,\n      this.fromFile,\n      this.meta,\n      true,\n      false,\n      undefined\n    ) as this;\n  }\n  withMeta(meta: Record<string, any> | undefined): this {\n    return new EsBuildModuleRequest(\n      this.context,\n      this.kind,\n      this.specifier,\n      this.fromFile,\n      meta,\n      this.isVirtual,\n      this.isNotFound,\n      this.resolvedTo\n    ) as this;\n  }\n  notFound(): this {\n    return new EsBuildModuleRequest(\n      this.context,\n      this.kind,\n      this.specifier,\n      this.fromFile,\n      this.meta,\n      this.isVirtual,\n      true,\n      undefined\n    ) as this;\n  }\n\n  resolveTo(resolution: Resolution<OnResolveResult, OnResolveResult>): this {\n    return new EsBuildModuleRequest(\n      this.context,\n      this.kind,\n      this.specifier,\n      this.fromFile,\n      this.meta,\n      this.isVirtual,\n      this.isNotFound,\n      resolution\n    ) as this;\n  }\n\n  async defaultResolve(): Promise<Resolution<OnResolveResult, OnResolveResult>> {\n    const request = this;\n    if (request.isVirtual) {\n      return {\n        type: 'found',\n        filename: request.specifier,\n        result: { path: request.specifier, namespace: 'embroider' },\n        isVirtual: this.isVirtual,\n      };\n    }\n    if (request.isNotFound) {\n      // todo: make sure this looks correct to users\n      return {\n        type: 'not_found',\n        err: {\n          errors: [{ text: `module not found ${request.specifier}` }],\n        },\n      };\n    }\n\n    let result = await this.context.resolve(request.specifier, {\n      importer: request.fromFile,\n      resolveDir: dirname(request.fromFile),\n      kind: this.kind,\n      pluginData: {\n        embroider: {\n          enableCustomResolver: false,\n          meta: request.meta,\n        },\n      },\n    });\n    if (result.errors.length > 0) {\n      return { type: 'not_found', err: result };\n    } else if (result.external) {\n      return { type: 'ignored', result };\n    } else {\n      return { type: 'found', filename: result.path, result, isVirtual: this.isVirtual };\n    }\n  }\n}\n"]}

package/src/esbuild-resolver.d.ts

@@ -0,0 +1,2 @@
+import type { Plugin as EsBuildPlugin } from 'esbuild';
+export declare function esBuildResolver(root?: string): EsBuildPlugin;

package/src/esbuild-resolver.js

@@ -0,0 +1,118 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.esBuildResolver = void 0;
+const core_1 = require("@babel/core");
+const core_2 = require("@embroider/core");
+const fs_extra_1 = require("fs-extra");
+const esbuild_request_1 = require("./esbuild-request");
+const assert_never_1 = __importDefault(require("assert-never"));
+const path_1 = require("path");
+const core_3 = require("@embroider/core");
+const content_tag_1 = require("content-tag");
+function* candidates(path) {
+    yield path;
+    yield path + '.hbs';
+    yield path + '.gjs';
+    yield path + '.gts';
+}
+function esBuildResolver(root = process.cwd()) {
+    let resolverLoader = new core_2.ResolverLoader(process.cwd());
+    let macrosConfig;
+    let preprocessor = new content_tag_1.Preprocessor();
+    return {
+        name: 'embroider-esbuild-resolver',
+        setup(build) {
+            // This resolver plugin is designed to test candidates for extensions and interoperates with our other embroider specific plugin
+            build.onResolve({ filter: /./ }, async ({ path, importer, namespace, resolveDir, pluginData, kind }) => {
+                if (pluginData === null || pluginData === void 0 ? void 0 : pluginData.embroiderExtensionSearch) {
+                    return null;
+                }
+                let firstFailure;
+                for (let candidate of candidates(path)) {
+                    let result = await build.resolve(candidate, {
+                        namespace,
+                        resolveDir,
+                        importer,
+                        kind,
+                        pluginData: { ...pluginData, embroiderExtensionSearch: true },
+                    });
+                    if (result.errors.length === 0) {
+                        return result;
+                    }
+                    if (!firstFailure) {
+                        firstFailure = result;
+                    }
+                }
+                return firstFailure;
+            });
+            build.onResolve({ filter: /./ }, async ({ path, importer, pluginData, kind }) => {
+                let request = esbuild_request_1.EsBuildModuleRequest.from(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 (0, assert_never_1.default)(resolution);
+                }
+            });
+            build.onLoad({ namespace: 'embroider', filter: /./ }, ({ path }) => {
+                let { src } = (0, core_2.virtualContent)(path, resolverLoader.resolver);
+                if (!macrosConfig) {
+                    macrosConfig = (0, fs_extra_1.readJSONSync)((0, path_1.resolve)((0, core_2.locateEmbroiderWorkingDir)(root), 'rewritten-app', 'macros-config.json'));
+                }
+                return { contents: runMacros(src, path, macrosConfig) };
+            });
+            build.onLoad({ filter: /\.g[jt]s$/ }, async ({ path: filename }) => {
+                const code = (0, fs_extra_1.readFileSync)(filename, 'utf8');
+                const result = (0, core_1.transform)(preprocessor.process(code, { filename }), {
+                    configFile: (0, path_1.join)(process.cwd(), 'babel.config.js'),
+                    filename,
+                });
+                if (!result || !result.code) {
+                    throw new Error(`Failed to load file ${filename} in esbuild-hbs-loader`);
+                }
+                const contents = result.code;
+                return { contents };
+            });
+            build.onLoad({ filter: /\.hbs$/ }, async ({ path: filename }) => {
+                const code = (0, fs_extra_1.readFileSync)(filename, 'utf8');
+                const result = (0, core_1.transform)((0, core_3.hbsToJS)(code), { configFile: (0, path_1.join)(process.cwd(), 'babel.config.js'), filename });
+                if (!result || !result.code) {
+                    throw new Error(`Failed to load file ${filename} in esbuild-hbs-loader`);
+                }
+                const contents = result.code;
+                return { contents };
+            });
+            build.onLoad({ filter: /\.[jt]s$/ }, ({ path, namespace }) => {
+                let src;
+                if (namespace === 'embroider') {
+                    src = (0, core_2.virtualContent)(path, resolverLoader.resolver).src;
+                }
+                else {
+                    src = (0, fs_extra_1.readFileSync)(path, 'utf8');
+                }
+                if (!macrosConfig) {
+                    macrosConfig = (0, fs_extra_1.readJSONSync)((0, path_1.resolve)((0, core_2.locateEmbroiderWorkingDir)(root), 'rewritten-app', 'macros-config.json'));
+                }
+                return { contents: runMacros(src, path, macrosConfig) };
+            });
+        },
+    };
+}
+exports.esBuildResolver = esBuildResolver;
+function runMacros(src, filename, macrosConfig) {
+    return (0, core_1.transform)(src, {
+        filename,
+        plugins: [macrosConfig],
+    }).code;
+}
+//# 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 } from 'esbuild';\nimport { type PluginItem, transform } from '@babel/core';\nimport { ResolverLoader, virtualContent, locateEmbroiderWorkingDir } from '@embroider/core';\nimport { readFileSync, readJSONSync } from 'fs-extra';\nimport { EsBuildModuleRequest } from './esbuild-request';\nimport assertNever from 'assert-never';\nimport { resolve, join } from 'path';\nimport { hbsToJS } from '@embroider/core';\nimport { Preprocessor } from 'content-tag';\n\nfunction* candidates(path: string) {\n  yield path;\n  yield path + '.hbs';\n  yield path + '.gjs';\n  yield path + '.gts';\n}\n\nexport function esBuildResolver(root = process.cwd()): EsBuildPlugin {\n  let resolverLoader = new ResolverLoader(process.cwd());\n  let macrosConfig: PluginItem | undefined;\n  let preprocessor = new Preprocessor();\n\n  return {\n    name: 'embroider-esbuild-resolver',\n    setup(build) {\n      // This resolver plugin is designed to test candidates for extensions and interoperates with our other embroider specific plugin\n      build.onResolve({ filter: /./ }, async ({ path, importer, namespace, resolveDir, pluginData, kind }) => {\n        if (pluginData?.embroiderExtensionSearch) {\n          return null;\n        }\n\n        let firstFailure;\n\n        for (let candidate of candidates(path)) {\n          let result = await build.resolve(candidate, {\n            namespace,\n            resolveDir,\n            importer,\n            kind,\n            pluginData: { ...pluginData, embroiderExtensionSearch: true },\n          });\n\n          if (result.errors.length === 0) {\n            return result;\n          }\n\n          if (!firstFailure) {\n            firstFailure = result;\n          }\n        }\n\n        return firstFailure;\n      });\n      build.onResolve({ filter: /./ }, async ({ path, importer, pluginData, kind }) => {\n        let request = EsBuildModuleRequest.from(build, kind, path, importer, pluginData);\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      build.onLoad({ namespace: 'embroider', filter: /./ }, ({ path }) => {\n        let { src } = virtualContent(path, resolverLoader.resolver);\n        if (!macrosConfig) {\n          macrosConfig = readJSONSync(\n            resolve(locateEmbroiderWorkingDir(root), 'rewritten-app', 'macros-config.json')\n          ) as PluginItem;\n        }\n        return { contents: runMacros(src, path, macrosConfig) };\n      });\n\n      build.onLoad({ filter: /\\.g[jt]s$/ }, async ({ path: filename }) => {\n        const code = readFileSync(filename, 'utf8');\n\n        const result = transform(preprocessor.process(code, { filename }), {\n          configFile: join(process.cwd(), 'babel.config.js'),\n          filename,\n        });\n\n        if (!result || !result.code) {\n          throw new Error(`Failed to load file ${filename} in esbuild-hbs-loader`);\n        }\n\n        const contents = result.code;\n\n        return { contents };\n      });\n\n      build.onLoad({ filter: /\\.hbs$/ }, async ({ path: filename }) => {\n        const code = readFileSync(filename, 'utf8');\n\n        const result = transform(hbsToJS(code), { configFile: join(process.cwd(), 'babel.config.js'), filename });\n\n        if (!result || !result.code) {\n          throw new Error(`Failed to load file ${filename} in esbuild-hbs-loader`);\n        }\n\n        const contents = result.code;\n\n        return { contents };\n      });\n\n      build.onLoad({ filter: /\\.[jt]s$/ }, ({ path, namespace }) => {\n        let src: string;\n        if (namespace === 'embroider') {\n          src = virtualContent(path, resolverLoader.resolver).src;\n        } else {\n          src = readFileSync(path, 'utf8');\n        }\n        if (!macrosConfig) {\n          macrosConfig = readJSONSync(\n            resolve(locateEmbroiderWorkingDir(root), 'rewritten-app', 'macros-config.json')\n          ) as PluginItem;\n        }\n        return { contents: runMacros(src, path, macrosConfig) };\n      });\n    },\n  };\n}\n\nfunction runMacros(src: string, filename: string, macrosConfig: PluginItem): string {\n  return transform(src, {\n    filename,\n    plugins: [macrosConfig],\n  })!.code!;\n}\n"]}

package/src/hbs.js

@@ -7,7 +7,6 @@ exports.hbs = void 0;
 // 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");
@@ -17,7 +16,11 @@ function hbs() {
     return {
         name: 'rollup-hbs-plugin',
         enforce: 'pre',
-        async resolveId(source, importer) {
+        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;
+            }
             let resolution = await this.resolve(source, importer, {
                 skipSelf: true,
             });
@@ -28,15 +31,14 @@ function hbs() {
                 return maybeRewriteHBS(resolution);
             }
         },
-        load(id) {
+        transform(source, id) {
             const meta = getMeta(this, id);
             if (!meta) {
                 return;
             }
             switch (meta.type) {
                 case 'template':
-                    let input = (0, fs_1.readFileSync)(id, 'utf8');
-                    let code = (0, core_1.hbsToJS)(input);
+                    let code = (0, core_1.hbsToJS)(source);
                     return {
                         code,
                     };
@@ -81,6 +83,7 @@ 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,
             },
         },
     });
@@ -99,7 +102,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 { 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":["// 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 } 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, 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  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,9 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.optimizeDeps = void 0;
+const esbuild_resolver_1 = require("./esbuild-resolver");
 function optimizeDeps() {
     return {
         exclude: ['@embroider/macros'],
+        extensions: ['.hbs', '.gjs', '.gts'],
+        esbuildOptions: {
+            plugins: [(0, esbuild_resolver_1.esBuildResolver)()],
+        },
     };
 }
 exports.optimizeDeps = optimizeDeps;

package/src/optimize-deps.js.map

@@ -1 +1 @@
-{"version":3,"file":"optimize-deps.js","sourceRoot":"","sources":["optimize-deps.ts"],"names":[],"mappings":";;;AAKA,SAAgB,YAAY;IAC1B,OAAO;QACL,OAAO,EAAE,CAAC,mBAAmB,CAAC;KAC/B,CAAC;AACJ,CAAC;AAJD,oCAIC","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,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"]}

package/src/request.d.ts

@@ -1,14 +1,22 @@
-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;
+    static from(context: PluginContext, source: string, importer: string | undefined, custom: Record<string, any> | undefined): RollupModuleRequest | undefined;
     private constructor();
+    get debugType(): string;
     get isVirtual(): boolean;
     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,11 +4,14 @@ exports.RollupModuleRequest = exports.virtualPrefix = void 0;
 const core_1 = require("@embroider/core");
 exports.virtualPrefix = 'embroider_virtual:';
 class RollupModuleRequest {
-    static from(source, importer, custom) {
+    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 (custom === null || custom === void 0 ? void 0 : custom.depScan) {
+            return;
+        }
         if (source && importer && source[0] !== '\0') {
             let nonVirtual;
             if (importer.startsWith(exports.virtualPrefix)) {
@@ -19,33 +22,77 @@ class RollupModuleRequest {
             }
             // 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);
+            return new RollupModuleRequest(context, source, fromFile, (_c = custom === null || custom === void 0 ? void 0 : custom.embroider) === null || _c === void 0 ? void 0 : _c.meta, false, undefined);
         }
     }
-    constructor(specifier, fromFile, meta) {
+    constructor(context, specifier, fromFile, meta, isNotFound, resolvedTo) {
+        this.context = context;
         this.specifier = specifier;
         this.fromFile = fromFile;
         this.meta = meta;
+        this.isNotFound = isNotFound;
+        this.resolvedTo = resolvedTo;
+    }
+    get debugType() {
+        return 'rollup';
     }
     get isVirtual() {
         return this.specifier.startsWith(exports.virtualPrefix);
     }
     alias(newSpecifier) {
-        return new RollupModuleRequest(newSpecifier, this.fromFile, this.meta);
+        return new RollupModuleRequest(this.context, newSpecifier, this.fromFile, this.meta, false, undefined);
     }
     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);
         }
     }
     virtualize(filename) {
-        return new RollupModuleRequest(exports.virtualPrefix + filename, this.fromFile, this.meta);
+        return new RollupModuleRequest(this.context, exports.virtualPrefix + filename, this.fromFile, this.meta, false, undefined);
     }
     withMeta(meta) {
-        return new RollupModuleRequest(this.specifier, this.fromFile, meta);
+        return new RollupModuleRequest(this.context, this.specifier, this.fromFile, meta, this.isNotFound, this.resolvedTo);
+    }
+    notFound() {
+        return new RollupModuleRequest(this.context, this.specifier, this.fromFile, this.meta, true, undefined);
+    }
+    async defaultResolve() {
+        if (this.isVirtual) {
+            return {
+                type: 'found',
+                filename: this.specifier,
+                result: { id: this.specifier, resolvedBy: this.fromFile },
+                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.specifier}`);
+            err.code = 'MODULE_NOT_FOUND';
+            return { type: 'not_found', err };
+        }
+        let result = await this.context.resolve(this.specifier, this.fromFile, {
+            skipSelf: true,
+            custom: {
+                embroider: {
+                    enableCustomResolver: false,
+                    meta: this.meta,
+                },
+            },
+        });
+        if (result) {
+            return { type: 'found', filename: result.id, 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);
     }
 }
 exports.RollupModuleRequest = RollupModuleRequest;

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;YACtD,OAAO;SACR;QAED,IAAI,MAAM,IAAI,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE;YAC5C,IAAI,UAAkB,CAAC;YACvB,IAAI,QAAQ,CAAC,UAAU,CAAC,qBAAa,CAAC,EAAE;gBACtC,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,qBAAa,CAAC,MAAM,CAAC,CAAC;aACnD;iBAAM;gBACL,UAAU,GAAG,QAAQ,CAAC;aACvB;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;SAC3E;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;YACjC,OAAO,IAAI,CAAC;SACb;aAAM;YACL,OAAO,IAAI,mBAAmB,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAS,CAAC;SAChF;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 { cleanUrl } 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      return new RollupModuleRequest(context, source, fromFile, custom?.embroider?.meta, false, undefined);\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  ) {}\n\n  get debugType() {\n    return 'rollup';\n  }\n\n  get isVirtual(): boolean {\n    return this.specifier.startsWith(virtualPrefix);\n  }\n\n  alias(newSpecifier: string) {\n    return new RollupModuleRequest(this.context, newSpecifier, this.fromFile, this.meta, false, undefined) as this;\n  }\n  rehome(newFromFile: string) {\n    if (this.fromFile === newFromFile) {\n      return this;\n    } else {\n      return new RollupModuleRequest(this.context, this.specifier, newFromFile, this.meta, false, undefined) 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    ) 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    ) as this;\n  }\n  notFound(): this {\n    return new RollupModuleRequest(this.context, this.specifier, this.fromFile, this.meta, true, undefined) 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.specifier, resolvedBy: this.fromFile },\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.specifier}`);\n      (err as any).code = 'MODULE_NOT_FOUND';\n      return { type: 'not_found', err };\n    }\n    let result = await this.context.resolve(this.specifier, this.fromFile, {\n      skipSelf: true,\n      custom: {\n        embroider: {\n          enableCustomResolver: false,\n          meta: this.meta,\n        },\n      },\n    });\n    if (result) {\n      return { type: 'found', filename: result.id, 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    ) as this;\n  }\n}\n"]}

package/src/resolver.js

@@ -4,26 +4,45 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolver = void 0;
-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 debug = (0, debug_1.default)('embroider:vite');
 function resolver() {
-    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);
+    let resolverLoader = new core_1.ResolverLoader(process.cwd());
+    let server;
+    let virtualDeps = new Map();
     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(source, importer, options.custom);
+            let request = request_1.RollupModuleRequest.from(this, source, importer, options.custom);
             if (!request) {
                 // fallthrough to other rollup plugins
                 return null;
             }
-            let resolution = await resolver.resolve(request, defaultResolve(this));
+            let resolution = await resolverLoader.resolver.resolve(request);
             switch (resolution.type) {
                 case 'found':
+                case 'ignored':
                     return resolution.result;
                 case 'not_found':
                     return null;
@@ -33,34 +52,13 @@ function resolver() {
         },
         load(id) {
             if (id.startsWith(request_1.virtualPrefix)) {
-                return (0, core_1.virtualContent)(id.slice(request_1.virtualPrefix.length), resolver);
+                let { src, watches } = (0, core_1.virtualContent)(id.slice(request_1.virtualPrefix.length), resolverLoader.resolver);
+                virtualDeps.set(id, watches);
+                server === null || server === void 0 ? void 0 : server.watcher.add(watches);
+                return 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":";;;;;;AAEA,+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;gBACZ,sCAAsC;gBACtC,OAAO,IAAI,CAAC;aACb;YACD,IAAI,UAAU,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;YACvE,QAAQ,UAAU,CAAC,IAAI,EAAE;gBACvB,KAAK,OAAO;oBACV,OAAO,UAAU,CAAC,MAAM,CAAC;gBAC3B,KAAK,WAAW;oBACd,OAAO,IAAI,CAAC;gBACd;oBACE,MAAM,IAAA,sBAAW,EAAC,UAAU,CAAC,CAAC;aACjC;QACH,CAAC;QACD,IAAI,CAAC,EAAE;YACL,IAAI,EAAE,CAAC,UAAU,CAAC,uBAAa,CAAC,EAAE;gBAChC,OAAO,IAAA,qBAAc,EAAC,EAAE,CAAC,KAAK,CAAC,uBAAa,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC;aACjE;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AA7BD,4BA6BC;AAED,SAAS,cAAc,CAAC,OAAsB;IAC5C,OAAO,KAAK,EAAE,OAA4B,EAAE,EAAE;QAC5C,IAAI,OAAO,CAAC,SAAS,EAAE;YACrB,OAAO;gBACL,IAAI,EAAE,OAAO;gBACb,MAAM,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,SAAS,EAAE,UAAU,EAAE,OAAO,CAAC,QAAQ,EAAE;aAChE,CAAC;SACH;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;YACV,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;SAClC;aAAM;YACL,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC;SAC9C;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"]}
+{"version":3,"file":"resolver.js","sourceRoot":"","sources":["resolver.ts"],"names":[],"mappings":";;;;;;AACA,0CAAiE;AACjE,uCAA+D;AAC/D,gEAAuC;AACvC,kDAA8B;AAE9B,MAAM,KAAK,GAAG,IAAA,eAAS,EAAC,gBAAgB,CAAC,CAAC;AAE1C,SAAgB,QAAQ;IACtB,IAAI,cAAc,GAAG,IAAI,qBAAc,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACvD,IAAI,MAAqB,CAAC;IAC1B,IAAI,WAAW,GAA0B,IAAI,GAAG,EAAE,CAAC;IAEnD,OAAO;QACL,IAAI,EAAE,oBAAoB;QAC1B,OAAO,EAAE,KAAK;QAEd,eAAe,CAAC,CAAC;YACf,MAAM,GAAG,CAAC,CAAC;YACX,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE;gBAC5C,KAAK,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,WAAW,EAAE;oBACrC,KAAK,IAAI,KAAK,IAAI,OAAO,EAAE;wBACzB,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;4BAC1B,KAAK,CAAC,0BAA0B,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;4BAC5C,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;4BACpC,IAAI,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;4BAC7C,IAAI,CAAC,EAAE;gCACL,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;6BACxB;yBACF;qBACF;iBACF;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAED,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO;YACvC,IAAI,OAAO,GAAG,6BAAmB,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YAC/E,IAAI,CAAC,OAAO,EAAE;gBACZ,sCAAsC;gBACtC,OAAO,IAAI,CAAC;aACb;YACD,IAAI,UAAU,GAAG,MAAM,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAChE,QAAQ,UAAU,CAAC,IAAI,EAAE;gBACvB,KAAK,OAAO,CAAC;gBACb,KAAK,SAAS;oBACZ,OAAO,UAAU,CAAC,MAAM,CAAC;gBAC3B,KAAK,WAAW;oBACd,OAAO,IAAI,CAAC;gBACd;oBACE,MAAM,IAAA,sBAAW,EAAC,UAAU,CAAC,CAAC;aACjC;QACH,CAAC;QACD,IAAI,CAAC,EAAE;YACL,IAAI,EAAE,CAAC,UAAU,CAAC,uBAAa,CAAC,EAAE;gBAChC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,IAAA,qBAAc,EAAC,EAAE,CAAC,KAAK,CAAC,uBAAa,CAAC,MAAM,CAAC,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;gBAC/F,WAAW,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;gBAC7B,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAC7B,OAAO,GAAG,CAAC;aACZ;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AArDD,4BAqDC","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';\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 { src, watches } = virtualContent(id.slice(virtualPrefix.length), resolverLoader.resolver);\n        virtualDeps.set(id, watches);\n        server?.watcher.add(watches);\n        return src;\n      }\n    },\n  };\n}\n"]}

package/src/template-tag.d.ts

@@ -1,2 +1,4 @@
 import type { Plugin } from 'vite';
-export declare function templateTag(): Plugin;
+export declare function templateTag({ inline_source_map }?: {
+    inline_source_map: boolean;
+}): Plugin;

package/src/template-tag.js

@@ -2,18 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.templateTag = void 0;
 const pluginutils_1 = require("@rollup/pluginutils");
-const fs_1 = require("fs");
 const content_tag_1 = require("content-tag");
-const gjsFilter = (0, pluginutils_1.createFilter)('**/*.gjs');
-function templateTag() {
+const gjsFilter = (0, pluginutils_1.createFilter)('**/*.{gjs,gts}?(\\?)*');
+function templateTag({ inline_source_map } = { inline_source_map: false }) {
     let preprocessor = new content_tag_1.Preprocessor();
     function candidates(id) {
-        return [id + '.gjs'];
+        return [id + '.gjs', id + '.gts'];
     }
     return {
         name: 'embroider-template-tag',
         enforce: 'pre',
-        async resolveId(id, importer) {
+        async resolveId(id, 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;
+            }
             let resolution = await this.resolve(id, importer, {
                 skipSelf: true,
             });
@@ -25,6 +28,7 @@ function templateTag() {
                     skipSelf: true,
                     custom: {
                         embroider: {
+                            isExtensionSearch: true,
                             enableCustomResolver: false,
                         },
                     },
@@ -36,11 +40,14 @@ function templateTag() {
                 }
             }
         },
-        load(id) {
+        transform(code, id) {
             if (!gjsFilter(id)) {
                 return null;
             }
-            return preprocessor.process((0, fs_1.readFileSync)(id, 'utf8'), id);
+            return preprocessor.process(code, {
+                filename: id,
+                inline_source_map: inline_source_map,
+            });
         },
     };
 }

package/src/template-tag.js.map

@@ -1 +1 @@
-{"version":3,"file":"template-tag.js","sourceRoot":"","sources":["template-tag.ts"],"names":[],"mappings":";;;AAAA,qDAAmD;AAEnD,2BAAkC;AAClC,6CAA2C;AAE3C,MAAM,SAAS,GAAG,IAAA,0BAAY,EAAC,UAAU,CAAC,CAAC;AAE3C,SAAgB,WAAW;IACzB,IAAI,YAAY,GAAG,IAAI,0BAAY,EAAE,CAAC;IAEtC,SAAS,UAAU,CAAC,EAAU;QAC5B,OAAO,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC;IACvB,CAAC;IAED,OAAO;QACL,IAAI,EAAE,wBAAwB;QAC9B,OAAO,EAAE,KAAK;QAEd,KAAK,CAAC,SAAS,CAAC,EAAU,EAAE,QAA4B;YACtD,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,QAAQ,EAAE;gBAChD,QAAQ,EAAE,IAAI;aACf,CAAC,CAAC;YACH,IAAI,UAAU,EAAE;gBACd,OAAO,UAAU,CAAC;aACnB;YACD,KAAK,IAAI,SAAS,IAAI,UAAU,CAAC,EAAE,CAAC,EAAE;gBACpC,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE;oBACnD,QAAQ,EAAE,IAAI;oBACd,MAAM,EAAE;wBACN,SAAS,EAAE;4BACT,oBAAoB,EAAE,KAAK;yBAC5B;qBACF;iBACF,CAAC,CAAC;gBACH,IAAI,UAAU,EAAE;oBACd,OAAO;wBACL,EAAE,EAAE,UAAU,CAAC,EAAE;qBAClB,CAAC;iBACH;aACF;QACH,CAAC;QAED,IAAI,CAAC,EAAU;YACb,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE;gBAClB,OAAO,IAAI,CAAC;aACb;YACD,OAAO,YAAY,CAAC,OAAO,CAAC,IAAA,iBAAY,EAAC,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5D,CAAC;KACF,CAAC;AACJ,CAAC;AA1CD,kCA0CC","sourcesContent":["import { createFilter } from '@rollup/pluginutils';\nimport type { Plugin } from 'vite';\nimport { readFileSync } from 'fs';\nimport { Preprocessor } from 'content-tag';\n\nconst gjsFilter = createFilter('**/*.gjs');\n\nexport function templateTag(): Plugin {\n  let preprocessor = new Preprocessor();\n\n  function candidates(id: string) {\n    return [id + '.gjs'];\n  }\n\n  return {\n    name: 'embroider-template-tag',\n    enforce: 'pre',\n\n    async resolveId(id: string, importer: string | undefined) {\n      let resolution = await this.resolve(id, importer, {\n        skipSelf: true,\n      });\n      if (resolution) {\n        return resolution;\n      }\n      for (let candidate of candidates(id)) {\n        resolution = await this.resolve(candidate, importer, {\n          skipSelf: true,\n          custom: {\n            embroider: {\n              enableCustomResolver: false,\n            },\n          },\n        });\n        if (resolution) {\n          return {\n            id: resolution.id,\n          };\n        }\n      }\n    },\n\n    load(id: string) {\n      if (!gjsFilter(id)) {\n        return null;\n      }\n      return preprocessor.process(readFileSync(id, 'utf8'), id);\n    },\n  };\n}\n"]}
+{"version":3,"file":"template-tag.js","sourceRoot":"","sources":["template-tag.ts"],"names":[],"mappings":";;;AAAA,qDAAmD;AAEnD,6CAA2C;AAE3C,MAAM,SAAS,GAAG,IAAA,0BAAY,EAAC,uBAAuB,CAAC,CAAC;AAExD,SAAgB,WAAW,CAAC,EAAE,iBAAiB,EAAE,GAAG,EAAE,iBAAiB,EAAE,KAAK,EAAE;IAC9E,IAAI,YAAY,GAAG,IAAI,0BAAY,EAAE,CAAC;IAEtC,SAAS,UAAU,CAAC,EAAU;QAC5B,OAAO,CAAC,EAAE,GAAG,MAAM,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC;IACpC,CAAC;IAED,OAAO;QACL,IAAI,EAAE,wBAAwB;QAC9B,OAAO,EAAE,KAAK;QAEd,KAAK,CAAC,SAAS,CAAC,EAAU,EAAE,QAA4B,EAAE,OAAO;;YAC/D,IAAI,MAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,SAAS,0CAAE,iBAAiB,EAAE;gBAChD,OAAO,IAAI,CAAC;aACb;YACD,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,QAAQ,EAAE;gBAChD,QAAQ,EAAE,IAAI;aACf,CAAC,CAAC;YACH,IAAI,UAAU,EAAE;gBACd,OAAO,UAAU,CAAC;aACnB;YACD,KAAK,IAAI,SAAS,IAAI,UAAU,CAAC,EAAE,CAAC,EAAE;gBACpC,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE;oBACnD,QAAQ,EAAE,IAAI;oBACd,MAAM,EAAE;wBACN,SAAS,EAAE;4BACT,iBAAiB,EAAE,IAAI;4BACvB,oBAAoB,EAAE,KAAK;yBAC5B;qBACF;iBACF,CAAC,CAAC;gBACH,IAAI,UAAU,EAAE;oBACd,OAAO;wBACL,EAAE,EAAE,UAAU,CAAC,EAAE;qBAClB,CAAC;iBACH;aACF;QACH,CAAC;QAED,SAAS,CAAC,IAAY,EAAE,EAAU;YAChC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE;gBAClB,OAAO,IAAI,CAAC;aACb;YACD,OAAO,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE;gBAChC,QAAQ,EAAE,EAAE;gBACZ,iBAAiB,EAAE,iBAAiB;aACrC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC;AAjDD,kCAiDC","sourcesContent":["import { createFilter } from '@rollup/pluginutils';\nimport type { Plugin } from 'vite';\nimport { Preprocessor } from 'content-tag';\n\nconst gjsFilter = createFilter('**/*.{gjs,gts}?(\\\\?)*');\n\nexport function templateTag({ inline_source_map } = { inline_source_map: false }): Plugin {\n  let preprocessor = new Preprocessor();\n\n  function candidates(id: string) {\n    return [id + '.gjs', id + '.gts'];\n  }\n\n  return {\n    name: 'embroider-template-tag',\n    enforce: 'pre',\n\n    async resolveId(id: string, importer: string | undefined, options) {\n      if (options.custom?.embroider?.isExtensionSearch) {\n        return null;\n      }\n      let resolution = await this.resolve(id, importer, {\n        skipSelf: true,\n      });\n      if (resolution) {\n        return resolution;\n      }\n      for (let candidate of candidates(id)) {\n        resolution = await this.resolve(candidate, importer, {\n          skipSelf: true,\n          custom: {\n            embroider: {\n              isExtensionSearch: true,\n              enableCustomResolver: false,\n            },\n          },\n        });\n        if (resolution) {\n          return {\n            id: resolution.id,\n          };\n        }\n      }\n    },\n\n    transform(code: string, id: string) {\n      if (!gjsFilter(id)) {\n        return null;\n      }\n      return preprocessor.process(code, {\n        filename: id,\n        inline_source_map: inline_source_map,\n      });\n    },\n  };\n}\n"]}

package/src/addons.d.ts

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

package/src/addons.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addons = void 0;
-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];
-}
-exports.addons = addons;
-//# sourceMappingURL=addons.js.map

package/src/addons.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"addons.js","sourceRoot":"","sources":["addons.ts"],"names":[],"mappings":";;;AAAA,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;QACnD,IAAI,KAAK,GAAG,IAAA,kBAAW,EAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,KAAK,EAAE;YACT,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SAClB;KACF;IACD,KAAK,IAAI,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;QACpD,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;KACjB;IACD,KAAK,IAAI,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QAClD,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;KACjB;IACD,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC;AACpB,CAAC;AAjBD,wBAiBC","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"]}