Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Jun 25, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix(deploy): adapt to the new server plugin for entry
  • Loading branch information
@yimingjfe
yimingjfe committed Jun 25, 2024
commit 0876468cad64b0913980b94ddd2c1842641e31ac
6 changes: 6 additions & 0 deletions .changeset/pink-drinks-invent.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@modern-js/app-tools': patch
---

fix: adapt to the new server plugin for entry
fix: server entry 适配新的 server plugin
8 changes: 7 additions & 1 deletion packages/solutions/app-tools/src/plugins/deploy/platforms/netlify.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,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();
Expand All @@ -118,6 +123,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);
Expand Down
1 change: 1 addition & 0 deletions packages/solutions/app-tools/src/plugins/deploy/platforms/netlifyEntry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ async function initServer() {
apiDirectory: p_apiDirectory,
lambdaDirectory: p_lambdaDirectory,
},
plugins: p_plugins,
...dynamicProdOptions,
};
const requestHandler = await createNetlifyFunction(prodServerOptions);
Expand Down
8 changes: 7 additions & 1 deletion packages/solutions/app-tools/src/plugins/deploy/platforms/node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,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();
Expand All @@ -53,6 +58,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);
Expand Down
1 change: 1 addition & 0 deletions packages/solutions/app-tools/src/plugins/deploy/platforms/nodeEntry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ async function main() {
apiDirectory: p_apiDirectory,
lambdaDirectory: p_lambdaDirectory,
},
plugins: p_plugins,
...dynamicProdOptions,
};

Expand Down
8 changes: 7 additions & 1 deletion packages/solutions/app-tools/src/plugins/deploy/platforms/vercel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,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 = (
Expand All @@ -126,6 +131,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);
Expand Down
1 change: 1 addition & 0 deletions packages/solutions/app-tools/src/plugins/deploy/platforms/vercelEntry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ async function initServer() {
apiDirectory: p_apiDirectory,
lambdaDirectory: p_lambdaDirectory,
},
plugins: p_plugins,
...dynamicProdOptions,
};
const app = await createProdServer(prodServerOptions);
Expand Down
Loading