diff --git a/packages/vite/src/esbuild-resolver.ts b/packages/vite/src/esbuild-resolver.ts index 06a64ae47e..89f021c62d 100644 --- a/packages/vite/src/esbuild-resolver.ts +++ b/packages/vite/src/esbuild-resolver.ts @@ -56,10 +56,11 @@ export function esBuildResolver(): EsBuildPlugin { switch (resolution.type) { case 'found': // if some addon imports app files we do not want to bundle it - const isInNodeModules = - resolution.filename.includes('/node_modules/') || resolution.filename.includes('@embroider/ext-es'); - if (!isInNodeModules && importer !== '') { - const isFromApp = !importer.includes('/node_modules/'); + const filename = resolution.filename.replace(/\\/g, '/'); + const fromFile = importer.replace(/\\/, '/'); + const isInNodeModules = filename.includes('/node_modules/') || filename.includes('@embroider/ext-es'); + if (!isInNodeModules && fromFile !== '') { + const isFromApp = !fromFile.includes('/node_modules/'); if (!isFromApp) { if (resolution.isVirtual) { return { @@ -94,6 +95,7 @@ export function esBuildResolver(): EsBuildPlugin { return null; } + // vite resolver does not take part when optimizing deps const extensions = ['', '.hbs']; for (const extension of extensions) { let result = await build.resolve(path + extension, { diff --git a/test-packages/support/rebuilder.ts b/test-packages/support/rebuilder.ts index 3992c8c37f..c215ec796b 100644 --- a/test-packages/support/rebuilder.ts +++ b/test-packages/support/rebuilder.ts @@ -2,7 +2,6 @@ import type { ChildProcess } from 'child_process'; import { fork } from 'child_process'; import type Project from 'ember-cli/lib/models/project'; import type { Builder } from 'broccoli'; -// import { rm } from 'fs-extra'; /* A minimalist test harness for running ember-cli builds and rebuilds on demand. @@ -137,7 +136,6 @@ async function main() { for (let changed of m[1]) { didChange(builder, changed); } - // await rm('./tmp/rewritten-app', { recursive: true, force: true }); await builder.build(); sendToParent({ type: 'built', outputPath: builder.outputPath }); }