@embroider/vite 0.2.1 → 0.2.2-unstable.01e21e6

package/index.d.ts

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

package/index.mjs

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

package/package.json

@@ -1,28 +1,44 @@
 {
   "name": "@embroider/vite",
-  "version": "0.2.1",
-  "main": "index.mjs",
+  "version": "0.2.2-unstable.01e21e6",
+  "type": "module",
+  "exports": {
+    ".": {
+      "default": "./index.mjs",
+      "types": "./index.d.ts"
+    }
+  },
   "peerDependencies": {
-    "vite": "^4.3.9",
-    "@embroider/core": "^3.4.17"
+    "vite": "^5.2.0",
+    "@embroider/core": "^3.4.20-unstable.01e21e6"
   },
   "dependencies": {
-    "@rollup/pluginutils": "^4.1.1",
+    "@babel/core": "^7.22.9",
+    "@rollup/pluginutils": "^5.1.0",
     "assert-never": "^1.2.1",
-    "content-tag": "^2.0.1",
+    "browserslist": "*",
+    "browserslist-to-esbuild": "^2.1.1",
+    "content-tag": "^2.0.2",
     "debug": "^4.3.2",
+    "esbuild": "^0.17.19",
+    "fast-glob": "^3.3.2",
     "fs-extra": "^10.0.0",
     "jsdom": "^25.0.0",
+    "send": "^0.18.0",
     "source-map-url": "^0.4.1",
-    "terser": "^5.7.0"
+    "terser": "^5.7.0",
+    "@embroider/macros": "1.16.10-unstable.01e21e6",
+    "@embroider/reverse-exports": "0.1.1-unstable.01e21e6"
   },
   "devDependencies": {
+    "@types/babel__core": "^7.20.1",
     "@types/debug": "^4.1.5",
-    "@types/jsdom": "^16.2.11",
     "@types/fs-extra": "^9.0.12",
-    "rollup": "^3.23.0",
-    "vite": "^4.3.9",
-    "@embroider/core": "^3.4.17"
+    "@types/jsdom": "^16.2.11",
+    "@types/send": "^0.17.4",
+    "rollup": "^4.18.0",
+    "vite": "^5.3.3",
+    "@embroider/core": "^3.4.20-unstable.01e21e6"
   },
   "files": [
     "index.mjs",

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,87 @@
+import core from '@embroider/core';
+const { ResolverLoader } = core;
+import * as process from 'process';
+import { join, posix } from 'path';
+import fs from 'fs-extra';
+const { existsSync, readFileSync, lstatSync } = fs;
+import send from '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]) => posix.resolve('/', a) === relativePath)) === null || _a === void 0 ? void 0 : _a[0];
+                let local = asset ? join(addon.root, asset) : null;
+                if (local && existsSync(local)) {
+                    return local;
+                }
+            }
+        }
+    }
+}
+export function assets() {
+    const cwd = process.cwd();
+    const resolverLoader = new 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 send(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 (existsSync(join(publicDir, dest))) {
+                                return;
+                            }
+                            const filePath = join(pkg.root, path);
+                            if (!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: readFileSync(filePath),
+                                fileName: posix.resolve('/', dest).slice(1),
+                            });
+                        });
+                    });
+                }
+            },
+        },
+    };
+}
+//# 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 core from '@embroider/core';\nconst { ResolverLoader } = core;\nimport type { Plugin } from 'vite';\nimport * as process from 'process';\nimport { join, posix } from 'path';\nimport fs from 'fs-extra';\nconst { existsSync, readFileSync, lstatSync } = fs;\nimport send from 'send';\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, assetUrl).pipe(res as unknown as NodeJS.WritableStream);\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, resolvableExtensions: string[] | undefined): Promise<void>;
+export declare function compatPrebuild(): Plugin;

package/src/build.js

