-
Notifications
You must be signed in to change notification settings - Fork 169
perf: drop babel
to reduce the server bundle size
#891
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
"@opennextjs/aws": patch | ||
--- | ||
|
||
perf: drop `babel` to reduce the server bundle size |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,88 @@ | ||
/** | ||
* Patches to avoid pulling babel (~4MB). | ||
* | ||
* Details: | ||
* - empty `NextServer#runMiddleware` and `NextServer#runEdgeFunction` that are not used | ||
* - drop `next/dist/server/node-environment-extensions/error-inspect.js` | ||
*/ | ||
|
||
import { getCrossPlatformPathRegex } from "utils/regex.js"; | ||
import { patchCode } from "../astCodePatcher.js"; | ||
import type { CodePatcher } from "../codePatcher.js"; | ||
|
||
export const patchDropBabel: CodePatcher = { | ||
name: "patch-drop-babel", | ||
patches: [ | ||
// Empty the body of `NextServer#runMiddleware` | ||
{ | ||
field: { | ||
pathFilter: getCrossPlatformPathRegex( | ||
String.raw`/next/dist/server/next-server\.js$`, | ||
{ | ||
escape: false, | ||
}, | ||
), | ||
contentFilter: /runMiddleware\(/, | ||
patchCode: async ({ code }) => | ||
patchCode(code, createEmptyBodyRule("runMiddleware")), | ||
}, | ||
}, | ||
// Empty the body of `NextServer#runEdgeFunction` | ||
{ | ||
field: { | ||
pathFilter: getCrossPlatformPathRegex( | ||
String.raw`/next/dist/server/next-server\.js$`, | ||
{ | ||
escape: false, | ||
}, | ||
), | ||
contentFilter: /runEdgeFunction\(/, | ||
patchCode: async ({ code }) => | ||
patchCode(code, createEmptyBodyRule("runEdgeFunction")), | ||
}, | ||
}, | ||
// Drop `error-inspect` that pulls babel | ||
{ | ||
field: { | ||
pathFilter: getCrossPlatformPathRegex( | ||
String.raw`next/dist/server/node-environment\.js$`, | ||
{ | ||
escape: false, | ||
}, | ||
), | ||
contentFilter: /error-inspect/, | ||
patchCode: async ({ code }) => patchCode(code, errorInspectRule), | ||
}, | ||
}, | ||
], | ||
}; | ||
|
||
/** | ||
* Swaps the body for a throwing implementation | ||
* | ||
* @param methodName The name of the method | ||
* @returns A rule to replace the body with a `throw` | ||
*/ | ||
export function createEmptyBodyRule(methodName: string) { | ||
return ` | ||
rule: | ||
pattern: | ||
selector: method_definition | ||
context: "class { async ${methodName}($$$PARAMS) { $$$_ } }" | ||
fix: |- | ||
async ${methodName}($$$PARAMS) { | ||
throw new Error("${methodName} should not be called with OpenNext"); | ||
} | ||
`; | ||
} | ||
|
||
/** | ||
* Drops `require("./node-environment-extensions/error-inspect");` | ||
*/ | ||
export const errorInspectRule = ` | ||
rule: | ||
pattern: require("./node-environment-extensions/error-inspect"); | ||
fix: |- | ||
// Removed by OpenNext | ||
// require("./node-environment-extensions/error-inspect"); | ||
`; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
194 changes: 194 additions & 0 deletions
194
packages/tests-unit/tests/build/patch/patches/dropBabel.test.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,194 @@ | ||
import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js"; | ||
import { | ||
createEmptyBodyRule, | ||
errorInspectRule, | ||
} from "@opennextjs/aws/build/patch/patches/dropBabel.js"; | ||
import { describe, expect, test } from "vitest"; | ||
|
||
describe("babel-drop", () => { | ||
test("Drop body", () => { | ||
const code = ` | ||
class NextNodeServer extends _baseserver.default { | ||
constructor(options){ | ||
// Initialize super class | ||
super(options); | ||
this.handleNextImageRequest = async (req, res, parsedUrl) => { /* ... */ }; | ||
} | ||
async handleUpgrade() { | ||
// The web server does not support web sockets, it's only used for HMR in | ||
// development. | ||
} | ||
getEnabledDirectories(dev) { | ||
const dir = dev ? this.dir : this.serverDistDir; | ||
return { | ||
app: (0, _findpagesdir.findDir)(dir, "app") ? true : false, | ||
pages: (0, _findpagesdir.findDir)(dir, "pages") ? true : false | ||
}; | ||
} | ||
/** | ||
* This method gets all middleware matchers and execute them when the request | ||
* matches. It will make sure that each middleware exists and is compiled and | ||
* ready to be invoked. The development server will decorate it to add warns | ||
* and errors with rich traces. | ||
*/ async runMiddleware(params) { | ||
if (process.env.NEXT_MINIMAL) { | ||
throw new Error('invariant: runMiddleware should not be called in minimal mode'); | ||
} | ||
// Middleware is skipped for on-demand revalidate requests | ||
if ((0, _apiutils.checkIsOnDemandRevalidate)(params.request, this.renderOpts.previewProps).isOnDemandRevalidate) { | ||
return { | ||
response: new Response(null, { | ||
headers: { | ||
'x-middleware-next': '1' | ||
} | ||
}) | ||
}; | ||
} | ||
// ... | ||
} | ||
async runEdgeFunction(params) { | ||
if (process.env.NEXT_MINIMAL) { | ||
throw new Error('Middleware is not supported in minimal mode.'); | ||
} | ||
let edgeInfo; | ||
const { query, page, match } = params; | ||
if (!match) await this.ensureEdgeFunction({ | ||
page, | ||
appPaths: params.appPaths, | ||
url: params.req.url | ||
}); | ||
// ... | ||
} | ||
// ... | ||
}`; | ||
|
||
expect( | ||
patchCode(code, createEmptyBodyRule("runMiddleware")), | ||
).toMatchInlineSnapshot(` | ||
"class NextNodeServer extends _baseserver.default { | ||
constructor(options){ | ||
// Initialize super class | ||
super(options); | ||
this.handleNextImageRequest = async (req, res, parsedUrl) => { /* ... */ }; | ||
} | ||
async handleUpgrade() { | ||
// The web server does not support web sockets, it's only used for HMR in | ||
// development. | ||
} | ||
getEnabledDirectories(dev) { | ||
const dir = dev ? this.dir : this.serverDistDir; | ||
return { | ||
app: (0, _findpagesdir.findDir)(dir, "app") ? true : false, | ||
pages: (0, _findpagesdir.findDir)(dir, "pages") ? true : false | ||
}; | ||
} | ||
/** | ||
* This method gets all middleware matchers and execute them when the request | ||
* matches. It will make sure that each middleware exists and is compiled and | ||
* ready to be invoked. The development server will decorate it to add warns | ||
* and errors with rich traces. | ||
*/ async runMiddleware(params) { | ||
throw new Error("runMiddleware should not be called with OpenNext"); | ||
} | ||
async runEdgeFunction(params) { | ||
if (process.env.NEXT_MINIMAL) { | ||
throw new Error('Middleware is not supported in minimal mode.'); | ||
} | ||
let edgeInfo; | ||
const { query, page, match } = params; | ||
if (!match) await this.ensureEdgeFunction({ | ||
page, | ||
appPaths: params.appPaths, | ||
url: params.req.url | ||
}); | ||
// ... | ||
} | ||
// ... | ||
}" | ||
`); | ||
|
||
expect( | ||
patchCode(code, createEmptyBodyRule("runEdgeFunction")), | ||
).toMatchInlineSnapshot(` | ||
"class NextNodeServer extends _baseserver.default { | ||
constructor(options){ | ||
// Initialize super class | ||
super(options); | ||
this.handleNextImageRequest = async (req, res, parsedUrl) => { /* ... */ }; | ||
} | ||
async handleUpgrade() { | ||
// The web server does not support web sockets, it's only used for HMR in | ||
// development. | ||
} | ||
getEnabledDirectories(dev) { | ||
const dir = dev ? this.dir : this.serverDistDir; | ||
return { | ||
app: (0, _findpagesdir.findDir)(dir, "app") ? true : false, | ||
pages: (0, _findpagesdir.findDir)(dir, "pages") ? true : false | ||
}; | ||
} | ||
/** | ||
* This method gets all middleware matchers and execute them when the request | ||
* matches. It will make sure that each middleware exists and is compiled and | ||
* ready to be invoked. The development server will decorate it to add warns | ||
* and errors with rich traces. | ||
*/ async runMiddleware(params) { | ||
if (process.env.NEXT_MINIMAL) { | ||
throw new Error('invariant: runMiddleware should not be called in minimal mode'); | ||
} | ||
// Middleware is skipped for on-demand revalidate requests | ||
if ((0, _apiutils.checkIsOnDemandRevalidate)(params.request, this.renderOpts.previewProps).isOnDemandRevalidate) { | ||
return { | ||
response: new Response(null, { | ||
headers: { | ||
'x-middleware-next': '1' | ||
} | ||
}) | ||
}; | ||
} | ||
// ... | ||
} | ||
async runEdgeFunction(params) { | ||
throw new Error("runEdgeFunction should not be called with OpenNext"); | ||
} | ||
// ... | ||
}" | ||
`); | ||
}); | ||
|
||
test("Error Inspect", () => { | ||
const code = ` | ||
// This file should be imported before any others. It sets up the environment | ||
// for later imports to work properly. | ||
"use strict"; | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
require("./node-environment-baseline"); | ||
require("./node-environment-extensions/error-inspect"); | ||
require("./node-environment-extensions/random"); | ||
require("./node-environment-extensions/date"); | ||
require("./node-environment-extensions/web-crypto"); | ||
require("./node-environment-extensions/node-crypto"); | ||
//# sourceMappingURL=node-environment.js.map | ||
}`; | ||
|
||
expect(patchCode(code, errorInspectRule)).toMatchInlineSnapshot(` | ||
"// This file should be imported before any others. It sets up the environment | ||
// for later imports to work properly. | ||
"use strict"; | ||
Object.defineProperty(exports, "__esModule", { | ||
value: true | ||
}); | ||
require("./node-environment-baseline"); | ||
// Removed by OpenNext | ||
// require("./node-environment-extensions/error-inspect"); | ||
require("./node-environment-extensions/random"); | ||
require("./node-environment-extensions/date"); | ||
require("./node-environment-extensions/web-crypto"); | ||
require("./node-environment-extensions/node-crypto"); | ||
//# sourceMappingURL=node-environment.js.map | ||
}" | ||
`); | ||
}); | ||
}); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The changeset only lists
@opennextjs/aws
but thepatchDropBabel
changes live in the Open Next package; the affected package should be included here so the release picks up your updates.Copilot uses AI. Check for mistakes.