@embroider/vite 0.2.1-unstable.ecb0185 → 0.2.1-unstable.ee5e024

package/index.d.ts

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

package/index.mjs

@@ -4,3 +4,6 @@ export * from './src/hbs.js';
 export * from './src/scripts.js';
 export * from './src/template-tag.js';
 export * from './src/optimize-deps.js';
+export * from './src/build.js';
+export * from './src/assets.js';
+export * from './src/content-for.js';

package/package.json

@@ -1,30 +1,33 @@
 {
   "name": "@embroider/vite",
-  "version": "0.2.1-unstable.ecb0185",
+  "version": "0.2.1-unstable.ee5e024",
   "main": "index.mjs",
   "peerDependencies": {
-    "@embroider/core": "3.4.4-unstable.ecb0185",
-    "vite": "^4.3.9"
+    "@embroider/core": "3.4.12-unstable.ee5e024",
+    "vite": "^4.3.9 || ^5.0.0"
   },
   "scripts": {
     "test": "jest"
   },
   "dependencies": {
     "@babel/core": "^7.22.9",
-    "@embroider/macros": "1.13.5-unstable.ecb0185",
+    "@embroider/macros": "1.16.4-unstable.ee5e024",
     "@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"
+    "terser": "^5.7.0",
+    "fast-glob": "^3.3.2",
+    "send": "^0.18.0"
   },
   "devDependencies": {
-    "@embroider/core": "3.4.4-unstable.ecb0185",
+    "@embroider/core": "3.4.12-unstable.ee5e024",
     "@types/babel__core": "^7.20.1",
+    "@types/send": "^0.17.4",
     "@types/debug": "^4.1.5",
     "@types/jsdom": "^16.2.11",
     "@types/fs-extra": "^9.0.12",

package/src/assets.d.ts

@@ -0,0 +1,2 @@
+import type { Plugin } from 'vite';
+export declare function assets(): Plugin;

package/src/assets.js

@@ -0,0 +1,115 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assets = void 0;
+const core_1 = require("@embroider/core");
+const process = __importStar(require("process"));
+const path_1 = require("path");
+const fs_extra_1 = require("fs-extra");
+const send_1 = __importDefault(require("send"));
+function findPublicAsset(relativePath, resolver) {
+    var _a;
+    const packageCache = resolver.packageCache;
+    let pkg = packageCache.ownerOfFile(relativePath);
+    for (const engine of resolver.options.engines) {
+        for (const addon of engine.activeAddons) {
+            pkg = packageCache.ownerOfFile(addon.root);
+            if (pkg && pkg.meta && pkg.isV2Addon() && pkg.meta['public-assets']) {
+                const asset = (_a = Object.entries(pkg.meta['public-assets']).find(([_key, a]) => path_1.posix.resolve('/', a) === relativePath)) === null || _a === void 0 ? void 0 : _a[0];
+                let local = asset ? (0, path_1.join)(addon.root, asset) : null;
+                if (local && (0, fs_extra_1.existsSync)(local)) {
+                    return local;
+                }
+            }
+        }
+    }
+}
+function assets() {
+    const cwd = process.cwd();
+    const resolverLoader = new core_1.ResolverLoader(cwd);
+    let mode = 'build';
+    let publicDir = 'public';
+    return {
+        name: 'assets',
+        enforce: 'post',
+        configResolved(options) {
+            mode = options.command;
+            publicDir = options.publicDir;
+        },
+        configureServer(server) {
+            return () => {
+                server.middlewares.use((req, res, next) => {
+                    if (req.originalUrl && req.originalUrl.length > 1) {
+                        const assetUrl = findPublicAsset(req.originalUrl.split('?')[0], resolverLoader.resolver);
+                        if (assetUrl) {
+                            return (0, send_1.default)(req, assetUrl).pipe(res);
+                        }
+                    }
+                    return next();
+                });
+            };
+        },
+        buildStart: {
+            // we need to wait for the compatBuild plugin's buildStart hook to finish
+            // so that the resolver config exists before we try to read it.
+            sequential: true,
+            order: 'post',
+            async handler() {
+                if (mode !== 'build')
+                    return;
+                const engines = resolverLoader.resolver.options.engines;
+                for (const engine of engines) {
+                    const packages = engine.activeAddons.map(a => resolverLoader.resolver.packageCache.ownerOfFile(a.root));
+                    packages.forEach(pkg => {
+                        if (!pkg || !pkg.isV2Addon())
+                            return;
+                        const assets = pkg.meta['public-assets'] || {};
+                        Object.entries(assets).forEach(([path, dest]) => {
+                            // do not override app public assets
+                            if ((0, fs_extra_1.existsSync)((0, path_1.join)(publicDir, dest))) {
+                                return;
+                            }
+                            const filePath = (0, path_1.join)(pkg.root, path);
+                            if (!(0, fs_extra_1.lstatSync)(filePath).isFile()) {
+                                console.log(`Invalid package definition, ${pkg.name} has defined a file "${path}" that is not a file`);
+                                return;
+                            }
+                            this.emitFile({
+                                type: 'asset',
+                                source: (0, fs_extra_1.readFileSync)(filePath),
+                                fileName: path_1.posix.resolve('/', dest).slice(1),
+                            });
+                        });
+                    });
+                }
+            },
+        },
+    };
+}
+exports.assets = assets;
+//# sourceMappingURL=assets.js.map

package/src/assets.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"assets.js","sourceRoot":"","sources":["assets.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Resolver } from '@embroider/core';\nimport { ResolverLoader } from '@embroider/core';\nimport type { Plugin } from 'vite';\nimport * as process from 'process';\nimport { join, posix } from 'path';\nimport { existsSync, readFileSync, lstatSync } from 'fs-extra';\nimport send from 'send';\nimport type { Readable } from 'stream';\n\nfunction findPublicAsset(relativePath: string, resolver: Resolver) {\n  const packageCache = resolver.packageCache;\n  let pkg = packageCache.ownerOfFile(relativePath);\n\n  for (const engine of resolver.options.engines) {\n    for (const addon of engine.activeAddons) {\n      pkg = packageCache.ownerOfFile(addon.root);\n      if (pkg && pkg.meta && pkg.isV2Addon() && pkg.meta['public-assets']) {\n        const asset = Object.entries(pkg.meta['public-assets']).find(\n          ([_key, a]) => posix.resolve('/', a) === relativePath\n        )?.[0];\n        let local = asset ? join(addon.root, asset) : null;\n        if (local && existsSync(local)) {\n          return local;\n        }\n      }\n    }\n  }\n}\n\nexport function assets(): Plugin {\n  const cwd = process.cwd();\n  const resolverLoader = new ResolverLoader(cwd);\n  let mode: 'build' | 'serve' = 'build';\n  let publicDir = 'public';\n  return {\n    name: 'assets',\n    enforce: 'post',\n    configResolved(options) {\n      mode = options.command;\n      publicDir = options.publicDir;\n    },\n    configureServer(server) {\n      return () => {\n        server.middlewares.use((req, res, next) => {\n          if (req.originalUrl && req.originalUrl.length > 1) {\n            const assetUrl = findPublicAsset(req.originalUrl.split('?')[0], resolverLoader.resolver);\n            if (assetUrl) {\n              return send(req as Readable, assetUrl).pipe(res);\n            }\n          }\n          return next();\n        });\n      };\n    },\n    buildStart: {\n      // we need to wait for the compatBuild plugin's buildStart hook to finish\n      // so that the resolver config exists before we try to read it.\n      sequential: true,\n      order: 'post',\n      async handler() {\n        if (mode !== 'build') return;\n        const engines = resolverLoader.resolver.options.engines;\n        for (const engine of engines) {\n          const packages = engine.activeAddons.map(a => resolverLoader.resolver.packageCache.ownerOfFile(a.root));\n          packages.forEach(pkg => {\n            if (!pkg || !pkg.isV2Addon()) return;\n            const assets = pkg.meta['public-assets'] || {};\n            Object.entries(assets).forEach(([path, dest]) => {\n              // do not override app public assets\n              if (existsSync(join(publicDir, dest))) {\n                return;\n              }\n\n              const filePath = join(pkg.root, path);\n              if (!lstatSync(filePath).isFile()) {\n                console.log(`Invalid package definition, ${pkg.name} has defined a file \"${path}\" that is not a file`);\n                return;\n              }\n\n              this.emitFile({\n                type: 'asset',\n                source: readFileSync(filePath),\n                fileName: posix.resolve('/', dest).slice(1),\n              });\n            });\n          });\n        }\n      },\n    },\n  };\n}\n"]}

package/src/build.d.ts

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

package/src/build.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compatPrebuild = exports.emberBuild = void 0;
+const child_process_1 = require("child_process");
+function emberBuild(command, mode) {
+    if (command === 'build') {
+        return new Promise((resolve, reject) => {
+            const child = (0, child_process_1.fork)('./node_modules/ember-cli/bin/ember', ['build', '--environment', mode], {
+                env: {
+                    ...process.env,
+                    EMBROIDER_PREBUILD: 'true',
+                },
+            });
+            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', '--environment', mode], {
+            silent: true,
+            env: {
+                ...process.env,
+                EMBROIDER_PREBUILD: '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 viteCommand;
+    let viteMode;
+    return {
+        name: 'embroider-builder',
+        enforce: 'pre',
+        config(_config, { mode, command }) {
+            viteCommand = command;
+            viteMode = mode;
+        },
+        async buildStart() {
+            if (!viteCommand) {
+                throw new Error(`bug: embroider compatPrebuild did not detect Vite's command`);
+            }
+            if (!viteMode) {
+                throw new Error(`bug: embroider compatPrebuild did not detect Vite's mode`);
+            }
+            await emberBuild(viteCommand, viteMode);
+        },
+    };
+}
+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,OAAe,EAAE,IAAY;IACtD,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;QACxB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,KAAK,GAAG,IAAA,oBAAI,EAAC,oCAAoC,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,IAAI,CAAC,EAAE;gBACzF,GAAG,EAAE;oBACH,GAAG,OAAO,CAAC,GAAG;oBACd,kBAAkB,EAAE,MAAM;iBAC3B;aACF,CAAC,CAAC;YACH,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;IACL,CAAC;IACD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,KAAK,GAAG,IAAA,oBAAI,EAAC,oCAAoC,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,IAAI,CAAC,EAAE;YACpG,MAAM,EAAE,IAAI;YACZ,GAAG,EAAE;gBACH,GAAG,OAAO,CAAC,GAAG;gBACd,kBAAkB,EAAE,MAAM;aAC3B;SACF,CAAC,CAAC;QACH,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,CAAC;oBACjD,OAAO,EAAE,CAAC;gBACZ,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAjCD,gCAiCC;AAED,SAAgB,cAAc;IAC5B,IAAI,WAA+B,CAAC;IACpC,IAAI,QAA4B,CAAC;IAEjC,OAAO;QACL,IAAI,EAAE,mBAAmB;QACzB,OAAO,EAAE,KAAK;QACd,MAAM,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;YAC/B,WAAW,GAAG,OAAO,CAAC;YACtB,QAAQ,GAAG,IAAI,CAAC;QAClB,CAAC;QACD,KAAK,CAAC,UAAU;YACd,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;YACjF,CAAC;YACD,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;YAC9E,CAAC;YACD,MAAM,UAAU,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QAC1C,CAAC;KACF,CAAC;AACJ,CAAC;AArBD,wCAqBC","sourcesContent":["import { fork } from 'child_process';\nimport type { Plugin } from 'vite';\n\nexport function emberBuild(command: string, mode: string): Promise<void> {\n  if (command === 'build') {\n    return new Promise((resolve, reject) => {\n      const child = fork('./node_modules/ember-cli/bin/ember', ['build', '--environment', mode], {\n        env: {\n          ...process.env,\n          EMBROIDER_PREBUILD: 'true',\n        },\n      });\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', '--environment', mode], {\n      silent: true,\n      env: {\n        ...process.env,\n        EMBROIDER_PREBUILD: 'true',\n      },\n    });\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 viteCommand: string | undefined;\n  let viteMode: string | undefined;\n\n  return {\n    name: 'embroider-builder',\n    enforce: 'pre',\n    config(_config, { mode, command }) {\n      viteCommand = command;\n      viteMode = mode;\n    },\n    async buildStart() {\n      if (!viteCommand) {\n        throw new Error(`bug: embroider compatPrebuild did not detect Vite's command`);\n      }\n      if (!viteMode) {\n        throw new Error(`bug: embroider compatPrebuild did not detect Vite's mode`);\n      }\n      await emberBuild(viteCommand, viteMode);\n    },\n  };\n}\n"]}

package/src/content-for.d.ts

@@ -0,0 +1,2 @@
+import type { Plugin } from 'vite';
+export declare function contentFor(): Plugin;

package/src/content-for.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.contentFor = void 0;
+const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
+const core_1 = require("@embroider/core");
+function contentFor() {
+    return {
+        name: 'embroider-content-for',
+        transformIndexHtml(html, { path }) {
+            let config = (0, fs_extra_1.readJSONSync)((0, path_1.join)((0, core_1.locateEmbroiderWorkingDir)(process.cwd()), 'content-for.json'));
+            let contentsForConfig = config[path];
+            for (const [contentType, htmlContent] of Object.entries(contentsForConfig)) {
+                html = html.replace(`{{content-for "${contentType}"}}`, `${htmlContent}`);
+            }
+            return html;
+        },
+    };
+}
+exports.contentFor = contentFor;
+//# sourceMappingURL=content-for.js.map

package/src/content-for.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"content-for.js","sourceRoot":"","sources":["content-for.ts"],"names":[],"mappings":";;;AACA,uCAAwC;AACxC,+BAA4B;AAC5B,0CAA4D;AAE5D,SAAgB,UAAU;IACxB,OAAO;QACL,IAAI,EAAE,uBAAuB;QAE7B,kBAAkB,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE;YAC/B,IAAI,MAAM,GAAQ,IAAA,uBAAY,EAAC,IAAA,WAAI,EAAC,IAAA,gCAAyB,EAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,kBAAkB,CAAC,CAAC,CAAC;YACnG,IAAI,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;YACrC,KAAK,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBAC3E,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,WAAW,KAAK,EAAE,GAAG,WAAW,EAAE,CAAC,CAAC;YAC5E,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAC;AACJ,CAAC;AAbD,gCAaC","sourcesContent":["import type { Plugin } from 'vite';\nimport { readJSONSync } from 'fs-extra';\nimport { join } from 'path';\nimport { locateEmbroiderWorkingDir } from '@embroider/core';\n\nexport function contentFor(): Plugin {\n  return {\n    name: 'embroider-content-for',\n\n    transformIndexHtml(html, { path }) {\n      let config: any = readJSONSync(join(locateEmbroiderWorkingDir(process.cwd()), 'content-for.json'));\n      let contentsForConfig = config[path];\n      for (const [contentType, htmlContent] of Object.entries(contentsForConfig)) {\n        html = html.replace(`{{content-for \"${contentType}\"}}`, `${htmlContent}`);\n      }\n      return html;\n    },\n  };\n}\n"]}

package/src/esbuild-request.d.ts

@@ -1,12 +1,16 @@
 import { type ModuleRequest } from '@embroider/core';
-export declare const virtualNamespace = "embroider";
+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;
-    static from(source: string, importer: string | undefined, pluginData: Record<string, any> | undefined): EsBuildModuleRequest | undefined;
+    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;
@@ -14,4 +18,6 @@ export declare class EsBuildModuleRequest implements ModuleRequest {
     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

@@ -1,48 +1,94 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EsBuildModuleRequest = exports.virtualNamespace = void 0;
+exports.EsBuildModuleRequest = void 0;
 const core_1 = require("@embroider/core");
-exports.virtualNamespace = 'embroider';
+const path_1 = require("path");
 class EsBuildModuleRequest {
-    static from(source, importer, pluginData) {
+    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(source, fromFile, (_c = pluginData === null || pluginData === void 0 ? void 0 : pluginData.embroider) === null || _c === void 0 ? void 0 : _c.meta, false, false);
+            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(specifier, fromFile, meta, isVirtual, isNotFound) {
+    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(newSpecifier, this.fromFile, this.meta, this.isVirtual, false);
+        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.specifier, newFromFile, this.meta, this.isVirtual, false);
+            return new EsBuildModuleRequest(this.context, this.kind, this.specifier, newFromFile, this.meta, this.isVirtual, false, undefined);
         }
     }
     virtualize(filename) {
-        return new EsBuildModuleRequest(filename, this.fromFile, this.meta, true, false);
+        return new EsBuildModuleRequest(this.context, this.kind, filename, this.fromFile, this.meta, true, false, undefined);
     }
     withMeta(meta) {
-        return new EsBuildModuleRequest(this.specifier, this.fromFile, meta, this.isVirtual, this.isNotFound);
+        return new EsBuildModuleRequest(this.context, this.kind, this.specifier, this.fromFile, meta, this.isVirtual, this.isNotFound, this.resolvedTo);
     }
     notFound() {
-        return new EsBuildModuleRequest(this.specifier, this.fromFile, this.meta, this.isVirtual, true);
+        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;

package/src/esbuild-request.js.map

@@ -1 +1 @@
-{"version":3,"file":"esbuild-request.js","sourceRoot":"","sources":["esbuild-request.ts"],"names":[],"mappings":";;;AAAA,0CAA+D;AAElD,QAAA,gBAAgB,GAAG,WAAW,CAAC;AAE5C,MAAa,oBAAoB;IAC/B,MAAM,CAAC,IAAI,CACT,MAAc,EACd,QAA4B,EAC5B,UAA2C;;QAE3C,IAAI,CAAC,CAAC,MAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,SAAS,0CAAE,oBAAoB,mCAAI,IAAI,CAAC,EAAE;YAC1D,OAAO;SACR;QAED,IAAI,MAAM,IAAI,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE;YAC5C,IAAI,QAAQ,GAAG,IAAA,eAAQ,EAAC,QAAQ,CAAC,CAAC;YAClC,OAAO,IAAI,oBAAoB,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,SAAS,0CAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;SAC9F;IACH,CAAC;IAED,YACW,SAAiB,EACjB,QAAgB,EAChB,IAAqC,EACrC,SAAkB,EAClB,UAAmB;QAJnB,cAAS,GAAT,SAAS,CAAQ;QACjB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,SAAI,GAAJ,IAAI,CAAiC;QACrC,cAAS,GAAT,SAAS,CAAS;QAClB,eAAU,GAAV,UAAU,CAAS;IAC3B,CAAC;IAEJ,IAAI,SAAS;QACX,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,YAAoB;QACxB,OAAO,IAAI,oBAAoB,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,KAAK,CAAS,CAAC;IACzG,CAAC;IACD,MAAM,CAAC,WAAmB;QACxB,IAAI,IAAI,CAAC,QAAQ,KAAK,WAAW,EAAE;YACjC,OAAO,IAAI,CAAC;SACb;aAAM;YACL,OAAO,IAAI,oBAAoB,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,KAAK,CAAS,CAAC;SACxG;IACH,CAAC;IACD,UAAU,CAAC,QAAgB;QACzB,OAAO,IAAI,oBAAoB,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAS,CAAC;IAC3F,CAAC;IACD,QAAQ,CAAC,IAAqC;QAC5C,OAAO,IAAI,oBAAoB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,UAAU,CAAS,CAAC;IAChH,CAAC;IACD,QAAQ;QACN,OAAO,IAAI,oBAAoB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAS,CAAC;IAC1G,CAAC;CACF;AA/CD,oDA+CC","sourcesContent":["import { type ModuleRequest, cleanUrl } from '@embroider/core';\n\nexport const virtualNamespace = 'embroider';\n\nexport class EsBuildModuleRequest implements ModuleRequest {\n  static from(\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(source, fromFile, pluginData?.embroider?.meta, false, false);\n    }\n  }\n\n  private constructor(\n    readonly specifier: string,\n    readonly fromFile: string,\n    readonly meta: Record<string, any> | undefined,\n    readonly isVirtual: boolean,\n    readonly isNotFound: boolean\n  ) {}\n\n  get debugType() {\n    return 'esbuild';\n  }\n\n  alias(newSpecifier: string) {\n    return new EsBuildModuleRequest(newSpecifier, this.fromFile, this.meta, this.isVirtual, false) as this;\n  }\n  rehome(newFromFile: string) {\n    if (this.fromFile === newFromFile) {\n      return this;\n    } else {\n      return new EsBuildModuleRequest(this.specifier, newFromFile, this.meta, this.isVirtual, false) as this;\n    }\n  }\n  virtualize(filename: string) {\n    return new EsBuildModuleRequest(filename, this.fromFile, this.meta, true, false) as this;\n  }\n  withMeta(meta: Record<string, any> | undefined): this {\n    return new EsBuildModuleRequest(this.specifier, this.fromFile, meta, this.isVirtual, this.isNotFound) as this;\n  }\n  notFound(): this {\n    return new EsBuildModuleRequest(this.specifier, this.fromFile, this.meta, this.isVirtual, true) as this;\n  }\n}\n"]}
+{"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.js

@@ -12,6 +12,12 @@ 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;
@@ -19,14 +25,40 @@ function esBuildResolver(root = process.cwd()) {
     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 { specifier, fromFile } = adjustVirtualImport(candidate, importer);
+                    let result = await build.resolve(specifier, {
+                        namespace,
+                        resolveDir,
+                        importer: fromFile,
+                        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(path, importer, pluginData);
+                let { specifier, fromFile } = adjustVirtualImport(path, importer);
+                let request = esbuild_request_1.EsBuildModuleRequest.from(build, kind, specifier, fromFile, pluginData);
                 if (!request) {
                     return null;
                 }
-                let resolution = await resolverLoader.resolver.resolve(request, defaultResolve(build, kind));
+                let resolution = await resolverLoader.resolver.resolve(request);
                 switch (resolution.type) {
                     case 'found':
+                    case 'ignored':
                         return resolution.result;
                     case 'not_found':
                         return resolution.err;
@@ -35,16 +67,19 @@ function esBuildResolver(root = process.cwd()) {
                 }
             });
             build.onLoad({ namespace: 'embroider', filter: /./ }, ({ path }) => {
-                let src = (0, core_2.virtualContent)(path, resolverLoader.resolver);
+                // We don't want esbuild to try loading virtual CSS files
+                if (path.endsWith('.css')) {
+                    return { contents: '' };
+                }
+                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'));
+                    macrosConfig = (0, fs_extra_1.readJSONSync)((0, path_1.resolve)((0, core_2.locateEmbroiderWorkingDir)(root), 'macros-config.json'));
                 }
                 return { contents: runMacros(src, path, macrosConfig) };
             });
-            build.onLoad({ filter: /\.gjs$/ }, async ({ path: filename }) => {
+            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'),
+                const result = (0, core_1.transform)(preprocessor.process(code, { filename }), {
                     filename,
                 });
                 if (!result || !result.code) {
@@ -55,23 +90,23 @@ function esBuildResolver(root = process.cwd()) {
             });
             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 });
+                const result = (0, core_1.transform)((0, core_3.hbsToJS)(code), { 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: /\.js$/ }, ({ path, namespace }) => {
+            build.onLoad({ filter: /\.[jt]s$/ }, ({ path, namespace }) => {
                 let src;
                 if (namespace === 'embroider') {
-                    src = (0, core_2.virtualContent)(path, resolverLoader.resolver);
+                    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'));
+                    macrosConfig = (0, fs_extra_1.readJSONSync)((0, path_1.resolve)((0, core_2.locateEmbroiderWorkingDir)(root), 'macros-config.json'));
                 }
                 return { contents: runMacros(src, path, macrosConfig) };
             });
@@ -85,40 +120,28 @@ function runMacros(src, filename, macrosConfig) {
         plugins: [macrosConfig],
     }).code;
 }
-function defaultResolve(context, kind) {
-    return async (request) => {
-        if (request.isVirtual) {
+// esbuild's resolve does not like when we resolve from virtual paths. That is,
+// a request like "../thing.js" from "/a/real/path/VIRTUAL_SUBDIR/virtual.js"
+// has an unambiguous target of "/a/real/path/thing.js", but esbuild won't do
+// that path adjustment until after checking whether VIRTUAL_SUBDIR actually
+// exists.
+//
+// We can do the path adjustments before doing resolve.
+function adjustVirtualImport(specifier, fromFile) {
+    let fromDir = (0, path_1.dirname)(fromFile);
+    if (!(0, path_1.isAbsolute)(specifier) && specifier.startsWith('.')) {
+        let targetPath = (0, path_1.resolve)(fromDir, specifier);
+        let newFromDir = (0, path_1.dirname)(targetPath);
+        if (fromDir !== newFromDir) {
             return {
-                type: 'found',
-                result: { path: request.specifier, namespace: 'embroider' },
+                specifier: (0, core_2.explicitRelative)(newFromDir, targetPath),
+                // we're resolving *from* the destination, because we need to resolve
+                // from a file that exists, and we know that (if this was supposed to
+                // succeed at all) that file definitely does
+                fromFile: targetPath,
             };
         }
-        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 context.resolve(request.specifier, {
-            importer: request.fromFile,
-            resolveDir: (0, path_1.dirname)(request.fromFile),
-            kind,
-            pluginData: {
-                embroider: {
-                    enableCustomResolver: false,
-                    meta: request.meta,
-                },
-            },
-        });
-        if (result.errors.length > 0) {
-            return { type: 'not_found', err: result };
-        }
-        else {
-            return { type: 'found', result };
-        }
-    };
+    }
+    return { specifier, fromFile };
 }
 //# sourceMappingURL=esbuild-resolver.js.map