@embroider/vite 0.2.1-unstable.f7656a3 → 0.2.1

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';\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"]}
+{"version":3,"file":"resolver.js","sourceRoot":"","sources":["resolver.ts"],"names":[],"mappings":";;;;;AASA,4BA6BC;AApCD,+BAA4B;AAE5B,0CAAsF;AACtF,uCAAwC;AACxC,uCAA+D;AAC/D,gEAAuC;AAEvC,SAAgB,QAAQ;IACtB,IAAI,eAAe,GAAoB,IAAA,uBAAY,EAAC,IAAA,WAAI,EAAC,IAAA,gCAAyB,EAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC;IACrH,IAAI,QAAQ,GAAG,IAAI,eAAQ,CAAC,eAAe,CAAC,CAAC;IAE7C,OAAO;QACL,IAAI,EAAE,oBAAoB;QAC1B,OAAO,EAAE,KAAK;QACd,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO;YACvC,IAAI,OAAO,GAAG,6BAAmB,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YACzE,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,sCAAsC;gBACtC,OAAO,IAAI,CAAC;YACd,CAAC;YACD,IAAI,UAAU,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;YACvE,QAAQ,UAAU,CAAC,IAAI,EAAE,CAAC;gBACxB,KAAK,OAAO;oBACV,OAAO,UAAU,CAAC,MAAM,CAAC;gBAC3B,KAAK,WAAW;oBACd,OAAO,IAAI,CAAC;gBACd;oBACE,MAAM,IAAA,sBAAW,EAAC,UAAU,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;QACD,IAAI,CAAC,EAAE;YACL,IAAI,EAAE,CAAC,UAAU,CAAC,uBAAa,CAAC,EAAE,CAAC;gBACjC,OAAO,IAAA,qBAAc,EAAC,EAAE,CAAC,KAAK,CAAC,uBAAa,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC;YAClE,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,OAAsB;IAC5C,OAAO,KAAK,EAAE,OAA4B,EAAE,EAAE;QAC5C,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YACtB,OAAO;gBACL,IAAI,EAAE,OAAO;gBACb,MAAM,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,SAAS,EAAE,UAAU,EAAE,OAAO,CAAC,QAAQ,EAAE;aAChE,CAAC;QACJ,CAAC;QACD,IAAI,MAAM,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,QAAQ,EAAE;YACtE,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE;gBACN,SAAS,EAAE;oBACT,IAAI,EAAE,OAAO,CAAC,IAAI;iBACnB;aACF;SACF,CAAC,CAAC;QACH,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QACnC,CAAC;aAAM,CAAC;YACN,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC;QAC/C,CAAC;IACH,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import type { PluginContext, ResolveIdResult } from 'rollup';\nimport type { Plugin } from 'vite';\nimport { join } from 'path';\nimport type { Resolution, ResolverFunction, ResolverOptions } from '@embroider/core';\nimport { Resolver, locateEmbroiderWorkingDir, virtualContent } from '@embroider/core';\nimport { readJSONSync } from 'fs-extra';\nimport { RollupModuleRequest, virtualPrefix } from './request';\nimport assertNever from 'assert-never';\n\nexport function resolver(): Plugin {\n  let resolverOptions: ResolverOptions = readJSONSync(join(locateEmbroiderWorkingDir(process.cwd()), 'resolver.json'));\n  let resolver = new Resolver(resolverOptions);\n\n  return {\n    name: 'embroider-resolver',\n    enforce: 'pre',\n    async resolveId(source, importer, options) {\n      let request = RollupModuleRequest.from(source, importer, options.custom);\n      if (!request) {\n        // fallthrough to other rollup plugins\n        return null;\n      }\n      let resolution = await resolver.resolve(request, defaultResolve(this));\n      switch (resolution.type) {\n        case 'found':\n          return resolution.result;\n        case 'not_found':\n          return null;\n        default:\n          throw assertNever(resolution);\n      }\n    },\n    load(id) {\n      if (id.startsWith(virtualPrefix)) {\n        return virtualContent(id.slice(virtualPrefix.length), resolver);\n      }\n    },\n  };\n}\n\nfunction defaultResolve(context: PluginContext): ResolverFunction<RollupModuleRequest, Resolution<ResolveIdResult>> {\n  return async (request: RollupModuleRequest) => {\n    if (request.isVirtual) {\n      return {\n        type: 'found',\n        result: { id: request.specifier, resolvedBy: request.fromFile },\n      };\n    }\n    let result = await context.resolve(request.specifier, request.fromFile, {\n      skipSelf: true,\n      custom: {\n        embroider: {\n          meta: request.meta,\n        },\n      },\n    });\n    if (result) {\n      return { type: 'found', result };\n    } else {\n      return { type: 'not_found', err: undefined };\n    }\n  };\n}\n"]}

