@embroider/vite 0.2.1-unstable.ea895c2 → 0.2.1-unstable.eb93cd5

package/LICENSE

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

package/index.d.ts

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

package/package.json

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

package/src/assets.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assets = void 0;
+exports.assets = assets;
 const core_1 = require("@embroider/core");
 const process = __importStar(require("process"));
 const path_1 = require("path");
@@ -111,5 +111,4 @@ function assets() {
         },
     };
 }
-exports.assets = assets;
 //# sourceMappingURL=assets.js.map

package/src/assets.js.map

@@ -1 +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"]}
+{"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.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compatPrebuild = exports.emberBuild = void 0;
+exports.emberBuild = emberBuild;
+exports.compatPrebuild = compatPrebuild;
 const child_process_1 = require("child_process");
 function emberBuild(command, mode) {
     if (command === 'build') {
@@ -37,7 +38,6 @@ function emberBuild(command, mode) {
         });
     });
 }
-exports.emberBuild = emberBuild;
 function compatPrebuild() {
     let viteCommand;
     let viteMode;
@@ -59,5 +59,4 @@ function compatPrebuild() {
         },
     };
 }
-exports.compatPrebuild = compatPrebuild;
 //# sourceMappingURL=build.js.map

package/src/build.js.map

@@ -1 +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;QACvB,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;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,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;oBAChD,OAAO,EAAE,CAAC;iBACX;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;gBAChB,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;aAChF;YACD,IAAI,CAAC,QAAQ,EAAE;gBACb,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;aAC7E;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"]}
+{"version":3,"file":"build.js","sourceRoot":"","sources":["build.ts"],"names":[],"mappings":";;AAGA,gCAiCC;AAED,wCAqBC;AA3DD,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;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","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.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.contentFor = void 0;
+exports.contentFor = contentFor;
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
 const core_1 = require("@embroider/core");
@@ -17,5 +17,4 @@ function contentFor() {
         },
     };
 }
-exports.contentFor = contentFor;
 //# sourceMappingURL=content-for.js.map

package/src/content-for.js.map

@@ -1 +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;gBAC1E,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,WAAW,KAAK,EAAE,GAAG,WAAW,EAAE,CAAC,CAAC;aAC3E;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"]}
+{"version":3,"file":"content-for.js","sourceRoot":"","sources":["content-for.ts"],"names":[],"mappings":";;AAKA,gCAaC;AAjBD,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","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

@@ -21,3 +21,4 @@ export declare class EsBuildModuleRequest implements ModuleRequest {
     resolveTo(resolution: Resolution<OnResolveResult, OnResolveResult>): this;
     defaultResolve(): Promise<Resolution<OnResolveResult, OnResolveResult>>;
 }
+export declare function writeStatus(id: string, status: 'found' | 'not_found'): void;

package/src/esbuild-request.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EsBuildModuleRequest = void 0;
+exports.writeStatus = writeStatus;
 const core_1 = require("@embroider/core");
 const path_1 = require("path");
 class EsBuildModuleRequest {
@@ -9,7 +10,7 @@ class EsBuildModuleRequest {
         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') {
+        if (source && importer && source[0] !== '\0' && !source.startsWith('virtual-module:')) {
             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);
         }
@@ -56,7 +57,7 @@ class EsBuildModuleRequest {
             return {
                 type: 'found',
                 filename: request.specifier,
-                result: { path: request.specifier, namespace: 'embroider' },
+                result: { path: request.specifier, namespace: 'embroider-virtual' },
                 isVirtual: this.isVirtual,
             };
         }
@@ -69,6 +70,7 @@ class EsBuildModuleRequest {
                 },
             };
         }
+        requestStatus(request.specifier);
         let result = await this.context.resolve(request.specifier, {
             importer: request.fromFile,
             resolveDir: (0, path_1.dirname)(request.fromFile),
@@ -80,7 +82,8 @@ class EsBuildModuleRequest {
                 },
             },
         });
