Unverified Commit 8ff22ca3 authored by Jimmy Lai's avatar Jimmy Lai Committed by GitHub

edge-ssr: bundle next/dist as ESM for better tree-shaking (#40251) (#40980)

Re-do of https://github.com/vercel/next.js/pull/40251

Edge SSR'd routes cold boot performances are proportional to the
executed code size.

In order to improve it, we are trying to optimize for the bundle size of
a packed Edge SSR route.

This PR adds ESM compilation targets for all Next.js dist packages and
use them to bundle Edge SSR'd route.

This allows us to leverage the better tree shaking/DCE for ESM modules
in webpack in order to decrease the overall bundle size.

This PR also enables minifying Edge SSR routes. Since we don't control
which minifier might be used later (if any), it's best if we provide an
already optimised bundle.

<img width="903" alt="image"

src="https://user-images.githubusercontent.com/11064311/190005211-b7cb2c58-a56a-44b0-8ee4-fd3f603e41bd.png">

This is a 10ms cold boot win per my benchmarking script, which I'll put
in a subsequent PR.

Not done yet:
- ~~swap exported requires in `next/link` (and others) etc to point them
to the esm modules version~~

<!--
Thanks for opening a PR! Your contribution is much appreciated. In order
to make sure your PR is handled as smoothly as possible we request that
you follow the checklist sections below. Choose the right checklist for
the change that you're making: -->

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`

- [x] Implements an existing feature request or RFC. Make sure the
feature request has been accepted for implementation before opening a
PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have helpful link attached, see `contributing.md`

- [ ] Make sure the linting passes by running `pnpm lint`
- [ ] The examples guidelines are followed from [our contributing
doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)
Co-authored-by: 's avatarJJ Kasper <jj@jjsweb.site>
Co-authored-by: 's avatarShu Ding <g@shud.in>

<!--
Thanks for opening a PR! Your contribution is much appreciated.
To make sure your PR is handled as smoothly as possible we request that
you follow the checklist sections below.
Choose the right checklist for the change that you're making:
-->

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have a helpful link attached, see `contributing.md`

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the
feature request has been accepted for implementation before opening a
PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have a helpful link attached, see `contributing.md`

## Documentation / Examples

- [ ] Make sure the linting passes by running `pnpm lint`
- [ ] The "examples guidelines" are followed from [our contributing
doc](https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md)
Co-authored-by: 's avatarJJ Kasper <jj@jjsweb.site>
Co-authored-by: 's avatarShu Ding <g@shud.in>
parent f7ce8ece
module.exports = require('./dist/shared/lib/amp') module.exports =
process.env.NEXT_RUNTIME === 'edge'
? require('./dist/esm/shared/lib/amp')
: require('./dist/shared/lib/amp')
module.exports = require('./dist/pages/_app') module.exports =
process.env.NEXT_RUNTIME === 'edge'
? require('./dist/esm/pages/_app')
: require('./dist/pages/_app')
...@@ -219,6 +219,7 @@ export function getAppEntry(opts: { ...@@ -219,6 +219,7 @@ export function getAppEntry(opts: {
appDir: string appDir: string
appPaths: string[] | null appPaths: string[] | null
pageExtensions: string[] pageExtensions: string[]
nextRuntime: string
}) { }) {
return { return {
import: `next-app-loader?${stringify(opts)}!`, import: `next-app-loader?${stringify(opts)}!`,
...@@ -455,6 +456,7 @@ export async function createEntrypoints(params: CreateEntrypointsParams) { ...@@ -455,6 +456,7 @@ export async function createEntrypoints(params: CreateEntrypointsParams) {
appDir, appDir,
appPaths: matchedAppPaths, appPaths: matchedAppPaths,
pageExtensions, pageExtensions,
nextRuntime: 'nodejs',
}) })
} else if (isTargetLikeServerless(target)) { } else if (isTargetLikeServerless(target)) {
if (page !== '/_app' && page !== '/_document') { if (page !== '/_app' && page !== '/_document') {
...@@ -479,6 +481,7 @@ export async function createEntrypoints(params: CreateEntrypointsParams) { ...@@ -479,6 +481,7 @@ export async function createEntrypoints(params: CreateEntrypointsParams) {
appDir: appDir!, appDir: appDir!,
appPaths: matchedAppPaths, appPaths: matchedAppPaths,
pageExtensions, pageExtensions,
nextRuntime: 'edge',
}).import }).import
} }
......
...@@ -180,11 +180,9 @@ export function getDefineEnv({ ...@@ -180,11 +180,9 @@ export function getDefineEnv({
}), }),
// TODO: enforce `NODE_ENV` on `process.env`, and add a test: // TODO: enforce `NODE_ENV` on `process.env`, and add a test:
'process.env.NODE_ENV': JSON.stringify(dev ? 'development' : 'production'), 'process.env.NODE_ENV': JSON.stringify(dev ? 'development' : 'production'),
...((isNodeServer || isEdgeServer) && { 'process.env.NEXT_RUNTIME': JSON.stringify(
'process.env.NEXT_RUNTIME': JSON.stringify( isEdgeServer ? 'edge' : isNodeServer ? 'nodejs' : undefined
isEdgeServer ? 'edge' : 'nodejs' ),
),
}),
'process.env.__NEXT_MIDDLEWARE_MATCHERS': JSON.stringify( 'process.env.__NEXT_MIDDLEWARE_MATCHERS': JSON.stringify(
middlewareMatchers || [] middlewareMatchers || []
), ),
...@@ -795,7 +793,7 @@ export default async function getBaseWebpackConfig( ...@@ -795,7 +793,7 @@ export default async function getBaseWebpackConfig(
return prev return prev
}, [] as string[]) }, [] as string[])
: []), : []),
'next/dist/pages/_app.js', isEdgeServer ? 'next/dist/esm/pages/_app.js' : 'next/dist/pages/_app.js',
] ]
customAppAliases[`${PAGES_DIR_ALIAS}/_error`] = [ customAppAliases[`${PAGES_DIR_ALIAS}/_error`] = [
...(pagesDir ...(pagesDir
...@@ -804,7 +802,9 @@ export default async function getBaseWebpackConfig( ...@@ -804,7 +802,9 @@ export default async function getBaseWebpackConfig(
return prev return prev
}, [] as string[]) }, [] as string[])
: []), : []),
'next/dist/pages/_error.js', isEdgeServer
? 'next/dist/esm/pages/_error.js'
: 'next/dist/pages/_error.js',
] ]
customDocumentAliases[`${PAGES_DIR_ALIAS}/_document`] = [ customDocumentAliases[`${PAGES_DIR_ALIAS}/_document`] = [
...(pagesDir ...(pagesDir
...@@ -813,7 +813,9 @@ export default async function getBaseWebpackConfig( ...@@ -813,7 +813,9 @@ export default async function getBaseWebpackConfig(
return prev return prev
}, [] as string[]) }, [] as string[])
: []), : []),
`next/dist/pages/_document.js`, isEdgeServer
? `next/dist/esm/pages/_document.js`
: `next/dist/pages/_document.js`,
] ]
} }
......
...@@ -120,8 +120,9 @@ const nextAppLoader: webpack.LoaderDefinitionFunction<{ ...@@ -120,8 +120,9 @@ const nextAppLoader: webpack.LoaderDefinitionFunction<{
appDir: string appDir: string
appPaths: string[] | null appPaths: string[] | null
pageExtensions: string[] pageExtensions: string[]
nextRuntime: string
}> = async function nextAppLoader() { }> = async function nextAppLoader() {
const { name, appDir, appPaths, pagePath, pageExtensions } = const { name, appDir, appPaths, pagePath, pageExtensions, nextRuntime } =
this.getOptions() || {} this.getOptions() || {}
const buildInfo = getModuleBuildInfo((this as any)._module) const buildInfo = getModuleBuildInfo((this as any)._module)
...@@ -179,23 +180,24 @@ const nextAppLoader: webpack.LoaderDefinitionFunction<{ ...@@ -179,23 +180,24 @@ const nextAppLoader: webpack.LoaderDefinitionFunction<{
resolveParallelSegments, resolveParallelSegments,
}) })
const rootDistFolder = nextRuntime === 'edge' ? 'next/dist/esm' : 'next/dist'
const result = ` const result = `
export ${treeCode} export ${treeCode}
export const AppRouter = require('next/dist/client/components/app-router.client.js').default export const AppRouter = require('${rootDistFolder}/client/components/app-router.client.js').default
export const LayoutRouter = require('next/dist/client/components/layout-router.client.js').default export const LayoutRouter = require('${rootDistFolder}/client/components/layout-router.client.js').default
export const RenderFromTemplateContext = require('next/dist/client/components/render-from-template-context.client.js').default export const RenderFromTemplateContext = require('${rootDistFolder}/client/components/render-from-template-context.client.js').default
export const HotReloader = ${ export const HotReloader = ${
// Disable HotReloader component in production // Disable HotReloader component in production
this.mode === 'development' this.mode === 'development'
? `require('next/dist/client/components/hot-reloader.client.js').default` ? `require('${rootDistFolder}/client/components/hot-reloader.client.js').default`
: 'null' : 'null'
} }
export const staticGenerationAsyncStorage = require('next/dist/client/components/static-generation-async-storage.js').staticGenerationAsyncStorage export const staticGenerationAsyncStorage = require('${rootDistFolder}/client/components/static-generation-async-storage.js').staticGenerationAsyncStorage
export const requestAsyncStorage = require('next/dist/client/components/request-async-storage.js').requestAsyncStorage export const requestAsyncStorage = require('${rootDistFolder}/client/components/request-async-storage.js').requestAsyncStorage
export const serverHooks = require('next/dist/client/components/hooks-server-context.js') export const serverHooks = require('${rootDistFolder}/client/components/hooks-server-context.js')
export const renderToReadableStream = require('next/dist/compiled/react-server-dom-webpack/writer.browser.server').renderToReadableStream export const renderToReadableStream = require('next/dist/compiled/react-server-dom-webpack/writer.browser.server').renderToReadableStream
export const __next_app_webpack_require__ = __webpack_require__ export const __next_app_webpack_require__ = __webpack_require__
......
...@@ -18,6 +18,18 @@ export type EdgeSSRLoaderQuery = { ...@@ -18,6 +18,18 @@ export type EdgeSSRLoaderQuery = {
hasFontLoaders: boolean hasFontLoaders: boolean
} }
/*
For pages SSR'd at the edge, we bundle them with the ESM version of Next in order to
benefit from the better tree-shaking and thus, smaller bundle sizes.
The absolute paths for _app, _error and _document, used in this loader, link to the regular CJS modules.
They are generated in `createPagesMapping` where we don't have access to `isEdgeRuntime`,
so we have to do it here. It's not that bad because it keeps all references to ESM modules magic in this place.
*/
function swapDistFolderWithEsmDistFolder(path: string) {
return path.replace('next/dist/pages', 'next/dist/esm/pages')
}
export default async function edgeSSRLoader(this: any) { export default async function edgeSSRLoader(this: any) {
const { const {
dev, dev,
...@@ -54,9 +66,18 @@ export default async function edgeSSRLoader(this: any) { ...@@ -54,9 +66,18 @@ export default async function edgeSSRLoader(this: any) {
} }
const stringifiedPagePath = stringifyRequest(this, absolutePagePath) const stringifiedPagePath = stringifyRequest(this, absolutePagePath)
const stringifiedAppPath = stringifyRequest(this, absoluteAppPath) const stringifiedAppPath = stringifyRequest(
const stringifiedErrorPath = stringifyRequest(this, absoluteErrorPath) this,
const stringifiedDocumentPath = stringifyRequest(this, absoluteDocumentPath) swapDistFolderWithEsmDistFolder(absoluteAppPath)
)
const stringifiedErrorPath = stringifyRequest(
this,
swapDistFolderWithEsmDistFolder(absoluteErrorPath)
)
const stringifiedDocumentPath = stringifyRequest(
this,
swapDistFolderWithEsmDistFolder(absoluteDocumentPath)
)
const stringified500Path = absolute500Path const stringified500Path = absolute500Path
? stringifyRequest(this, absolute500Path) ? stringifyRequest(this, absolute500Path)
: null : null
...@@ -67,8 +88,8 @@ export default async function edgeSSRLoader(this: any) { ...@@ -67,8 +88,8 @@ export default async function edgeSSRLoader(this: any) {
)}` )}`
const transformed = ` const transformed = `
import { adapter, enhanceGlobals } from 'next/dist/server/web/adapter' import { adapter, enhanceGlobals } from 'next/dist/esm/server/web/adapter'
import { getRender } from 'next/dist/build/webpack/loaders/next-edge-ssr-loader/render' import { getRender } from 'next/dist/esm/build/webpack/loaders/next-edge-ssr-loader/render'
enhanceGlobals() enhanceGlobals()
...@@ -77,7 +98,7 @@ export default async function edgeSSRLoader(this: any) { ...@@ -77,7 +98,7 @@ export default async function edgeSSRLoader(this: any) {
isAppDir isAppDir
? ` ? `
const Document = null const Document = null
const appRenderToHTML = require('next/dist/server/app-render').renderToHTMLOrFlight const appRenderToHTML = require('next/dist/esm/server/app-render').renderToHTMLOrFlight
const pagesRenderToHTML = null const pagesRenderToHTML = null
const pageMod = require(${JSON.stringify(pageModPath)}) const pageMod = require(${JSON.stringify(pageModPath)})
const appMod = null const appMod = null
...@@ -87,7 +108,7 @@ export default async function edgeSSRLoader(this: any) { ...@@ -87,7 +108,7 @@ export default async function edgeSSRLoader(this: any) {
: ` : `
const Document = require(${stringifiedDocumentPath}).default const Document = require(${stringifiedDocumentPath}).default
const appRenderToHTML = null const appRenderToHTML = null
const pagesRenderToHTML = require('next/dist/server/render').renderToHTML const pagesRenderToHTML = require('next/dist/esm/server/render').renderToHTML
const pageMod = require(${stringifiedPagePath}) const pageMod = require(${stringifiedPagePath})
const appMod = require(${stringifiedAppPath}) const appMod = require(${stringifiedAppPath})
const errorMod = require(${stringifiedErrorPath}) const errorMod = require(${stringifiedErrorPath})
......
import type { NextConfig } from '../../../../server/config-shared' import type { NextConfig } from '../../../../server/config-shared'
import type { DocumentType, AppType } from '../../../../shared/lib/utils' import type { DocumentType, AppType } from '../../../../shared/lib/utils'
import type { BuildManifest } from '../../../../server/get-page-files' import type { BuildManifest } from '../../../../server/get-page-files'
import type { ReactLoadableManifest } from '../../../../server/load-components' import type { ReactLoadableManifest } from '../../../../server/load-components'
......
...@@ -307,9 +307,19 @@ export class FlightClientEntryPlugin { ...@@ -307,9 +307,19 @@ export class FlightClientEntryPlugin {
modules: clientComponentImports, modules: clientComponentImports,
server: false, server: false,
} }
const clientLoader = `next-flight-client-entry-loader?${stringify(
loaderOptions // For the client entry, we always use the CJS build of Next.js. If the
)}!` // server is using the ESM build (when using the Edge runtime), we need to
// replace them.
const clientLoader = `next-flight-client-entry-loader?${stringify({
modules: this.isEdgeServer
? clientComponentImports.map((importPath) =>
importPath.replace('next/dist/esm/', 'next/dist/')
)
: clientComponentImports,
server: false,
})}!`
const clientSSRLoader = `next-flight-client-entry-loader?${stringify({ const clientSSRLoader = `next-flight-client-entry-loader?${stringify({
...loaderOptions, ...loaderOptions,
server: true, server: true,
......
...@@ -56,6 +56,9 @@ export type FlightManifest = { ...@@ -56,6 +56,9 @@ export type FlightManifest = {
__ssr_module_mapping__: { __ssr_module_mapping__: {
[moduleId: string]: ManifestNode [moduleId: string]: ManifestNode
} }
__edge_ssr_module_mapping__: {
[moduleId: string]: ManifestNode
}
} & { } & {
[modulePath: string]: ManifestNode [modulePath: string]: ManifestNode
} }
...@@ -141,6 +144,7 @@ export class FlightManifestPlugin { ...@@ -141,6 +144,7 @@ export class FlightManifestPlugin {
) { ) {
const manifest: FlightManifest = { const manifest: FlightManifest = {
__ssr_module_mapping__: {}, __ssr_module_mapping__: {},
__edge_ssr_module_mapping__: {},
} }
const dev = this.dev const dev = this.dev
const fontLoaderTargets = this.fontLoaderTargets const fontLoaderTargets = this.fontLoaderTargets
...@@ -196,6 +200,7 @@ export class FlightManifestPlugin { ...@@ -196,6 +200,7 @@ export class FlightManifestPlugin {
const moduleExports = manifest[resource] || {} const moduleExports = manifest[resource] || {}
const moduleIdMapping = manifest.__ssr_module_mapping__ const moduleIdMapping = manifest.__ssr_module_mapping__
const edgeModuleIdMapping = manifest.__edge_ssr_module_mapping__
// Note that this isn't that reliable as webpack is still possible to assign // Note that this isn't that reliable as webpack is still possible to assign
// additional queries to make sure there's no conflict even using the `named` // additional queries to make sure there's no conflict even using the `named`
...@@ -304,10 +309,25 @@ export class FlightManifestPlugin { ...@@ -304,10 +309,25 @@ export class FlightManifestPlugin {
...moduleExports[name], ...moduleExports[name],
id: ssrNamedModuleId, id: ssrNamedModuleId,
} }
edgeModuleIdMapping[id] = edgeModuleIdMapping[id] || {}
edgeModuleIdMapping[id][name] = {
...moduleExports[name],
id: ssrNamedModuleId.replace(/\/next\/dist\//, '/next/dist/esm/'),
}
}) })
manifest[resource] = moduleExports manifest[resource] = moduleExports
// The client compiler will always use the CJS Next.js build, so here we
// also add the mapping for the ESM build (Edge runtime) to consume.
if (/\/next\/dist\//.test(resource)) {
manifest[resource.replace(/\/next\/dist\//, '/next/dist/esm/')] =
moduleExports
}
manifest.__ssr_module_mapping__ = moduleIdMapping manifest.__ssr_module_mapping__ = moduleIdMapping
manifest.__edge_ssr_module_mapping__ = edgeModuleIdMapping
} }
chunkGroup.chunks.forEach((chunk: webpack.Chunk) => { chunkGroup.chunks.forEach((chunk: webpack.Chunk) => {
......
...@@ -110,11 +110,15 @@ function findFeatureInModule(module: Module): Feature | undefined { ...@@ -110,11 +110,15 @@ function findFeatureInModule(module: Module): Feature | undefined {
* dependency. * dependency.
*/ */
function findUniqueOriginModulesInConnections( function findUniqueOriginModulesInConnections(
connections: Connection[] connections: Connection[],
originModule: Module
): Set<unknown> { ): Set<unknown> {
const originModules = new Set() const originModules = new Set()
for (const connection of connections) { for (const connection of connections) {
if (!originModules.has(connection.originModule)) { if (
!originModules.has(connection.originModule) &&
connection.originModule !== originModule
) {
originModules.add(connection.originModule) originModules.add(connection.originModule)
} }
} }
...@@ -161,8 +165,10 @@ export class TelemetryPlugin implements webpack.WebpackPluginInstance { ...@@ -161,8 +165,10 @@ export class TelemetryPlugin implements webpack.WebpackPluginInstance {
const connections = ( const connections = (
compilation as any compilation as any
).moduleGraph.getIncomingConnections(module) ).moduleGraph.getIncomingConnections(module)
const originModules = const originModules = findUniqueOriginModulesInConnections(
findUniqueOriginModulesInConnections(connections) connections,
module
)
this.usageTracker.get(feature)!.invocationCount = this.usageTracker.get(feature)!.invocationCount =
originModules.size originModules.size
} }
......
module.exports = require('./dist/client/index') module.exports =
process.env.NEXT_RUNTIME === 'edge'
? require('./dist/esm/client/index')
: require('./dist/client/index')
module.exports = require('./dist/shared/lib/runtime-config') module.exports =
process.env.NEXT_RUNTIME === 'edge'
? require('./dist/esm/shared/lib/runtime-config')
: require('./dist/shared/lib/runtime-config')
module.exports = require('./dist/shared/lib/constants') module.exports =
process.env.NEXT_RUNTIME === 'edge'
? require('./dist/esm/shared/lib/constants')
: require('./dist/shared/lib/constants')
module.exports = require('./dist/pages/_document') module.exports =
process.env.NEXT_RUNTIME === 'edge'
? require('./dist/esm/pages/_document')
: require('./dist/pages/_document')
module.exports = require('./dist/shared/lib/dynamic') module.exports =
process.env.NEXT_RUNTIME === 'edge'
? require('./dist/esm/shared/lib/dynamic')
: require('./dist/shared/lib/dynamic')
module.exports = require('./dist/pages/_error') module.exports =
process.env.NEXT_RUNTIME === 'edge'
? require('./dist/esm/pages/_error')
: require('./dist/pages/_error')
module.exports = require('./dist/shared/lib/head') module.exports =
process.env.NEXT_RUNTIME === 'edge'
? require('./dist/esm/shared/lib/head')
: require('./dist/shared/lib/head')
module.exports = require('./dist/client/image') module.exports =
process.env.NEXT_RUNTIME === 'edge'
? require('./dist/esm/client/image')
: require('./dist/client/image')
module.exports = require('./dist/client/link') module.exports =
process.env.NEXT_RUNTIME === 'edge'
? require('./dist/esm/client/link')
: require('./dist/client/link')
import React from 'react' import React from 'react'
import {
loadGetInitialProps, import type {
AppContextType, AppContextType,
AppInitialProps, AppInitialProps,
AppPropsType, AppPropsType,
...@@ -9,6 +9,8 @@ import { ...@@ -9,6 +9,8 @@ import {
} from '../shared/lib/utils' } from '../shared/lib/utils'
import type { Router } from '../client/router' import type { Router } from '../client/router'
import { loadGetInitialProps } from '../shared/lib/utils'
export { AppInitialProps, AppType } export { AppInitialProps, AppType }
export { NextWebVitalsMetric } export { NextWebVitalsMetric }
......
module.exports = require('./dist/client/router') module.exports =
process.env.NEXT_RUNTIME === 'edge'
? require('./dist/esm/client/router')
: require('./dist/client/router')
module.exports = require('./dist/client/script') module.exports =
process.env.NEXT_RUNTIME === 'edge'
? require('./dist/esm/client/script')
: require('./dist/client/script')
...@@ -258,7 +258,10 @@ function useFlightResponse( ...@@ -258,7 +258,10 @@ function useFlightResponse(
const [renderStream, forwardStream] = readableStreamTee(req) const [renderStream, forwardStream] = readableStreamTee(req)
const res = createFromReadableStream(renderStream, { const res = createFromReadableStream(renderStream, {
moduleMap: serverComponentManifest.__ssr_module_mapping__, moduleMap:
process.env.NEXT_RUNTIME === 'edge'
? serverComponentManifest.__edge_ssr_module_mapping__
: serverComponentManifest.__ssr_module_mapping__,
}) })
flightResponseRef.current = res flightResponseRef.current = res
...@@ -270,7 +273,7 @@ function useFlightResponse( ...@@ -270,7 +273,7 @@ function useFlightResponse(
? `<script nonce=${JSON.stringify(nonce)}>` ? `<script nonce=${JSON.stringify(nonce)}>`
: '<script>' : '<script>'
function process() { function read() {
forwardReader.read().then(({ done, value }) => { forwardReader.read().then(({ done, value }) => {
if (value) { if (value) {
rscChunks.push(value) rscChunks.push(value)
...@@ -296,11 +299,11 @@ function useFlightResponse( ...@@ -296,11 +299,11 @@ function useFlightResponse(
)})</script>` )})</script>`
writer.write(encodeText(scripts)) writer.write(encodeText(scripts))
process() read()
} }
}) })
} }
process() read()
return res return res
} }
......
...@@ -626,6 +626,7 @@ export default class HotReloader { ...@@ -626,6 +626,7 @@ export default class HotReloader {
), ),
appDir: this.appDir!, appDir: this.appDir!,
pageExtensions: this.config.pageExtensions, pageExtensions: this.config.pageExtensions,
nextRuntime: 'edge',
}).import }).import
: undefined : undefined
...@@ -705,6 +706,7 @@ export default class HotReloader { ...@@ -705,6 +706,7 @@ export default class HotReloader {
), ),
appDir: this.appDir!, appDir: this.appDir!,
pageExtensions: this.config.pageExtensions, pageExtensions: this.config.pageExtensions,
nextRuntime: 'nodejs',
}) })
: relativeRequest, : relativeRequest,
appDir: this.config.experimental.appDir, appDir: this.config.experimental.appDir,
......
...@@ -18,6 +18,7 @@ module.exports = function (task) { ...@@ -18,6 +18,7 @@ module.exports = function (task) {
stripExtension, stripExtension,
keepImportAssertions = false, keepImportAssertions = false,
interopClientDefaultExport = false, interopClientDefaultExport = false,
esm = false,
} = {} } = {}
) { ) {
// Don't compile .d.ts // Don't compile .d.ts
...@@ -28,7 +29,7 @@ module.exports = function (task) { ...@@ -28,7 +29,7 @@ module.exports = function (task) {
/** @type {import('@swc/core').Options} */ /** @type {import('@swc/core').Options} */
const swcClientOptions = { const swcClientOptions = {
module: { module: {
type: 'commonjs', type: esm ? 'es6' : 'commonjs',
ignoreDynamic: true, ignoreDynamic: true,
}, },
jsc: { jsc: {
...@@ -59,7 +60,7 @@ module.exports = function (task) { ...@@ -59,7 +60,7 @@ module.exports = function (task) {
/** @type {import('@swc/core').Options} */ /** @type {import('@swc/core').Options} */
const swcServerOptions = { const swcServerOptions = {
module: { module: {
type: 'commonjs', type: esm ? 'es6' : 'commonjs',
ignoreDynamic: true, ignoreDynamic: true,
}, },
env: { env: {
...@@ -126,7 +127,7 @@ module.exports = function (task) { ...@@ -126,7 +127,7 @@ module.exports = function (task) {
} }
if (output.map) { if (output.map) {
if (interopClientDefaultExport) { if (interopClientDefaultExport && !esm) {
output.code += ` output.code += `
if ((typeof exports.default === 'function' || (typeof exports.default === 'object' && exports.default !== null)) && typeof exports.default.__esModule === 'undefined') { if ((typeof exports.default === 'function' || (typeof exports.default === 'object' && exports.default !== null)) && typeof exports.default.__esModule === 'undefined') {
Object.defineProperty(exports.default, '__esModule', { value: true }); Object.defineProperty(exports.default, '__esModule', { value: true });
......
...@@ -1946,16 +1946,23 @@ export async function compile(task, opts) { ...@@ -1946,16 +1946,23 @@ export async function compile(task, opts) {
'cli', 'cli',
'bin', 'bin',
'server', 'server',
'server_esm',
'nextbuild', 'nextbuild',
'nextbuildjest', 'nextbuildjest',
'nextbuildstatic', 'nextbuildstatic',
'nextbuild_esm',
'pages', 'pages',
'pages_esm',
'lib', 'lib',
'lib_esm',
'client', 'client',
'client_esm',
'telemetry', 'telemetry',
'trace', 'trace',
'shared', 'shared',
'shared_esm',
'shared_re_exported', 'shared_re_exported',
'shared_re_exported_esm',
'server_wasm', 'server_wasm',
// we compile this each time so that fresh runtime data is pulled // we compile this each time so that fresh runtime data is pulled
// before each publish // before each publish
...@@ -1990,6 +1997,14 @@ export async function lib(task, opts) { ...@@ -1990,6 +1997,14 @@ export async function lib(task, opts) {
notify('Compiled lib files') notify('Compiled lib files')
} }
export async function lib_esm(task, opts) {
await task
.source(opts.src || 'lib/**/*.+(js|ts|tsx)')
.swc('server', { dev: opts.dev, esm: true })
.target('dist/esm/lib')
notify('Compiled lib files')
}
export async function server(task, opts) { export async function server(task, opts) {
await task await task
.source(opts.src || 'server/**/*.+(js|ts|tsx)') .source(opts.src || 'server/**/*.+(js|ts|tsx)')
...@@ -2004,6 +2019,14 @@ export async function server(task, opts) { ...@@ -2004,6 +2019,14 @@ export async function server(task, opts) {
notify('Compiled server files') notify('Compiled server files')
} }
export async function server_esm(task, opts) {
await task
.source(opts.src || 'server/**/*.+(js|ts|tsx)')
.swc('server', { dev: opts.dev, esm: true })
.target('dist/esm/server')
notify('Compiled server files to ESM')
}
export async function nextbuild(task, opts) { export async function nextbuild(task, opts) {
await task await task
.source(opts.src || 'build/**/*.+(js|ts|tsx)', { .source(opts.src || 'build/**/*.+(js|ts|tsx)', {
...@@ -2014,6 +2037,16 @@ export async function nextbuild(task, opts) { ...@@ -2014,6 +2037,16 @@ export async function nextbuild(task, opts) {
notify('Compiled build files') notify('Compiled build files')
} }
export async function nextbuild_esm(task, opts) {
await task
.source(opts.src || 'build/**/*.+(js|ts|tsx)', {
ignore: ['**/fixture/**', '**/tests/**', '**/jest/**'],
})
.swc('server', { dev: opts.dev, esm: true })
.target('dist/esm/build')
notify('Compiled build files to ESM')
}
export async function nextbuildjest(task, opts) { export async function nextbuildjest(task, opts) {
await task await task
.source(opts.src || 'build/jest/**/*.+(js|ts|tsx)', { .source(opts.src || 'build/jest/**/*.+(js|ts|tsx)', {
...@@ -2032,6 +2065,14 @@ export async function client(task, opts) { ...@@ -2032,6 +2065,14 @@ export async function client(task, opts) {
notify('Compiled client files') notify('Compiled client files')
} }
export async function client_esm(task, opts) {
await task
.source(opts.src || 'client/**/*.+(js|ts|tsx)')
.swc('client', { dev: opts.dev, esm: true })
.target('dist/esm/client')
notify('Compiled client files to ESM')
}
// export is a reserved keyword for functions // export is a reserved keyword for functions
export async function nextbuildstatic(task, opts) { export async function nextbuildstatic(task, opts) {
await task await task
...@@ -2062,10 +2103,38 @@ export async function pages_document(task, opts) { ...@@ -2062,10 +2103,38 @@ export async function pages_document(task, opts) {
.target('dist/pages') .target('dist/pages')
} }
export async function pages_app_esm(task, opts) {
await task
.source('pages/_app.tsx')
.swc('client', { dev: opts.dev, keepImportAssertions: true, esm: true })
.target('dist/esm/pages')
}
export async function pages_error_esm(task, opts) {
await task
.source('pages/_error.tsx')
.swc('client', { dev: opts.dev, keepImportAssertions: true, esm: true })
.target('dist/esm/pages')
}
export async function pages_document_esm(task, opts) {
await task
.source('pages/_document.tsx')
.swc('server', { dev: opts.dev, keepImportAssertions: true, esm: true })
.target('dist/esm/pages')
}
export async function pages(task, opts) { export async function pages(task, opts) {
await task.parallel(['pages_app', 'pages_error', 'pages_document'], opts) await task.parallel(['pages_app', 'pages_error', 'pages_document'], opts)
} }
export async function pages_esm(task, opts) {
await task.parallel(
['pages_app_esm', 'pages_error_esm', 'pages_document_esm'],
opts
)
}
export async function telemetry(task, opts) { export async function telemetry(task, opts) {
await task await task
.source(opts.src || 'telemetry/**/*.+(js|ts|tsx)') .source(opts.src || 'telemetry/**/*.+(js|ts|tsx)')
...@@ -2093,11 +2162,15 @@ export default async function (task) { ...@@ -2093,11 +2162,15 @@ export default async function (task) {
await task.watch('bin/*', 'bin', opts) await task.watch('bin/*', 'bin', opts)
await task.watch('pages/**/*.+(js|ts|tsx)', 'pages', opts) await task.watch('pages/**/*.+(js|ts|tsx)', 'pages', opts)
await task.watch('server/**/*.+(js|ts|tsx)', 'server', opts) await task.watch('server/**/*.+(js|ts|tsx)', 'server', opts)
await task.watch('server/**/*.+(js|ts|tsx)', 'server_esm', opts)
await task.watch('build/**/*.+(js|ts|tsx)', 'nextbuild', opts) await task.watch('build/**/*.+(js|ts|tsx)', 'nextbuild', opts)
await task.watch('build/**/*.+(js|ts|tsx)', 'nextbuild_esm', opts)
await task.watch('build/jest/**/*.+(js|ts|tsx)', 'nextbuildjest', opts) await task.watch('build/jest/**/*.+(js|ts|tsx)', 'nextbuildjest', opts)
await task.watch('export/**/*.+(js|ts|tsx)', 'nextbuildstatic', opts) await task.watch('export/**/*.+(js|ts|tsx)', 'nextbuildstatic', opts)
await task.watch('client/**/*.+(js|ts|tsx)', 'client', opts) await task.watch('client/**/*.+(js|ts|tsx)', 'client', opts)
await task.watch('client/**/*.+(js|ts|tsx)', 'client_esm', opts)
await task.watch('lib/**/*.+(js|ts|tsx)', 'lib', opts) await task.watch('lib/**/*.+(js|ts|tsx)', 'lib', opts)
await task.watch('lib/**/*.+(js|ts|tsx)', 'lib_esm', opts)
await task.watch('cli/**/*.+(js|ts|tsx)', 'cli', opts) await task.watch('cli/**/*.+(js|ts|tsx)', 'cli', opts)
await task.watch('telemetry/**/*.+(js|ts|tsx)', 'telemetry', opts) await task.watch('telemetry/**/*.+(js|ts|tsx)', 'telemetry', opts)
await task.watch('trace/**/*.+(js|ts|tsx)', 'trace', opts) await task.watch('trace/**/*.+(js|ts|tsx)', 'trace', opts)
...@@ -2111,6 +2184,16 @@ export default async function (task) { ...@@ -2111,6 +2184,16 @@ export default async function (task) {
'shared', 'shared',
opts opts
) )
await task.watch(
'shared/**/!(amp|config|constants|dynamic|head).+(js|ts|tsx)',
'shared_esm',
opts
)
await task.watch(
'shared/lib/{amp,config,constants,dynamic,head}.+(js|ts|tsx)',
'shared_re_exported_esm',
opts
)
await task.watch('server/**/*.+(wasm)', 'server_wasm', opts) await task.watch('server/**/*.+(wasm)', 'server_wasm', opts)
await task.watch( await task.watch(
'../react-dev-overlay/dist/**/*.js', '../react-dev-overlay/dist/**/*.js',
...@@ -2130,6 +2213,16 @@ export async function shared(task, opts) { ...@@ -2130,6 +2213,16 @@ export async function shared(task, opts) {
notify('Compiled shared files') notify('Compiled shared files')
} }
export async function shared_esm(task, opts) {
await task
.source(
opts.src || 'shared/**/!(amp|config|constants|dynamic|head).+(js|ts|tsx)'
)
.swc('client', { dev: opts.dev, esm: true })
.target('dist/esm/shared')
notify('Compiled shared files to ESM')
}
export async function shared_re_exported(task, opts) { export async function shared_re_exported(task, opts) {
await task await task
.source( .source(
...@@ -2141,6 +2234,19 @@ export async function shared_re_exported(task, opts) { ...@@ -2141,6 +2234,19 @@ export async function shared_re_exported(task, opts) {
notify('Compiled shared re-exported files') notify('Compiled shared re-exported files')
} }
export async function shared_re_exported_esm(task, opts) {
await task
.source(
opts.src || 'shared/**/{amp,config,constants,dynamic,head}.+(js|ts|tsx)'
)
.swc('client', {
dev: opts.dev,
esm: true,
})
.target('dist/esm/shared')
notify('Compiled shared re-exported files as ESM')
}
export async function server_wasm(task, opts) { export async function server_wasm(task, opts) {
await task.source(opts.src || 'server/**/*.+(wasm)').target('dist/server') await task.source(opts.src || 'server/**/*.+(wasm)').target('dist/server')
notify('Moved server wasm files') notify('Moved server wasm files')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment