npm - @embroider/vite - Versions diffs - 0.2.2-unstable.449a68c → 0.2.2-unstable.57e628d - Mend

@embroider/vite 0.2.2-unstable.449a68c → 0.2.2-unstable.57e628d

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.

Files changed (19) hide show

package/index.mjs +2 -0
package/package.json +5 -5
package/src/assets.js.map +1 -1
package/src/classic-ember-support.d.ts +1 -0
package/src/classic-ember-support.js +9 -0
package/src/classic-ember-support.js.map +1 -0
package/src/ember.d.ts +6 -0
package/src/ember.js +43 -0
package/src/ember.js.map +1 -0
package/src/esbuild-request.d.ts +19 -16
package/src/esbuild-request.js +15 -38
package/src/esbuild-request.js.map +1 -1
package/src/esbuild-resolver.js +16 -8
package/src/esbuild-resolver.js.map +1 -1
package/src/request.d.ts +13 -18
package/src/request.js +46 -70
package/src/request.js.map +1 -1
package/src/resolver.js +8 -3
package/src/resolver.js.map +1 -1

package/index.mjs CHANGED Viewed

@@ -7,3 +7,5 @@ export * from './src/optimize-deps.js';
 export * from './src/build.js';
 export * from './src/assets.js';
 export * from './src/content-for.js';