package/src/scripts.js

@@ -71,15 +71,10 @@ class ScriptOptimizer {
         this.emitted = new Map();
     }
     async optimizedScript(script) {
-        let fullName = (0, path_1.resolve)(this.rootDir, script.slice(1));
-        if (!(0, fs_extra_1.existsSync)(fullName)) {
-            // in prod builds, test-support.js isn't going to exist (for example)
-            return [];
-        }
         // loading these lazily here so they never load in non-production builds.
         // The node cache will ensures we only load them once.
         const [Terser, srcURL] = await Promise.all([Promise.resolve().then(() => __importStar(require('terser'))), Promise.resolve().then(() => __importStar(require('source-map-url')))]);
-        let inCode = (0, fs_extra_1.readFileSync)(fullName, 'utf8');
+        let inCode = (0, fs_extra_1.readFileSync)((0, path_1.resolve)(this.rootDir, script.slice(1)), 'utf8');
         let terserOpts = {};
         let fileRelativeSourceMapURL;
         let appRelativeSourceMapURL;

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 } 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    // 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(resolve(this.rootDir, script.slice(1)), '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

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

package/src/template-tag.js.map

@@ -1 +1 @@
-{"version":3,"file":"template-tag.js","sourceRoot":"","sources":["template-tag.ts"],"names":[],"mappings":";;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"]}
+{"version":3,"file":"template-tag.js","sourceRoot":"","sources":["template-tag.ts"],"names":[],"mappings":";;AAOA,kCA6CC;AApDD,qDAAmD;AAEnD,2BAAkC;AAClC,6CAA2C;AAE3C,MAAM,SAAS,GAAG,IAAA,0BAAY,EAAC,UAAU,CAAC,CAAC;AAE3C,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,CAAC,CAAC;IACvB,CAAC;IAED,OAAO;QACL,IAAI,EAAE,wBAAwB;QAC9B,OAAO,EAAE,KAAK;QAEd,KAAK,CAAC,SAAS,CAAC,EAAU,EAAE,QAA4B;YACtD,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,QAAQ,EAAE;gBAChD,QAAQ,EAAE,IAAI;aACf,CAAC,CAAC;YACH,IAAI,UAAU,EAAE,CAAC;gBACf,OAAO,UAAU,CAAC;YACpB,CAAC;YACD,KAAK,IAAI,SAAS,IAAI,UAAU,CAAC,EAAE,CAAC,EAAE,CAAC;gBACrC,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE;oBACnD,QAAQ,EAAE,IAAI;oBACd,MAAM,EAAE;wBACN,SAAS,EAAE;4BACT,oBAAoB,EAAE,KAAK;yBAC5B;qBACF;iBACF,CAAC,CAAC;gBACH,IAAI,UAAU,EAAE,CAAC;oBACf,OAAO;wBACL,EAAE,EAAE,UAAU,CAAC,EAAE;qBAClB,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,CAAC,EAAU;YACb,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC;gBACnB,OAAO,IAAI,CAAC;YACd,CAAC;YACD,OAAO,YAAY,CAAC,OAAO,CAAC,IAAA,iBAAY,EAAC,EAAE,EAAE,MAAM,CAAC,EAAE;gBACpD,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 { readFileSync } from 'fs';\nimport { Preprocessor } from 'content-tag';\n\nconst gjsFilter = createFilter('**/*.gjs');\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'];\n  }\n\n  return {\n    name: 'embroider-template-tag',\n    enforce: 'pre',\n\n    async resolveId(id: string, importer: string | undefined) {\n      let resolution = await this.resolve(id, importer, {\n        skipSelf: true,\n      });\n      if (resolution) {\n        return resolution;\n      }\n      for (let candidate of candidates(id)) {\n        resolution = await this.resolve(candidate, importer, {\n          skipSelf: true,\n          custom: {\n            embroider: {\n              enableCustomResolver: false,\n            },\n          },\n        });\n        if (resolution) {\n          return {\n            id: resolution.id,\n          };\n        }\n      }\n    },\n\n    load(id: string) {\n      if (!gjsFilter(id)) {\n        return null;\n      }\n      return preprocessor.process(readFileSync(id, 'utf8'), {\n        filename: id,\n        inline_source_map: inline_source_map,\n      });\n    },\n  };\n}\n"]}