-        if (result.errors.length > 0) {
+        let status = readStatus(request.specifier);
+        if (result.errors.length > 0 || status === 'not_found') {
             return { type: 'not_found', err: result };
         }
         else if (result.external) {
@@ -92,4 +95,37 @@ class EsBuildModuleRequest {
     }
 }
 exports.EsBuildModuleRequest = EsBuildModuleRequest;
+/*
+  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, 'pending');
+}
+function writeStatus(id, status) {
+    let channel = sharedGlobalState();
+    if (channel.get(id) === 'pending') {
+        channel.set(id, status);
+    }
+}
+function readStatus(id) {
+    var _a;
+    let channel = sharedGlobalState();
+    let result = (_a = channel.get(id)) !== null && _a !== void 0 ? _a : 'pending';
+    channel.delete(id);
+    return result;
+}
 //# sourceMappingURL=esbuild-request.js.map

package/src/esbuild-request.js.map

@@ -1 +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"]}
+{"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' && !source.startsWith('virtual-module:')) {\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-virtual' },\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    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 === 'not_found') {\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\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\n    | undefined\n    | Map<string, 'pending' | 'found' | 'not_found'>;\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, 'pending');\n}\n\nexport function writeStatus(id: string, status: 'found' | 'not_found'): void {\n  let channel = sharedGlobalState();\n  if (channel.get(id) === 'pending') {\n    channel.set(id, status);\n  }\n}\n\nfunction readStatus(id: string): 'pending' | 'not_found' | 'found' {\n  let channel = sharedGlobalState();\n  let result = channel.get(id) ?? 'pending';\n  channel.delete(id);\n  return result;\n}\n"]}

package/src/esbuild-resolver.d.ts

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

package/src/esbuild-resolver.js

@@ -3,51 +3,51 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.esBuildResolver = void 0;
+exports.esBuildResolver = esBuildResolver;
 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()) {
+const templateOnlyComponent = `import templateOnly from '@ember/component/template-only';\n` + `export default templateOnly();\n`;
+function esBuildResolver() {
     let resolverLoader = new core_2.ResolverLoader(process.cwd());
-    let macrosConfig;
     let preprocessor = new content_tag_1.Preprocessor();
+    function transformAndAssert(src, filename) {
+        const result = (0, core_1.transform)(src, { filename });
+        if (!result || result.code == null) {
+            throw new Error(`Failed to load file ${filename} in esbuild-hbs-loader`);
+        }
+        return result.code;
+    }
+    function onLoad({ path, namespace }) {
+        let src;
+        if (namespace === 'embroider-template-only-component') {
+            src = templateOnlyComponent;
+        }
+        else if (namespace === 'embroider-virtual') {
+            src = (0, core_2.virtualContent)(path, resolverLoader.resolver).src;
+        }
+        else {
+            src = (0, fs_extra_1.readFileSync)(path, 'utf8');
+        }
+        if (path.endsWith('.hbs')) {
+            src = (0, core_3.hbsToJS)(src);
+        }
+        else if (['.gjs', '.gts'].some(ext => path.endsWith(ext))) {
+            src = preprocessor.process(src, { filename: path });
+        }
+        if (['.hbs', '.gjs', '.gts', '.js', '.ts'].some(ext => path.endsWith(ext))) {
+            src = transformAndAssert(src, path);
+        }
+        return { contents: src };
+    }
     return {
         name: 'embroider-esbuild-resolver',
         setup(build) {
-            // 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;
-            });
+            // Embroider Resolver
             build.onResolve({ filter: /./ }, async ({ path, importer, pluginData, kind }) => {
                 let request = esbuild_request_1.EsBuildModuleRequest.from(build, kind, path, importer, pluginData);
                 if (!request) {
@@ -64,58 +64,37 @@ function esBuildResolver(root = process.cwd()) {
                         throw (0, assert_never_1.default)(resolution);
                 }
             });
-            build.onLoad({ namespace: 'embroider', filter: /./ }, ({ path }) => {
-                // 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'));
+            // template-only-component synthesis
+            build.onResolve({ filter: /./ }, async ({ path, importer, namespace, resolveDir, pluginData, kind }) => {
+                if (pluginData === null || pluginData === void 0 ? void 0 : pluginData.embroiderExtensionResolving) {
+                    // reentrance
+                    return null;
                 }
-                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 }), {
-                    filename,
+                let result = await build.resolve(path, {
+                    namespace,
+                    resolveDir,
+                    importer,
+                    kind,
+                    // avoid reentrance
+                    pluginData: { ...pluginData, embroiderExtensionResolving: true },
                 });
-                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), { 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'));
+                if (result.errors.length === 0 && !result.external) {
+                    let syntheticPath = (0, core_2.needsSyntheticComponentJS)(path, result.path, resolverLoader.resolver.packageCache);
+                    if (syntheticPath) {
+                        return { path: syntheticPath, namespace: 'embroider-template-only-component' };
+                    }
                 }
-                return { contents: runMacros(src, path, macrosConfig) };
+                return result;
             });
+            // we need to handle everything from one of our three special namespaces:
+            build.onLoad({ namespace: 'embroider-template-only-component', filter: /./ }, onLoad);
+            build.onLoad({ namespace: 'embroider-virtual', filter: /./ }, onLoad);
+            build.onLoad({ namespace: 'embroider-template-tag', filter: /./ }, onLoad);
+            // we need to handle all hbs
+            build.onLoad({ filter: /\.hbs$/ }, onLoad);
+            // we need to handle all GJS (to preprocess) and JS (to run macros)
+            build.onLoad({ filter: /\.g?[jt]s$/ }, onLoad);
         },
     };
 }
-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

@@ -1 +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 } 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        // We don't want esbuild to try loading virtual CSS files\n        if (path.endsWith('.css')) {\n          return { contents: '' };\n        }\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          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), { 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"]}
+{"version":3,"file":"esbuild-resolver.js","sourceRoot":"","sources":["esbuild-resolver.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Plugin as EsBuildPlugin, OnLoadResult } from 'esbuild';\nimport { transform } from '@babel/core';\nimport { ResolverLoader, virtualContent, needsSyntheticComponentJS } from '@embroider/core';\nimport { readFileSync } from 'fs-extra';\nimport { EsBuildModuleRequest } from './esbuild-request';\nimport assertNever from 'assert-never';\nimport { hbsToJS } from '@embroider/core';\nimport { Preprocessor } from 'content-tag';\n\nconst templateOnlyComponent =\n  `import templateOnly from '@ember/component/template-only';\\n` + `export default templateOnly();\\n`;\n\nexport function esBuildResolver(): EsBuildPlugin {\n  let resolverLoader = new ResolverLoader(process.cwd());\n  let preprocessor = new Preprocessor();\n\n  function transformAndAssert(src: string, filename: string): string {\n    const result = transform(src, { filename });\n    if (!result || result.code == null) {\n      throw new Error(`Failed to load file ${filename} in esbuild-hbs-loader`);\n    }\n    return result.code!;\n  }\n\n  function onLoad({ path, namespace }: { path: string; namespace: string }): OnLoadResult {\n    let src: string;\n    if (namespace === 'embroider-template-only-component') {\n      src = templateOnlyComponent;\n    } else if (namespace === 'embroider-virtual') {\n      src = virtualContent(path, resolverLoader.resolver).src;\n    } else {\n      src = readFileSync(path, 'utf8');\n    }\n    if (path.endsWith('.hbs')) {\n      src = hbsToJS(src);\n    } else if (['.gjs', '.gts'].some(ext => path.endsWith(ext))) {\n      src = preprocessor.process(src, { filename: path });\n    }\n    if (['.hbs', '.gjs', '.gts', '.js', '.ts'].some(ext => path.endsWith(ext))) {\n      src = transformAndAssert(src, path);\n    }\n    return { contents: src };\n  }\n\n  return {\n    name: 'embroider-esbuild-resolver',\n    setup(build) {\n      // Embroider Resolver\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      // template-only-component synthesis\n      build.onResolve({ filter: /./ }, async ({ path, importer, namespace, resolveDir, pluginData, kind }) => {\n        if (pluginData?.embroiderExtensionResolving) {\n          // reentrance\n          return null;\n        }\n\n        let result = await build.resolve(path, {\n          namespace,\n          resolveDir,\n          importer,\n          kind,\n          // avoid reentrance\n          pluginData: { ...pluginData, embroiderExtensionResolving: true },\n        });\n\n        if (result.errors.length === 0 && !result.external) {\n          let syntheticPath = needsSyntheticComponentJS(path, result.path, resolverLoader.resolver.packageCache);\n          if (syntheticPath) {\n            return { path: syntheticPath, namespace: 'embroider-template-only-component' };\n          }\n        }\n\n        return result;\n      });\n\n      // we need to handle everything from one of our three special namespaces:\n      build.onLoad({ namespace: 'embroider-template-only-component', filter: /./ }, onLoad);\n      build.onLoad({ namespace: 'embroider-virtual', filter: /./ }, onLoad);\n      build.onLoad({ namespace: 'embroider-template-tag', filter: /./ }, onLoad);\n\n      // we need to handle all hbs\n      build.onLoad({ filter: /\\.hbs$/ }, onLoad);\n\n      // we need to handle all GJS (to preprocess) and JS (to run macros)\n      build.onLoad({ filter: /\\.g?[jt]s$/ }, onLoad);\n    },\n  };\n}\n"]}

package/src/hbs.js

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

package/src/hbs.js.map

@@ -1 +1 @@
-{"version":3,"file":"hbs.js","sourceRoot":"","sources":["hbs.ts"],"names":[],"mappings":"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","sourcesContent":["// TODO: I copied this from @embroider/addon-dev, it needs to be its own package\n// (or be in shared-internals or core)\nimport { createFilter } from '@rollup/pluginutils';\nimport type { PluginContext, ResolvedId } from 'rollup';\nimport type { Plugin } from 'vite';\nimport { hbsToJS, ResolverLoader } from '@embroider/core';\nimport assertNever from 'assert-never';\nimport { parse as pathParse } from 'path';\nimport makeDebug from 'debug';\n\nconst debug = makeDebug('embroider:hbs-plugin');\nconst resolverLoader = new ResolverLoader(process.cwd());\n\nexport function hbs(): Plugin {\n  return {\n    name: 'rollup-hbs-plugin',\n    enforce: 'pre',\n    async resolveId(source: string, importer: string | undefined, options) {\n      if (options.custom?.embroider?.isExtensionSearch) {\n        return null;\n      }\n      let resolution = await this.resolve(source, importer, {\n        skipSelf: true,\n      });\n\n      if (!resolution) {\n        return maybeSynthesizeComponentJS(this, source, importer);\n      } else {\n        return maybeRewriteHBS(resolution);\n      }\n    },\n\n    transform(source: string, id: string) {\n      const meta = getMeta(this, id);\n      if (!meta) {\n        return;\n      }\n\n      switch (meta.type) {\n        case 'template':\n          let code = hbsToJS(source);\n          return {\n            code,\n          };\n        case 'template-only-component-js':\n          return {\n            code: templateOnlyComponent,\n          };\n        default:\n          assertNever(meta);\n      }\n    },\n  };\n}\n\nconst templateOnlyComponent =\n  `import templateOnly from '@ember/component/template-only';\\n` + `export default templateOnly();\\n`;\n\ntype Meta =\n  | {\n      type: 'template';\n    }\n  | {\n      type: 'template-only-component-js';\n    };\n\nfunction getMeta(context: PluginContext, id: string): Meta | null {\n  const meta = context.getModuleInfo(id)?.meta?.['rollup-hbs-plugin'];\n  if (meta) {\n    return meta as Meta;\n  } else {\n    return null;\n  }\n}\n\nfunction correspondingTemplate(filename: string): string {\n  let { ext } = pathParse(filename);\n  return filename.slice(0, filename.length - ext.length) + '.hbs';\n}\n\nasync function maybeSynthesizeComponentJS(context: PluginContext, source: string, importer: string | undefined) {\n  debug(`checking for template-only component: %s`, source);\n  let templateResolution = await context.resolve(correspondingTemplate(source), importer, {\n    skipSelf: true,\n    custom: {\n      embroider: {\n        // we don't want to recurse into the whole embroider compatbility\n        // resolver here. It has presumably already steered our request to the\n        // correct place. All we want to do is slightly modify the request we\n        // were given (changing the extension) and check if that would resolve\n        // instead.\n        //\n        // Currently this guard is only actually exercised in rollup, not in\n        // vite, due to https://github.com/vitejs/vite/issues/13852\n        enableCustomResolver: false,\n        isExtensionSearch: true,\n      },\n    },\n  });\n  if (!templateResolution) {\n    return null;\n  }\n\n  const resolvedId = templateResolution.id.split('?')[0];\n  templateResolution.id = resolvedId;\n\n  const pkg = resolverLoader.resolver.packageCache.ownerOfFile(resolvedId);\n  const isInComponents = pkg?.isV2App() && resolvedId.slice(pkg?.root.length).startsWith('/components');\n\n  if (resolvedId.endsWith('/template.hbs') || !isInComponents) {\n    return {\n      ...templateResolution,\n      meta: {\n        'rollup-hbs-plugin': {\n          type: 'template',\n        },\n      },\n    };\n  }\n\n  debug(`emitting template only component: %s`, templateResolution.id);\n\n  // we're trying to resolve a JS module but only the corresponding HBS\n  // file exists. Synthesize the template-only component JS.\n  return {\n    id: templateResolution.id.replace(/\\.hbs$/, '.js'),\n    meta: {\n      'rollup-hbs-plugin': {\n        type: 'template-only-component-js',\n      },\n    },\n  };\n}\n\nconst hbsFilter = createFilter('**/*.hbs?([?]*)');\n\nfunction maybeRewriteHBS(resolution: ResolvedId) {\n  if (!hbsFilter(resolution.id)) {\n    return null;\n  }\n  debug('emitting hbs rewrite: %s', resolution.id);\n  return {\n    ...resolution,\n    meta: {\n      'rollup-hbs-plugin': {\n        type: 'template',\n      },\n    },\n  };\n}\n"]}
+{"version":3,"file":"hbs.js","sourceRoot":"","sources":["hbs.ts"],"names":[],"mappings":";;AAcA,kBA0EC;AAxFD,qDAAmD;AAGnD,0CAMyB;AAEzB,MAAM,cAAc,GAAG,IAAI,qBAAc,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;AACzD,MAAM,SAAS,GAAG,IAAA,0BAAY,EAAC,iBAAiB,CAAC,CAAC;AAElD,SAAgB,GAAG;IACjB,OAAO;QACL,IAAI,EAAE,mBAAmB;QACzB,OAAO,EAAE,KAAK;QACd,KAAK,CAAC,SAAS,CAAC,MAAc,EAAE,QAA4B,EAAE,OAAO;;YACnE,IAAI,MAAA,OAAO,CAAC,MAAM,0CAAE,OAAO,EAAE,CAAC;gBAC5B,gEAAgE;gBAChE,sEAAsE;gBACtE,OAAO,IAAI,CAAC;YACd,CAAC;YAED,IAAI,MAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,SAAS,0CAAE,iBAAiB,EAAE,CAAC;gBACjD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE;gBACpD,QAAQ,EAAE,IAAI;aACf,CAAC,CAAC;YAEH,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,IAAI,SAAS,GAAG,IAAA,uBAAgB,EAAC,MAAM,CAAC,CAAC;gBACzC,IAAI,SAAS,EAAE,CAAC;oBACd,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE;wBACnD,QAAQ,EAAE,IAAI;wBACd,MAAM,EAAE;4BACN,SAAS,EAAE;gCACT,iEAAiE;gCACjE,sEAAsE;gCACtE,qEAAqE;gCACrE,sEAAsE;gCACtE,WAAW;gCACX,EAAE;gCACF,oEAAoE;gCACpE,2DAA2D;gCAC3D,oBAAoB,EAAE,KAAK;gCAC3B,iBAAiB,EAAE,IAAI;6BACxB;yBACF;qBACF,CAAC,CAAC;gBACL,CAAC;gBAED,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChB,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;YAED,IAAI,WAAW,GAAG,IAAA,gCAAyB,EAAC,MAAM,EAAE,UAAU,CAAC,EAAE,EAAE,cAAc,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YACzG,IAAI,WAAW,EAAE,CAAC;gBAChB,OAAO;oBACL,EAAE,EAAE,WAAW;oBACf,IAAI,EAAE;wBACJ,mBAAmB,EAAE;4BACnB,IAAI,EAAE,4BAA4B;yBACnC;qBACF;iBACF,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,CAAC,EAAU;;YACb,IAAI,CAAA,MAAA,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,0CAAE,IAAI,MAAK,4BAA4B,EAAE,CAAC;gBAC7D,OAAO;oBACL,IAAI,EAAE,IAAA,kCAA2B,GAAE;iBACpC,CAAC;YACJ,CAAC;QACH,CAAC;QAED,SAAS,CAAC,IAAY,EAAE,EAAU;YAChC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC;gBACnB,OAAO,IAAI,CAAC;YACd,CAAC;YACD,OAAO,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;QACvB,CAAC;KACF,CAAC;AACJ,CAAC;AAMD,SAAS,OAAO,CAAC,OAAsB,EAAE,EAAU;;IACjD,MAAM,IAAI,GAAG,MAAA,MAAA,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,0CAAE,IAAI,0CAAG,mBAAmB,CAAC,CAAC;IACpE,IAAI,IAAI,EAAE,CAAC;QACT,OAAO,IAAY,CAAC;IACtB,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC","sourcesContent":["import { createFilter } from '@rollup/pluginutils';\nimport type { PluginContext } from 'rollup';\nimport type { Plugin } from 'vite';\nimport {\n  hbsToJS,\n  ResolverLoader,\n  needsSyntheticComponentJS,\n  templateOnlyComponentSource,\n  syntheticJStoHBS,\n} from '@embroider/core';\n\nconst resolverLoader = new ResolverLoader(process.cwd());\nconst hbsFilter = createFilter('**/*.hbs?([?]*)');\n\nexport function hbs(): Plugin {\n  return {\n    name: 'rollup-hbs-plugin',\n    enforce: 'pre',\n    async resolveId(source: string, importer: string | undefined, options) {\n      if (options.custom?.depScan) {\n        // during depscan we have a corresponding esbuild plugin that is\n        // responsible for this stuff instead. We don't want to fight with it.\n        return null;\n      }\n\n      if (options.custom?.embroider?.isExtensionSearch) {\n        return null;\n      }\n\n      let resolution = await this.resolve(source, importer, {\n        skipSelf: true,\n      });\n\n      if (!resolution) {\n        let hbsSource = syntheticJStoHBS(source);\n        if (hbsSource) {\n          resolution = await this.resolve(hbsSource, importer, {\n            skipSelf: true,\n            custom: {\n              embroider: {\n                // we don't want to recurse into the whole embroider compatbility\n                // resolver here. It has presumably already steered our request to the\n                // correct place. All we want to do is slightly modify the request we\n                // were given (changing the extension) and check if that would resolve\n                // instead.\n                //\n                // Currently this guard is only actually exercised in rollup, not in\n                // vite, due to https://github.com/vitejs/vite/issues/13852\n                enableCustomResolver: false,\n                isExtensionSearch: true,\n              },\n            },\n          });\n        }\n\n        if (!resolution) {\n          return null;\n        }\n      }\n\n      let syntheticId = needsSyntheticComponentJS(source, resolution.id, resolverLoader.resolver.packageCache);\n      if (syntheticId) {\n        return {\n          id: syntheticId,\n          meta: {\n            'rollup-hbs-plugin': {\n              type: 'template-only-component-js',\n            },\n          },\n        };\n      }\n    },\n\n    load(id: string) {\n      if (getMeta(this, id)?.type === 'template-only-component-js') {\n        return {\n          code: templateOnlyComponentSource(),\n        };\n      }\n    },\n\n    transform(code: string, id: string) {\n      if (!hbsFilter(id)) {\n        return null;\n      }\n      return hbsToJS(code);\n    },\n  };\n}\n\ntype Meta = {\n  type: 'template-only-component-js';\n};\n\nfunction getMeta(context: PluginContext, id: string): Meta | null {\n  const meta = context.getModuleInfo(id)?.meta?.['rollup-hbs-plugin'];\n  if (meta) {\n    return meta as Meta;\n  } else {\n    return null;\n  }\n}\n"]}

package/src/optimize-deps.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.optimizeDeps = void 0;
+exports.optimizeDeps = optimizeDeps;
 const esbuild_resolver_1 = require("./esbuild-resolver");
 function optimizeDeps() {
     return {
@@ -11,5 +11,4 @@ function optimizeDeps() {
         },
     };
 }
-exports.optimizeDeps = optimizeDeps;
 //# sourceMappingURL=optimize-deps.js.map

package/src/optimize-deps.js.map

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

@@ -9,9 +9,6 @@ class RollupModuleRequest {
         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)) {
@@ -26,8 +23,8 @@ class RollupModuleRequest {
             // strip query params off the source but keep track of them
             // we use regexp-based methods over a URL object because the
             // source can be a relative path.
-            let cleanSource = (0, core_1.cleanUrl)(source, true);
-            let queryParams = (0, core_1.getUrlQueryParams)(source, true);
+            let cleanSource = (0, core_1.cleanUrl)(source);
+            let queryParams = (0, core_1.getUrlQueryParams)(source);
             return new RollupModuleRequest(context, cleanSource, fromFile, (_c = custom === null || custom === void 0 ? void 0 : custom.embroider) === null || _c === void 0 ? void 0 : _c.meta, false, undefined, queryParams, importerQueryParams);
         }
     }

