@embroider/vite 0.2.1-unstable.996b2ff → 0.2.1-unstable.b33cb4c
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.
- package/package.json +4 -4
- package/src/esbuild-request.d.ts +3 -0
- package/src/esbuild-request.js +13 -6
- package/src/esbuild-request.js.map +1 -1
- package/src/esbuild-resolver.js +14 -2
- package/src/esbuild-resolver.js.map +1 -1
- package/src/request.d.ts +3 -0
- package/src/request.js +13 -6
- package/src/request.js.map +1 -1
- package/src/resolver.js +7 -0
- package/src/resolver.js.map +1 -1
- package/src/addons.d.ts +0 -1
- package/src/addons.js +0 -24
- package/src/addons.js.map +0 -1
package/package.json
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@embroider/vite",
|
|
3
|
-
"version": "0.2.1-unstable.
|
|
3
|
+
"version": "0.2.1-unstable.b33cb4c",
|
|
4
4
|
"main": "index.mjs",
|
|
5
5
|
"peerDependencies": {
|
|
6
|
-
"@embroider/core": "3.4.3-unstable.
|
|
6
|
+
"@embroider/core": "3.4.3-unstable.b33cb4c",
|
|
7
7
|
"vite": "^4.3.9"
|
|
8
8
|
},
|
|
9
9
|
"scripts": {
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"@babel/core": "^7.22.9",
|
|
14
|
-
"@embroider/macros": "1.13.4-unstable.
|
|
14
|
+
"@embroider/macros": "1.13.4-unstable.b33cb4c",
|
|
15
15
|
"@rollup/pluginutils": "^4.1.1",
|
|
16
16
|
"assert-never": "^1.2.1",
|
|
17
17
|
"content-tag": "^1.1.2",
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
"terser": "^5.7.0"
|
|
24
24
|
},
|
|
25
25
|
"devDependencies": {
|
|
26
|
-
"@embroider/core": "3.4.3-unstable.
|
|
26
|
+
"@embroider/core": "3.4.3-unstable.b33cb4c",
|
|
27
27
|
"@types/babel__core": "^7.20.1",
|
|
28
28
|
"@types/debug": "^4.1.5",
|
|
29
29
|
"@types/jsdom": "^16.2.11",
|
package/src/esbuild-request.d.ts
CHANGED
|
@@ -5,10 +5,13 @@ export declare class EsBuildModuleRequest implements ModuleRequest {
|
|
|
5
5
|
readonly fromFile: string;
|
|
6
6
|
readonly meta: Record<string, any> | undefined;
|
|
7
7
|
readonly isVirtual: boolean;
|
|
8
|
+
readonly isNotFound: boolean;
|
|
8
9
|
static from(source: string, importer: string | undefined, pluginData: Record<string, any> | undefined): EsBuildModuleRequest | undefined;
|
|
9
10
|
private constructor();
|
|
11
|
+
get debugType(): string;
|
|
10
12
|
alias(newSpecifier: string): this;
|
|
11
13
|
rehome(newFromFile: string): this;
|
|
12
14
|
virtualize(filename: string): this;
|
|
13
15
|
withMeta(meta: Record<string, any> | undefined): this;
|
|
16
|
+
notFound(): this;
|
|
14
17
|
}
|
package/src/esbuild-request.js
CHANGED
|
@@ -11,31 +11,38 @@ class EsBuildModuleRequest {
|
|
|
11
11
|
}
|
|
12
12
|
if (source && importer && source[0] !== '\0') {
|
|
13
13
|
let fromFile = (0, core_1.cleanUrl)(importer);
|
|
14
|
-
return new EsBuildModuleRequest(source, fromFile, (_c = pluginData === null || pluginData === void 0 ? void 0 : pluginData.embroider) === null || _c === void 0 ? void 0 : _c.meta, false);
|
|
14
|
+
return new EsBuildModuleRequest(source, fromFile, (_c = pluginData === null || pluginData === void 0 ? void 0 : pluginData.embroider) === null || _c === void 0 ? void 0 : _c.meta, false, false);
|
|
15
15
|
}
|
|
16
16
|
}
|
|
17
|
-
constructor(specifier, fromFile, meta, isVirtual) {
|
|
17
|
+
constructor(specifier, fromFile, meta, isVirtual, isNotFound) {
|
|
18
18
|
this.specifier = specifier;
|
|
19
19
|
this.fromFile = fromFile;
|
|
20
20
|
this.meta = meta;
|
|
21
21
|
this.isVirtual = isVirtual;
|
|
22
|
+
this.isNotFound = isNotFound;
|
|
23
|
+
}
|
|
24
|
+
get debugType() {
|
|
25
|
+
return 'esbuild';
|
|
22
26
|
}
|
|
23
27
|
alias(newSpecifier) {
|
|
24
|
-
return new EsBuildModuleRequest(newSpecifier, this.fromFile, this.meta, this.isVirtual);
|
|
28
|
+
return new EsBuildModuleRequest(newSpecifier, this.fromFile, this.meta, this.isVirtual, false);
|
|
25
29
|
}
|
|
26
30
|
rehome(newFromFile) {
|
|
27
31
|
if (this.fromFile === newFromFile) {
|
|
28
32
|
return this;
|
|
29
33
|
}
|
|
30
34
|
else {
|
|
31
|
-
return new EsBuildModuleRequest(this.specifier, newFromFile, this.meta, this.isVirtual);
|
|
35
|
+
return new EsBuildModuleRequest(this.specifier, newFromFile, this.meta, this.isVirtual, false);
|
|
32
36
|
}
|
|
33
37
|
}
|
|
34
38
|
virtualize(filename) {
|
|
35
|
-
return new EsBuildModuleRequest(filename, this.fromFile, this.meta, true);
|
|
39
|
+
return new EsBuildModuleRequest(filename, this.fromFile, this.meta, true, false);
|
|
36
40
|
}
|
|
37
41
|
withMeta(meta) {
|
|
38
|
-
return new EsBuildModuleRequest(this.specifier, this.fromFile, meta, this.isVirtual);
|
|
42
|
+
return new EsBuildModuleRequest(this.specifier, this.fromFile, meta, this.isVirtual, this.isNotFound);
|
|
43
|
+
}
|
|
44
|
+
notFound() {
|
|
45
|
+
return new EsBuildModuleRequest(this.specifier, this.fromFile, this.meta, this.isVirtual, true);
|
|
39
46
|
}
|
|
40
47
|
}
|
|
41
48
|
exports.EsBuildModuleRequest = EsBuildModuleRequest;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"esbuild-request.js","sourceRoot":"","sources":["esbuild-request.ts"],"names":[],"mappings":";;;AAAA,0CAA+D;AAElD,QAAA,gBAAgB,GAAG,WAAW,CAAC;AAE5C,MAAa,oBAAoB;IAC/B,MAAM,CAAC,IAAI,CACT,MAAc,EACd,QAA4B,EAC5B,UAA2C;;QAE3C,IAAI,CAAC,CAAC,MAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,SAAS,0CAAE,oBAAoB,mCAAI,IAAI,CAAC,EAAE;YAC1D,OAAO;SACR;QAED,IAAI,MAAM,IAAI,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE;YAC5C,IAAI,QAAQ,GAAG,IAAA,eAAQ,EAAC,QAAQ,CAAC,CAAC;YAClC,OAAO,IAAI,oBAAoB,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,SAAS,0CAAE,IAAI,EAAE,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"esbuild-request.js","sourceRoot":"","sources":["esbuild-request.ts"],"names":[],"mappings":";;;AAAA,0CAA+D;AAElD,QAAA,gBAAgB,GAAG,WAAW,CAAC;AAE5C,MAAa,oBAAoB;IAC/B,MAAM,CAAC,IAAI,CACT,MAAc,EACd,QAA4B,EAC5B,UAA2C;;QAE3C,IAAI,CAAC,CAAC,MAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,SAAS,0CAAE,oBAAoB,mCAAI,IAAI,CAAC,EAAE;YAC1D,OAAO;SACR;QAED,IAAI,MAAM,IAAI,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE;YAC5C,IAAI,QAAQ,GAAG,IAAA,eAAQ,EAAC,QAAQ,CAAC,CAAC;YAClC,OAAO,IAAI,oBAAoB,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,SAAS,0CAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;SAC9F;IACH,CAAC;IAED,YACW,SAAiB,EACjB,QAAgB,EAChB,IAAqC,EACrC,SAAkB,EAClB,UAAmB;QAJnB,cAAS,GAAT,SAAS,CAAQ;QACjB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,SAAI,GAAJ,IAAI,CAAiC;QACrC,cAAS,GAAT,SAAS,CAAS;QAClB,eAAU,GAAV,UAAU,CAAS;IAC3B,CAAC;IAEJ,IAAI,SAAS;QACX,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,YAAoB;QACxB,OAAO,IAAI,oBAAoB,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,KAAK,CAAS,CAAC;IACzG,CAAC;IACD,MAAM,CAAC,WAAmB;QACxB,IAAI,IAAI,CAAC,QAAQ,KAAK,WAAW,EAAE;YACjC,OAAO,IAAI,CAAC;SACb;aAAM;YACL,OAAO,IAAI,oBAAoB,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,KAAK,CAAS,CAAC;SACxG;IACH,CAAC;IACD,UAAU,CAAC,QAAgB;QACzB,OAAO,IAAI,oBAAoB,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAS,CAAC;IAC3F,CAAC;IACD,QAAQ,CAAC,IAAqC;QAC5C,OAAO,IAAI,oBAAoB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,UAAU,CAAS,CAAC;IAChH,CAAC;IACD,QAAQ;QACN,OAAO,IAAI,oBAAoB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAS,CAAC;IAC1G,CAAC;CACF;AA/CD,oDA+CC","sourcesContent":["import { type ModuleRequest, cleanUrl } from '@embroider/core';\n\nexport const virtualNamespace = 'embroider';\n\nexport class EsBuildModuleRequest implements ModuleRequest {\n static from(\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(source, fromFile, pluginData?.embroider?.meta, false, false);\n }\n }\n\n private constructor(\n readonly specifier: string,\n readonly fromFile: string,\n readonly meta: Record<string, any> | undefined,\n readonly isVirtual: boolean,\n readonly isNotFound: boolean\n ) {}\n\n get debugType() {\n return 'esbuild';\n }\n\n alias(newSpecifier: string) {\n return new EsBuildModuleRequest(newSpecifier, this.fromFile, this.meta, this.isVirtual, false) as this;\n }\n rehome(newFromFile: string) {\n if (this.fromFile === newFromFile) {\n return this;\n } else {\n return new EsBuildModuleRequest(this.specifier, newFromFile, this.meta, this.isVirtual, false) as this;\n }\n }\n virtualize(filename: string) {\n return new EsBuildModuleRequest(filename, this.fromFile, this.meta, true, false) as this;\n }\n withMeta(meta: Record<string, any> | undefined): this {\n return new EsBuildModuleRequest(this.specifier, this.fromFile, meta, this.isVirtual, this.isNotFound) as this;\n }\n notFound(): this {\n return new EsBuildModuleRequest(this.specifier, this.fromFile, this.meta, this.isVirtual, true) as this;\n }\n}\n"]}
|
package/src/esbuild-resolver.js
CHANGED
|
@@ -43,7 +43,10 @@ function esBuildResolver(root = process.cwd()) {
|
|
|
43
43
|
});
|
|
44
44
|
build.onLoad({ filter: /\.gjs$/ }, async ({ path: filename }) => {
|
|
45
45
|
const code = (0, fs_extra_1.readFileSync)(filename, 'utf8');
|
|
46
|
-
const result = (0, core_1.transform)(preprocessor.process(code, filename), {
|
|
46
|
+
const result = (0, core_1.transform)(preprocessor.process(code, filename), {
|
|
47
|
+
configFile: (0, path_1.join)(process.cwd(), 'babel.config.js'),
|
|
48
|
+
filename,
|
|
49
|
+
});
|
|
47
50
|
if (!result || !result.code) {
|
|
48
51
|
throw new Error(`Failed to load file ${filename} in esbuild-hbs-loader`);
|
|
49
52
|
}
|
|
@@ -52,7 +55,7 @@ function esBuildResolver(root = process.cwd()) {
|
|
|
52
55
|
});
|
|
53
56
|
build.onLoad({ filter: /\.hbs$/ }, async ({ path: filename }) => {
|
|
54
57
|
const code = (0, fs_extra_1.readFileSync)(filename, 'utf8');
|
|
55
|
-
const result = (0, core_1.transform)((0, core_3.hbsToJS)(code), { configFile: 'babel.config.js', filename });
|
|
58
|
+
const result = (0, core_1.transform)((0, core_3.hbsToJS)(code), { configFile: (0, path_1.join)(process.cwd(), 'babel.config.js'), filename });
|
|
56
59
|
if (!result || !result.code) {
|
|
57
60
|
throw new Error(`Failed to load file ${filename} in esbuild-hbs-loader`);
|
|
58
61
|
}
|
|
@@ -90,6 +93,15 @@ function defaultResolve(context, kind) {
|
|
|
90
93
|
result: { path: request.specifier, namespace: 'embroider' },
|
|
91
94
|
};
|
|
92
95
|
}
|
|
96
|
+
if (request.isNotFound) {
|
|
97
|
+
// todo: make sure this looks correct to users
|
|
98
|
+
return {
|
|
99
|
+
type: 'not_found',
|
|
100
|
+
err: {
|
|
101
|
+
errors: [{ text: `module not found ${request.specifier}` }],
|
|
102
|
+
},
|
|
103
|
+
};
|
|
104
|
+
}
|
|
93
105
|
let result = await context.resolve(request.specifier, {
|
|
94
106
|
importer: request.fromFile,
|
|
95
107
|
resolveDir: (0, path_1.dirname)(request.fromFile),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"esbuild-resolver.js","sourceRoot":"","sources":["esbuild-resolver.ts"],"names":[],"mappings":";;;;;;AACA,sCAAyD;AACzD,0CAMyB;AACzB,uCAAsD;AACtD,uDAAyD;AACzD,gEAAuC;AACvC,+
|
|
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: /\\.gjs$/ }, 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: /\\.js$/ }, ({ 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 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/request.d.ts
CHANGED
|
@@ -4,11 +4,14 @@ export declare class RollupModuleRequest implements ModuleRequest {
|
|
|
4
4
|
readonly specifier: string;
|
|
5
5
|
readonly fromFile: string;
|
|
6
6
|
readonly meta: Record<string, any> | undefined;
|
|
7
|
+
readonly isNotFound: boolean;
|
|
7
8
|
static from(source: string, importer: string | undefined, custom: Record<string, any> | undefined): RollupModuleRequest | undefined;
|
|
8
9
|
private constructor();
|
|
10
|
+
get debugType(): string;
|
|
9
11
|
get isVirtual(): boolean;
|
|
10
12
|
alias(newSpecifier: string): this;
|
|
11
13
|
rehome(newFromFile: string): this;
|
|
12
14
|
virtualize(filename: string): this;
|
|
13
15
|
withMeta(meta: Record<string, any> | undefined): this;
|
|
16
|
+
notFound(): this;
|
|
14
17
|
}
|
package/src/request.js
CHANGED
|
@@ -22,33 +22,40 @@ class RollupModuleRequest {
|
|
|
22
22
|
}
|
|
23
23
|
// strip query params off the importer
|
|
24
24
|
let fromFile = (0, core_1.cleanUrl)(nonVirtual);
|
|
25
|
-
return new RollupModuleRequest(source, fromFile, (_c = custom === null || custom === void 0 ? void 0 : custom.embroider) === null || _c === void 0 ? void 0 : _c.meta);
|
|
25
|
+
return new RollupModuleRequest(source, fromFile, (_c = custom === null || custom === void 0 ? void 0 : custom.embroider) === null || _c === void 0 ? void 0 : _c.meta, false);
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
|
-
constructor(specifier, fromFile, meta) {
|
|
28
|
+
constructor(specifier, fromFile, meta, isNotFound) {
|
|
29
29
|
this.specifier = specifier;
|
|
30
30
|
this.fromFile = fromFile;
|
|
31
31
|
this.meta = meta;
|
|
32
|
+
this.isNotFound = isNotFound;
|
|
33
|
+
}
|
|
34
|
+
get debugType() {
|
|
35
|
+
return 'rollup';
|
|
32
36
|
}
|
|
33
37
|
get isVirtual() {
|
|
34
38
|
return this.specifier.startsWith(exports.virtualPrefix);
|
|
35
39
|
}
|
|
36
40
|
alias(newSpecifier) {
|
|
37
|
-
return new RollupModuleRequest(newSpecifier, this.fromFile, this.meta);
|
|
41
|
+
return new RollupModuleRequest(newSpecifier, this.fromFile, this.meta, false);
|
|
38
42
|
}
|
|
39
43
|
rehome(newFromFile) {
|
|
40
44
|
if (this.fromFile === newFromFile) {
|
|
41
45
|
return this;
|
|
42
46
|
}
|
|
43
47
|
else {
|
|
44
|
-
return new RollupModuleRequest(this.specifier, newFromFile, this.meta);
|
|
48
|
+
return new RollupModuleRequest(this.specifier, newFromFile, this.meta, false);
|
|
45
49
|
}
|
|
46
50
|
}
|
|
47
51
|
virtualize(filename) {
|
|
48
|
-
return new RollupModuleRequest(exports.virtualPrefix + filename, this.fromFile, this.meta);
|
|
52
|
+
return new RollupModuleRequest(exports.virtualPrefix + filename, this.fromFile, this.meta, false);
|
|
49
53
|
}
|
|
50
54
|
withMeta(meta) {
|
|
51
|
-
return new RollupModuleRequest(this.specifier, this.fromFile, meta);
|
|
55
|
+
return new RollupModuleRequest(this.specifier, this.fromFile, meta, this.isNotFound);
|
|
56
|
+
}
|
|
57
|
+
notFound() {
|
|
58
|
+
return new RollupModuleRequest(this.specifier, this.fromFile, this.meta, true);
|
|
52
59
|
}
|
|
53
60
|
}
|
|
54
61
|
exports.RollupModuleRequest = RollupModuleRequest;
|
package/src/request.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.js","sourceRoot":"","sources":["request.ts"],"names":[],"mappings":";;;AACA,0CAA2C;AAE9B,QAAA,aAAa,GAAG,oBAAoB,CAAC;AAElD,MAAa,mBAAmB;IAC9B,MAAM,CAAC,IAAI,CACT,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,OAAO,IAAI,mBAAmB,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,0CAAE,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"request.js","sourceRoot":"","sources":["request.ts"],"names":[],"mappings":";;;AACA,0CAA2C;AAE9B,QAAA,aAAa,GAAG,oBAAoB,CAAC;AAElD,MAAa,mBAAmB;IAC9B,MAAM,CAAC,IAAI,CACT,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,OAAO,IAAI,mBAAmB,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,0CAAE,IAAI,EAAE,KAAK,CAAC,CAAC;SAClF;IACH,CAAC;IAED,YACW,SAAiB,EACjB,QAAgB,EAChB,IAAqC,EACrC,UAAmB;QAHnB,cAAS,GAAT,SAAS,CAAQ;QACjB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,SAAI,GAAJ,IAAI,CAAiC;QACrC,eAAU,GAAV,UAAU,CAAS;IAC3B,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,KAAK,CAAC,YAAoB;QACxB,OAAO,IAAI,mBAAmB,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,CAAS,CAAC;IACxF,CAAC;IACD,MAAM,CAAC,WAAmB;QACxB,IAAI,IAAI,CAAC,QAAQ,KAAK,WAAW,EAAE;YACjC,OAAO,IAAI,CAAC;SACb;aAAM;YACL,OAAO,IAAI,mBAAmB,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,CAAS,CAAC;SACvF;IACH,CAAC;IACD,UAAU,CAAC,QAAgB;QACzB,OAAO,IAAI,mBAAmB,CAAC,qBAAa,GAAG,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,CAAS,CAAC;IACpG,CAAC;IACD,QAAQ,CAAC,IAAqC;QAC5C,OAAO,IAAI,mBAAmB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,UAAU,CAAS,CAAC;IAC/F,CAAC;IACD,QAAQ;QACN,OAAO,IAAI,mBAAmB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAS,CAAC;IACzF,CAAC;CACF;AA7DD,kDA6DC","sourcesContent":["import type { ModuleRequest } from '@embroider/core';\nimport { cleanUrl } from '@embroider/core';\n\nexport const virtualPrefix = 'embroider_virtual:';\n\nexport class RollupModuleRequest implements ModuleRequest {\n static from(\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 return new RollupModuleRequest(source, fromFile, custom?.embroider?.meta, false);\n }\n }\n\n private constructor(\n readonly specifier: string,\n readonly fromFile: string,\n readonly meta: Record<string, any> | undefined,\n readonly isNotFound: boolean\n ) {}\n\n get debugType() {\n return 'rollup';\n }\n\n get isVirtual(): boolean {\n return this.specifier.startsWith(virtualPrefix);\n }\n\n alias(newSpecifier: string) {\n return new RollupModuleRequest(newSpecifier, this.fromFile, this.meta, false) as this;\n }\n rehome(newFromFile: string) {\n if (this.fromFile === newFromFile) {\n return this;\n } else {\n return new RollupModuleRequest(this.specifier, newFromFile, this.meta, false) as this;\n }\n }\n virtualize(filename: string) {\n return new RollupModuleRequest(virtualPrefix + filename, this.fromFile, this.meta, false) as this;\n }\n withMeta(meta: Record<string, any> | undefined): this {\n return new RollupModuleRequest(this.specifier, this.fromFile, meta, this.isNotFound) as this;\n }\n notFound(): this {\n return new RollupModuleRequest(this.specifier, this.fromFile, this.meta, true) as this;\n }\n}\n"]}
|
package/src/resolver.js
CHANGED
|
@@ -44,6 +44,13 @@ function defaultResolve(context) {
|
|
|
44
44
|
result: { id: request.specifier, resolvedBy: request.fromFile },
|
|
45
45
|
};
|
|
46
46
|
}
|
|
47
|
+
if (request.isNotFound) {
|
|
48
|
+
// TODO: we can make sure this looks correct in rollup & vite output when a
|
|
49
|
+
// user encounters it
|
|
50
|
+
let err = new Error(`module not found ${request.specifier}`);
|
|
51
|
+
err.code = 'MODULE_NOT_FOUND';
|
|
52
|
+
return { type: 'not_found', err };
|
|
53
|
+
}
|
|
47
54
|
let result = await context.resolve(request.specifier, request.fromFile, {
|
|
48
55
|
skipSelf: true,
|
|
49
56
|
custom: {
|
package/src/resolver.js.map
CHANGED
|
@@ -1 +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,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 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"]}
|
|
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"]}
|
package/src/addons.d.ts
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export declare function addons(root: string): string[];
|
package/src/addons.js
DELETED
|
@@ -1,24 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.addons = void 0;
|
|
4
|
-
const core_1 = require("@embroider/core");
|
|
5
|
-
function addons(root) {
|
|
6
|
-
let rloader = new core_1.ResolverLoader(root);
|
|
7
|
-
let { options } = rloader.resolver;
|
|
8
|
-
let names = new Set();
|
|
9
|
-
for (let from of Object.keys(options.renameModules)) {
|
|
10
|
-
let pName = (0, core_1.packageName)(from);
|
|
11
|
-
if (pName) {
|
|
12
|
-
names.add(pName);
|
|
13
|
-
}
|
|
14
|
-
}
|
|
15
|
-
for (let from of Object.keys(options.renamePackages)) {
|
|
16
|
-
names.add(from);
|
|
17
|
-
}
|
|
18
|
-
for (let name of Object.keys(options.activeAddons)) {
|
|
19
|
-
names.add(name);
|
|
20
|
-
}
|
|
21
|
-
return [...names];
|
|
22
|
-
}
|
|
23
|
-
exports.addons = addons;
|
|
24
|
-
//# sourceMappingURL=addons.js.map
|
package/src/addons.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"addons.js","sourceRoot":"","sources":["addons.ts"],"names":[],"mappings":";;;AAAA,0CAA8D;AAE9D,SAAgB,MAAM,CAAC,IAAY;IACjC,IAAI,OAAO,GAAG,IAAI,qBAAc,CAAC,IAAI,CAAC,CAAC;IACvC,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC;IACnC,IAAI,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;IAC9B,KAAK,IAAI,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;QACnD,IAAI,KAAK,GAAG,IAAA,kBAAW,EAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,KAAK,EAAE;YACT,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SAClB;KACF;IACD,KAAK,IAAI,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;QACpD,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;KACjB;IACD,KAAK,IAAI,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QAClD,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;KACjB;IACD,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC;AACpB,CAAC;AAjBD,wBAiBC","sourcesContent":["import { ResolverLoader, packageName } from '@embroider/core';\n\nexport function addons(root: string): string[] {\n let rloader = new ResolverLoader(root);\n let { options } = rloader.resolver;\n let names = new Set<string>();\n for (let from of Object.keys(options.renameModules)) {\n let pName = packageName(from);\n if (pName) {\n names.add(pName);\n }\n }\n for (let from of Object.keys(options.renamePackages)) {\n names.add(from);\n }\n for (let name of Object.keys(options.activeAddons)) {\n names.add(name);\n }\n return [...names];\n}\n"]}
|