package/src/assets.d.ts

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

package/src/assets.js

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

package/src/assets.js.map

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

package/src/build.d.ts

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

package/src/build.js

@@ -1,64 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.emberBuild = emberBuild;
-exports.compatPrebuild = compatPrebuild;
-const child_process_1 = require("child_process");
-function emberBuild(command, mode, resolvableExtensions) {
-    let env = {
-        ...process.env,
-        EMBROIDER_PREBUILD: 'true',
-    };
-    if (resolvableExtensions) {
-        env['EMBROIDER_RESOLVABLE_EXTENSIONS'] = resolvableExtensions === null || resolvableExtensions === void 0 ? void 0 : resolvableExtensions.join(',');
-    }
-    if (command === 'build') {
-        return new Promise((resolve, reject) => {
-            const child = (0, child_process_1.fork)('./node_modules/ember-cli/bin/ember', ['build', '--environment', mode], { env });
-            child.on('exit', code => (code === 0 ? resolve() : reject()));
-        });
-    }
-    return new Promise((resolve, reject) => {
-        const child = (0, child_process_1.fork)('./node_modules/ember-cli/bin/ember', ['build', '--watch', '--environment', mode], {
-            silent: true,
-            env,
-        });
-        child.on('exit', code => (code === 0 ? resolve() : reject(new Error('ember build --watch failed'))));
-        child.on('spawn', () => {
-            var _a;
-            (_a = child.stderr) === null || _a === void 0 ? void 0 : _a.on('data', data => {
-                console.error(data.toString());
-            });
-            child.stdout.on('data', data => {
-                console.log(data.toString());
-                if (data.toString().includes('Build successful')) {
-                    resolve();
-                }
-            });
-        });
-    });
-}
-function compatPrebuild() {
-    let viteCommand;
-    let viteMode;
-    let resolvableExtensions;
-    return {
-        name: 'embroider-builder',
-        enforce: 'pre',
-        config(config, { mode, command }) {
-            var _a;
-            viteCommand = command;
-            viteMode = mode;
-            resolvableExtensions = (_a = config.resolve) === null || _a === void 0 ? void 0 : _a.extensions;
-        },
-        async buildStart() {
-            if (!viteCommand) {
-                throw new Error(`bug: embroider compatPrebuild did not detect Vite's command`);
-            }
-            if (!viteMode) {
-                throw new Error(`bug: embroider compatPrebuild did not detect Vite's mode`);
-            }
-            await emberBuild(viteCommand, viteMode, resolvableExtensions);
-        },
-    };
-}
-//# sourceMappingURL=build.js.map

package/src/build.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"build.js","sourceRoot":"","sources":["build.ts"],"names":[],"mappings":"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","sourcesContent":["import { fork } from 'child_process';\nimport type { Plugin } from 'vite';\n\nexport function emberBuild(command: string, mode: string, resolvableExtensions: string[] | undefined): Promise<void> {\n  let env: Record<string, string> = {\n    ...process.env,\n    EMBROIDER_PREBUILD: 'true',\n  };\n\n  if (resolvableExtensions) {\n    env['EMBROIDER_RESOLVABLE_EXTENSIONS'] = resolvableExtensions?.join(',');\n  }\n\n  if (command === 'build') {\n    return new Promise((resolve, reject) => {\n      const child = fork('./node_modules/ember-cli/bin/ember', ['build', '--environment', mode], { env });\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    });\n    child.on('exit', code => (code === 0 ? resolve() : reject(new Error('ember build --watch failed'))));\n    child.on('spawn', () => {\n      child.stderr?.on('data', data => {\n        console.error(data.toString());\n      });\n      child.stdout!.on('data', data => {\n        console.log(data.toString());\n        if (data.toString().includes('Build successful')) {\n          resolve();\n        }\n      });\n    });\n  });\n}\n\nexport function compatPrebuild(): Plugin {\n  let viteCommand: string | undefined;\n  let viteMode: string | undefined;\n  let resolvableExtensions: string[] | undefined;\n\n  return {\n    name: 'embroider-builder',\n    enforce: 'pre',\n    config(config, { mode, command }) {\n      viteCommand = command;\n      viteMode = mode;\n      resolvableExtensions = config.resolve?.extensions;\n    },\n    async buildStart() {\n      if (!viteCommand) {\n        throw new Error(`bug: embroider compatPrebuild did not detect Vite's command`);\n      }\n      if (!viteMode) {\n        throw new Error(`bug: embroider compatPrebuild did not detect Vite's mode`);\n      }\n      await emberBuild(viteCommand, viteMode, resolvableExtensions);\n    },\n  };\n}\n"]}