package/src/request.js.map

@@ -1 +1 @@
-{"version":3,"file":"request.js","sourceRoot":"","sources":["request.ts"],"names":[],"mappings":";;;AACA,0CAA8D;AAGjD,QAAA,aAAa,GAAG,oBAAoB,CAAC;AAElD,MAAa,mBAAmB;IAC9B,MAAM,CAAC,IAAI,CACT,OAAsB,EACtB,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;QACD,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,EAAE;YACnB,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,IAAI,mBAAmB,GAAG,IAAA,wBAAiB,EAAC,UAAU,CAAC,CAAC;YAExD,2DAA2D;YAC3D,4DAA4D;YAC5D,iCAAiC;YACjC,IAAI,WAAW,GAAG,IAAA,eAAQ,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YACzC,IAAI,WAAW,GAAG,IAAA,wBAAiB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YAElD,OAAO,IAAI,mBAAmB,CAC5B,OAAO,EACP,WAAW,EACX,QAAQ,EACR,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,0CAAE,IAAI,EACvB,KAAK,EACL,SAAS,EACT,WAAW,EACX,mBAAmB,CACpB,CAAC;SACH;IACH,CAAC;IAED,YACU,OAAsB,EACrB,SAAiB,EACjB,QAAgB,EAChB,IAAqC,EACrC,UAAmB,EACnB,UAAmD,EACpD,WAAmB,EACnB,mBAA2B;QAP3B,YAAO,GAAP,OAAO,CAAe;QACrB,cAAS,GAAT,SAAS,CAAQ;QACjB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,SAAI,GAAJ,IAAI,CAAiC;QACrC,eAAU,GAAV,UAAU,CAAS;QACnB,eAAU,GAAV,UAAU,CAAyC;QACpD,gBAAW,GAAX,WAAW,CAAQ;QACnB,wBAAmB,GAAnB,mBAAmB,CAAQ;IAClC,CAAC;IAEJ,IAAI,SAAS;QACX,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,qBAAa,CAAC,CAAC;IAClD,CAAC;IAED,IAAY,wBAAwB;QAClC,OAAO,GAAG,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IAChD,CAAC;IAED,IAAY,uBAAuB;QACjC,OAAO,GAAG,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,YAAoB;QACxB,OAAO,IAAI,mBAAmB,CAC5B,IAAI,CAAC,OAAO,EACZ,YAAY,EACZ,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,IAAI,EACT,KAAK,EACL,SAAS,EACT,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,mBAAmB,CACjB,CAAC;IACZ,CAAC;IACD,MAAM,CAAC,WAAmB;QACxB,IAAI,IAAI,CAAC,QAAQ,KAAK,WAAW,EAAE;YACjC,OAAO,IAAI,CAAC;SACb;aAAM;YACL,OAAO,IAAI,mBAAmB,CAC5B,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,SAAS,EACd,WAAW,EACX,IAAI,CAAC,IAAI,EACT,KAAK,EACL,SAAS,EACT,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,mBAAmB,CACjB,CAAC;SACX;IACH,CAAC;IACD,UAAU,CAAC,QAAgB;QACzB,OAAO,IAAI,mBAAmB,CAC5B,IAAI,CAAC,OAAO,EACZ,qBAAa,GAAG,QAAQ,EACxB,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,IAAI,EACT,KAAK,EACL,SAAS,EACT,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,mBAAmB,CACjB,CAAC;IACZ,CAAC;IACD,QAAQ,CAAC,IAAqC;QAC5C,OAAO,IAAI,mBAAmB,CAC5B,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,QAAQ,EACb,IAAI,EACJ,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,mBAAmB,CACjB,CAAC;IACZ,CAAC;IACD,QAAQ;QACN,OAAO,IAAI,mBAAmB,CAC5B,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,IAAI,EACT,IAAI,EACJ,SAAS,EACT,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,mBAAmB,CACjB,CAAC;IACZ,CAAC;IACD,KAAK,CAAC,cAAc;QAClB,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,OAAO;gBACL,IAAI,EAAE,OAAO;gBACb,QAAQ,EAAE,IAAI,CAAC,SAAS;gBACxB,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,wBAAwB,EAAE,UAAU,EAAE,IAAI,CAAC,uBAAuB,EAAE;gBACvF,SAAS,EAAE,IAAI,CAAC,SAAS;aAC1B,CAAC;SACH;QACD,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,2EAA2E;YAC3E,qBAAqB;YACrB,IAAI,GAAG,GAAG,IAAI,KAAK,CAAC,oBAAoB,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC;YACxE,GAAW,CAAC,IAAI,GAAG,kBAAkB,CAAC;YACvC,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC;SACnC;QACD,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,wBAAwB,EAAE,IAAI,CAAC,uBAAuB,EAAE;YACnG,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE;gBACN,SAAS,EAAE;oBACT,oBAAoB,EAAE,KAAK;oBAC3B,IAAI,EAAE,IAAI,CAAC,IAAI;iBAChB;aACF;SACF,CAAC,CAAC;QACH,IAAI,MAAM,EAAE;YACV,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,oBAAoB,CAAC,CAAC;YAC5D,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC;SACjF;aAAM;YACL,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC;SAC9C;IACH,CAAC;IAED,SAAS,CAAC,UAAuC;QAC/C,OAAO,IAAI,mBAAmB,CAC5B,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,UAAU,EACf,UAAU,EACV,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,mBAAmB,CACjB,CAAC;IACZ,CAAC;CACF;AArLD,kDAqLC","sourcesContent":["import type { ModuleRequest, Resolution } from '@embroider/core';\nimport { cleanUrl, getUrlQueryParams } from '@embroider/core';\nimport type { PluginContext, ResolveIdResult } from 'rollup';\n\nexport const virtualPrefix = 'embroider_virtual:';\n\nexport class RollupModuleRequest implements ModuleRequest {\n  static from(\n    context: PluginContext,\n    source: string,\n    importer: string | undefined,\n    custom: Record<string, any> | undefined\n  ): RollupModuleRequest | undefined {\n    if (!(custom?.embroider?.enableCustomResolver ?? true)) {\n      return;\n    }\n    if (custom?.depScan) {\n      return;\n    }\n\n    if (source && importer && source[0] !== '\\0') {\n      let nonVirtual: string;\n      if (importer.startsWith(virtualPrefix)) {\n        nonVirtual = importer.slice(virtualPrefix.length);\n      } else {\n        nonVirtual = importer;\n      }\n\n      // strip query params off the importer\n      let fromFile = cleanUrl(nonVirtual);\n      let importerQueryParams = getUrlQueryParams(nonVirtual);\n\n      // strip query params off the source but keep track of them\n      // we use regexp-based methods over a URL object because the\n      // source can be a relative path.\n      let cleanSource = cleanUrl(source, true);\n      let queryParams = getUrlQueryParams(source, true);\n\n      return new RollupModuleRequest(\n        context,\n        cleanSource,\n        fromFile,\n        custom?.embroider?.meta,\n        false,\n        undefined,\n        queryParams,\n        importerQueryParams\n      );\n    }\n  }\n\n  private constructor(\n    private context: PluginContext,\n    readonly specifier: string,\n    readonly fromFile: string,\n    readonly meta: Record<string, any> | undefined,\n    readonly isNotFound: boolean,\n    readonly resolvedTo: Resolution<ResolveIdResult> | undefined,\n    private queryParams: string,\n    private importerQueryParams: string\n  ) {}\n\n  get debugType() {\n    return 'rollup';\n  }\n\n  get isVirtual(): boolean {\n    return this.specifier.startsWith(virtualPrefix);\n  }\n\n  private get specifierWithQueryParams(): string {\n    return `${this.specifier}${this.queryParams}`;\n  }\n\n  private get fromFileWithQueryParams(): string {\n    return `${this.fromFile}${this.importerQueryParams}`;\n  }\n\n  alias(newSpecifier: string) {\n    return new RollupModuleRequest(\n      this.context,\n      newSpecifier,\n      this.fromFile,\n      this.meta,\n      false,\n      undefined,\n      this.queryParams,\n      this.importerQueryParams\n    ) as this;\n  }\n  rehome(newFromFile: string) {\n    if (this.fromFile === newFromFile) {\n      return this;\n    } else {\n      return new RollupModuleRequest(\n        this.context,\n        this.specifier,\n        newFromFile,\n        this.meta,\n        false,\n        undefined,\n        this.queryParams,\n        this.importerQueryParams\n      ) as this;\n    }\n  }\n  virtualize(filename: string) {\n    return new RollupModuleRequest(\n      this.context,\n      virtualPrefix + filename,\n      this.fromFile,\n      this.meta,\n      false,\n      undefined,\n      this.queryParams,\n      this.importerQueryParams\n    ) as this;\n  }\n  withMeta(meta: Record<string, any> | undefined): this {\n    return new RollupModuleRequest(\n      this.context,\n      this.specifier,\n      this.fromFile,\n      meta,\n      this.isNotFound,\n      this.resolvedTo,\n      this.queryParams,\n      this.importerQueryParams\n    ) as this;\n  }\n  notFound(): this {\n    return new RollupModuleRequest(\n      this.context,\n      this.specifier,\n      this.fromFile,\n      this.meta,\n      true,\n      undefined,\n      this.queryParams,\n      this.importerQueryParams\n    ) as this;\n  }\n  async defaultResolve(): Promise<Resolution<ResolveIdResult>> {\n    if (this.isVirtual) {\n      return {\n        type: 'found',\n        filename: this.specifier,\n        result: { id: this.specifierWithQueryParams, resolvedBy: this.fromFileWithQueryParams },\n        isVirtual: this.isVirtual,\n      };\n    }\n    if (this.isNotFound) {\n      // TODO: we can make sure this looks correct in rollup & vite output when a\n      // user encounters it\n      let err = new Error(`module not found ${this.specifierWithQueryParams}`);\n      (err as any).code = 'MODULE_NOT_FOUND';\n      return { type: 'not_found', err };\n    }\n    let result = await this.context.resolve(this.specifierWithQueryParams, this.fromFileWithQueryParams, {\n      skipSelf: true,\n      custom: {\n        embroider: {\n          enableCustomResolver: false,\n          meta: this.meta,\n        },\n      },\n    });\n    if (result) {\n      let { pathname } = new URL(result.id, 'http://example.com');\n      return { type: 'found', filename: pathname, result, isVirtual: this.isVirtual };\n    } else {\n      return { type: 'not_found', err: undefined };\n    }\n  }\n\n  resolveTo(resolution: Resolution<ResolveIdResult>): this {\n    return new RollupModuleRequest(\n      this.context,\n      this.specifier,\n      this.fromFile,\n      this.meta,\n      this.isNotFound,\n      resolution,\n      this.queryParams,\n      this.importerQueryParams\n    ) as this;\n  }\n}\n"]}
+{"version":3,"file":"request.js","sourceRoot":"","sources":["request.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ModuleRequest, Resolution } from '@embroider/core';\nimport { cleanUrl, getUrlQueryParams } from '@embroider/core';\nimport type { PluginContext, ResolveIdResult } from 'rollup';\n\nexport const virtualPrefix = 'embroider_virtual:';\n\nexport class RollupModuleRequest implements ModuleRequest {\n  static from(\n    context: PluginContext,\n    source: string,\n    importer: string | undefined,\n    custom: Record<string, any> | undefined\n  ): RollupModuleRequest | undefined {\n    if (!(custom?.embroider?.enableCustomResolver ?? true)) {\n      return;\n    }\n    if (source && importer && source[0] !== '\\0') {\n      let nonVirtual: string;\n      if (importer.startsWith(virtualPrefix)) {\n        nonVirtual = importer.slice(virtualPrefix.length);\n      } else {\n        nonVirtual = importer;\n      }\n\n      // strip query params off the importer\n      let fromFile = cleanUrl(nonVirtual);\n      let importerQueryParams = getUrlQueryParams(nonVirtual);\n\n      // strip query params off the source but keep track of them\n      // we use regexp-based methods over a URL object because the\n      // source can be a relative path.\n      let cleanSource = cleanUrl(source);\n      let queryParams = getUrlQueryParams(source);\n\n      return new RollupModuleRequest(\n        context,\n        cleanSource,\n        fromFile,\n        custom?.embroider?.meta,\n        false,\n        undefined,\n        queryParams,\n        importerQueryParams\n      );\n    }\n  }\n\n  private constructor(\n    private context: PluginContext,\n    readonly specifier: string,\n    readonly fromFile: string,\n    readonly meta: Record<string, any> | undefined,\n    readonly isNotFound: boolean,\n    readonly resolvedTo: Resolution<ResolveIdResult> | undefined,\n    private queryParams: string,\n    private importerQueryParams: string\n  ) {}\n\n  get debugType() {\n    return 'rollup';\n  }\n\n  get isVirtual(): boolean {\n    return this.specifier.startsWith(virtualPrefix);\n  }\n\n  private get specifierWithQueryParams(): string {\n    return `${this.specifier}${this.queryParams}`;\n  }\n\n  private get fromFileWithQueryParams(): string {\n    return `${this.fromFile}${this.importerQueryParams}`;\n  }\n\n  alias(newSpecifier: string) {\n    return new RollupModuleRequest(\n      this.context,\n      newSpecifier,\n      this.fromFile,\n      this.meta,\n      false,\n      undefined,\n      this.queryParams,\n      this.importerQueryParams\n    ) as this;\n  }\n  rehome(newFromFile: string) {\n    if (this.fromFile === newFromFile) {\n      return this;\n    } else {\n      return new RollupModuleRequest(\n        this.context,\n        this.specifier,\n        newFromFile,\n        this.meta,\n        false,\n        undefined,\n        this.queryParams,\n        this.importerQueryParams\n      ) as this;\n    }\n  }\n  virtualize(filename: string) {\n    return new RollupModuleRequest(\n      this.context,\n      virtualPrefix + filename,\n      this.fromFile,\n      this.meta,\n      false,\n      undefined,\n      this.queryParams,\n      this.importerQueryParams\n    ) as this;\n  }\n  withMeta(meta: Record<string, any> | undefined): this {\n    return new RollupModuleRequest(\n      this.context,\n      this.specifier,\n      this.fromFile,\n      meta,\n      this.isNotFound,\n      this.resolvedTo,\n      this.queryParams,\n      this.importerQueryParams\n    ) as this;\n  }\n  notFound(): this {\n    return new RollupModuleRequest(\n      this.context,\n      this.specifier,\n      this.fromFile,\n      this.meta,\n      true,\n      undefined,\n      this.queryParams,\n      this.importerQueryParams\n    ) as this;\n  }\n  async defaultResolve(): Promise<Resolution<ResolveIdResult>> {\n    if (this.isVirtual) {\n      return {\n        type: 'found',\n        filename: this.specifier,\n        result: { id: this.specifierWithQueryParams, resolvedBy: this.fromFileWithQueryParams },\n        isVirtual: this.isVirtual,\n      };\n    }\n    if (this.isNotFound) {\n      // TODO: we can make sure this looks correct in rollup & vite output when a\n      // user encounters it\n      let err = new Error(`module not found ${this.specifierWithQueryParams}`);\n      (err as any).code = 'MODULE_NOT_FOUND';\n      return { type: 'not_found', err };\n    }\n    let result = await this.context.resolve(this.specifierWithQueryParams, this.fromFileWithQueryParams, {\n      skipSelf: true,\n      custom: {\n        embroider: {\n          enableCustomResolver: false,\n          meta: this.meta,\n        },\n      },\n    });\n    if (result) {\n      let { pathname } = new URL(result.id, 'http://example.com');\n      return { type: 'found', filename: pathname, result, isVirtual: this.isVirtual };\n    } else {\n      return { type: 'not_found', err: undefined };\n    }\n  }\n\n  resolveTo(resolution: Resolution<ResolveIdResult>): this {\n    return new RollupModuleRequest(\n      this.context,\n      this.specifier,\n      this.fromFile,\n      this.meta,\n      this.isNotFound,\n      resolution,\n      this.queryParams,\n      this.importerQueryParams\n    ) as this;\n  }\n}\n"]}