@@ -0,0 +1,60 @@
+import { fork } from 'child_process';
+export function emberBuild(command, mode, resolvableExtensions) {
+    let env = {
+        ...process.env,
+        EMBROIDER_PREBUILD: 'true',
+    };
+    if (resolvableExtensions) {
+        env['EMBROIDER_RESOLVABLE_EXTENSIONS'] = resolvableExtensions === null || resolvableExtensions === void 0 ? void 0 : resolvableExtensions.join(',');
+    }
+    if (command === 'build') {
+        return new Promise((resolve, reject) => {
+            const child = fork('./node_modules/ember-cli/bin/ember', ['build', '--environment', mode, '-o', 'tmp/compat-prebuild', '--suppress-sizes'], { env });
+            child.on('exit', code => (code === 0 ? resolve() : reject()));
+        });
+    }
+    return new Promise((resolve, reject) => {
+        const child = fork('./node_modules/ember-cli/bin/ember', ['build', '--watch', '--environment', mode, '-o', 'tmp/compat-prebuild', '--suppress-sizes'], {
+            silent: true,
+            env,
+        });
+        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();
+                }
+            });
+        });
+    });
+}
+export function compatPrebuild() {
+    let viteCommand;
+    let viteMode;
+    let resolvableExtensions;
+    return {
+        name: 'embroider-builder',
+        enforce: 'pre',
+        config(config, { mode, command }) {
+            var _a;
+            viteCommand = command;
+            viteMode = mode;
+            resolvableExtensions = (_a = config.resolve) === null || _a === void 0 ? void 0 : _a.extensions;
+        },
+        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, resolvableExtensions);
+        },
+    };
+}
+//# sourceMappingURL=build.js.map

package/src/build.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"build.js","sourceRoot":"","sources":["build.ts"],"names":[],"mappings":"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","sourcesContent":["import { fork } from 'child_process';\nimport type { Plugin } from 'vite';\n\nexport function emberBuild(command: string, mode: string, resolvableExtensions: string[] | undefined): Promise<void> {\n  let env: Record<string, string> = {\n    ...process.env,\n    EMBROIDER_PREBUILD: 'true',\n  };\n\n  if (resolvableExtensions) {\n    env['EMBROIDER_RESOLVABLE_EXTENSIONS'] = resolvableExtensions?.join(',');\n  }\n\n  if (command === 'build') {\n    return new Promise((resolve, reject) => {\n      const child = fork(\n        './node_modules/ember-cli/bin/ember',\n        ['build', '--environment', mode, '-o', 'tmp/compat-prebuild', '--suppress-sizes'],\n        { env }\n      );\n      child.on('exit', code => (code === 0 ? resolve() : reject()));\n    });\n  }\n  return new Promise((resolve, reject) => {\n    const child = fork(\n      './node_modules/ember-cli/bin/ember',\n      ['build', '--watch', '--environment', mode, '-o', 'tmp/compat-prebuild', '--suppress-sizes'],\n      {\n        silent: true,\n        env,\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  let resolvableExtensions: string[] | undefined;\n\n  return {\n    name: 'embroider-builder',\n    enforce: 'pre',\n    config(config, { mode, command }) {\n      viteCommand = command;\n      viteMode = mode;\n      resolvableExtensions = config.resolve?.extensions;\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, resolvableExtensions);\n    },\n  };\n}\n"]}

package/src/classic-ember-support.d.ts

@@ -0,0 +1,5 @@
+import { type UserConfig } from 'vite';
+export declare function classicEmberSupport(): (import("vite").Plugin<any> | {
+    name: string;
+    config(userConfig: UserConfig): Promise<Record<string, any> | UserConfig>;
+})[];

package/src/classic-ember-support.js

