@embroider/vite 0.2.1-unstable.a74ae69 → 0.2.1-unstable.b10d4db

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@embroider/vite",
-  "version": "0.2.1-unstable.a74ae69",
+  "version": "0.2.1-unstable.b10d4db",
   "main": "index.mjs",
   "peerDependencies": {
-    "@embroider/core": "3.4.4-unstable.a74ae69",
+    "@embroider/core": "3.4.4-unstable.b10d4db",
     "vite": "^4.3.9"
   },
   "scripts": {
@@ -11,10 +11,10 @@
   },
   "dependencies": {
     "@babel/core": "^7.22.9",
-    "@embroider/macros": "1.13.5-unstable.a74ae69",
+    "@embroider/macros": "1.13.5-unstable.b10d4db",
     "@rollup/pluginutils": "^4.1.1",
     "assert-never": "^1.2.1",
-    "content-tag": "^1.1.2",
+    "content-tag": "^2.0.1",
     "debug": "^4.3.2",
     "esbuild": "^0.17.19",
     "fs-extra": "^10.0.0",
@@ -23,7 +23,7 @@
     "terser": "^5.7.0"
   },
   "devDependencies": {
-    "@embroider/core": "3.4.4-unstable.a74ae69",
+    "@embroider/core": "3.4.4-unstable.b10d4db",
     "@types/babel__core": "^7.20.1",
     "@types/debug": "^4.1.5",
     "@types/jsdom": "^16.2.11",

package/src/esbuild-resolver.js

@@ -35,7 +35,7 @@ function esBuildResolver(root = process.cwd()) {
                 }
             });
             build.onLoad({ namespace: 'embroider', filter: /./ }, ({ path }) => {
-                let src = (0, core_2.virtualContent)(path, resolverLoader.resolver);
+                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'));
                 }
@@ -43,7 +43,7 @@ function esBuildResolver(root = process.cwd()) {
             });
             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), {
+                const result = (0, core_1.transform)(preprocessor.process(code, { filename }), {
                     configFile: (0, path_1.join)(process.cwd(), 'babel.config.js'),
                     filename,
                 });
@@ -65,7 +65,7 @@ function esBuildResolver(root = process.cwd()) {
             build.onLoad({ filter: /\.[jt]s$/ }, ({ path, namespace }) => {
                 let src;
                 if (namespace === 'embroider') {
-                    src = (0, core_2.virtualContent)(path, resolverLoader.resolver);
+                    src = (0, core_2.virtualContent)(path, resolverLoader.resolver).src;
                 }
                 else {
                     src = (0, fs_extra_1.readFileSync)(path, 'utf8');

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, ImportKind, OnResolveResult, PluginBuild } from 'esbuild';\nimport { type PluginItem, transform } from '@babel/core';\nimport {\n  type Resolution,\n  type ResolverFunction,\n  ResolverLoader,\n  virtualContent,\n  locateEmbroiderWorkingDir,\n} from '@embroider/core';\nimport { readFileSync, readJSONSync } from 'fs-extra';\nimport { EsBuildModuleRequest } from './esbuild-request';\nimport assertNever from 'assert-never';\nimport { dirname, resolve, join } from 'path';\nimport { hbsToJS } from '@embroider/core';\nimport { Preprocessor } from 'content-tag';\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      build.onResolve({ filter: /./ }, async ({ path, importer, pluginData, kind }) => {\n        let request = EsBuildModuleRequest.from(path, importer, pluginData);\n        if (!request) {\n          return null;\n        }\n        let resolution = await resolverLoader.resolver.resolve(request, defaultResolve(build, kind));\n        switch (resolution.type) {\n          case 'found':\n            return resolution.result;\n          case 'not_found':\n            return resolution.err;\n          default:\n            throw assertNever(resolution);\n        }\n      });\n\n      build.onLoad({ namespace: 'embroider', filter: /./ }, ({ path }) => {\n        let src = virtualContent(path, resolverLoader.resolver);\n        if (!macrosConfig) {\n          macrosConfig = readJSONSync(\n            resolve(locateEmbroiderWorkingDir(root), 'rewritten-app', 'macros-config.json')\n          ) as PluginItem;\n        }\n        return { contents: runMacros(src, path, macrosConfig) };\n      });\n\n      build.onLoad({ filter: /\\.g[jt]s$/ }, async ({ path: filename }) => {\n        const code = readFileSync(filename, 'utf8');\n\n        const result = transform(preprocessor.process(code, filename), {\n          configFile: join(process.cwd(), 'babel.config.js'),\n          filename,\n        });\n\n        if (!result || !result.code) {\n          throw new Error(`Failed to load file ${filename} in esbuild-hbs-loader`);\n        }\n\n        const contents = result.code;\n\n        return { contents };\n      });\n\n      build.onLoad({ filter: /\\.hbs$/ }, async ({ path: filename }) => {\n        const code = readFileSync(filename, 'utf8');\n\n        const result = transform(hbsToJS(code), { configFile: join(process.cwd(), 'babel.config.js'), filename });\n\n        if (!result || !result.code) {\n          throw new Error(`Failed to load file ${filename} in esbuild-hbs-loader`);\n        }\n\n        const contents = result.code;\n\n        return { contents };\n      });\n\n      build.onLoad({ filter: /\\.[jt]s$/ }, ({ path, namespace }) => {\n        let src: string;\n        if (namespace === 'embroider') {\n          src = virtualContent(path, resolverLoader.resolver);\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\nfunction defaultResolve(\n  context: PluginBuild,\n  kind: ImportKind\n): ResolverFunction<EsBuildModuleRequest, Resolution<OnResolveResult, OnResolveResult>> {\n  return async (request: EsBuildModuleRequest) => {\n    if (request.isVirtual) {\n      return {\n        type: 'found',\n        result: { path: request.specifier, namespace: 'embroider' },\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 context.resolve(request.specifier, {\n      importer: request.fromFile,\n      resolveDir: dirname(request.fromFile),\n      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 {\n      return { type: 'found', result };\n    }\n  };\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, ImportKind, OnResolveResult, PluginBuild } from 'esbuild';\nimport { type PluginItem, transform } from '@babel/core';\nimport {\n  type Resolution,\n  type ResolverFunction,\n  ResolverLoader,\n  virtualContent,\n  locateEmbroiderWorkingDir,\n} from '@embroider/core';\nimport { readFileSync, readJSONSync } from 'fs-extra';\nimport { EsBuildModuleRequest } from './esbuild-request';\nimport assertNever from 'assert-never';\nimport { dirname, resolve, join } from 'path';\nimport { hbsToJS } from '@embroider/core';\nimport { Preprocessor } from 'content-tag';\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      build.onResolve({ filter: /./ }, async ({ path, importer, pluginData, kind }) => {\n        let request = EsBuildModuleRequest.from(path, importer, pluginData);\n        if (!request) {\n          return null;\n        }\n        let resolution = await resolverLoader.resolver.resolve(request, defaultResolve(build, kind));\n        switch (resolution.type) {\n          case 'found':\n            return resolution.result;\n          case 'not_found':\n            return resolution.err;\n          default:\n            throw assertNever(resolution);\n        }\n      });\n\n      build.onLoad({ namespace: 'embroider', filter: /./ }, ({ path }) => {\n        let { src } = virtualContent(path, resolverLoader.resolver);\n        if (!macrosConfig) {\n          macrosConfig = readJSONSync(\n            resolve(locateEmbroiderWorkingDir(root), 'rewritten-app', 'macros-config.json')\n          ) as PluginItem;\n        }\n        return { contents: runMacros(src, path, macrosConfig) };\n      });\n\n      build.onLoad({ filter: /\\.g[jt]s$/ }, async ({ path: filename }) => {\n        const code = readFileSync(filename, 'utf8');\n\n        const result = transform(preprocessor.process(code, { filename }), {\n          configFile: join(process.cwd(), 'babel.config.js'),\n          filename,\n        });\n\n        if (!result || !result.code) {\n          throw new Error(`Failed to load file ${filename} in esbuild-hbs-loader`);\n        }\n\n        const contents = result.code;\n\n        return { contents };\n      });\n\n      build.onLoad({ filter: /\\.hbs$/ }, async ({ path: filename }) => {\n        const code = readFileSync(filename, 'utf8');\n\n        const result = transform(hbsToJS(code), { configFile: join(process.cwd(), 'babel.config.js'), filename });\n\n        if (!result || !result.code) {\n          throw new Error(`Failed to load file ${filename} in esbuild-hbs-loader`);\n        }\n\n        const contents = result.code;\n\n        return { contents };\n      });\n\n      build.onLoad({ filter: /\\.[jt]s$/ }, ({ path, namespace }) => {\n        let src: string;\n        if (namespace === 'embroider') {\n          src = virtualContent(path, resolverLoader.resolver).src;\n        } else {\n          src = readFileSync(path, 'utf8');\n        }\n        if (!macrosConfig) {\n          macrosConfig = readJSONSync(\n            resolve(locateEmbroiderWorkingDir(root), 'rewritten-app', 'macros-config.json')\n          ) as PluginItem;\n        }\n        return { contents: runMacros(src, path, macrosConfig) };\n      });\n    },\n  };\n}\n\nfunction runMacros(src: string, filename: string, macrosConfig: PluginItem): string {\n  return transform(src, {\n    filename,\n    plugins: [macrosConfig],\n  })!.code!;\n}\n\nfunction defaultResolve(\n  context: PluginBuild,\n  kind: ImportKind\n): ResolverFunction<EsBuildModuleRequest, Resolution<OnResolveResult, OnResolveResult>> {\n  return async (request: EsBuildModuleRequest) => {\n    if (request.isVirtual) {\n      return {\n        type: 'found',\n        result: { path: request.specifier, namespace: 'embroider' },\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 context.resolve(request.specifier, {\n      importer: request.fromFile,\n      resolveDir: dirname(request.fromFile),\n      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 {\n      return { type: 'found', result };\n    }\n  };\n}\n"]}

package/src/resolver.js

@@ -7,11 +7,32 @@ exports.resolver = void 0;
 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 debug = (0, debug_1.default)('embroider:vite');
 function resolver() {
     let resolverLoader = new core_1.ResolverLoader(process.cwd());
+    let server;
+    let virtualDeps = new Map();
     return {
         name: 'embroider-resolver',
         enforce: 'pre',
+        configureServer(s) {
+            server = s;
+            server.watcher.on('all', (_eventName, path) => {
+                for (let [id, watches] of virtualDeps) {
+                    for (let watch of watches) {
+                        if (path.startsWith(watch)) {
+                            debug('Invalidate %s because %s', id, path);
+                            server.moduleGraph.onFileChange(id);
+                            let m = server.moduleGraph.getModuleById(id);
+                            if (m) {
+                                server.reloadModule(m);
+                            }
+                        }
+                    }
+                }
+            });
+        },
         async resolveId(source, importer, options) {
             let request = request_1.RollupModuleRequest.from(source, importer, options.custom);
             if (!request) {
@@ -30,7 +51,10 @@ function resolver() {
         },
         load(id) {
             if (id.startsWith(request_1.virtualPrefix)) {
-                return (0, core_1.virtualContent)(id.slice(request_1.virtualPrefix.length), resolverLoader.resolver);
+                let { src, watches } = (0, core_1.virtualContent)(id.slice(request_1.virtualPrefix.length), resolverLoader.resolver);
+                virtualDeps.set(id, watches);
+                server.watcher.add(watches);
+                return src;
             }
         },
     };

package/src/resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolver.js","sourceRoot":"","sources":["resolver.ts"],"names":[],"mappings":";;;;;;AAGA,0CAAiE;AACjE,uCAA+D;AAC/D,gEAAuC;AAEvC,SAAgB,QAAQ;IACtB,IAAI,cAAc,GAAG,IAAI,qBAAc,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAEvD,OAAO;QACL,IAAI,EAAE,oBAAoB;QAC1B,OAAO,EAAE,KAAK;QACd,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO;YACvC,IAAI,OAAO,GAAG,6BAAmB,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YACzE,IAAI,CAAC,OAAO,EAAE;gBACZ,sCAAsC;gBACtC,OAAO,IAAI,CAAC;aACb;YACD,IAAI,UAAU,GAAG,MAAM,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;YACtF,QAAQ,UAAU,CAAC,IAAI,EAAE;gBACvB,KAAK,OAAO;oBACV,OAAO,UAAU,CAAC,MAAM,CAAC;gBAC3B,KAAK,WAAW;oBACd,OAAO,IAAI,CAAC;gBACd;oBACE,MAAM,IAAA,sBAAW,EAAC,UAAU,CAAC,CAAC;aACjC;QACH,CAAC;QACD,IAAI,CAAC,EAAE;YACL,IAAI,EAAE,CAAC,UAAU,CAAC,uBAAa,CAAC,EAAE;gBAChC,OAAO,IAAA,qBAAc,EAAC,EAAE,CAAC,KAAK,CAAC,uBAAa,CAAC,MAAM,CAAC,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;aAChF;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AA5BD,4BA4BC;AAED,SAAS,cAAc,CAAC,OAAsB;IAC5C,OAAO,KAAK,EAAE,OAA4B,EAAE,EAAE;QAC5C,IAAI,OAAO,CAAC,SAAS,EAAE;YACrB,OAAO;gBACL,IAAI,EAAE,OAAO;gBACb,MAAM,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,SAAS,EAAE,UAAU,EAAE,OAAO,CAAC,QAAQ,EAAE;aAChE,CAAC;SACH;QACD,IAAI,OAAO,CAAC,UAAU,EAAE;YACtB,2EAA2E;YAC3E,qBAAqB;YACrB,IAAI,GAAG,GAAG,IAAI,KAAK,CAAC,oBAAoB,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;YAC5D,GAAW,CAAC,IAAI,GAAG,kBAAkB,CAAC;YACvC,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC;SACnC;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,oBAAoB,EAAE,KAAK;oBAC3B,IAAI,EAAE,OAAO,CAAC,IAAI;iBACnB;aACF;SACF,CAAC,CAAC;QACH,IAAI,MAAM,EAAE;YACV,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;SAClC;aAAM;YACL,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC;SAC9C;IACH,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import type { PluginContext, ResolveIdResult } from 'rollup';\nimport type { Plugin } from 'vite';\nimport type { Resolution, ResolverFunction } from '@embroider/core';\nimport { virtualContent, ResolverLoader } from '@embroider/core';\nimport { RollupModuleRequest, virtualPrefix } from './request';\nimport assertNever from 'assert-never';\n\nexport function resolver(): Plugin {\n  let resolverLoader = new ResolverLoader(process.cwd());\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 resolverLoader.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), resolverLoader.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    if (request.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 ${request.specifier}`);\n      (err as any).code = 'MODULE_NOT_FOUND';\n      return { type: 'not_found', err };\n    }\n    let result = await context.resolve(request.specifier, request.fromFile, {\n      skipSelf: true,\n      custom: {\n        embroider: {\n          enableCustomResolver: false,\n          meta: request.meta,\n        },\n      },\n    });\n    if (result) {\n      return { type: 'found', result };\n    } else {\n      return { type: 'not_found', err: undefined };\n    }\n  };\n}\n"]}
+{"version":3,"file":"resolver.js","sourceRoot":"","sources":["resolver.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PluginContext, ResolveIdResult } from 'rollup';\nimport type { Plugin, ViteDevServer } from 'vite';\nimport type { Resolution, ResolverFunction } from '@embroider/core';\nimport { virtualContent, ResolverLoader } from '@embroider/core';\nimport { RollupModuleRequest, virtualPrefix } from './request';\nimport assertNever from 'assert-never';\nimport makeDebug from 'debug';\n\nconst debug = makeDebug('embroider:vite');\n\nexport function resolver(): Plugin {\n  let resolverLoader = new ResolverLoader(process.cwd());\n  let server: ViteDevServer;\n  let virtualDeps: Map<string, string[]> = new Map();\n\n  return {\n    name: 'embroider-resolver',\n    enforce: 'pre',\n\n    configureServer(s) {\n      server = s;\n      server.watcher.on('all', (_eventName, path) => {\n        for (let [id, watches] of virtualDeps) {\n          for (let watch of watches) {\n            if (path.startsWith(watch)) {\n              debug('Invalidate %s because %s', id, path);\n              server.moduleGraph.onFileChange(id);\n              let m = server.moduleGraph.getModuleById(id);\n              if (m) {\n                server.reloadModule(m);\n              }\n            }\n          }\n        }\n      });\n    },\n\n    async resolveId(source, importer, options) {\n      let request = RollupModuleRequest.from(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, 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        let { src, watches } = virtualContent(id.slice(virtualPrefix.length), resolverLoader.resolver);\n        virtualDeps.set(id, watches);\n        server.watcher.add(watches);\n        return src;\n      }\n    },\n  };\n}\n\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    if (request.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 ${request.specifier}`);\n      (err as any).code = 'MODULE_NOT_FOUND';\n      return { type: 'not_found', err };\n    }\n    let result = await context.resolve(request.specifier, request.fromFile, {\n      skipSelf: true,\n      custom: {\n        embroider: {\n          enableCustomResolver: false,\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/template-tag.d.ts

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

package/src/template-tag.js

@@ -4,7 +4,7 @@ exports.templateTag = void 0;
 const pluginutils_1 = require("@rollup/pluginutils");
 const content_tag_1 = require("content-tag");
 const gjsFilter = (0, pluginutils_1.createFilter)('**/*.{gjs,gts}?(\\?)*');
-function templateTag() {
+function templateTag({ inline_source_map } = { inline_source_map: false }) {
     let preprocessor = new content_tag_1.Preprocessor();
     function candidates(id) {
         return [id + '.gjs', id + '.gts'];
@@ -39,7 +39,10 @@ function templateTag() {
             if (!gjsFilter(id)) {
                 return null;
             }
-            return preprocessor.process(code, id);
+            return preprocessor.process(code, {
+                filename: id,
+                inline_source_map: inline_source_map,
+            });
         },
     };
 }

package/src/template-tag.js.map

@@ -1 +1 @@
-{"version":3,"file":"template-tag.js","sourceRoot":"","sources":["template-tag.ts"],"names":[],"mappings":";;;AAAA,qDAAmD;AAEnD,6CAA2C;AAE3C,MAAM,SAAS,GAAG,IAAA,0BAAY,EAAC,uBAAuB,CAAC,CAAC;AAExD,SAAgB,WAAW;IACzB,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;YACtD,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,QAAQ,EAAE;gBAChD,QAAQ,EAAE,IAAI;aACf,CAAC,CAAC;YACH,IAAI,UAAU,EAAE;gBACd,OAAO,UAAU,CAAC;aACnB;YACD,KAAK,IAAI,SAAS,IAAI,UAAU,CAAC,EAAE,CAAC,EAAE;gBACpC,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE;oBACnD,QAAQ,EAAE,IAAI;oBACd,MAAM,EAAE;wBACN,SAAS,EAAE;4BACT,oBAAoB,EAAE,KAAK;yBAC5B;qBACF;iBACF,CAAC,CAAC;gBACH,IAAI,UAAU,EAAE;oBACd,OAAO;wBACL,EAAE,EAAE,UAAU,CAAC,EAAE;qBAClB,CAAC;iBACH;aACF;QACH,CAAC;QAED,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,EAAE,CAAC,CAAC;QACxC,CAAC;KACF,CAAC;AACJ,CAAC;AA1CD,kCA0CC","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(): 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) {\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    transform(code: string, id: string) {\n      if (!gjsFilter(id)) {\n        return null;\n      }\n      return preprocessor.process(code, id);\n    },\n  };\n}\n"]}
+{"version":3,"file":"template-tag.js","sourceRoot":"","sources":["template-tag.ts"],"names":[],"mappings":";;;AAAA,qDAAmD;AAEnD,6CAA2C;AAE3C,MAAM,SAAS,GAAG,IAAA,0BAAY,EAAC,uBAAuB,CAAC,CAAC;AAExD,SAAgB,WAAW,CAAC,EAAE,iBAAiB,EAAE,GAAG,EAAE,iBAAiB,EAAE,KAAK,EAAE;IAC9E,IAAI,YAAY,GAAG,IAAI,0BAAY,EAAE,CAAC;IAEtC,SAAS,UAAU,CAAC,EAAU;QAC5B,OAAO,CAAC,EAAE,GAAG,MAAM,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC;IACpC,CAAC;IAED,OAAO;QACL,IAAI,EAAE,wBAAwB;QAC9B,OAAO,EAAE,KAAK;QAEd,KAAK,CAAC,SAAS,CAAC,EAAU,EAAE,QAA4B;YACtD,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,QAAQ,EAAE;gBAChD,QAAQ,EAAE,IAAI;aACf,CAAC,CAAC;YACH,IAAI,UAAU,EAAE;gBACd,OAAO,UAAU,CAAC;aACnB;YACD,KAAK,IAAI,SAAS,IAAI,UAAU,CAAC,EAAE,CAAC,EAAE;gBACpC,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE;oBACnD,QAAQ,EAAE,IAAI;oBACd,MAAM,EAAE;wBACN,SAAS,EAAE;4BACT,oBAAoB,EAAE,KAAK;yBAC5B;qBACF;iBACF,CAAC,CAAC;gBACH,IAAI,UAAU,EAAE;oBACd,OAAO;wBACL,EAAE,EAAE,UAAU,CAAC,EAAE;qBAClB,CAAC;iBACH;aACF;QACH,CAAC;QAED,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;AA7CD,kCA6CC","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) {\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    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"]}