@embroider/vite 1.0.0-alpha.9 → 1.0.1-unstable.13e4ba7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -32,7 +32,8 @@ export function esBuildResolver() {
|
|
|
32
32
|
src = hbsToJS(src);
|
|
33
33
|
}
|
|
34
34
|
else if (['.gjs', '.gts'].some(ext => path.endsWith(ext))) {
|
|
35
|
-
|
|
35
|
+
let { code /*, map */ } = preprocessor.process(src, { filename: path, inline_source_map: true });
|
|
36
|
+
src = code;
|
|
36
37
|
}
|
|
37
38
|
if (['.hbs', '.gjs', '.gts', '.js', '.ts'].some(ext => path.endsWith(ext))) {
|
|
38
39
|
src = await transformAndAssert(src, path);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"esbuild-resolver.js","sourceRoot":"","sources":["../../src/esbuild-resolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,IAAI,EAAE,EAAE,aAAa,EAAwB,MAAM,iBAAiB,CAAC;AAC5E,MAAM,EAAE,cAAc,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;AAChD,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC;AAC5B,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,MAAM,UAAU,eAAe;IAC7B,IAAI,cAAc,GAAG,IAAI,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACvD,IAAI,YAAY,GAAG,IAAI,YAAY,EAAE,CAAC;IAEtC,KAAK,UAAU,kBAAkB,CAAC,GAAW,EAAE,QAAgB;QAC7D,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QACvD,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,uBAAuB,QAAQ,wBAAwB,CAAC,CAAC;QAC3E,CAAC;QACD,OAAO,MAAM,CAAC,IAAK,CAAC;IACtB,CAAC;IAED,KAAK,UAAU,MAAM,CAAC,EACpB,IAAI,EACJ,SAAS,EACT,UAAU,GAKX;QACC,IAAI,GAAW,CAAC;QAChB,IAAI,SAAS,KAAK,mBAAmB,EAAE,CAAC;YACtC,uEAAuE;YACvE,mBAAmB;YACnB,GAAG,GAAG,cAAc,CAAC,UAAW,CAAC,OAAO,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC;QACzE,CAAC;aAAM,CAAC;YACN,GAAG,GAAG,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACnC,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1B,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;QACrB,CAAC;aAAM,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YAC5D,
|
|
1
|
+
{"version":3,"file":"esbuild-resolver.js","sourceRoot":"","sources":["../../src/esbuild-resolver.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Plugin as EsBuildPlugin, OnLoadResult, PluginBuild, ResolveResult } from 'esbuild';\nimport { transformAsync } from '@babel/core';\nimport core, { ModuleRequest, type VirtualResponse } from '@embroider/core';\nconst { ResolverLoader, virtualContent } = core;\nimport fs from 'fs-extra';\nconst { readFileSync } = fs;\nimport { EsBuildRequestAdapter } from './esbuild-request.js';\nimport { assertNever } from 'assert-never';\nimport { hbsToJS } from '@embroider/core';\nimport { Preprocessor } from 'content-tag';\nimport { extname } from 'path';\n\nexport function esBuildResolver(): EsBuildPlugin {\n let resolverLoader = new ResolverLoader(process.cwd());\n let preprocessor = new Preprocessor();\n\n async function transformAndAssert(src: string, filename: string): Promise<string> {\n const result = await transformAsync(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 async function onLoad({\n path,\n namespace,\n pluginData,\n }: {\n path: string;\n namespace: string;\n pluginData?: { virtual: VirtualResponse };\n }): Promise<OnLoadResult> {\n let src: string;\n if (namespace === 'embroider-virtual') {\n // castin because response in our namespace are supposed to always have\n // this pluginData.\n src = virtualContent(pluginData!.virtual, 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 let { code /*, map */ } = preprocessor.process(src, { filename: path, inline_source_map: true });\n src = code;\n }\n if (['.hbs', '.gjs', '.gts', '.js', '.ts'].some(ext => path.endsWith(ext))) {\n src = await transformAndAssert(src, path);\n }\n return { contents: src };\n }\n\n return {\n name: 'embroider-esbuild-resolver',\n setup(build) {\n const phase = detectPhase(build);\n\n // Embroider Resolver\n build.onResolve({ filter: /./ }, async ({ path, importer, pluginData, kind }) => {\n let request = ModuleRequest.create(EsBuildRequestAdapter.create, {\n packageCache: resolverLoader.resolver.packageCache,\n phase,\n build,\n kind,\n path,\n importer,\n pluginData,\n });\n if (!request) {\n return null;\n }\n let resolution = await resolverLoader.resolver.resolve(request);\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 if (phase === 'bundling') {\n // during bundling phase, we need to provide our own extension\n // searching. We do it here in its own resolve plugin so that it's\n // sitting beneath the embroider resolver since it expects the ambient\n // system to have extension search.\n build.onResolve({ filter: /./ }, async ({ path, importer, namespace, resolveDir, pluginData, kind }) => {\n if (pluginData?.embroiderExtensionResolving) {\n // reentrance\n return null;\n }\n\n let firstResult: ResolveResult | undefined;\n\n for (let requestName of extensionSearch(path, resolverLoader.resolver.options.resolvableExtensions)) {\n let result = await build.resolve(requestName, {\n namespace,\n resolveDir,\n importer,\n kind,\n // avoid reentrance\n pluginData: { ...pluginData, embroiderExtensionResolving: true },\n });\n\n if (result.errors.length > 0) {\n // if extension search fails, we want to let the first failure be the\n // one that propagates, so that the error message makes sense.\n firstResult = result;\n } else {\n return result;\n }\n }\n\n return firstResult;\n });\n }\n\n // we need to handle everything from our special namespaces\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\nfunction detectPhase(build: PluginBuild): 'bundling' | 'other' {\n let plugins = (build.initialOptions.plugins ?? []).map(p => p.name);\n if (plugins.includes('vite:dep-pre-bundle')) {\n return 'bundling';\n } else {\n return 'other';\n }\n}\n\nfunction* extensionSearch(specifier: string, extensions: string[]): Generator<string> {\n yield specifier;\n // when there's no explicit extension, we may do extension search\n if (extname(specifier) === '') {\n for (let ext of extensions) {\n yield specifier + ext;\n }\n }\n}\n"]}
|
package/dist/src/template-tag.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { createFilter } from '@rollup/pluginutils';
|
|
2
2
|
import { Preprocessor } from 'content-tag';
|
|
3
3
|
const gjsFilter = createFilter('**/*.{gjs,gts}?(\\?)*');
|
|
4
|
-
export function templateTag(
|
|
4
|
+
export function templateTag() {
|
|
5
5
|
let preprocessor = new Preprocessor();
|
|
6
6
|
return {
|
|
7
7
|
name: 'embroider-template-tag',
|
|
@@ -12,7 +12,6 @@ export function templateTag({ inline_source_map } = { inline_source_map: false }
|
|
|
12
12
|
}
|
|
13
13
|
return preprocessor.process(code, {
|
|
14
14
|
filename: id,
|
|
15
|
-
inline_source_map: inline_source_map,
|
|
16
15
|
});
|
|
17
16
|
},
|
|
18
17
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"template-tag.js","sourceRoot":"","sources":["../../src/template-tag.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,SAAS,GAAG,YAAY,CAAC,uBAAuB,CAAC,CAAC;AAExD,MAAM,UAAU,WAAW
|
|
1
|
+
{"version":3,"file":"template-tag.js","sourceRoot":"","sources":["../../src/template-tag.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,SAAS,GAAG,YAAY,CAAC,uBAAuB,CAAC,CAAC;AAExD,MAAM,UAAU,WAAW;IACzB,IAAI,YAAY,GAAG,IAAI,YAAY,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;aACb,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(): 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 });\n },\n };\n}\n"]}
|