@@ -0,0 +1,37 @@
+import { hbs } from './hbs.js';
+import { scripts } from './scripts.js';
+import { compatPrebuild } from './build.js';
+import { assets } from './assets.js';
+import { contentFor } from './content-for.js';
+import browserslistToEsbuild from 'browserslist-to-esbuild';
+import { existsSync } from 'fs';
+import { join } from 'path';
+import { mergeConfig } from 'vite';
+import { pathToFileURL } from 'url';
+export function classicEmberSupport() {
+    return [
+        hbs(),
+        scripts(),
+        compatPrebuild(),
+        assets(),
+        contentFor(),
+        {
+            name: 'vite-plugin-ember-browser-targets',
+            async config(userConfig) {
+                const targetsPath = join(process.cwd(), 'config/targets.js');
+                if (existsSync(targetsPath)) {
+                    const targets = await import(pathToFileURL(targetsPath).toString());
+                    if (targets.default.browsers) {
+                        return mergeConfig({
+                            build: {
+                                target: browserslistToEsbuild(targets.browsers),
+                            },
+                        }, userConfig);
+                    }
+                }
+                return userConfig;
+            },
+        },
+    ];
+}
+//# sourceMappingURL=classic-ember-support.js.map

package/src/classic-ember-support.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"classic-ember-support.js","sourceRoot":"","sources":["classic-ember-support.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,qBAAqB,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAmB,MAAM,MAAM,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,MAAM,UAAU,mBAAmB;IACjC,OAAO;QACL,GAAG,EAAE;QACL,OAAO,EAAE;QACT,cAAc,EAAE;QAChB,MAAM,EAAE;QACR,UAAU,EAAE;QACZ;YACE,IAAI,EAAE,mCAAmC;YACzC,KAAK,CAAC,MAAM,CAAC,UAAsB;gBACjC,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,mBAAmB,CAAC,CAAC;gBAC7D,IAAI,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;oBAC5B,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;oBACpE,IAAI,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;wBAC7B,OAAO,WAAW,CAChB;4BACE,KAAK,EAAE;gCACL,MAAM,EAAE,qBAAqB,CAAC,OAAO,CAAC,QAAQ,CAAC;6BAChD;yBACF,EACD,UAAU,CACX,CAAC;oBACJ,CAAC;gBACH,CAAC;gBACD,OAAO,UAAU,CAAC;YACpB,CAAC;SACF;KACF,CAAC;AACJ,CAAC","sourcesContent":["import { hbs } from './hbs.js';\nimport { scripts } from './scripts.js';\nimport { compatPrebuild } from './build.js';\nimport { assets } from './assets.js';\nimport { contentFor } from './content-for.js';\nimport browserslistToEsbuild from 'browserslist-to-esbuild';\nimport { existsSync } from 'fs';\nimport { join } from 'path';\nimport { mergeConfig, type UserConfig } from 'vite';\nimport { pathToFileURL } from 'url';\n\nexport function classicEmberSupport() {\n  return [\n    hbs(),\n    scripts(),\n    compatPrebuild(),\n    assets(),\n    contentFor(),\n    {\n      name: 'vite-plugin-ember-browser-targets',\n      async config(userConfig: UserConfig) {\n        const targetsPath = join(process.cwd(), 'config/targets.js');\n        if (existsSync(targetsPath)) {\n          const targets = await import(pathToFileURL(targetsPath).toString());\n          if (targets.default.browsers) {\n            return mergeConfig(\n              {\n                build: {\n                  target: browserslistToEsbuild(targets.browsers),\n                },\n              },\n              userConfig\n            );\n          }\n        }\n        return userConfig;\n      },\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,19 @@
+import fs from 'fs-extra';
+const { readJSONSync } = fs;
+import { join } from 'path';
+import core from '@embroider/core';
+const { locateEmbroiderWorkingDir } = core;
+export function contentFor() {
+    return {
+        name: 'embroider-content-for',
+        transformIndexHtml(html, { path }) {
+            let config = readJSONSync(join(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;
+        },
+    };
+}
+//# 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,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC;AAC5B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,IAAI,MAAM,iBAAiB,CAAC;AACnC,MAAM,EAAE,yBAAyB,EAAE,GAAG,IAAI,CAAC;AAE3C,MAAM,UAAU,UAAU;IACxB,OAAO;QACL,IAAI,EAAE,uBAAuB;QAE7B,kBAAkB,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE;YAC/B,IAAI,MAAM,GAAQ,YAAY,CAAC,IAAI,CAAC,yBAAyB,CAAC,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","sourcesContent":["import type { Plugin } from 'vite';\nimport fs from 'fs-extra';\nconst { readJSONSync } = fs;\nimport { join } from 'path';\nimport core from '@embroider/core';\nconst { locateEmbroiderWorkingDir } = 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/ember.d.ts

@@ -0,0 +1,6 @@
+import { type UserConfig, type ConfigEnv } from 'vite';
+export declare let extensions: string[];
+export declare function ember(): (import("vite").Plugin<any> | {
+    name: string;
+    config(config: UserConfig, env: ConfigEnv): Promise<Record<string, any>>;
+})[];

package/src/ember.js

@@ -0,0 +1,43 @@
+import { templateTag } from './template-tag.js';
+import { resolver } from './resolver.js';
+import { mergeConfig } from 'vite';
+import { esBuildResolver } from './esbuild-resolver.js';
+export let extensions = ['.mjs', '.gjs', '.js', '.mts', '.gts', '.ts', '.hbs', '.hbs.js', '.json'];
+export function ember() {
+    return [
+        templateTag(),
+        resolver(),
+        {
+            name: 'vite-plugin-ember-config',
+            async config(config, env) {
+                return mergeConfig({
+                    resolve: {
+                        extensions,
+                    },
+                    optimizeDeps: {
+                        exclude: ['@embroider/macros'],
+                        extensions: ['.hbs', '.gjs', '.gts'],
+                        esbuildOptions: {
+                            plugins: [esBuildResolver()],
+                        },
+                    },
+                    build: {
+                        rollupOptions: {
+                            input: {
+                                main: 'index.html',
+                                ...(shouldBuildTests(env.mode) ? { tests: 'tests/index.html' } : undefined),
+                            },
+                        },
+                    },
+                    server: {
+                        port: 4200,
+                    },
+                }, config);
+            },
+        },
+    ];
+}
+function shouldBuildTests(mode) {
+    return mode !== 'production' || process.env.FORCE_BUILD_TESTS;
+}
+//# sourceMappingURL=ember.js.map

package/src/ember.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ember.js","sourceRoot":"","sources":["ember.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,WAAW,EAAmC,MAAM,MAAM,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,CAAC,IAAI,UAAU,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;AAEnG,MAAM,UAAU,KAAK;IACnB,OAAO;QACL,WAAW,EAAE;QACb,QAAQ,EAAE;QACV;YACE,IAAI,EAAE,0BAA0B;YAChC,KAAK,CAAC,MAAM,CAAC,MAAkB,EAAE,GAAc;gBAC7C,OAAO,WAAW,CAChB;oBACE,OAAO,EAAE;wBACP,UAAU;qBACX;oBAED,YAAY,EAAE;wBACZ,OAAO,EAAE,CAAC,mBAAmB,CAAC;wBAC9B,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;wBACpC,cAAc,EAAE;4BACd,OAAO,EAAE,CAAC,eAAe,EAAE,CAAC;yBAC7B;qBACF;oBAED,KAAK,EAAE;wBACL,aAAa,EAAE;4BACb,KAAK,EAAE;gCACL,IAAI,EAAE,YAAY;gCAClB,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;6BAC5E;yBACF;qBACF;oBACD,MAAM,EAAE;wBACN,IAAI,EAAE,IAAI;qBACX;iBACF,EACD,MAAM,CACP,CAAC;YACJ,CAAC;SACF;KACF,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAY;IACpC,OAAO,IAAI,KAAK,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;AAChE,CAAC","sourcesContent":["import { templateTag } from './template-tag.js';\nimport { resolver } from './resolver.js';\nimport { mergeConfig, type UserConfig, type ConfigEnv } from 'vite';\nimport { esBuildResolver } from './esbuild-resolver.js';\n\nexport let extensions = ['.mjs', '.gjs', '.js', '.mts', '.gts', '.ts', '.hbs', '.hbs.js', '.json'];\n\nexport function ember() {\n  return [\n    templateTag(),\n    resolver(),\n    {\n      name: 'vite-plugin-ember-config',\n      async config(config: UserConfig, env: ConfigEnv) {\n        return mergeConfig(\n          {\n            resolve: {\n              extensions,\n            },\n\n            optimizeDeps: {\n              exclude: ['@embroider/macros'],\n              extensions: ['.hbs', '.gjs', '.gts'],\n              esbuildOptions: {\n                plugins: [esBuildResolver()],\n              },\n            },\n\n            build: {\n              rollupOptions: {\n                input: {\n                  main: 'index.html',\n                  ...(shouldBuildTests(env.mode) ? { tests: 'tests/index.html' } : undefined),\n                },\n              },\n            },\n            server: {\n              port: 4200,\n            },\n          },\n          config\n        );\n      },\n    },\n  ];\n}\n\nfunction shouldBuildTests(mode: string) {\n  return mode !== 'production' || process.env.FORCE_BUILD_TESTS;\n}\n"]}

package/src/esbuild-request.d.ts

@@ -0,0 +1,44 @@
+import core from '@embroider/core';
+import type { ImportKind, OnResolveResult, PluginBuild } from 'esbuild';
+import type { PackageCache as _PackageCache, Resolution, ModuleRequest, RequestAdapter } from '@embroider/core';
+type PublicAPI<T> = {
+    [K in keyof T]: T[K];
+};
+type PackageCache = PublicAPI<_PackageCache>;
+export declare class EsBuildRequestAdapter implements RequestAdapter<Resolution<OnResolveResult, OnResolveResult>> {
+    private packageCache;
+    private phase;
+    private context;
+    private kind;
+    static create({ packageCache, phase, build, kind, path, importer, pluginData, }: {
+        packageCache: PackageCache;
+        phase: 'bundling' | 'other';
+        build: PluginBuild;
+        kind: ImportKind;
+        path: string;
+        importer: string | undefined;
+        pluginData: Record<string, any> | undefined;
+    }): {
+        initialState: {
+            specifier: string;
+            fromFile: string;
+            meta: any;
+        };
+        adapter: EsBuildRequestAdapter;
+    } | undefined;
+    private constructor();
+    get debugType(): string;
+    notFoundResponse(request: core.ModuleRequest<Resolution<OnResolveResult, OnResolveResult>>): Resolution<OnResolveResult, OnResolveResult>;
+    virtualResponse(_request: core.ModuleRequest<Resolution<OnResolveResult, OnResolveResult>>, virtualFileName: string): Resolution<OnResolveResult, OnResolveResult>;
+    resolve(request: ModuleRequest<Resolution<OnResolveResult, OnResolveResult>>): Promise<Resolution<OnResolveResult, OnResolveResult>>;
+}
+export declare function writeStatus(id: string, status: InternalStatus): void;
+type InternalStatus = {
+    type: 'pending';
+} | {
+    type: 'not_found';
+} | {
+    type: 'found';
+    filename: string;
+};
+export {};

package/src/esbuild-request.js

@@ -0,0 +1,158 @@
+import core from '@embroider/core';
+const { cleanUrl, packageName } = core;
+import { dirname } from 'path';
+import { externalName } from '@embroider/reverse-exports';
+export class EsBuildRequestAdapter {
+    static create({ packageCache, phase, build, kind, path, 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 (path && importer && path[0] !== '\0' && !path.startsWith('virtual-module:')) {
+            let fromFile = cleanUrl(importer);
+            return {
+                initialState: {
+                    specifier: path,
+                    fromFile,
+                    meta: (_c = pluginData === null || pluginData === void 0 ? void 0 : pluginData.embroider) === null || _c === void 0 ? void 0 : _c.meta,
+                },
+                adapter: new EsBuildRequestAdapter(packageCache, phase, build, kind),
+            };
+        }
+    }
+    constructor(packageCache, phase, context, kind) {
+        this.packageCache = packageCache;
+        this.phase = phase;
+        this.context = context;
+        this.kind = kind;
+    }
+    get debugType() {
+        return 'esbuild';
+    }
+    notFoundResponse(request) {
+        return {
+            type: 'not_found',
+            err: {
+                errors: [{ text: `module not found ${request.specifier}` }],
+            },
+        };
+    }
+    virtualResponse(_request, virtualFileName) {
+        return {
+            type: 'found',
+            filename: virtualFileName,
+            result: { path: virtualFileName, namespace: 'embroider-virtual' },
+            isVirtual: true,
+        };
+    }
+    async resolve(request) {
+        requestStatus(request.specifier);
+        let result = await this.context.resolve(request.specifier, {
+            importer: request.fromFile,
+            resolveDir: dirname(request.fromFile),
+            kind: this.kind,
+            pluginData: {
+                embroider: {
+                    enableCustomResolver: false,
+                    meta: request.meta,
+                },
+            },
+        });
+        let status = readStatus(request.specifier);
+        if (result.errors.length > 0 || status.type === 'not_found') {
+            return { type: 'not_found', err: result };
+        }
+        else {
+            if (this.phase === 'bundling') {
+                // we need to ensure that we don't traverse back into the app while
+                // doing dependency pre-bundling. There are multiple ways an addon can
+                // resolve things from the app, due to the existince of both app-js
+                // (modules in addons that are logically part of the app's namespace)
+                // and non-strict handlebars (which resolves
+                // components/helpers/modifiers against the app's global pool).
+                let pkg = this.packageCache.ownerOfFile(result.path);
+                if ((pkg === null || pkg === void 0 ? void 0 : pkg.root) === this.packageCache.appRoot &&
+                    // vite provides node built-in polyfills under a custom namespace and we dont
+                    // want to interrupt that. We'd prefer they get bundled in the dep optimizer normally,
+                    // rather than getting deferred to the app build (which also works, but means they didn't
+                    // get pre-optimized).
+                    (result.namespace === 'file' || result.namespace.startsWith('embroider-'))) {
+                    let externalizedName = request.specifier;
+                    if (!packageName(externalizedName)) {
+                        // the request was a relative path. This won't remain valid once
+                        // it has been bundled into vite/deps. But we know it targets the
+                        // app, so we can always convert it into a non-relative import
+                        // from the app's namespace
+                        //
+                        // IMPORTANT: whenever an addon resolves a relative path to the
+                        // app, it does so because our code in the core resolver has
+                        // rewritten the request to be relative to the app's root. So here
+                        // we will only ever encounter relative paths that are already
+                        // relative to the app's root directory.
+                        externalizedName = externalName(pkg.packageJSON, externalizedName) || externalizedName;
+                    }
+                    return {
+                        type: 'found',
+                        filename: externalizedName,
+                        isVirtual: false,
+                        result: {
+                            path: externalizedName,
+                            external: true,
+                        },
+                    };
+                }
+            }
+            let filename;
+            if (status.type === 'found' && result.external) {
+                // when we know that the file was really found, but vite has
+                // externalized it, report the true filename that was found, not the
+                // externalized request path.
+                filename = status.filename;
+            }
+            else {
+                filename = result.path;
+            }
+            return {
+                type: 'found',
+                filename,
+                result,
+                isVirtual: false,
+            };
+        }
+    }
+}
+/*
+  This is an unfortunate necessity. During depscan, vite deliberately hides
+  information from esbuild. Specifically, it treats "not found" and "this is an
+  external dependency" as both "external: true". But we really care about the
+  difference, since we have fallback behaviors for the "not found" case. Using
+  this global state, our rollup resolver plugin can observe what vite is
+  actually doing and communicate that knowledge outward to our esbuild resolver
+  plugin.
+ */
+function sharedGlobalState() {
+    let channel = globalThis.__embroider_vite_resolver_channel__;
+    if (!channel) {
+        channel = new Map();
+        globalThis.__embroider_vite_resolver_channel__ = channel;
+    }
+    return channel;
+}
+function requestStatus(id) {
+    sharedGlobalState().set(id, { type: 'pending' });
+}
+export function writeStatus(id, status) {
+    var _a;
+    let channel = sharedGlobalState();
+    if (((_a = channel.get(id)) === null || _a === void 0 ? void 0 : _a.type) === 'pending') {
+        channel.set(id, status);
+    }
+}
+function readStatus(id) {
+    var _a;
+    let channel = sharedGlobalState();
+    let result = (_a = channel.get(id)) !== null && _a !== void 0 ? _a : { type: 'pending' };
+    channel.delete(id);
+    return result;
+}
+//# 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 core from '@embroider/core';\nconst { cleanUrl, packageName } = core;\nimport type { ImportKind, OnResolveResult, PluginBuild } from 'esbuild';\nimport { dirname } from 'path';\n\nimport type { PackageCache as _PackageCache, Resolution, ModuleRequest, RequestAdapter } from '@embroider/core';\nimport { externalName } from '@embroider/reverse-exports';\n\ntype PublicAPI<T> = { [K in keyof T]: T[K] };\ntype PackageCache = PublicAPI<_PackageCache>;\n\nexport class EsBuildRequestAdapter implements RequestAdapter<Resolution<OnResolveResult, OnResolveResult>> {\n  static create({\n    packageCache,\n    phase,\n    build,\n    kind,\n    path,\n    importer,\n    pluginData,\n  }: {\n    packageCache: PackageCache;\n    phase: 'bundling' | 'other';\n    build: PluginBuild;\n    kind: ImportKind;\n    path: string;\n    importer: string | undefined;\n    pluginData: Record<string, any> | undefined;\n  }) {\n    if (!(pluginData?.embroider?.enableCustomResolver ?? true)) {\n      return;\n    }\n\n    if (path && importer && path[0] !== '\\0' && !path.startsWith('virtual-module:')) {\n      let fromFile = cleanUrl(importer);\n      return {\n        initialState: {\n          specifier: path,\n          fromFile,\n          meta: pluginData?.embroider?.meta,\n        },\n        adapter: new EsBuildRequestAdapter(packageCache, phase, build, kind),\n      };\n    }\n  }\n\n  private constructor(\n    private packageCache: PackageCache,\n    private phase: 'bundling' | 'other',\n    private context: PluginBuild,\n    private kind: ImportKind\n  ) {}\n\n  get debugType() {\n    return 'esbuild';\n  }\n\n  notFoundResponse(\n    request: core.ModuleRequest<Resolution<OnResolveResult, OnResolveResult>>\n  ): Resolution<OnResolveResult, OnResolveResult> {\n    return {\n      type: 'not_found',\n      err: {\n        errors: [{ text: `module not found ${request.specifier}` }],\n      },\n    };\n  }\n\n  virtualResponse(\n    _request: core.ModuleRequest<Resolution<OnResolveResult, OnResolveResult>>,\n    virtualFileName: string\n  ): Resolution<OnResolveResult, OnResolveResult> {\n    return {\n      type: 'found',\n      filename: virtualFileName,\n      result: { path: virtualFileName, namespace: 'embroider-virtual' },\n      isVirtual: true,\n    };\n  }\n\n  async resolve(\n    request: ModuleRequest<Resolution<OnResolveResult, OnResolveResult>>\n  ): Promise<Resolution<OnResolveResult, OnResolveResult>> {\n    requestStatus(request.specifier);\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\n    let status = readStatus(request.specifier);\n\n    if (result.errors.length > 0 || status.type === 'not_found') {\n      return { type: 'not_found', err: result };\n    } else {\n      if (this.phase === 'bundling') {\n        // we need to ensure that we don't traverse back into the app while\n        // doing dependency pre-bundling. There are multiple ways an addon can\n        // resolve things from the app, due to the existince of both app-js\n        // (modules in addons that are logically part of the app's namespace)\n        // and non-strict handlebars (which resolves\n        // components/helpers/modifiers against the app's global pool).\n        let pkg = this.packageCache.ownerOfFile(result.path);\n        if (\n          pkg?.root === this.packageCache.appRoot &&\n          // vite provides node built-in polyfills under a custom namespace and we dont\n          // want to interrupt that. We'd prefer they get bundled in the dep optimizer normally,\n          // rather than getting deferred to the app build (which also works, but means they didn't\n          // get pre-optimized).\n          (result.namespace === 'file' || result.namespace.startsWith('embroider-'))\n        ) {\n          let externalizedName = request.specifier;\n          if (!packageName(externalizedName)) {\n            // the request was a relative path. This won't remain valid once\n            // it has been bundled into vite/deps. But we know it targets the\n            // app, so we can always convert it into a non-relative import\n            // from the app's namespace\n            //\n            // IMPORTANT: whenever an addon resolves a relative path to the\n            // app, it does so because our code in the core resolver has\n            // rewritten the request to be relative to the app's root. So here\n            // we will only ever encounter relative paths that are already\n            // relative to the app's root directory.\n            externalizedName = externalName(pkg.packageJSON, externalizedName) || externalizedName;\n          }\n          return {\n            type: 'found',\n            filename: externalizedName,\n            isVirtual: false,\n            result: {\n              path: externalizedName,\n              external: true,\n            },\n          };\n        }\n      }\n\n      let filename: string;\n      if (status.type === 'found' && result.external) {\n        // when we know that the file was really found, but vite has\n        // externalized it, report the true filename that was found, not the\n        // externalized request path.\n        filename = status.filename;\n      } else {\n        filename = result.path;\n      }\n\n      return {\n        type: 'found',\n        filename,\n        result,\n        isVirtual: false,\n      };\n    }\n  }\n}\n\n/*\n  This is an unfortunate necessity. During depscan, vite deliberately hides\n  information from esbuild. Specifically, it treats \"not found\" and \"this is an\n  external dependency\" as both \"external: true\". But we really care about the\n  difference, since we have fallback behaviors for the \"not found\" case. Using\n  this global state, our rollup resolver plugin can observe what vite is\n  actually doing and communicate that knowledge outward to our esbuild resolver\n  plugin.\n */\nfunction sharedGlobalState() {\n  let channel = (globalThis as any).__embroider_vite_resolver_channel__ as undefined | Map<string, InternalStatus>;\n  if (!channel) {\n    channel = new Map();\n    (globalThis as any).__embroider_vite_resolver_channel__ = channel;\n  }\n  return channel;\n}\n\nfunction requestStatus(id: string): void {\n  sharedGlobalState().set(id, { type: 'pending' });\n}\n\nexport function writeStatus(id: string, status: InternalStatus): void {\n  let channel = sharedGlobalState();\n  if (channel.get(id)?.type === 'pending') {\n    channel.set(id, status);\n  }\n}\n\nfunction readStatus(id: string): InternalStatus {\n  let channel = sharedGlobalState();\n  let result = channel.get(id) ?? { type: 'pending' };\n  channel.delete(id);\n  return result;\n}\n\ntype InternalStatus = { type: 'pending' } | { type: 'not_found' } | { type: 'found'; filename: string };\n"]}