package/src/resolver.js

@@ -3,12 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolver = void 0;
+exports.resolver = resolver;
 const core_1 = require("@embroider/core");
 const request_1 = require("./request");
 const assert_never_1 = __importDefault(require("assert-never"));
 const debug_1 = __importDefault(require("debug"));
 const path_1 = require("path");
+const esbuild_request_1 = require("./esbuild-request");
 const debug = (0, debug_1.default)('embroider:vite');
 function resolver() {
     let resolverLoader = new core_1.ResolverLoader(process.cwd());
@@ -35,6 +36,10 @@ function resolver() {
             });
         },
         async resolveId(source, importer, options) {
+            var _a;
+            if ((_a = options.custom) === null || _a === void 0 ? void 0 : _a.depScan) {
+                return await observeDepScan(this, source, importer, options);
+            }
             let request = request_1.RollupModuleRequest.from(this, source, importer, options.custom);
             if (!request) {
                 // fallthrough to other rollup plugins
@@ -61,6 +66,11 @@ function resolver() {
             }
         },
         buildEnd() {
+            this.emitFile({
+                type: 'asset',
+                fileName: '@embroider/core/vendor.js',
+                source: (0, core_1.virtualContent)((0, path_1.resolve)(resolverLoader.resolver.options.engines[0].root, '-embroider-vendor.js'), resolverLoader.resolver).src,
+            });
             this.emitFile({
                 type: 'asset',
                 fileName: '@embroider/core/test-support.js',
@@ -69,5 +79,24 @@ function resolver() {
         },
     };
 }
-exports.resolver = resolver;
+// During depscan, we have a wildly different job than during normal
+// usage. Embroider's esbuild resolver plugin replaces this rollup
+// resolver plugin for actually doing resolving, so we don't do any of
+// that. But we are still well-positioned to observe what vite's rollup
+// resolver plugin is doing, and that is important because vite's
+// esbuild depscan plugin will always obscure the results before
+// embroider's esbuild resolver plugin can see them. It obscures the
+// results by marking *both* "not found" and "this is a third-party
+// package" as "external: true". We really care about the difference
+// between the two, since we have fallback behaviors that should apply
+// to "not found" that should not apply to successfully discovered
+// third-party packages.
+async function observeDepScan(context, source, importer, options) {
+    let result = await context.resolve(source, importer, {
+        ...options,
+        skipSelf: true,
+    });
+    (0, esbuild_request_1.writeStatus)(source, result ? 'found' : 'not_found');
+    return result;
+}
 //# sourceMappingURL=resolver.js.map

package/src/resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolver.js","sourceRoot":"","sources":["resolver.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Plugin, ViteDevServer } from 'vite';\nimport { virtualContent, ResolverLoader } from '@embroider/core';\nimport { RollupModuleRequest, virtualPrefix } from './request';\nimport assertNever from 'assert-never';\nimport makeDebug from 'debug';\nimport { resolve } from 'path';\n\nconst debug = makeDebug('embroider:vite');\n\nexport function resolver(): Plugin {\n  let resolverLoader = new ResolverLoader(process.cwd());\n  let server: ViteDevServer;\n  let virtualDeps: Map<string, string[]> = new Map();\n\n  return {\n    name: 'embroider-resolver',\n    enforce: 'pre',\n\n    configureServer(s) {\n      server = s;\n      server.watcher.on('all', (_eventName, path) => {\n        for (let [id, watches] of virtualDeps) {\n          for (let watch of watches) {\n            if (path.startsWith(watch)) {\n              debug('Invalidate %s because %s', id, path);\n              server.moduleGraph.onFileChange(id);\n              let m = server.moduleGraph.getModuleById(id);\n              if (m) {\n                server.reloadModule(m);\n              }\n            }\n          }\n        }\n      });\n    },\n\n    async resolveId(source, importer, options) {\n      let request = RollupModuleRequest.from(this, source, importer, options.custom);\n      if (!request) {\n        // fallthrough to other rollup plugins\n        return null;\n      }\n      let resolution = await resolverLoader.resolver.resolve(request);\n      switch (resolution.type) {\n        case 'found':\n        case 'ignored':\n          return resolution.result;\n        case 'not_found':\n          return null;\n        default:\n          throw assertNever(resolution);\n      }\n    },\n    load(id) {\n      if (id.startsWith(virtualPrefix)) {\n        let { pathname } = new URL(id, 'http://example.com');\n        let { src, watches } = virtualContent(pathname.slice(virtualPrefix.length + 1), resolverLoader.resolver);\n        virtualDeps.set(id, watches);\n        server?.watcher.add(watches);\n        return src;\n      }\n    },\n    buildEnd() {\n      this.emitFile({\n        type: 'asset',\n        fileName: '@embroider/core/test-support.js',\n        source: virtualContent(\n          resolve(resolverLoader.resolver.options.engines[0].root, '-embroider-test-support.js'),\n          resolverLoader.resolver\n        ).src,\n      });\n    },\n  };\n}\n"]}
+{"version":3,"file":"resolver.js","sourceRoot":"","sources":["resolver.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Plugin, ViteDevServer } from 'vite';\nimport { virtualContent, ResolverLoader } from '@embroider/core';\nimport { RollupModuleRequest, virtualPrefix } from './request';\nimport assertNever from 'assert-never';\nimport makeDebug from 'debug';\nimport { resolve } from 'path';\nimport { writeStatus } from './esbuild-request';\nimport type { PluginContext } from 'rollup';\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      if (options.custom?.depScan) {\n        return await observeDepScan(this, source, importer, options);\n      }\n\n      let request = RollupModuleRequest.from(this, source, importer, options.custom);\n      if (!request) {\n        // fallthrough to other rollup plugins\n        return null;\n      }\n      let resolution = await resolverLoader.resolver.resolve(request);\n      switch (resolution.type) {\n        case 'found':\n        case 'ignored':\n          return resolution.result;\n        case 'not_found':\n          return null;\n        default:\n          throw assertNever(resolution);\n      }\n    },\n    load(id) {\n      if (id.startsWith(virtualPrefix)) {\n        let { pathname } = new URL(id, 'http://example.com');\n        let { src, watches } = virtualContent(pathname.slice(virtualPrefix.length + 1), resolverLoader.resolver);\n        virtualDeps.set(id, watches);\n        server?.watcher.add(watches);\n        return src;\n      }\n    },\n    buildEnd() {\n      this.emitFile({\n        type: 'asset',\n        fileName: '@embroider/core/vendor.js',\n        source: virtualContent(\n          resolve(resolverLoader.resolver.options.engines[0].root, '-embroider-vendor.js'),\n          resolverLoader.resolver\n        ).src,\n      });\n      this.emitFile({\n        type: 'asset',\n        fileName: '@embroider/core/test-support.js',\n        source: virtualContent(\n          resolve(resolverLoader.resolver.options.engines[0].root, '-embroider-test-support.js'),\n          resolverLoader.resolver\n        ).src,\n      });\n    },\n  };\n}\n\n// During depscan, we have a wildly different job than during normal\n// usage. Embroider's esbuild resolver plugin replaces this rollup\n// resolver plugin for actually doing resolving, so we don't do any of\n// that. But we are still well-positioned to observe what vite's rollup\n// resolver plugin is doing, and that is important because vite's\n// esbuild depscan plugin will always obscure the results before\n// embroider's esbuild resolver plugin can see them. It obscures the\n// results by marking *both* \"not found\" and \"this is a third-party\n// package\" as \"external: true\". We really care about the difference\n// between the two, since we have fallback behaviors that should apply\n// to \"not found\" that should not apply to successfully discovered\n// third-party packages.\nasync function observeDepScan(context: PluginContext, source: string, importer: string | undefined, options: any) {\n  let result = await context.resolve(source, importer, {\n    ...options,\n    skipSelf: true,\n  });\n  writeStatus(source, result ? 'found' : 'not_found');\n  return result;\n}\n"]}

package/src/scripts.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.scripts = void 0;
+exports.scripts = scripts;
 const jsdom_1 = require("jsdom");
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
@@ -65,7 +65,6 @@ function scripts(params) {
         },
     };
 }
-exports.scripts = scripts;
 class ScriptOptimizer {
     constructor(rootDir) {
         this.rootDir = rootDir;

package/src/scripts.js.map

@@ -1 +1 @@
-{"version":3,"file":"scripts.js","sourceRoot":"","sources":["scripts.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Plugin } from 'vite';\nimport type { EmittedFile } from 'rollup';\nimport { JSDOM } from 'jsdom';\nimport { readFileSync, readJSONSync, existsSync } from 'fs-extra';\nimport { dirname, posix, resolve } from 'path';\n\n// This is a type-only import, so it gets compiled away. At runtime, we load\n// terser lazily so it's only loaded for production builds that use it. Don't\n// add any non-type-only imports here.\nimport type { MinifyOptions } from 'terser';\n\nconst defaults = ['/assets/vendor.js', '/assets/test-support.js'];\n\nexport function scripts(params?: { include?: string[]; exclude?: string[] }): Plugin {\n  let optimizer: ScriptOptimizer;\n\n  // configured names are always interpreted as origin-absolute URLs.\n  let names = (params?.include ?? defaults)\n    .filter(name => !params?.exclude?.includes(name))\n    .map(name => {\n      if (name.startsWith('/')) {\n        return name;\n      } else {\n        return '/' + name;\n      }\n    });\n\n  return {\n    name: 'embroider-scripts',\n    enforce: 'pre',\n\n    configResolved(resolvedConfig) {\n      optimizer = new ScriptOptimizer(resolvedConfig.root);\n    },\n\n    async generateBundle() {\n      // this hook only runs in `vite build`\n      for (let name of names) {\n        for (let file of await optimizer.optimizedScript(name)) {\n          this.emitFile(file);\n        }\n      }\n    },\n\n    transformIndexHtml(htmlIn, context) {\n      // we don't do anything in `vite dev`, we only need to work in `vite\n      // build`\n      if (!context.server) {\n        return optimizer.transformHTML(htmlIn);\n      }\n    },\n  };\n}\n\nclass ScriptOptimizer {\n  private emitted = new Map<string, string>();\n  private transformState:\n    | {\n        htmlIn: string;\n        htmlOut: string;\n        parsed: JSDOM;\n      }\n    | undefined;\n\n  constructor(private rootDir: string) {}\n\n  async optimizedScript(script: string): Promise<EmittedFile[]> {\n    let fullName = resolve(this.rootDir, script.slice(1));\n    if (!existsSync(fullName)) {\n      // in prod builds, test-support.js isn't going to exist (for example)\n      return [];\n    }\n\n    // loading these lazily here so they never load in non-production builds.\n    // The node cache will ensures we only load them once.\n    const [Terser, srcURL] = await Promise.all([import('terser'), import('source-map-url')]);\n\n    let inCode = readFileSync(fullName, 'utf8');\n    let terserOpts: MinifyOptions = {};\n    let fileRelativeSourceMapURL;\n    let appRelativeSourceMapURL;\n    if (srcURL.default.existsIn(inCode)) {\n      fileRelativeSourceMapURL = srcURL.default.getFrom(inCode)!;\n      appRelativeSourceMapURL = posix.join(dirname(script.slice(1)), fileRelativeSourceMapURL);\n      let content;\n      try {\n        content = readJSONSync(resolve(this.rootDir, appRelativeSourceMapURL));\n      } catch (err) {\n        // the script refers to a sourcemap that doesn't exist, so we just leave\n        // the map out.\n      }\n      if (content) {\n        terserOpts.sourceMap = { content, url: fileRelativeSourceMapURL };\n      }\n    }\n    let { code: outCode, map: outMap } = await Terser.default.minify(inCode, terserOpts);\n    let finalFilename = await this.getFingerprintedFilename(script, outCode!);\n    let emit: EmittedFile[] = [];\n    emit.push({\n      type: 'asset',\n      fileName: finalFilename.slice(1),\n      source: outCode!,\n    });\n    this.emitted.set(script, finalFilename);\n    if (appRelativeSourceMapURL && outMap) {\n      emit.push({\n        type: 'asset',\n        fileName: appRelativeSourceMapURL,\n        source: JSON.stringify(outMap, null, 2),\n      });\n    }\n    return emit;\n  }\n\n  async getFingerprintedFilename(filename: string, content: string): Promise<string> {\n    let crypto = await import('crypto');\n    let md5 = crypto.createHash('md5');\n    md5.update(content);\n    let hash = md5.digest('hex');\n    let fileParts = filename.split('.');\n    fileParts.splice(fileParts.length - 1, 0, hash);\n    return fileParts.join('.');\n  }\n\n  transformHTML(htmlIn: string) {\n    if (this.transformState?.htmlIn !== htmlIn) {\n      let parsed = new JSDOM(htmlIn);\n      let scriptTags = [...parsed.window.document.querySelectorAll('script')] as HTMLScriptElement[];\n      for (let scriptTag of scriptTags) {\n        if (scriptTag.type !== 'module') {\n          let fingerprinted = this.emitted.get(scriptTag.src);\n          if (fingerprinted) {\n            scriptTag.src = fingerprinted;\n          }\n        }\n      }\n      let htmlOut = parsed.serialize();\n      this.transformState = { htmlIn, parsed, htmlOut };\n    }\n    return this.transformState.htmlOut;\n  }\n}\n"]}
+{"version":3,"file":"scripts.js","sourceRoot":"","sources":["scripts.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Plugin } from 'vite';\nimport type { EmittedFile } from 'rollup';\nimport { JSDOM } from 'jsdom';\nimport { readFileSync, readJSONSync, existsSync } from 'fs-extra';\nimport { dirname, posix, resolve } from 'path';\n\n// This is a type-only import, so it gets compiled away. At runtime, we load\n// terser lazily so it's only loaded for production builds that use it. Don't\n// add any non-type-only imports here.\nimport type { MinifyOptions } from 'terser';\n\nconst defaults = ['/assets/vendor.js', '/assets/test-support.js'];\n\nexport function scripts(params?: { include?: string[]; exclude?: string[] }): Plugin {\n  let optimizer: ScriptOptimizer;\n\n  // configured names are always interpreted as origin-absolute URLs.\n  let names = (params?.include ?? defaults)\n    .filter(name => !params?.exclude?.includes(name))\n    .map(name => {\n      if (name.startsWith('/')) {\n        return name;\n      } else {\n        return '/' + name;\n      }\n    });\n\n  return {\n    name: 'embroider-scripts',\n    enforce: 'pre',\n\n    configResolved(resolvedConfig) {\n      optimizer = new ScriptOptimizer(resolvedConfig.root);\n    },\n\n    async generateBundle() {\n      // this hook only runs in `vite build`\n      for (let name of names) {\n        for (let file of await optimizer.optimizedScript(name)) {\n          this.emitFile(file);\n        }\n      }\n    },\n\n    transformIndexHtml(htmlIn, context) {\n      // we don't do anything in `vite dev`, we only need to work in `vite\n      // build`\n      if (!context.server) {\n        return optimizer.transformHTML(htmlIn);\n      }\n    },\n  };\n}\n\nclass ScriptOptimizer {\n  private emitted = new Map<string, string>();\n  private transformState:\n    | {\n        htmlIn: string;\n        htmlOut: string;\n        parsed: JSDOM;\n      }\n    | undefined;\n\n  constructor(private rootDir: string) {}\n\n  async optimizedScript(script: string): Promise<EmittedFile[]> {\n    let fullName = resolve(this.rootDir, script.slice(1));\n    if (!existsSync(fullName)) {\n      // in prod builds, test-support.js isn't going to exist (for example)\n      return [];\n    }\n\n    // loading these lazily here so they never load in non-production builds.\n    // The node cache will ensures we only load them once.\n    const [Terser, srcURL] = await Promise.all([import('terser'), import('source-map-url')]);\n\n    let inCode = readFileSync(fullName, 'utf8');\n    let terserOpts: MinifyOptions = {};\n    let fileRelativeSourceMapURL;\n    let appRelativeSourceMapURL;\n    if (srcURL.default.existsIn(inCode)) {\n      fileRelativeSourceMapURL = srcURL.default.getFrom(inCode)!;\n      appRelativeSourceMapURL = posix.join(dirname(script.slice(1)), fileRelativeSourceMapURL);\n      let content;\n      try {\n        content = readJSONSync(resolve(this.rootDir, appRelativeSourceMapURL));\n      } catch (err) {\n        // the script refers to a sourcemap that doesn't exist, so we just leave\n        // the map out.\n      }\n      if (content) {\n        terserOpts.sourceMap = { content, url: fileRelativeSourceMapURL };\n      }\n    }\n    let { code: outCode, map: outMap } = await Terser.default.minify(inCode, terserOpts);\n    let finalFilename = await this.getFingerprintedFilename(script, outCode!);\n    let emit: EmittedFile[] = [];\n    emit.push({\n      type: 'asset',\n      fileName: finalFilename.slice(1),\n      source: outCode!,\n    });\n    this.emitted.set(script, finalFilename);\n    if (appRelativeSourceMapURL && outMap) {\n      emit.push({\n        type: 'asset',\n        fileName: appRelativeSourceMapURL,\n        source: JSON.stringify(outMap, null, 2),\n      });\n    }\n    return emit;\n  }\n\n  async getFingerprintedFilename(filename: string, content: string): Promise<string> {\n    let crypto = await import('crypto');\n    let md5 = crypto.createHash('md5');\n    md5.update(content);\n    let hash = md5.digest('hex');\n    let fileParts = filename.split('.');\n    fileParts.splice(fileParts.length - 1, 0, hash);\n    return fileParts.join('.');\n  }\n\n  transformHTML(htmlIn: string) {\n    if (this.transformState?.htmlIn !== htmlIn) {\n      let parsed = new JSDOM(htmlIn);\n      let scriptTags = [...parsed.window.document.querySelectorAll('script')] as HTMLScriptElement[];\n      for (let scriptTag of scriptTags) {\n        if (scriptTag.type !== 'module') {\n          let fingerprinted = this.emitted.get(scriptTag.src);\n          if (fingerprinted) {\n            scriptTag.src = fingerprinted;\n          }\n        }\n      }\n      let htmlOut = parsed.serialize();\n      this.transformState = { htmlIn, parsed, htmlOut };\n    }\n    return this.transformState.htmlOut;\n  }\n}\n"]}

package/src/template-tag.js

@@ -1,45 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.templateTag = void 0;
+exports.templateTag = templateTag;
 const pluginutils_1 = require("@rollup/pluginutils");
 const content_tag_1 = require("content-tag");
 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', id + '.gts'];
-    }
     return {
         name: 'embroider-template-tag',
         enforce: 'pre',
-        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,
-            });
-            if (resolution) {
-                return resolution;
-            }
-            for (let candidate of candidates(id)) {
-                resolution = await this.resolve(candidate, importer, {
-                    skipSelf: true,
-                    custom: {
-                        embroider: {
-                            isExtensionSearch: true,
-                            enableCustomResolver: false,
-                        },
-                    },
-                });
-                if (resolution) {
-                    return {
-                        id: resolution.id,
-                    };
-                }
-            }
-        },
         transform(code, id) {
             if (!gjsFilter(id)) {
                 return null;
@@ -51,5 +20,4 @@ function templateTag({ inline_source_map } = { inline_source_map: false }) {
         },
     };
 }
-exports.templateTag = templateTag;
 //# sourceMappingURL=template-tag.js.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,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"]}
+{"version":3,"file":"template-tag.js","sourceRoot":"","sources":["template-tag.ts"],"names":[],"mappings":";;AAMA,kCAiBC;AAvBD,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,OAAO;QACL,IAAI,EAAE,wBAAwB;QAC9B,OAAO,EAAE,KAAK;QAEd,SAAS,CAAC,IAAY,EAAE,EAAU;YAChC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC;gBACnB,OAAO,IAAI,CAAC;YACd,CAAC;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","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  return {\n    name: 'embroider-template-tag',\n    enforce: 'pre',\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"]}