+export * from './src/classic-ember-support.js';
+export * from './src/ember.js';

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@embroider/vite",
-  "version": "0.2.2-unstable.449a68c",
+  "version": "0.2.2-unstable.57e628d",
   "type": "module",
   "exports": {
     ".": {
@@ -10,7 +10,7 @@
   },
   "peerDependencies": {
     "vite": "^5.2.0",
-    "@embroider/core": "^3.4.20-unstable.449a68c"
+    "@embroider/core": "^3.4.20-unstable.57e628d"
   },
   "dependencies": {
     "@babel/core": "^7.22.9",
@@ -25,8 +25,8 @@
     "send": "^0.18.0",
     "source-map-url": "^0.4.1",
     "terser": "^5.7.0",
-    "@embroider/macros": "1.16.10-unstable.449a68c",
-    "@embroider/reverse-exports": "0.1.1-unstable.449a68c"
+    "@embroider/macros": "1.16.10-unstable.57e628d",
+    "@embroider/reverse-exports": "0.1.1-unstable.57e628d"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.1",
@@ -36,7 +36,7 @@
     "@types/send": "^0.17.4",
     "rollup": "^4.18.0",
     "vite": "^5.3.3",
-    "@embroider/core": "^3.4.20-unstable.449a68c"
+    "@embroider/core": "^3.4.20-unstable.57e628d"
   },
   "files": [
     "index.mjs",

package/src/assets.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"assets.js","sourceRoot":"","sources":["assets.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,iBAAiB,CAAC;AACnC,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;AAEhC,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AACnC,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC;AACnD,OAAO,IAAI,MAAM,MAAM,CAAC;~~AAGxB~~,SAAS,eAAe,CAAC,YAAoB,EAAE,QAAkB;;IAC/D,MAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC;IAC3C,IAAI,GAAG,GAAG,YAAY,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;IAEjD,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QAC9C,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;YACxC,GAAG,GAAG,YAAY,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC3C,IAAI,GAAG,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,SAAS,EAAE,IAAI,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC;gBACpE,MAAM,KAAK,GAAG,MAAA,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAC1D,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,KAAK,YAAY,CACtD,0CAAG,CAAC,CAAC,CAAC;gBACP,IAAI,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;gBACnD,IAAI,KAAK,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC/B,OAAO,KAAK,CAAC;gBACf,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,UAAU,MAAM;IACpB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1B,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,GAAG,CAAC,CAAC;IAC/C,IAAI,IAAI,GAAsB,OAAO,CAAC;IACtC,IAAI,SAAS,GAAG,QAAQ,CAAC;IACzB,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,MAAM;QACf,cAAc,CAAC,OAAO;YACpB,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC;YACvB,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QAChC,CAAC;QACD,eAAe,CAAC,MAAM;YACpB,OAAO,GAAG,EAAE;gBACV,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;oBACxC,IAAI,GAAG,CAAC,WAAW,IAAI,GAAG,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBAClD,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;wBACzF,IAAI,QAAQ,EAAE,CAAC;4BACb,OAAO,IAAI,CAAC,~~GAAe~~,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,~~GAAG~~,CAAC,CAAC;~~wBACnD~~,CAAC;oBACH,CAAC;oBACD,OAAO,IAAI,EAAE,CAAC;gBAChB,CAAC,CAAC,CAAC;YACL,CAAC,CAAC;QACJ,CAAC;QACD,UAAU,EAAE;YACV,yEAAyE;YACzE,+DAA+D;YAC/D,UAAU,EAAE,IAAI;YAChB,KAAK,EAAE,MAAM;YACb,KAAK,CAAC,OAAO;gBACX,IAAI,IAAI,KAAK,OAAO;oBAAE,OAAO;gBAC7B,MAAM,OAAO,GAAG,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC;gBACxD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;oBAC7B,MAAM,QAAQ,GAAG,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;oBACxG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;wBACrB,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE;4BAAE,OAAO;wBACrC,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC;wBAC/C,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE;4BAC9C,oCAAoC;4BACpC,IAAI,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC;gCACtC,OAAO;4BACT,CAAC;4BAED,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;4BACtC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC;gCAClC,OAAO,CAAC,GAAG,CAAC,+BAA+B,GAAG,CAAC,IAAI,wBAAwB,IAAI,sBAAsB,CAAC,CAAC;gCACvG,OAAO;4BACT,CAAC;4BAED,IAAI,CAAC,QAAQ,CAAC;gCACZ,IAAI,EAAE,OAAO;gCACb,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC;gCAC9B,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;6BAC5C,CAAC,CAAC;wBACL,CAAC,CAAC,CAAC;oBACL,CAAC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;SACF;KACF,CAAC;AACJ,CAAC","sourcesContent":["import type { Resolver } from '@embroider/core';\nimport core from '@embroider/core';\nconst { ResolverLoader } = core;\nimport type { Plugin } from 'vite';\nimport * as process from 'process';\nimport { join, posix } from 'path';\nimport fs from 'fs-extra';\nconst { existsSync, readFileSync, lstatSync } = fs;\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"]}
1	+ {"version":3,"file":"assets.js","sourceRoot":"","sources":["assets.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Resolver } from '@embroider/core';\nimport core from '@embroider/core';\nconst { ResolverLoader } = core;\nimport type { Plugin } from 'vite';\nimport * as process from 'process';\nimport { join, posix } from 'path';\nimport fs from 'fs-extra';\nconst { existsSync, readFileSync, lstatSync } = fs;\nimport send from 'send';\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, assetUrl).pipe(res as unknown as NodeJS.WritableStream);\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/classic-ember-support.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export declare function classicEmberSupport(): import("vite").Plugin<any>[];

package/src/classic-ember-support.js ADDED Viewed

@@ -0,0 +1,9 @@
+import { hbs } from './hbs.js';
+import { scripts } from './scripts.js';
+import { compatPrebuild } from './build.js';
+import { assets } from './assets.js';
+import { contentFor } from './content-for.js';
+export function classicEmberSupport() {
+    return [hbs(), scripts(), compatPrebuild(), assets(), contentFor()];
+}
+//# sourceMappingURL=classic-ember-support.js.map

package/src/classic-ember-support.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"classic-ember-support.js","sourceRoot":"","sources":["classic-ember-support.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,MAAM,UAAU,mBAAmB;IACjC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,EAAE,cAAc,EAAE,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;AACtE,CAAC","sourcesContent":["import { hbs } from './hbs.js';\nimport { scripts } from './scripts.js';\nimport { compatPrebuild } from './build.js';\nimport { assets } from './assets.js';\nimport { contentFor } from './content-for.js';\n\nexport function classicEmberSupport() {\n return [hbs(), scripts(), compatPrebuild(), assets(), contentFor()];\n}\n"]}

package/src/ember.d.ts ADDED Viewed

@@ -0,0 +1,6 @@
+import { type UserConfig, type ConfigEnv } from 'vite';
+export declare let extensions: string[];
+export declare function ember(): (import("vite").Plugin<any> | {
+    name: string;
+    config(config: UserConfig, env: ConfigEnv): Promise<Record<string, any>>;
+})[];

package/src/ember.js ADDED Viewed

@@ -0,0 +1,43 @@
+import { templateTag } from './template-tag.js';
+import { resolver } from './resolver.js';
+import { mergeConfig } from 'vite';
+import { esBuildResolver } from './esbuild-resolver.js';
+export let extensions = ['.mjs', '.gjs', '.js', '.mts', '.gts', '.ts', '.hbs', '.hbs.js', '.json'];
+export function ember() {
+    return [
+        templateTag(),
+        resolver(),
+        {
+            name: 'vite-plugin-ember-config',
+            async config(config, env) {
+                return mergeConfig({
+                    resolve: {
+                        extensions,
+                    },
+                    optimizeDeps: {
+                        exclude: ['@embroider/macros'],
+                        extensions: ['.hbs', '.gjs', '.gts'],
+                        esbuildOptions: {
+                            plugins: [esBuildResolver()],
+                        },
+                    },
+                    build: {
+                        rollupOptions: {
+                            input: {
+                                main: 'index.html',
+                                ...(shouldBuildTests(env.mode) ? { tests: 'tests/index.html' } : undefined),
+                            },
+                        },
+                    },
+                    server: {
+                        port: 4200,
+                    },
+                }, config);
+            },
+        },
+    ];
+}
+function shouldBuildTests(mode) {
+    return mode !== 'production' || process.env.FORCE_BUILD_TESTS;
+}
+//# sourceMappingURL=ember.js.map

package/src/ember.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"ember.js","sourceRoot":"","sources":["ember.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,WAAW,EAAmC,MAAM,MAAM,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,CAAC,IAAI,UAAU,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;AAEnG,MAAM,UAAU,KAAK;IACnB,OAAO;QACL,WAAW,EAAE;QACb,QAAQ,EAAE;QACV;YACE,IAAI,EAAE,0BAA0B;YAChC,KAAK,CAAC,MAAM,CAAC,MAAkB,EAAE,GAAc;gBAC7C,OAAO,WAAW,CAChB;oBACE,OAAO,EAAE;wBACP,UAAU;qBACX;oBAED,YAAY,EAAE;wBACZ,OAAO,EAAE,CAAC,mBAAmB,CAAC;wBAC9B,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;wBACpC,cAAc,EAAE;4BACd,OAAO,EAAE,CAAC,eAAe,EAAE,CAAC;yBAC7B;qBACF;oBAED,KAAK,EAAE;wBACL,aAAa,EAAE;4BACb,KAAK,EAAE;gCACL,IAAI,EAAE,YAAY;gCAClB,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;6BAC5E;yBACF;qBACF;oBACD,MAAM,EAAE;wBACN,IAAI,EAAE,IAAI;qBACX;iBACF,EACD,MAAM,CACP,CAAC;YACJ,CAAC;SACF;KACF,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAY;IACpC,OAAO,IAAI,KAAK,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;AAChE,CAAC","sourcesContent":["import { templateTag } from './template-tag.js';\nimport { resolver } from './resolver.js';\nimport { mergeConfig, type UserConfig, type ConfigEnv } from 'vite';\nimport { esBuildResolver } from './esbuild-resolver.js';\n\nexport let extensions = ['.mjs', '.gjs', '.js', '.mts', '.gts', '.ts', '.hbs', '.hbs.js', '.json'];\n\nexport function ember() {\n return [\n templateTag(),\n resolver(),\n {\n name: 'vite-plugin-ember-config',\n async config(config: UserConfig, env: ConfigEnv) {\n return mergeConfig(\n {\n resolve: {\n extensions,\n },\n\n optimizeDeps: {\n exclude: ['@embroider/macros'],\n extensions: ['.hbs', '.gjs', '.gts'],\n esbuildOptions: {\n plugins: [esBuildResolver()],\n },\n },\n\n build: {\n rollupOptions: {\n input: {\n main: 'index.html',\n ...(shouldBuildTests(env.mode) ? { tests: 'tests/index.html' } : undefined),\n },\n },\n },\n server: {\n port: 4200,\n },\n },\n config\n );\n },\n },\n ];\n}\n\nfunction shouldBuildTests(mode: string) {\n return mode !== 'production' || process.env.FORCE_BUILD_TESTS;\n}\n"]}

package/src/esbuild-request.d.ts CHANGED Viewed

@@ -1,30 +1,33 @@
 import type { ImportKind, OnResolveResult, PluginBuild } from 'esbuild';
-import type { PackageCache as _PackageCache, Resolution, ModuleRequest } from '@embroider/core';
+import type { PackageCache as _PackageCache, Resolution, ModuleRequest, RequestAdapter } from '@embroider/core';
 type PublicAPI<T> = {
     [K in keyof T]: T[K];
 };
 type PackageCache = PublicAPI<_PackageCache>;
-export declare class EsBuildModuleRequest implements ModuleRequest {
+export declare class EsBuildRequestAdapter implements RequestAdapter<Resolution<OnResolveResult, OnResolveResult>> {
     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' | 'other', context: PluginBuild, kind: ImportKind, source: string, importer: string | undefined, pluginData: Record<string, any> | undefined): EsBuildModuleRequest | undefined;
+    static create({ packageCache, phase, build, kind, path, importer, pluginData, }: {
+        packageCache: PackageCache;
+        phase: 'bundling' | 'other';
+        build: PluginBuild;
+        kind: ImportKind;
+        path: string;
+        importer: string | undefined;
+        pluginData: Record<string, any> | undefined;
+    }): {
+        initialState: {
+            specifier: string;
+            fromFile: string;
+            meta: any;
+        };
+        adapter: EsBuildRequestAdapter;
+    } | 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>>;
+    resolve(request: ModuleRequest<Resolution<OnResolveResult, OnResolveResult>>): Promise<Resolution<OnResolveResult, OnResolveResult>>;
 }
 export declare function writeStatus(id: string, status: 'found' | 'not_found'): void;
 export {};

package/src/esbuild-request.js CHANGED Viewed

@@ -2,63 +2,40 @@ import core from '@embroider/core';
 const { cleanUrl, packageName } = core;
 import { dirname } from 'path';
 import { externalName } from '@embroider/reverse-exports';
-export class EsBuildModuleRequest {
-    static from(packageCache, phase, context, kind, source, importer, pluginData) {
+export class EsBuildRequestAdapter {
+    static create({ packageCache, phase, build, kind, path, 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:')) {
+        if (path && importer && path[0] !== '\0' && !path.startsWith('virtual-module:')) {
             let fromFile = 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);
+            return {
+                initialState: {
+                    specifier: path,
+                    fromFile,
+                    meta: (_c = pluginData === null || pluginData === void 0 ? void 0 : pluginData.embroider) === null || _c === void 0 ? void 0 : _c.meta,
+                },
+                adapter: new EsBuildRequestAdapter(packageCache, phase, build, kind),
+            };
         }
     }
-    constructor(packageCache, phase, context, kind, specifier, fromFile, meta, isVirtual, isNotFound, resolvedTo) {
+    constructor(packageCache, phase, context, kind) {
         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;
+    async resolve(request) {
         if (request.isVirtual) {
             return {
                 type: 'found',
                 filename: request.specifier,
                 result: { path: request.specifier, namespace: 'embroider-virtual' },
-                isVirtual: this.isVirtual,
+                isVirtual: request.isVirtual,
             };
         }
         if (request.isNotFound) {
@@ -122,7 +99,7 @@ export class EsBuildModuleRequest {
                     };
                 }
             }
-            return { type: 'found', filename: result.path, result, isVirtual: this.isVirtual };
+            return { type: 'found', filename: result.path, result, isVirtual: request.isVirtual };
         }
     }
 }

package/src/esbuild-request.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"esbuild-request.js","sourceRoot":"","sources":["esbuild-request.ts"],"names":[],"mappings":"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","sourcesContent":["import core from '@embroider/core';\nconst { cleanUrl, packageName } = core;\nimport type { ImportKind, OnResolveResult, PluginBuild } from 'esbuild';\nimport { dirname } from 'path';\n\nimport type { PackageCache as _PackageCache, Resolution, ModuleRequest } from '@embroider/core';\nimport { externalName } from '@embroider/reverse-exports';\n\ntype PublicAPI<T> = { [K in keyof T]: T[K] };\ntype PackageCache = PublicAPI<_PackageCache>;\n\nexport class EsBuildModuleRequest implements ModuleRequest {\n static from(\n packageCache: PackageCache,\n phase: 'bundling' \| 'other',\n context: PluginBuild,\n kind: ImportKind,\n source: string,\n importer: string \| undefined,\n pluginData: Record<string, any> \| undefined\n ): EsBuildModuleRequest \| undefined {\n if (!(pluginData?.embroider?.enableCustomResolver ?? true)) {\n return;\n }\n\n if (source && importer && source[0] !== '\\0' && !source.startsWith('virtual-module:')) {\n let fromFile = cleanUrl(importer);\n return new EsBuildModuleRequest(\n packageCache,\n phase,\n context,\n kind,\n source,\n fromFile,\n pluginData?.embroider?.meta,\n false,\n false,\n undefined\n );\n }\n }\n\n private constructor(\n private packageCache: PackageCache,\n private phase: 'bundling' \| 'other',\n private context: PluginBuild,\n private kind: ImportKind,\n readonly specifier: string,\n readonly fromFile: string,\n readonly meta: Record<string, any> \| undefined,\n readonly isVirtual: boolean,\n readonly isNotFound: boolean,\n readonly resolvedTo: Resolution<OnResolveResult, OnResolveResult> \| undefined\n ) {}\n\n get debugType() {\n return 'esbuild';\n }\n\n alias(newSpecifier: string) {\n return new EsBuildModuleRequest(\n this.packageCache,\n this.phase,\n this.context,\n this.kind,\n newSpecifier,\n this.fromFile,\n this.meta,\n this.isVirtual,\n false,\n undefined\n ) as this;\n }\n rehome(newFromFile: string) {\n if (this.fromFile === newFromFile) {\n return this;\n } else {\n return new EsBuildModuleRequest(\n this.packageCache,\n this.phase,\n this.context,\n this.kind,\n this.specifier,\n newFromFile,\n this.meta,\n this.isVirtual,\n false,\n undefined\n ) as this;\n }\n }\n virtualize(filename: string) {\n return new EsBuildModuleRequest(\n this.packageCache,\n this.phase,\n this.context,\n this.kind,\n filename,\n this.fromFile,\n this.meta,\n true,\n false,\n undefined\n ) as this;\n }\n withMeta(meta: Record<string, any> \| undefined): this {\n return new EsBuildModuleRequest(\n this.packageCache,\n this.phase,\n this.context,\n this.kind,\n this.specifier,\n this.fromFile,\n meta,\n this.isVirtual,\n this.isNotFound,\n this.resolvedTo\n ) as this;\n }\n notFound(): this {\n return new EsBuildModuleRequest(\n this.packageCache,\n this.phase,\n this.context,\n this.kind,\n this.specifier,\n this.fromFile,\n this.meta,\n this.isVirtual,\n true,\n undefined\n ) as this;\n }\n\n resolveTo(resolution: Resolution<OnResolveResult, OnResolveResult>): this {\n return new EsBuildModuleRequest(\n this.packageCache,\n this.phase,\n this.context,\n this.kind,\n this.specifier,\n this.fromFile,\n this.meta,\n this.isVirtual,\n this.isNotFound,\n resolution\n ) as this;\n }\n\n async defaultResolve(): Promise<Resolution<OnResolveResult, OnResolveResult>> {\n const request = this;\n if (request.isVirtual) {\n return {\n type: 'found',\n filename: request.specifier,\n result: { path: request.specifier, namespace: 'embroider-virtual' },\n isVirtual: this.isVirtual,\n };\n }\n if (request.isNotFound) {\n // todo: make sure this looks correct to users\n return {\n type: 'not_found',\n err: {\n errors: [{ text: `module not found ${request.specifier}` }],\n },\n };\n }\n\n requestStatus(request.specifier);\n\n let result = await this.context.resolve(request.specifier, {\n importer: request.fromFile,\n resolveDir: dirname(request.fromFile),\n kind: this.kind,\n pluginData: {\n embroider: {\n enableCustomResolver: false,\n meta: request.meta,\n },\n },\n });\n\n let status = readStatus(request.specifier);\n\n if (result.errors.length > 0 \|\| status === 'not_found') {\n return { type: 'not_found', err: result };\n } else if (result.external) {\n return { type: 'ignored', result };\n } else {\n if (this.phase === 'bundling') {\n // we need to ensure that we don't traverse back into the app while\n // doing dependency pre-bundling. There are multiple ways an addon can\n // resolve things from the app, due to the existince of both app-js\n // (modules in addons that are logically part of the app's namespace)\n // and non-strict handlebars (which resolves\n // components/helpers/modifiers against the app's global pool).\n let pkg = this.packageCache.ownerOfFile(result.path);\n if (pkg?.root === this.packageCache.appRoot) {\n let externalizedName = request.specifier;\n if (!packageName(externalizedName)) {\n // the request was a relative path. This won't remain valid once\n // it has been bundled into vite/deps. But we know it targets the\n // app, so we can always convert it into a non-relative import\n // from the app's namespace\n //\n // IMPORTANT: whenever an addon resolves a relative path to the\n // app, it does so because our code in the core resolver has\n // rewritten the request to be relative to the app's root. So here\n // we will only ever encounter relative paths that are already\n // relative to the app's root directory.\n externalizedName = externalName(pkg.packageJSON, externalizedName) \|\| externalizedName;\n }\n return {\n type: 'ignored',\n result: {\n path: externalizedName,\n external: true,\n },\n };\n }\n }\n return { type: 'found', filename: result.path, result, isVirtual: this.isVirtual };\n }\n }\n}\n\n/\n This is an unfortunate necessity. During depscan, vite deliberately hides\n information from esbuild. Specifically, it treats \"not found\" and \"this is an\n external dependency\" as both \"external: true\". But we really care about the\n difference, since we have fallback behaviors for the \"not found\" case. Using\n this global state, our rollup resolver plugin can observe what vite is\n actually doing and communicate that knowledge outward to our esbuild resolver\n plugin.\n /\nfunction sharedGlobalState() {\n let channel = (globalThis as any).__embroider_vite_resolver_channel__ as\n \| undefined\n \| Map<string, 'pending' \| 'found' \| 'not_found'>;\n if (!channel) {\n channel = new Map();\n (globalThis as any).__embroider_vite_resolver_channel__ = channel;\n }\n return channel;\n}\n\nfunction requestStatus(id: string): void {\n sharedGlobalState().set(id, 'pending');\n}\n\nexport function writeStatus(id: string, status: 'found' \| 'not_found'): void {\n let channel = sharedGlobalState();\n if (channel.get(id) === 'pending') {\n channel.set(id, status);\n }\n}\n\nfunction readStatus(id: string): 'pending' \| 'not_found' \| 'found' {\n let channel = sharedGlobalState();\n let result = channel.get(id) ?? 'pending';\n channel.delete(id);\n return result;\n}\n"]}
1	+ {"version":3,"file":"esbuild-request.js","sourceRoot":"","sources":["esbuild-request.ts"],"names":[],"mappings":"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","sourcesContent":["import core from '@embroider/core';\nconst { cleanUrl, packageName } = core;\nimport type { ImportKind, OnResolveResult, PluginBuild } from 'esbuild';\nimport { dirname } from 'path';\n\nimport type { PackageCache as _PackageCache, Resolution, ModuleRequest, RequestAdapter } from '@embroider/core';\nimport { externalName } from '@embroider/reverse-exports';\n\ntype PublicAPI<T> = { [K in keyof T]: T[K] };\ntype PackageCache = PublicAPI<_PackageCache>;\n\nexport class EsBuildRequestAdapter implements RequestAdapter<Resolution<OnResolveResult, OnResolveResult>> {\n static create({\n packageCache,\n phase,\n build,\n kind,\n path,\n importer,\n pluginData,\n }: {\n packageCache: PackageCache;\n phase: 'bundling' \| 'other';\n build: PluginBuild;\n kind: ImportKind;\n path: string;\n importer: string \| undefined;\n pluginData: Record<string, any> \| undefined;\n }) {\n if (!(pluginData?.embroider?.enableCustomResolver ?? true)) {\n return;\n }\n\n if (path && importer && path[0] !== '\\0' && !path.startsWith('virtual-module:')) {\n let fromFile = cleanUrl(importer);\n return {\n initialState: {\n specifier: path,\n fromFile,\n meta: pluginData?.embroider?.meta,\n },\n adapter: new EsBuildRequestAdapter(packageCache, phase, build, kind),\n };\n }\n }\n\n private constructor(\n private packageCache: PackageCache,\n private phase: 'bundling' \| 'other',\n private context: PluginBuild,\n private kind: ImportKind\n ) {}\n\n get debugType() {\n return 'esbuild';\n }\n\n async resolve(\n request: ModuleRequest<Resolution<OnResolveResult, OnResolveResult>>\n ): Promise<Resolution<OnResolveResult, OnResolveResult>> {\n if (request.isVirtual) {\n return {\n type: 'found',\n filename: request.specifier,\n result: { path: request.specifier, namespace: 'embroider-virtual' },\n isVirtual: request.isVirtual,\n };\n }\n if (request.isNotFound) {\n // todo: make sure this looks correct to users\n return {\n type: 'not_found',\n err: {\n errors: [{ text: `module not found ${request.specifier}` }],\n },\n };\n }\n\n requestStatus(request.specifier);\n\n let result = await this.context.resolve(request.specifier, {\n importer: request.fromFile,\n resolveDir: dirname(request.fromFile),\n kind: this.kind,\n pluginData: {\n embroider: {\n enableCustomResolver: false,\n meta: request.meta,\n },\n },\n });\n\n let status = readStatus(request.specifier);\n\n if (result.errors.length > 0 \|\| status === 'not_found') {\n return { type: 'not_found', err: result };\n } else if (result.external) {\n return { type: 'ignored', result };\n } else {\n if (this.phase === 'bundling') {\n // we need to ensure that we don't traverse back into the app while\n // doing dependency pre-bundling. There are multiple ways an addon can\n // resolve things from the app, due to the existince of both app-js\n // (modules in addons that are logically part of the app's namespace)\n // and non-strict handlebars (which resolves\n // components/helpers/modifiers against the app's global pool).\n let pkg = this.packageCache.ownerOfFile(result.path);\n if (pkg?.root === this.packageCache.appRoot) {\n let externalizedName = request.specifier;\n if (!packageName(externalizedName)) {\n // the request was a relative path. This won't remain valid once\n // it has been bundled into vite/deps. But we know it targets the\n // app, so we can always convert it into a non-relative import\n // from the app's namespace\n //\n // IMPORTANT: whenever an addon resolves a relative path to the\n // app, it does so because our code in the core resolver has\n // rewritten the request to be relative to the app's root. So here\n // we will only ever encounter relative paths that are already\n // relative to the app's root directory.\n externalizedName = externalName(pkg.packageJSON, externalizedName) \|\| externalizedName;\n }\n return {\n type: 'ignored',\n result: {\n path: externalizedName,\n external: true,\n },\n };\n }\n }\n return { type: 'found', filename: result.path, result, isVirtual: request.isVirtual };\n }\n }\n}\n\n/\n This is an unfortunate necessity. During depscan, vite deliberately hides\n information from esbuild. Specifically, it treats \"not found\" and \"this is an\n external dependency\" as both \"external: true\". But we really care about the\n difference, since we have fallback behaviors for the \"not found\" case. Using\n this global state, our rollup resolver plugin can observe what vite is\n actually doing and communicate that knowledge outward to our esbuild resolver\n plugin.\n /\nfunction sharedGlobalState() {\n let channel = (globalThis as any).__embroider_vite_resolver_channel__ as\n \| undefined\n \| Map<string, 'pending' \| 'found' \| 'not_found'>;\n if (!channel) {\n channel = new Map();\n (globalThis as any).__embroider_vite_resolver_channel__ = channel;\n }\n return channel;\n}\n\nfunction requestStatus(id: string): void {\n sharedGlobalState().set(id, 'pending');\n}\n\nexport function writeStatus(id: string, status: 'found' \| 'not_found'): void {\n let channel = sharedGlobalState();\n if (channel.get(id) === 'pending') {\n channel.set(id, status);\n }\n}\n\nfunction readStatus(id: string): 'pending' \| 'not_found' \| 'found' {\n let channel = sharedGlobalState();\n let result = channel.get(id) ?? 'pending';\n channel.delete(id);\n return result;\n}\n"]}

package/src/esbuild-resolver.js CHANGED Viewed

@@ -1,9 +1,9 @@
-import { transform } from '@babel/core';
-import core from '@embroider/core';
+import { transformAsync } from '@babel/core';
+import core, { ModuleRequest } from '@embroider/core';
 const { ResolverLoader, virtualContent, needsSyntheticComponentJS, isInComponents } = core;
 import fs from 'fs-extra';
 const { readFileSync } = fs;
-import { EsBuildModuleRequest } from './esbuild-request.js';
+import { EsBuildRequestAdapter } from './esbuild-request.js';
 import { assertNever } from 'assert-never';
 import { hbsToJS } from '@embroider/core';
 import { Preprocessor } from 'content-tag';
@@ -12,14 +12,14 @@ const templateOnlyComponent = `import templateOnly from '@ember/component/templa
 export function esBuildResolver() {
     let resolverLoader = new ResolverLoader(process.cwd());
     let preprocessor = new Preprocessor();
-    function transformAndAssert(src, filename) {
-        const result = transform(src, { filename });
+    async function transformAndAssert(src, filename) {
+        const result = await transformAsync(src, { filename });
         if (!result || result.code == null) {
             throw new Error(`Failed to load file ${filename} in esbuild-hbs-loader`);
         }
         return result.code;
     }
-    function onLoad({ path, namespace }) {
+    async function onLoad({ path, namespace }) {
         let src;
         if (namespace === 'embroider-template-only-component') {
             src = templateOnlyComponent;
@@ -37,7 +37,7 @@ export function esBuildResolver() {
             src = preprocessor.process(src, { filename: path });
         }
         if (['.hbs', '.gjs', '.gts', '.js', '.ts'].some(ext => path.endsWith(ext))) {
-            src = transformAndAssert(src, path);
+            src = await transformAndAssert(src, path);
         }
         return { contents: src };
     }
@@ -47,7 +47,15 @@ export function esBuildResolver() {
             const phase = detectPhase(build);
             // Embroider Resolver
             build.onResolve({ filter: /./ }, async ({ path, importer, pluginData, kind }) => {
-                let request = EsBuildModuleRequest.from(resolverLoader.resolver.packageCache, phase, build, kind, path, importer, pluginData);
+                let request = ModuleRequest.create(EsBuildRequestAdapter.create, {
+                    packageCache: resolverLoader.resolver.packageCache,
+                    phase,
+                    build,
+                    kind,
+                    path,
+                    importer,
+                    pluginData,
+                });
                 if (!request) {
                     return null;
                 }

package/src/esbuild-resolver.js.map CHANGED Viewed

	@@ -1 +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, OnLoadResult, PluginBuild, ResolveResult } from 'esbuild';\nimport { transform } from '@babel/core';\nimport core from '@embroider/core';\nconst { ResolverLoader, virtualContent, needsSyntheticComponentJS, isInComponents } = core;\nimport fs from 'fs-extra';\nconst { readFileSync } = fs;\nimport { EsBuildModuleRequest } from './esbuild-request.js';\nimport { assertNever } from 'assert-never';\nimport { hbsToJS } from '@embroider/core';\nimport { Preprocessor } from 'content-tag';\nimport { extname } from 'path';\n\nconst templateOnlyComponent =\n `import templateOnly from '@ember/component/template-only';\\n` + `export default templateOnly();\\n`;\n\nexport function esBuildResolver(): EsBuildPlugin {\n let resolverLoader = new ResolverLoader(process.cwd());\n let preprocessor = new Preprocessor();\n\n function transformAndAssert(src: string, filename: string): string {\n const result = transform(src, { filename });\n if (!result \|\| result.code == null) {\n throw new Error(`Failed to load file ${filename} in esbuild-hbs-loader`);\n }\n return result.code!;\n }\n\n function onLoad({ path, namespace }: { path: string; namespace: string }): OnLoadResult {\n let src: string;\n if (namespace === 'embroider-template-only-component') {\n src = templateOnlyComponent;\n } else if (namespace === 'embroider-virtual') {\n src = virtualContent(path, resolverLoader.resolver).src;\n } else {\n src = readFileSync(path, 'utf8');\n }\n if (path.endsWith('.hbs')) {\n src = hbsToJS(src);\n } else if (['.gjs', '.gts'].some(ext => path.endsWith(ext))) {\n src = preprocessor.process(src, { filename: path });\n }\n if (['.hbs', '.gjs', '.gts', '.js', '.ts'].some(ext => path.endsWith(ext))) {\n src = transformAndAssert(src, path);\n }\n return { contents: src };\n }\n\n return {\n name: 'embroider-esbuild-resolver',\n setup(build) {\n const phase = detectPhase(build);\n\n // Embroider Resolver\n build.onResolve({ filter: /./ }, async ({ path, importer, pluginData, kind }) => {\n let request = EsBuildModuleRequest.from(\n 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 case 'ignored':\n return resolution.result;\n case 'not_found':\n return resolution.err;\n default:\n throw assertNever(resolution);\n }\n });\n\n // template-only-component synthesis\n build.onResolve({ filter: /./ }, async ({ path, importer, namespace, resolveDir, pluginData, kind }) => {\n if (pluginData?.embroiderHBSResolving) {\n // reentrance\n return null;\n }\n\n let result = await build.resolve(path, {\n namespace,\n resolveDir,\n importer,\n kind,\n // avoid reentrance\n pluginData: { ...pluginData, embroiderHBSResolving: true },\n });\n\n if (result.errors.length === 0 && !result.external) {\n let syntheticPath = needsSyntheticComponentJS(path, result.path);\n if (syntheticPath && isInComponents(result.path, resolverLoader.resolver.packageCache)) {\n return { path: syntheticPath, namespace: 'embroider-template-only-component' };\n }\n }\n\n return result;\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 both embroider resolver and template-only-component\n // synthesizer, since both expect the ambient system to have extension\n // 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 one of our three special namespaces:\n build.onLoad({ namespace: 'embroider-template-only-component', filter: /./ }, onLoad);\n build.onLoad({ namespace: 'embroider-virtual', filter: /./ }, onLoad);\n build.onLoad({ namespace: 'embroider-template-tag', filter: /./ }, onLoad);\n\n // we need to handle all hbs\n build.onLoad({ filter: /\\.hbs$/ }, onLoad);\n\n // we need to handle all GJS (to preprocess) and JS (to run macros)\n build.onLoad({ filter: /\\.g?[jt]s$/ }, onLoad);\n },\n };\n}\n\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"]}
1	+ {"version":3,"file":"esbuild-resolver.js","sourceRoot":"","sources":["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 } from '@embroider/core';\nconst { ResolverLoader, virtualContent, needsSyntheticComponentJS, isInComponents } = 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\nconst templateOnlyComponent =\n `import templateOnly from '@ember/component/template-only';\\n` + `export default templateOnly();\\n`;\n\nexport function esBuildResolver(): EsBuildPlugin {\n let resolverLoader = new ResolverLoader(process.cwd());\n let preprocessor = new Preprocessor();\n\n 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({ path, namespace }: { path: string; namespace: string }): Promise<OnLoadResult> {\n let src: string;\n if (namespace === 'embroider-template-only-component') {\n src = templateOnlyComponent;\n } else if (namespace === 'embroider-virtual') {\n src = virtualContent(path, resolverLoader.resolver).src;\n } else {\n src = readFileSync(path, 'utf8');\n }\n if (path.endsWith('.hbs')) {\n src = hbsToJS(src);\n } else if (['.gjs', '.gts'].some(ext => path.endsWith(ext))) {\n src = preprocessor.process(src, { filename: path });\n }\n if (['.hbs', '.gjs', '.gts', '.js', '.ts'].some(ext => path.endsWith(ext))) {\n src = 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 case 'ignored':\n return resolution.result;\n case 'not_found':\n return resolution.err;\n default:\n throw assertNever(resolution);\n }\n });\n\n // template-only-component synthesis\n build.onResolve({ filter: /./ }, async ({ path, importer, namespace, resolveDir, pluginData, kind }) => {\n if (pluginData?.embroiderHBSResolving) {\n // reentrance\n return null;\n }\n\n let result = await build.resolve(path, {\n namespace,\n resolveDir,\n importer,\n kind,\n // avoid reentrance\n pluginData: { ...pluginData, embroiderHBSResolving: true },\n });\n\n if (result.errors.length === 0 && !result.external) {\n let syntheticPath = needsSyntheticComponentJS(path, result.path);\n if (syntheticPath && isInComponents(result.path, resolverLoader.resolver.packageCache)) {\n return { path: syntheticPath, namespace: 'embroider-template-only-component' };\n }\n }\n\n return result;\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 both embroider resolver and template-only-component\n // synthesizer, since both expect the ambient system to have extension\n // 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 one of our three special namespaces:\n build.onLoad({ namespace: 'embroider-template-only-component', filter: /./ }, onLoad);\n build.onLoad({ namespace: 'embroider-virtual', filter: /./ }, onLoad);\n build.onLoad({ namespace: 'embroider-template-tag', filter: /./ }, onLoad);\n\n // we need to handle all hbs\n build.onLoad({ filter: /\\.hbs$/ }, onLoad);\n\n // we need to handle all GJS (to preprocess) and JS (to run macros)\n build.onLoad({ filter: /\\.g?[jt]s$/ }, onLoad);\n },\n };\n}\n\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/src/request.d.ts CHANGED Viewed

@@ -1,26 +1,21 @@
-import type { ModuleRequest, Resolution } from '@embroider/core';
+import type { ModuleRequest, RequestAdapter, RequestAdapterCreate, Resolution } from '@embroider/core';
 import type { PluginContext, ResolveIdResult } from 'rollup';
 export declare const virtualPrefix = "embroider_virtual:";
-export declare class RollupModuleRequest implements ModuleRequest {
+interface Init {
+    context: PluginContext;
+    source: string;
+    importer: string | undefined;
+    custom: Record<string, any> | undefined;
+}
+export declare class RollupRequestAdapter implements RequestAdapter<Resolution<ResolveIdResult>> {
     private context;
-    readonly specifier: string;
-    readonly fromFile: string;
-    readonly meta: Record<string, any> | undefined;
-    readonly isNotFound: boolean;
-    readonly resolvedTo: Resolution<ResolveIdResult> | undefined;
     private queryParams;
     private importerQueryParams;
-    static from(context: PluginContext, source: string, importer: string | undefined, custom: Record<string, any> | undefined): RollupModuleRequest | undefined;
+    static create: RequestAdapterCreate<Init, Resolution<ResolveIdResult>>;
     private constructor();
     get debugType(): string;
-    get isVirtual(): boolean;
-    private get specifierWithQueryParams();
-    private get fromFileWithQueryParams();
-    alias(newSpecifier: string): this;
-    rehome(newFromFile: string): this;
-    virtualize(filename: string): this;
-    withMeta(meta: Record<string, any> | undefined): this;
-    notFound(): this;
-    defaultResolve(): Promise<Resolution<ResolveIdResult>>;
-    resolveTo(resolution: Resolution<ResolveIdResult>): this;
+    private specifierWithQueryParams;
+    private fromFileWithQueryParams;
+    resolve(request: ModuleRequest<Resolution<ResolveIdResult>>): Promise<Resolution<ResolveIdResult>>;
 }
+export {};

package/src/request.js CHANGED Viewed

@@ -1,108 +1,84 @@
 import core from '@embroider/core';
 const { cleanUrl, getUrlQueryParams } = core;
 export const virtualPrefix = 'embroider_virtual:';
-export class RollupModuleRequest {
-    static from(context, source, importer, custom) {
-        var _a, _b, _c;
-        if (!((_b = (_a = custom === null || custom === void 0 ? void 0 : custom.embroider) === null || _a === void 0 ? void 0 : _a.enableCustomResolver) !== null && _b !== void 0 ? _b : true)) {
-            return;
-        }
-        if (source && importer && source[0] !== '\0') {
-            let nonVirtual;
-            if (importer.startsWith(virtualPrefix)) {
-                nonVirtual = importer.slice(virtualPrefix.length);
-            }
-            else {
-                nonVirtual = importer;
-            }
-            // strip query params off the importer
-            let fromFile = cleanUrl(nonVirtual);
-            let importerQueryParams = getUrlQueryParams(nonVirtual);
-            // strip query params off the source but keep track of them
-            // we use regexp-based methods over a URL object because the
-            // source can be a relative path.
-            let cleanSource = cleanUrl(source);
-            let queryParams = getUrlQueryParams(source);
-            return new RollupModuleRequest(context, cleanSource, fromFile, (_c = custom === null || custom === void 0 ? void 0 : custom.embroider) === null || _c === void 0 ? void 0 : _c.meta, false, undefined, queryParams, importerQueryParams);
-        }
-    }
-    constructor(context, specifier, fromFile, meta, isNotFound, resolvedTo, queryParams, importerQueryParams) {
+export class RollupRequestAdapter {
+    constructor(context, queryParams, importerQueryParams) {
         this.context = context;
-        this.specifier = specifier;
-        this.fromFile = fromFile;
-        this.meta = meta;
-        this.isNotFound = isNotFound;
-        this.resolvedTo = resolvedTo;
         this.queryParams = queryParams;
         this.importerQueryParams = importerQueryParams;
     }
     get debugType() {
         return 'rollup';
     }
-    get isVirtual() {
-        return this.specifier.startsWith(virtualPrefix);
-    }
-    get specifierWithQueryParams() {
-        return `${this.specifier}${this.queryParams}`;
-    }
-    get fromFileWithQueryParams() {
-        return `${this.fromFile}${this.importerQueryParams}`;
-    }
-    alias(newSpecifier) {
-        return new RollupModuleRequest(this.context, newSpecifier, this.fromFile, this.meta, false, undefined, this.queryParams, this.importerQueryParams);
-    }
-    rehome(newFromFile) {
-        if (this.fromFile === newFromFile) {
-            return this;
-        }
-        else {
-            return new RollupModuleRequest(this.context, this.specifier, newFromFile, this.meta, false, undefined, this.queryParams, this.importerQueryParams);
-        }
+    specifierWithQueryParams(specifier) {
+        return `${specifier}${this.queryParams}`;
     }
-    virtualize(filename) {
-        return new RollupModuleRequest(this.context, virtualPrefix + filename, this.fromFile, this.meta, false, undefined, this.queryParams, this.importerQueryParams);
+    fromFileWithQueryParams(fromFile) {
+        return `${fromFile}${this.importerQueryParams}`;
     }
-    withMeta(meta) {
-        return new RollupModuleRequest(this.context, this.specifier, this.fromFile, meta, this.isNotFound, this.resolvedTo, this.queryParams, this.importerQueryParams);
-    }
-    notFound() {
-        return new RollupModuleRequest(this.context, this.specifier, this.fromFile, this.meta, true, undefined, this.queryParams, this.importerQueryParams);
-    }
-    async defaultResolve() {
-        if (this.isVirtual) {
+    async resolve(request) {
+        if (request.isVirtual) {
+            let specifier = virtualPrefix + request.specifier;
             return {
                 type: 'found',
-                filename: this.specifier,
-                result: { id: this.specifierWithQueryParams, resolvedBy: this.fromFileWithQueryParams },
-                isVirtual: this.isVirtual,
+                filename: specifier,
+                result: {
+                    id: this.specifierWithQueryParams(specifier),
+                    resolvedBy: this.fromFileWithQueryParams(request.fromFile),
+                },
+                isVirtual: request.isVirtual,
             };
         }
-        if (this.isNotFound) {
+        if (request.isNotFound) {
             // TODO: we can make sure this looks correct in rollup & vite output when a
             // user encounters it
             let err = new Error(`module not found ${this.specifierWithQueryParams}`);
             err.code = 'MODULE_NOT_FOUND';
             return { type: 'not_found', err };
         }
-        let result = await this.context.resolve(this.specifierWithQueryParams, this.fromFileWithQueryParams, {
+        let result = await this.context.resolve(this.specifierWithQueryParams(request.specifier), this.fromFileWithQueryParams(request.fromFile), {
             skipSelf: true,
             custom: {
                 embroider: {
                     enableCustomResolver: false,
-                    meta: this.meta,
+                    meta: request.meta,
                 },
             },
         });
         if (result) {
             let { pathname } = new URL(result.id, 'http://example.com');
-            return { type: 'found', filename: pathname, result, isVirtual: this.isVirtual };
+            return { type: 'found', filename: pathname, result, isVirtual: request.isVirtual };
         }
         else {
             return { type: 'not_found', err: undefined };
         }
     }
-    resolveTo(resolution) {
-        return new RollupModuleRequest(this.context, this.specifier, this.fromFile, this.meta, this.isNotFound, resolution, this.queryParams, this.importerQueryParams);
-    }
 }
+RollupRequestAdapter.create = ({ context, source, importer, custom, }) => {
+    var _a, _b, _c;
+    if (!((_b = (_a = custom === null || custom === void 0 ? void 0 : custom.embroider) === null || _a === void 0 ? void 0 : _a.enableCustomResolver) !== null && _b !== void 0 ? _b : true)) {
+        return;
+    }
+    if (source && importer && source[0] !== '\0') {
+        let nonVirtual;
+        if (importer.startsWith(virtualPrefix)) {
+            nonVirtual = importer.slice(virtualPrefix.length);
+        }
+        else {
+            nonVirtual = importer;
+        }
+        // strip query params off the importer
+        let fromFile = cleanUrl(nonVirtual);
+        let importerQueryParams = getUrlQueryParams(nonVirtual);
+        // strip query params off the source but keep track of them
+        // we use regexp-based methods over a URL object because the
+        // source can be a relative path.
+        let cleanSource = cleanUrl(source);
+        let queryParams = getUrlQueryParams(source);
+        return {
+            initialState: { specifier: cleanSource, fromFile, meta: (_c = custom === null || custom === void 0 ? void 0 : custom.embroider) === null || _c === void 0 ? void 0 : _c.meta },
+            adapter: new RollupRequestAdapter(context, queryParams, importerQueryParams),
+        };
+    }
+};
 //# sourceMappingURL=request.js.map

package/src/request.js.map CHANGED Viewed

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

package/src/resolver.js CHANGED Viewed

@@ -1,6 +1,6 @@
-import core from '@embroider/core';
+import core, { ModuleRequest } from '@embroider/core';
 const { virtualContent, ResolverLoader, explicitRelative, cleanUrl, tmpdir } = core;
-import { RollupModuleRequest, virtualPrefix } from './request.js';
+import { RollupRequestAdapter, virtualPrefix } from './request.js';
 import { assertNever } from 'assert-never';
 import makeDebug from 'debug';
 import { resolve, join } from 'path';
@@ -40,7 +40,12 @@ export function resolver() {
             if ((_a = options.custom) === null || _a === void 0 ? void 0 : _a.depScan) {
                 return await observeDepScan(this, source, importer, options);
             }
-            let request = RollupModuleRequest.from(this, source, importer, options.custom);
+            let request = ModuleRequest.create(RollupRequestAdapter.create, {
+                context: this,
+                source,
+                importer,
+                custom: options.custom,
+            });
             if (!request) {
                 // fallthrough to other rollup plugins
                 return null;

package/src/resolver.js.map CHANGED Viewed

	@@ -1 +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 core, { type Resolver } from '@embroider/core';\nconst { virtualContent, ResolverLoader, explicitRelative, cleanUrl, tmpdir } = core;\nimport { RollupModuleRequest, virtualPrefix } from './request.js';\nimport { assertNever } from 'assert-never';\nimport makeDebug from 'debug';\nimport { resolve, join } from 'path';\nimport { writeStatus } from './esbuild-request.js';\nimport type { PluginContext, ResolveIdResult } from 'rollup';\nimport { externalName } from '@embroider/reverse-exports';\nimport fs from 'fs-extra';\nimport { createHash } from 'crypto';\n\nconst { ensureSymlinkSync, outputJSONSync } = fs;\n\nconst debug = makeDebug('embroider:vite');\n\nexport function resolver(): Plugin {\n const resolverLoader = new ResolverLoader(process.cwd());\n let server: ViteDevServer;\n const virtualDeps: Map<string, string[]> = new Map();\n const notViteDeps = new Set<string>();\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 if (resolution.isVirtual) {\n return resolution.result;\n } else {\n return await maybeCaptureNewOptimizedDep(this, resolverLoader.resolver, resolution.result, notViteDeps);\n }\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/virtual/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/virtual/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\nfunction idFromResult(result: ResolveIdResult): string \| undefined {\n if (!result) {\n return undefined;\n }\n if (typeof result === 'string') {\n return cleanUrl(result);\n }\n return cleanUrl(result.id);\n}\n\nfunction hashed(path: string): string {\n let h = createHash('sha1');\n return h.update(path).digest('hex').slice(0, 8);\n}\n\nasync function maybeCaptureNewOptimizedDep(\n context: PluginContext,\n resolver: Resolver,\n result: ResolveIdResult,\n notViteDeps: Set<string>\n): Promise<ResolveIdResult> {\n let foundFile = idFromResult(result);\n if (!foundFile) {\n return result;\n }\n if (foundFile.startsWith(join(resolver.packageCache.appRoot, 'node_modules', '.vite'))) {\n debug('maybeCaptureNewOptimizedDep: %s already in vite deps', foundFile);\n return result;\n }\n let pkg = resolver.packageCache.ownerOfFile(foundFile);\n if (!pkg?.isV2Addon()) {\n debug('maybeCaptureNewOptimizedDep: %s not in v2 addon', foundFile);\n return result;\n }\n let target = externalName(pkg.packageJSON, explicitRelative(pkg.root, foundFile));\n if (!target) {\n debug('maybeCaptureNewOptimizedDep: %s is not exported', foundFile);\n return result;\n }\n\n if (notViteDeps.has(foundFile)) {\n debug('maybeCaptureNewOptimizedDep: already attmpted %s', foundFile);\n return result;\n }\n\n debug('maybeCaptureNewOptimizedDep: doing re-resolve for %s ', foundFile);\n\n let jumpRoot = join(tmpdir, 'embroider-vite-jump', hashed(pkg.root));\n let fromFile = join(jumpRoot, 'package.json');\n outputJSONSync(fromFile, {\n name: 'jump-root',\n });\n ensureSymlinkSync(pkg.root, join(jumpRoot, 'node_modules', pkg.name));\n let newResult = await context.resolve(target, fromFile);\n if (newResult) {\n if (idFromResult(newResult) === foundFile) {\n // This case is normal. For example, people could be using\n // `optimizeDeps.exclude` or they might be working in a monorepo where an\n // addon is not in node_modules. In both cases vite will decide not to\n // optimize the file, even though we gave it a chance to.\n //\n // We cache that result so we don't keep trying.\n debug('maybeCaptureNewOptimizedDep: %s did not become an optimized dep', foundFile);\n notViteDeps.add(foundFile);\n }\n\n return newResult;\n } else {\n return result;\n }\n}\n"]}
1	+ {"version":3,"file":"resolver.js","sourceRoot":"","sources":["resolver.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Plugin, ViteDevServer } from 'vite';\nimport core, { ModuleRequest, type Resolver } from '@embroider/core';\nconst { virtualContent, ResolverLoader, explicitRelative, cleanUrl, tmpdir } = core;\nimport { RollupRequestAdapter, virtualPrefix } from './request.js';\nimport { assertNever } from 'assert-never';\nimport makeDebug from 'debug';\nimport { resolve, join } from 'path';\nimport { writeStatus } from './esbuild-request.js';\nimport type { PluginContext, ResolveIdResult } from 'rollup';\nimport { externalName } from '@embroider/reverse-exports';\nimport fs from 'fs-extra';\nimport { createHash } from 'crypto';\n\nconst { ensureSymlinkSync, outputJSONSync } = fs;\n\nconst debug = makeDebug('embroider:vite');\n\nexport function resolver(): Plugin {\n const resolverLoader = new ResolverLoader(process.cwd());\n let server: ViteDevServer;\n const virtualDeps: Map<string, string[]> = new Map();\n const notViteDeps = new Set<string>();\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 = ModuleRequest.create(RollupRequestAdapter.create, {\n context: this,\n source,\n importer,\n custom: options.custom,\n });\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 if (resolution.isVirtual) {\n return resolution.result;\n } else {\n return await maybeCaptureNewOptimizedDep(this, resolverLoader.resolver, resolution.result, notViteDeps);\n }\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/virtual/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/virtual/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\nfunction idFromResult(result: ResolveIdResult): string \| undefined {\n if (!result) {\n return undefined;\n }\n if (typeof result === 'string') {\n return cleanUrl(result);\n }\n return cleanUrl(result.id);\n}\n\nfunction hashed(path: string): string {\n let h = createHash('sha1');\n return h.update(path).digest('hex').slice(0, 8);\n}\n\nasync function maybeCaptureNewOptimizedDep(\n context: PluginContext,\n resolver: Resolver,\n result: ResolveIdResult,\n notViteDeps: Set<string>\n): Promise<ResolveIdResult> {\n let foundFile = idFromResult(result);\n if (!foundFile) {\n return result;\n }\n if (foundFile.startsWith(join(resolver.packageCache.appRoot, 'node_modules', '.vite'))) {\n debug('maybeCaptureNewOptimizedDep: %s already in vite deps', foundFile);\n return result;\n }\n let pkg = resolver.packageCache.ownerOfFile(foundFile);\n if (!pkg?.isV2Addon()) {\n debug('maybeCaptureNewOptimizedDep: %s not in v2 addon', foundFile);\n return result;\n }\n let target = externalName(pkg.packageJSON, explicitRelative(pkg.root, foundFile));\n if (!target) {\n debug('maybeCaptureNewOptimizedDep: %s is not exported', foundFile);\n return result;\n }\n\n if (notViteDeps.has(foundFile)) {\n debug('maybeCaptureNewOptimizedDep: already attmpted %s', foundFile);\n return result;\n }\n\n debug('maybeCaptureNewOptimizedDep: doing re-resolve for %s ', foundFile);\n\n let jumpRoot = join(tmpdir, 'embroider-vite-jump', hashed(pkg.root));\n let fromFile = join(jumpRoot, 'package.json');\n outputJSONSync(fromFile, {\n name: 'jump-root',\n });\n ensureSymlinkSync(pkg.root, join(jumpRoot, 'node_modules', pkg.name));\n let newResult = await context.resolve(target, fromFile);\n if (newResult) {\n if (idFromResult(newResult) === foundFile) {\n // This case is normal. For example, people could be using\n // `optimizeDeps.exclude` or they might be working in a monorepo where an\n // addon is not in node_modules. In both cases vite will decide not to\n // optimize the file, even though we gave it a chance to.\n //\n // We cache that result so we don't keep trying.\n debug('maybeCaptureNewOptimizedDep: %s did not become an optimized dep', foundFile);\n notViteDeps.add(foundFile);\n }\n\n return newResult;\n } else {\n return result;\n }\n}\n"]}