package/src/content-for.d.ts

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

package/src/content-for.js

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

package/src/content-for.js.map

@@ -1 +0,0 @@
-{"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

@@ -1,31 +0,0 @@
-import { type ModuleRequest } from '@embroider/core';
-import type { ImportKind, OnResolveResult, PluginBuild } from 'esbuild';
-import type { PackageCache as _PackageCache, Resolution } from '@embroider/core';
-type PublicAPI<T> = {
-    [K in keyof T]: T[K];
-};
-type PackageCache = PublicAPI<_PackageCache>;
-export declare class EsBuildModuleRequest implements ModuleRequest {
-    private packageCache;
-    private phase;
-    private context;
-    private kind;
-    readonly specifier: string;
-    readonly fromFile: string;
-    readonly meta: Record<string, any> | undefined;
-    readonly isVirtual: boolean;
-    readonly isNotFound: boolean;
-    readonly resolvedTo: Resolution<OnResolveResult, OnResolveResult> | undefined;
-    static from(packageCache: PackageCache, phase: 'bundling' | 'scanning', context: PluginBuild, kind: ImportKind, source: string, importer: string | undefined, pluginData: Record<string, any> | undefined): EsBuildModuleRequest | undefined;
-    private constructor();
-    get debugType(): string;
-    alias(newSpecifier: string): this;
-    rehome(newFromFile: string): this;
-    virtualize(filename: string): this;
-    withMeta(meta: Record<string, any> | undefined): this;
-    notFound(): this;
-    resolveTo(resolution: Resolution<OnResolveResult, OnResolveResult>): this;
-    defaultResolve(): Promise<Resolution<OnResolveResult, OnResolveResult>>;
-}
-export declare function writeStatus(id: string, status: 'found' | 'not_found'): void;
-export {};

package/src/esbuild-request.js

@@ -1,166 +0,0 @@
-"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");
-const reverse_exports_1 = require("@embroider/reverse-exports");
-class EsBuildModuleRequest {
-    static from(packageCache, phase, context, kind, source, importer, pluginData) {
-        var _a, _b, _c;
-        if (!((_b = (_a = pluginData === null || pluginData === void 0 ? void 0 : pluginData.embroider) === null || _a === void 0 ? void 0 : _a.enableCustomResolver) !== null && _b !== void 0 ? _b : true)) {
-            return;
-        }
-        if (source && importer && source[0] !== '\0' && !source.startsWith('virtual-module:')) {
-            let fromFile = (0, core_1.cleanUrl)(importer);
-            return new EsBuildModuleRequest(packageCache, phase, context, kind, source, fromFile, (_c = pluginData === null || pluginData === void 0 ? void 0 : pluginData.embroider) === null || _c === void 0 ? void 0 : _c.meta, false, false, undefined);
-        }
-    }
-    constructor(packageCache, phase, context, kind, specifier, fromFile, meta, isVirtual, isNotFound, resolvedTo) {
-        this.packageCache = packageCache;
-        this.phase = phase;
-        this.context = context;
-        this.kind = kind;
-        this.specifier = specifier;
-        this.fromFile = fromFile;
-        this.meta = meta;
-        this.isVirtual = isVirtual;
-        this.isNotFound = isNotFound;
-        this.resolvedTo = resolvedTo;
-    }
-    get debugType() {
-        return 'esbuild';
-    }
-    alias(newSpecifier) {
-        return new EsBuildModuleRequest(this.packageCache, this.phase, this.context, this.kind, newSpecifier, this.fromFile, this.meta, this.isVirtual, false, undefined);
-    }
-    rehome(newFromFile) {
-        if (this.fromFile === newFromFile) {
-            return this;
-        }
-        else {
-            return new EsBuildModuleRequest(this.packageCache, this.phase, this.context, this.kind, this.specifier, newFromFile, this.meta, this.isVirtual, false, undefined);
-        }
-    }
-    virtualize(filename) {
-        return new EsBuildModuleRequest(this.packageCache, this.phase, this.context, this.kind, filename, this.fromFile, this.meta, true, false, undefined);
-    }
-    withMeta(meta) {
-        return new EsBuildModuleRequest(this.packageCache, this.phase, this.context, this.kind, this.specifier, this.fromFile, meta, this.isVirtual, this.isNotFound, this.resolvedTo);
-    }
-    notFound() {
-        return new EsBuildModuleRequest(this.packageCache, this.phase, this.context, this.kind, this.specifier, this.fromFile, this.meta, this.isVirtual, true, undefined);
-    }
-    resolveTo(resolution) {
-        return new EsBuildModuleRequest(this.packageCache, this.phase, this.context, this.kind, this.specifier, this.fromFile, this.meta, this.isVirtual, this.isNotFound, resolution);
-    }
-    async defaultResolve() {
-        const request = this;
-        if (request.isVirtual) {
-            return {
-                type: 'found',
-                filename: request.specifier,
-                result: { path: request.specifier, namespace: 'embroider-virtual' },
-                isVirtual: this.isVirtual,
-            };
-        }
-        if (request.isNotFound) {
-            // todo: make sure this looks correct to users
-            return {
-                type: 'not_found',
-                err: {
-                    errors: [{ text: `module not found ${request.specifier}` }],
-                },
-            };
-        }
-        requestStatus(request.specifier);
-        let result = await this.context.resolve(request.specifier, {
-            importer: request.fromFile,
-            resolveDir: (0, path_1.dirname)(request.fromFile),
-            kind: this.kind,
-            pluginData: {
-                embroider: {
-                    enableCustomResolver: false,
-                    meta: request.meta,
-                },
-            },
-        });
-        let status = readStatus(request.specifier);
-        if (result.errors.length > 0 || status === 'not_found') {
-            return { type: 'not_found', err: result };
-        }
-        else if (result.external) {
-            return { type: 'ignored', result };
-        }
-        else {
-            if (this.phase === 'bundling') {
-                // we need to ensure that we don't traverse back into the app while
-                // doing dependency pre-bundling. There are multiple ways an addon can
-                // resolve things from the app, due to the existince of both app-js
-                // (modules in addons that are logically part of the app's namespace)
-                // and non-strict handlebars (which resolves
-                // components/helpers/modifiers against the app's global pool).
-                let pkg = this.packageCache.ownerOfFile(result.path);
-                if ((pkg === null || pkg === void 0 ? void 0 : pkg.root) === this.packageCache.appRoot) {
-                    let externalizedName = request.specifier;
-                    if (!(0, core_1.packageName)(externalizedName)) {
-                        // the request was a relative path. This won't remain valid once
-                        // it has been bundled into vite/deps. But we know it targets the
-                        // app, so we can always convert it into a non-relative import
-                        // from the app's namespace
-                        //
-                        // IMPORTANT: whenever an addon resolves a relative path to the
-                        // app, it does so because our code in the core resolver has
-                        // rewritten the request to be relative to the app's root. So here
-                        // we will only ever encounter relative paths that are already
-                        // relative to the app's root directory.
-                        externalizedName = (0, reverse_exports_1.externalName)(pkg.packageJSON, externalizedName) || externalizedName;
-                    }
-                    return {
-                        type: 'ignored',
-                        result: {
-                            path: externalizedName,
-                            external: true,
-                        },
-                    };
-                }
-            }
-            return { type: 'found', filename: result.path, result, isVirtual: this.isVirtual };
-        }
-    }
-}
-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