renaming our workaround env var

embroider-build · Feb 5, 2025 · df96dfb · df96dfb
1 parent d0cf3c6
commit df96dfb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/packages/vite/src/build.ts b/packages/vite/src/build.ts
@@ -11,7 +11,7 @@ export function emberBuild(command: string, mode: string, resolvableExtensions:
     env['EMBROIDER_RESOLVABLE_EXTENSIONS'] = resolvableExtensions?.join(',');
   }
 
-  if (command === 'build' || process.env.FORCE_EMBER_CLI_EXIT) {
+  if (command === 'build') {
     return new Promise((resolve, reject) => {
       const child = fork(
         './node_modules/ember-cli/bin/ember',
@@ -54,7 +54,7 @@ export function compatPrebuild(): Plugin {
     name: 'embroider-builder',
     enforce: 'pre',
     config(config, { mode, command }) {
-      viteCommand = command;
+      viteCommand = process.env.EMBROIDER_VITE_COMMAND ?? command;
       viteMode = mode;
       resolvableExtensions = config.resolve?.extensions;
     },

diff --git a/tests/scenarios/vite-dep-optimizer-test.ts b/tests/scenarios/vite-dep-optimizer-test.ts
@@ -107,7 +107,7 @@ app.forEachScenario(scenario => {
         await execa('pnpm', ['vite', 'optimize', '--force'], {
           cwd: app.dir,
           env: {
-            FORCE_EMBER_CLI_EXIT: 'true',
+            EMBROIDER_VITE_COMMAND: 'build',
           },
         });
         assert.ok(existsSync(join(app.dir, 'node_modules', '.vite')));

diff --git a/tests/scenarios/vite-internals-test.ts b/tests/scenarios/vite-internals-test.ts
@@ -324,7 +324,7 @@ function runViteInternalsTest(scenario: Scenario) {
       test('vite optimize should succeed', async function (assert) {
         let result = await app.execute('pnpm vite optimize --force', {
           env: {
-            FORCE_EMBER_CLI_EXIT: 'true',
+            EMBROIDER_VITE_COMMAND: 'build',
           },
         });