fix(env-dir): propagate deploy env-dir into runtime entry

Co-Authored-By: Aiden

Author: GiveMe-A-Name

packages/solutions/app-tools/src/plugins/deploy/index.ts

@@ -11,6 +11,7 @@ import { createNodePreset } from './platforms/node';
 import { createVercelPreset } from './platforms/vercel';
 import type { PluginAPI } from './types';
 import { getProjectUsage } from './utils';
+
 type DeployPresetCreators = {
   node: typeof createNodePreset;
   vercel: typeof createVercelPreset;
@@ -32,6 +33,7 @@ async function getDeployPreset(
   modernConfig: AppToolsNormalizedConfig,
   deployTarget: DeployTarget,
   api: PluginAPI,
+  envDir?: string,
 ) {
   const { appDirectory, distDirectory, metaName } = appContext;
   const { useSSR, useAPI, useWebServer } = getProjectUsage(
@@ -49,13 +51,24 @@ async function getDeployPreset(
     );
   }
 
-  return createPreset({ appContext, modernConfig, needModernServer, api });
+  return createPreset({
+    appContext,
+    modernConfig,
+    needModernServer,
+    api,
+    envDir,
+  });
 }
 
 export default (): CliPlugin<AppTools> => ({
   name: '@modern-js/plugin-deploy',
   setup: api => {
     const deployTarget = process.env.MODERNJS_DEPLOY || provider || 'node';
+    let deployEnvDir: string | undefined;
+
+    api.onBeforeDeploy(options => {
+      deployEnvDir = options?.envDir;
+    });
 
     api.deploy(async () => {
       const appContext = api.getAppContext();
@@ -69,6 +82,7 @@ export default (): CliPlugin<AppTools> => ({
         modernConfig,
         deployTarget as DeployTarget,
         api,
+        deployEnvDir,
       );
 
       deployPreset?.prepare && (await deployPreset?.prepare());

packages/solutions/app-tools/src/plugins/deploy/platforms/netlify.ts

@@ -24,6 +24,7 @@ async function cleanDistDirectory(dir: string) {
 export const createNetlifyPreset: CreatePreset = ({
   appContext,
   modernConfig,
+  envDir,
   needModernServer,
 }) => {
   const { appDirectory, distDirectory, entrypoints, moduleType } = appContext;
@@ -102,6 +103,7 @@ export const createNetlifyPreset: CreatePreset = ({
         template,
         appContext,
         config: modernConfig,
+        envDir,
         isESM: isEsmProject,
       });
 

packages/solutions/app-tools/src/plugins/deploy/platforms/node.ts

@@ -13,6 +13,7 @@ export const createNodePreset: CreatePreset = ({
   appContext,
   modernConfig,
   api,
+  envDir,
 }) => {
   const { appDirectory, distDirectory, moduleType } = appContext;
   const isEsmProject = moduleType === 'module';
@@ -36,6 +37,7 @@ export const createNodePreset: CreatePreset = ({
         template,
         appContext,
         config: modernConfig,
+        envDir,
         isESM: isEsmProject,
       });
 

packages/solutions/app-tools/src/plugins/deploy/platforms/platform.ts

@@ -6,6 +6,7 @@ interface CreatePresetParams {
   appContext: AppToolsContext;
   modernConfig: AppToolsNormalizedConfig;
   api: PluginAPI;
+  envDir?: string;
   needModernServer?: boolean;
 }
 

packages/solutions/app-tools/src/plugins/deploy/platforms/vercel.ts

@@ -9,6 +9,7 @@ import type { CreatePreset } from './platform';
 export const createVercelPreset: CreatePreset = ({
   appContext,
   modernConfig,
+  envDir,
   needModernServer,
 }) => {
   const { appDirectory, distDirectory, entrypoints, moduleType } = appContext;
@@ -110,6 +111,7 @@ export const createVercelPreset: CreatePreset = ({
         template,
         appContext,
         config: modernConfig,
+        envDir,
         isESM: isEsmProject,
       });
 

packages/solutions/app-tools/src/plugins/deploy/utils/generator.ts

@@ -64,15 +64,18 @@ export interface GenerateHandlerOptions {
   template: string;
   appContext: AppToolsContext;
   config: AppToolsNormalizedConfig;
+  envDir?: string;
   serverConfig?: Partial<ProdServerOptions>;
   genAppContextTemplate?: typeof serverAppContextTemplate;
   genPluginImports?: typeof genPluginImportsCode;
   isESM?: boolean;
 }
+
 export const generateHandler = async ({
   template,
   appContext,
   config,
+  envDir,
   serverConfig: modifyServerConfig,
   genAppContextTemplate = serverAppContextTemplate,
   genPluginImports = genPluginImportsCode,
@@ -104,6 +107,7 @@ export const generateHandler = async ({
   const pluginImportCode = genPluginImports(plugins || [], Boolean(isESM));
   const dynamicProdOptions = {
     config: serverConfig,
+    envDir,
   };
 
   const serverConfigPath = getServerConfigPath(meta);

tests/integration/env-dir/tests/index.test.ts

@@ -1,4 +1,4 @@
-import { existsSync, rmSync } from 'fs';
+import { existsSync, readFileSync, rmSync } from 'fs';
 import path from 'path';
 import puppeteer, { type Browser, type Page } from 'puppeteer';
 import {
@@ -151,12 +151,33 @@ describe('test env-dir deploy', () => {
       stderr: true,
       env: {
         NODE_ENV: 'production',
+        MODERNJS_DEPLOY: 'node',
       },
     });
 
     expect(deployRes.code).toBe(0);
     expect(existsSync(envDirEnvPath)).toBe(true);
   });
+
+  test('should inject env-dir into deployed output runtime options', async () => {
+    const deployRes = await runModernCommand(['deploy', '--env-dir', './env'], {
+      cwd: appDir,
+      stdout: true,
+      stderr: true,
+      env: {
+        NODE_ENV: 'production',
+        MODERNJS_DEPLOY: 'node',
+      },
+    });
+
+    expect(deployRes.code).toBe(0);
+
+    const entryCode = readFileSync(
+      path.join(appDir, '.output', 'index.js'),
+      'utf-8',
+    );
+    expect(entryCode.includes('"envDir":"./env"')).toBe(true);
+  });
 });
 
 describe('test env-dir option precedence', () => {