fix(deploy): adapt to the new server plugin for entry (#5870)

web-infra-dev · Jun 25, 2024 · 8677d06 · 8677d06
1 parent b50d7ec
commit 8677d06
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 3 deletions.
diff --git a/.changeset/pink-drinks-invent.md b/.changeset/pink-drinks-invent.md
@@ -0,0 +1,6 @@
+---
+'@modern-js/app-tools': patch
+---
+
+fix: adapt to the new server plugin for entry
+fix: server entry 适配新的 server plugin
diff --git a/packages/solutions/app-tools/src/plugins/deploy/platforms/netlify.ts b/packages/solutions/app-tools/src/plugins/deploy/platforms/netlify.ts
@@ -106,9 +106,14 @@ export const createNetlifyPreset: CreatePreset = (
       const dynamicProdOptions = {
         config: serverConfig,
         serverConfigFile: DEFAULT_SERVER_CONFIG,
-        plugins,
       };
 
+      const pluginsCode = `[${plugins
+        .map((plugin, index) => {
+          return `plugin_${index}()`;
+        })
+        .join(',')}]`;
+
       let entryCode = (
         await fse.readFile(path.join(__dirname, './netlifyEntry.js'))
       ).toString();
@@ -119,6 +124,7 @@ export const createNetlifyPreset: CreatePreset = (
         .replace('p_genPluginImportsCode', pluginImportCode)
         .replace('p_ROUTE_SPEC_FILE', `"${ROUTE_SPEC_FILE}"`)
         .replace('p_dynamicProdOptions', JSON.stringify(dynamicProdOptions))
+        .replace('p_plugins', pluginsCode)
         .replace('p_sharedDirectory', serverAppContext.sharedDirectory)
         .replace('p_apiDirectory', serverAppContext.apiDirectory)
         .replace('p_lambdaDirectory', serverAppContext.lambdaDirectory);

diff --git a/packages/solutions/app-tools/src/plugins/deploy/platforms/netlifyEntry.js b/packages/solutions/app-tools/src/plugins/deploy/platforms/netlifyEntry.js
@@ -42,6 +42,7 @@ async function initServer() {
       apiDirectory: p_apiDirectory,
       lambdaDirectory: p_lambdaDirectory,
     },
+    plugins: p_plugins,
     ...dynamicProdOptions,
   };
   const requestHandler = await createNetlifyFunction(prodServerOptions);

diff --git a/packages/solutions/app-tools/src/plugins/deploy/platforms/node.ts b/packages/solutions/app-tools/src/plugins/deploy/platforms/node.ts
@@ -42,9 +42,14 @@ export const createNodePreset: CreatePreset = (appContext, config) => {
       const dynamicProdOptions = {
         config: serverConfig,
         serverConfigFile: DEFAULT_SERVER_CONFIG,
-        plugins,
       };
 
+      const pluginsCode = `[${plugins
+        .map((plugin, index) => {
+          return `plugin_${index}()`;
+        })
+        .join(',')}]`;
+
       let entryCode = (
         await fse.readFile(path.join(__dirname, './nodeEntry.js'))
       ).toString();
@@ -55,6 +60,7 @@ export const createNodePreset: CreatePreset = (appContext, config) => {
         .replace('p_genPluginImportsCode', pluginImportCode)
         .replace('p_ROUTE_SPEC_FILE', `"${ROUTE_SPEC_FILE}"`)
         .replace('p_dynamicProdOptions', JSON.stringify(dynamicProdOptions))
+        .replace('p_plugins', pluginsCode)
         .replace('p_sharedDirectory', serverAppContext.sharedDirectory)
         .replace('p_apiDirectory', serverAppContext.apiDirectory)
         .replace('p_lambdaDirectory', serverAppContext.lambdaDirectory);

diff --git a/packages/solutions/app-tools/src/plugins/deploy/platforms/nodeEntry.js b/packages/solutions/app-tools/src/plugins/deploy/platforms/nodeEntry.js
@@ -38,6 +38,7 @@ async function main() {
       apiDirectory: p_apiDirectory,
       lambdaDirectory: p_lambdaDirectory,
     },
+    plugins: p_plugins,
     ...dynamicProdOptions,
   };
 

diff --git a/packages/solutions/app-tools/src/plugins/deploy/platforms/vercel.ts b/packages/solutions/app-tools/src/plugins/deploy/platforms/vercel.ts
@@ -114,9 +114,14 @@ export const createVercelPreset: CreatePreset = (
       const dynamicProdOptions = {
         config: serverConfig,
         serverConfigFile: DEFAULT_SERVER_CONFIG,
-        plugins,
       };
 
+      const pluginsCode = `[${plugins
+        .map((plugin, index) => {
+          return `plugin_${index}()`;
+        })
+        .join(',')}]`;
+
       const serverAppContext = serverAppContenxtTemplate(appContext);
 
       let entryCode = (
@@ -127,6 +132,7 @@ export const createVercelPreset: CreatePreset = (
         .replace('p_genPluginImportsCode', pluginImportCode)
         .replace('p_ROUTE_SPEC_FILE', `"${ROUTE_SPEC_FILE}"`)
         .replace('p_dynamicProdOptions', JSON.stringify(dynamicProdOptions))
+        .replace('p_plugins', pluginsCode)
         .replace('p_sharedDirectory', serverAppContext.sharedDirectory)
         .replace('p_apiDirectory', serverAppContext.apiDirectory)
         .replace('p_lambdaDirectory', serverAppContext.lambdaDirectory);

diff --git a/packages/solutions/app-tools/src/plugins/deploy/platforms/vercelEntry.js b/packages/solutions/app-tools/src/plugins/deploy/platforms/vercelEntry.js
@@ -42,6 +42,7 @@ async function initServer() {
       apiDirectory: p_apiDirectory,
       lambdaDirectory: p_lambdaDirectory,
     },
+    plugins: p_plugins,
     ...dynamicProdOptions,
   };
   const app = await createProdServer(prodServerOptions);