next 13.4.4-canary.9 → 13.4.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bin/next +1 -1
- package/dist/build/index.js +1 -1
- package/dist/build/swc/index.js +1 -1
- package/dist/build/webpack/loaders/next-edge-function-loader.js +3 -3
- package/dist/build/webpack/loaders/next-edge-function-loader.js.map +1 -1
- package/dist/build/webpack/loaders/next-edge-ssr-loader/index.js +4 -3
- package/dist/build/webpack/loaders/next-edge-ssr-loader/index.js.map +1 -1
- package/dist/build/webpack/loaders/next-edge-ssr-loader/render.js +2 -1
- package/dist/build/webpack/loaders/next-edge-ssr-loader/render.js.map +1 -1
- package/dist/build/webpack/loaders/next-flight-loader/index.js +1 -1
- package/dist/build/webpack/loaders/next-flight-loader/index.js.map +1 -1
- package/dist/build/webpack/plugins/flight-client-entry-plugin.js +10 -6
- package/dist/build/webpack/plugins/flight-client-entry-plugin.js.map +1 -1
- package/dist/build/webpack-config.d.ts +1 -0
- package/dist/build/webpack-config.js +41 -18
- package/dist/build/webpack-config.js.map +1 -1
- package/dist/client/app-bootstrap.js +1 -1
- package/dist/client/components/app-router-headers.d.ts +1 -1
- package/dist/client/components/app-router-headers.js +1 -1
- package/dist/client/components/app-router-headers.js.map +1 -1
- package/dist/client/index.js +1 -1
- package/dist/esm/build/index.js +1 -1
- package/dist/esm/build/swc/index.js +1 -1
- package/dist/esm/build/webpack/loaders/next-edge-function-loader.js +3 -3
- package/dist/esm/build/webpack/loaders/next-edge-function-loader.js.map +1 -1
- package/dist/esm/build/webpack/loaders/next-edge-ssr-loader/index.js +4 -3
- package/dist/esm/build/webpack/loaders/next-edge-ssr-loader/index.js.map +1 -1
- package/dist/esm/build/webpack/loaders/next-edge-ssr-loader/render.js +2 -1
- package/dist/esm/build/webpack/loaders/next-edge-ssr-loader/render.js.map +1 -1
- package/dist/esm/build/webpack/loaders/next-flight-loader/index.js +1 -1
- package/dist/esm/build/webpack/loaders/next-flight-loader/index.js.map +1 -1
- package/dist/esm/build/webpack/plugins/flight-client-entry-plugin.js +10 -6
- package/dist/esm/build/webpack/plugins/flight-client-entry-plugin.js.map +1 -1
- package/dist/esm/build/webpack-config.js +41 -18
- package/dist/esm/build/webpack-config.js.map +1 -1
- package/dist/esm/client/app-bootstrap.js +1 -1
- package/dist/esm/client/components/app-router-headers.js +1 -1
- package/dist/esm/client/components/app-router-headers.js.map +1 -1
- package/dist/esm/client/index.js +1 -1
- package/dist/esm/server/dev/hot-reloader.js +1 -1
- package/dist/esm/server/lib/route-resolver.js +2 -11
- package/dist/esm/server/lib/route-resolver.js.map +1 -1
- package/dist/esm/server/lib/trace/tracer.js +7 -3
- package/dist/esm/server/lib/trace/tracer.js.map +1 -1
- package/dist/esm/server/require-hook.js +0 -8
- package/dist/esm/server/require-hook.js.map +1 -1
- package/dist/esm/server/web/spec-extension/cookies.js +1 -1
- package/dist/esm/server/web/spec-extension/cookies.js.map +1 -1
- package/dist/esm/server/web-server.js +7 -4
- package/dist/esm/server/web-server.js.map +1 -1
- package/dist/server/dev/hot-reloader.js +1 -1
- package/dist/server/lib/route-resolver.js +1 -10
- package/dist/server/lib/route-resolver.js.map +1 -1
- package/dist/server/lib/trace/tracer.js +7 -3
- package/dist/server/lib/trace/tracer.js.map +1 -1
- package/dist/server/require-hook.js +0 -8
- package/dist/server/require-hook.js.map +1 -1
- package/dist/server/web/spec-extension/cookies.d.ts +1 -1
- package/dist/server/web/spec-extension/cookies.js +17 -13
- package/dist/server/web/spec-extension/cookies.js.map +1 -1
- package/dist/server/web-server.d.ts +1 -0
- package/dist/server/web-server.js +7 -4
- package/dist/server/web-server.js.map +1 -1
- package/dist/telemetry/anonymous-meta.js +1 -1
- package/dist/telemetry/events/session-stopped.js +2 -2
- package/dist/telemetry/events/version.js +2 -2
- package/package.json +16 -16
package/dist/bin/next
CHANGED
|
@@ -76,7 +76,7 @@ const args = (0, _index.default)({
|
|
|
76
76
|
});
|
|
77
77
|
// Version is inlined into the file using taskr build pipeline
|
|
78
78
|
if (args["--version"]) {
|
|
79
|
-
console.log(`Next.js v${"13.4.4
|
|
79
|
+
console.log(`Next.js v${"13.4.4"}`);
|
|
80
80
|
process.exit(0);
|
|
81
81
|
}
|
|
82
82
|
// Check if we are running `next <subcommand>` or `next`
|
package/dist/build/index.js
CHANGED
|
@@ -135,7 +135,7 @@ async function build(dir, reactProductionProfiling = false, debugOutput = false,
|
|
|
135
135
|
let hasAppDir = false;
|
|
136
136
|
try {
|
|
137
137
|
const nextBuildSpan = (0, _trace.trace)("next-build", undefined, {
|
|
138
|
-
version: "13.4.4
|
|
138
|
+
version: "13.4.4"
|
|
139
139
|
});
|
|
140
140
|
_buildcontext.NextBuildContext.nextBuildSpan = nextBuildSpan;
|
|
141
141
|
_buildcontext.NextBuildContext.dir = dir;
|
package/dist/build/swc/index.js
CHANGED
|
@@ -127,7 +127,7 @@ function _interop_require_wildcard(obj, nodeInterop) {
|
|
|
127
127
|
return newObj;
|
|
128
128
|
}
|
|
129
129
|
var _platformArchTriples_PlatformName;
|
|
130
|
-
const nextVersion = "13.4.4
|
|
130
|
+
const nextVersion = "13.4.4";
|
|
131
131
|
const ArchName = (0, _os.arch)();
|
|
132
132
|
const PlatformName = (0, _os.platform)();
|
|
133
133
|
const triples = ((_platformArchTriples_PlatformName = _triples.platformArchTriples[PlatformName]) == null ? void 0 : _platformArchTriples_PlatformName[ArchName]) || [];
|
|
@@ -25,12 +25,12 @@ const nextEdgeFunctionLoader = function nextEdgeFunctionLoader() {
|
|
|
25
25
|
buildInfo.rootDir = rootDir;
|
|
26
26
|
return `
|
|
27
27
|
import { adapter, enhanceGlobals } from 'next/dist/esm/server/web/adapter'
|
|
28
|
-
import {IncrementalCache} from 'next/dist/esm/server/lib/incremental-cache'
|
|
28
|
+
import { IncrementalCache } from 'next/dist/esm/server/lib/incremental-cache'
|
|
29
29
|
|
|
30
30
|
enhanceGlobals()
|
|
31
31
|
|
|
32
|
-
|
|
33
|
-
|
|
32
|
+
const mod = require(${stringifiedPagePath})
|
|
33
|
+
const handler = mod.middleware || mod.default
|
|
34
34
|
|
|
35
35
|
if (typeof handler !== 'function') {
|
|
36
36
|
throw new Error('The Edge Function "pages${page}" must export a \`default\` function');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/build/webpack/loaders/next-edge-function-loader.ts"],"names":["nextEdgeFunctionLoader","absolutePagePath","page","rootDir","preferredRegion","getOptions","stringifiedPagePath","stringifyRequest","buildInfo","getModuleBuildInfo","_module","route","nextEdgeApiFunction","JSON","stringify"],"mappings":";;;;+BAuDA;;;eAAA;;;oCAtDmC;kCACF;AASjC,MAAMA,yBACJ,SAASA,yBAA6B;IACpC,MAAM,EACJC,iBAAgB,EAChBC,KAAI,EACJC,QAAO,EACPC,gBAAe,EAChB,GAA8B,IAAI,CAACC,UAAU;IAC9C,MAAMC,sBAAsBC,IAAAA,kCAAgB,EAAC,IAAI,EAAEN;IACnD,MAAMO,YAAYC,IAAAA,sCAAkB,EAAC,IAAI,CAACC,OAAO;IACjDF,UAAUG,KAAK,GAAG;QAChBT,MAAMA,QAAQ;QACdD;QACAG;IACF;IACAI,UAAUI,mBAAmB,GAAG;QAC9BV,MAAMA,QAAQ;IAChB;IACAM,UAAUL,OAAO,GAAGA;IAEpB,OAAO,CAAC;;;;;;
|
|
1
|
+
{"version":3,"sources":["../../../../src/build/webpack/loaders/next-edge-function-loader.ts"],"names":["nextEdgeFunctionLoader","absolutePagePath","page","rootDir","preferredRegion","getOptions","stringifiedPagePath","stringifyRequest","buildInfo","getModuleBuildInfo","_module","route","nextEdgeApiFunction","JSON","stringify"],"mappings":";;;;+BAuDA;;;eAAA;;;oCAtDmC;kCACF;AASjC,MAAMA,yBACJ,SAASA,yBAA6B;IACpC,MAAM,EACJC,iBAAgB,EAChBC,KAAI,EACJC,QAAO,EACPC,gBAAe,EAChB,GAA8B,IAAI,CAACC,UAAU;IAC9C,MAAMC,sBAAsBC,IAAAA,kCAAgB,EAAC,IAAI,EAAEN;IACnD,MAAMO,YAAYC,IAAAA,sCAAkB,EAAC,IAAI,CAACC,OAAO;IACjDF,UAAUG,KAAK,GAAG;QAChBT,MAAMA,QAAQ;QACdD;QACAG;IACF;IACAI,UAAUI,mBAAmB,GAAG;QAC9BV,MAAMA,QAAQ;IAChB;IACAM,UAAUL,OAAO,GAAGA;IAEpB,OAAO,CAAC;;;;;;4BAMgB,EAAEG,oBAAoB;;;;mDAIC,EAAEJ,KAAK;;;;;;;oBAOtC,EAAEW,KAAKC,SAAS,CAACZ,MAAM;;;;IAIvC,CAAC;AACH;MAEF,WAAeF"}
|
|
@@ -45,11 +45,11 @@ const edgeSSRLoader = async function edgeSSRLoader() {
|
|
|
45
45
|
const transformed = `
|
|
46
46
|
import { adapter, enhanceGlobals } from 'next/dist/esm/server/web/adapter'
|
|
47
47
|
import { getRender } from 'next/dist/esm/build/webpack/loaders/next-edge-ssr-loader/render'
|
|
48
|
-
import {IncrementalCache} from 'next/dist/esm/server/lib/incremental-cache'
|
|
48
|
+
import { IncrementalCache } from 'next/dist/esm/server/lib/incremental-cache'
|
|
49
49
|
|
|
50
50
|
enhanceGlobals()
|
|
51
51
|
|
|
52
|
-
const
|
|
52
|
+
const pagesType = ${JSON.stringify(pagesType)}
|
|
53
53
|
${isAppDir ? `
|
|
54
54
|
import { renderToHTMLOrFlight as appRenderToHTML } from 'next/dist/esm/server/app-render/app-render'
|
|
55
55
|
import * as pageMod from ${JSON.stringify(pageModPath)}
|
|
@@ -80,7 +80,7 @@ const edgeSSRLoader = async function edgeSSRLoader() {
|
|
|
80
80
|
const nextFontManifest = self.__NEXT_FONT_MANIFEST
|
|
81
81
|
|
|
82
82
|
const render = getRender({
|
|
83
|
-
|
|
83
|
+
pagesType,
|
|
84
84
|
dev: ${dev},
|
|
85
85
|
page: ${JSON.stringify(page)},
|
|
86
86
|
appMod,
|
|
@@ -89,6 +89,7 @@ const edgeSSRLoader = async function edgeSSRLoader() {
|
|
|
89
89
|
error500Mod,
|
|
90
90
|
Document,
|
|
91
91
|
buildManifest,
|
|
92
|
+
isAppPath: ${!!isAppDir},
|
|
92
93
|
prerenderManifest,
|
|
93
94
|
appRenderToHTML,
|
|
94
95
|
pagesRenderToHTML,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../src/build/webpack/loaders/next-edge-ssr-loader/index.ts"],"names":["swapDistFolderWithEsmDistFolder","path","replace","edgeSSRLoader","dev","page","buildId","absolutePagePath","absoluteAppPath","absoluteDocumentPath","absolute500Path","absoluteErrorPath","isServerComponent","stringifiedConfig","appDirLoader","appDirLoaderBase64","pagesType","sriEnabled","incrementalCacheHandlerPath","preferredRegion","getOptions","Buffer","from","toString","isAppDir","buildInfo","getModuleBuildInfo","_module","nextEdgeSSR","route","stringifiedPagePath","stringifyRequest","stringifiedAppPath","stringifiedErrorPath","stringifiedDocumentPath","stringified500Path","pageModPath","substring","length","transformed","JSON","stringify"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../../../../../src/build/webpack/loaders/next-edge-ssr-loader/index.ts"],"names":["swapDistFolderWithEsmDistFolder","path","replace","edgeSSRLoader","dev","page","buildId","absolutePagePath","absoluteAppPath","absoluteDocumentPath","absolute500Path","absoluteErrorPath","isServerComponent","stringifiedConfig","appDirLoader","appDirLoaderBase64","pagesType","sriEnabled","incrementalCacheHandlerPath","preferredRegion","getOptions","Buffer","from","toString","isAppDir","buildInfo","getModuleBuildInfo","_module","nextEdgeSSR","route","stringifiedPagePath","stringifyRequest","stringifiedAppPath","stringifiedErrorPath","stringifiedDocumentPath","stringified500Path","pageModPath","substring","length","transformed","JSON","stringify"],"mappings":";;;;+BAuLA;;;eAAA;;;oCAtLmC;kCACF;AAoBjC;;;;;;;AAOA,GACA,SAASA,gCAAgCC,IAAY,EAAE;IACrD,OAAOA,KAAKC,OAAO,CAAC,mBAAmB;AACzC;AAEA,MAAMC,gBACJ,eAAeA,gBAAoB;IACjC,MAAM,EACJC,IAAG,EACHC,KAAI,EACJC,QAAO,EACPC,iBAAgB,EAChBC,gBAAe,EACfC,qBAAoB,EACpBC,gBAAe,EACfC,kBAAiB,EACjBC,kBAAiB,EACjBC,kBAAiB,EACjBC,cAAcC,mBAAkB,EAChCC,UAAS,EACTC,WAAU,EACVC,4BAA2B,EAC3BC,gBAAe,EAChB,GAAG,IAAI,CAACC,UAAU;IAEnB,MAAMN,eAAeO,OAAOC,IAAI,CAC9BP,sBAAsB,IACtB,UACAQ,QAAQ;IACV,MAAMC,WAAWR,cAAc;IAE/B,MAAMS,YAAYC,IAAAA,sCAAkB,EAAC,IAAI,CAACC,OAAO;IACjDF,UAAUG,WAAW,GAAG;QACtB,gIAAgI;QAChIhB,mBAAmBA,sBAAsB;QACzCP,MAAMA;QACNmB;IACF;IACAC,UAAUI,KAAK,GAAG;QAChBxB;QACAE;QACAY;IACF;IAEA,MAAMW,sBAAsBC,IAAAA,kCAAgB,EAAC,IAAI,EAAExB;IACnD,MAAMyB,qBAAqBD,IAAAA,kCAAgB,EACzC,IAAI,EACJ/B,gCAAgCQ;IAElC,MAAMyB,uBAAuBF,IAAAA,kCAAgB,EAC3C,IAAI,EACJ/B,gCAAgCW;IAElC,MAAMuB,0BAA0BH,IAAAA,kCAAgB,EAC9C,IAAI,EACJ/B,gCAAgCS;IAElC,MAAM0B,qBAAqBzB,kBACvBqB,IAAAA,kCAAgB,EAAC,IAAI,EAAErB,mBACvB,IAAI;IAER,MAAM0B,cAAc,CAAC,EAAEtB,aAAa,EAAEgB,oBAAoBO,SAAS,CACjE,GACAP,oBAAoBQ,MAAM,GAAG,GAC7B,EAAEd,WAAW,wBAAwB,EAAE,CAAC,CAAC;IAE3C,MAAMe,cAAc,CAAC;;;;;;;sBAOH,EAAEC,KAAKC,SAAS,CAACzB,WAAW;IAC9C,EACEQ,WACI,CAAC;;+BAEoB,EAAEgB,KAAKC,SAAS,CAACL,aAAa;;;;;;IAMzD,CAAC,GACK,CAAC;2BACgB,EAAEF,wBAAwB;;+BAEtB,EAAEJ,oBAAoB;8BACvB,EAAEE,mBAAmB;gCACnB,EAAEC,qBAAqB;MACjD,EACEE,qBACI,CAAC,6BAA6B,EAAEA,mBAAmB,CAAC,GACpD,CAAC,wBAAwB,CAAC,CAC/B;;IAEH,CAAC,CACA;;oCAE+B,EAC9BjB,8BACI,CAAC,SAAS,EAAEA,4BAA4B,EAAE,CAAC,GAC3C,MAAM,CACX;;;;;;;;yCAQoC,EACnCD,aAAa,0CAA0C,WAAW,CACnE;;;;;WAKM,EAAEb,IAAI;YACL,EAAEoC,KAAKC,SAAS,CAACpC,MAAM;;;;;;;iBAOlB,EAAE,CAAC,CAACmB,SAAS;;;;;+BAKC,EAAEZ,kBAAkB;yBAC1B,EAAEA,kBAAkB;6BAChB,EAAEA,kBAAkB;;cAEnC,EAAEC,kBAAkB;eACnB,EAAE2B,KAAKC,SAAS,CAACnC,SAAS;;;;;;;;;;;;;KAapC,CAAC;IAEF,OAAOiC;AACT;MACF,WAAepC"}
|
|
@@ -11,6 +11,7 @@ Object.defineProperty(exports, "getRender", {
|
|
|
11
11
|
const _webserver = /*#__PURE__*/ _interop_require_default(require("../../../../server/web-server"));
|
|
12
12
|
const _web = require("../../../../server/base-http/web");
|
|
13
13
|
const _constants = require("../../../../lib/constants");
|
|
14
|
+
const _apppaths = require("../../../../shared/lib/router/utils/app-paths");
|
|
14
15
|
function _interop_require_default(obj) {
|
|
15
16
|
return obj && obj.__esModule ? obj : {
|
|
16
17
|
default: obj
|
|
@@ -34,6 +35,7 @@ function getRender({ dev , page , appMod , pageMod , errorMod , error500Mod , pa
|
|
|
34
35
|
minimalMode: true,
|
|
35
36
|
webServerConfig: {
|
|
36
37
|
page,
|
|
38
|
+
normalizedPage: isAppPath ? (0, _apppaths.normalizeAppPath)(page) : page,
|
|
37
39
|
pagesType,
|
|
38
40
|
prerenderManifest,
|
|
39
41
|
extendRenderOpts: {
|
|
@@ -49,7 +51,6 @@ function getRender({ dev , page , appMod , pageMod , errorMod , error500Mod , pa
|
|
|
49
51
|
pagesRenderToHTML,
|
|
50
52
|
incrementalCacheHandler,
|
|
51
53
|
loadComponent: async (pathname)=>{
|
|
52
|
-
if (isAppPath) return null;
|
|
53
54
|
if (pathname === page) {
|
|
54
55
|
return {
|
|
55
56
|
...baseLoadComponentResult,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../src/build/webpack/loaders/next-edge-ssr-loader/render.ts"],"names":["getRender","dev","page","appMod","pageMod","errorMod","error500Mod","pagesType","Document","buildManifest","prerenderManifest","reactLoadableManifest","appRenderToHTML","pagesRenderToHTML","clientReferenceManifest","subresourceIntegrityManifest","serverCSSManifest","serverActionsManifest","config","buildId","nextFontManifest","incrementalCacheHandler","isAppPath","baseLoadComponentResult","App","default","server","WebServer","conf","minimalMode","webServerConfig","extendRenderOpts","runtime","SERVER_RUNTIME","experimentalEdge","supportsDynamicHTML","disableOptimizedLoading","loadComponent","pathname","Component","pageConfig","getStaticProps","getServerSideProps","getStaticPaths","ComponentMod","__next_app_webpack_require__","requestHandler","getRequestHandler","render","request","extendedReq","WebNextRequest","extendedRes","WebNextResponse","toResponse"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../../../../../src/build/webpack/loaders/next-edge-ssr-loader/render.ts"],"names":["getRender","dev","page","appMod","pageMod","errorMod","error500Mod","pagesType","Document","buildManifest","prerenderManifest","reactLoadableManifest","appRenderToHTML","pagesRenderToHTML","clientReferenceManifest","subresourceIntegrityManifest","serverCSSManifest","serverActionsManifest","config","buildId","nextFontManifest","incrementalCacheHandler","isAppPath","baseLoadComponentResult","App","default","server","WebServer","conf","minimalMode","webServerConfig","normalizedPage","normalizeAppPath","extendRenderOpts","runtime","SERVER_RUNTIME","experimentalEdge","supportsDynamicHTML","disableOptimizedLoading","loadComponent","pathname","Component","pageConfig","getStaticProps","getServerSideProps","getStaticPaths","ComponentMod","__next_app_webpack_require__","requestHandler","getRequestHandler","render","request","extendedReq","WebNextRequest","extendedRes","WebNextResponse","toResponse"],"mappings":";;;;+BAiBgBA;;;eAAAA;;;kEATM;qBAIf;2BACwB;0BAEE;;;;;;AAE1B,SAASA,UAAU,EACxBC,IAAG,EACHC,KAAI,EACJC,OAAM,EACNC,QAAO,EACPC,SAAQ,EACRC,YAAW,EACXC,UAAS,EACTC,SAAQ,EACRC,cAAa,EACbC,kBAAiB,EACjBC,sBAAqB,EACrBC,gBAAe,EACfC,kBAAiB,EACjBC,wBAAuB,EACvBC,6BAA4B,EAC5BC,kBAAiB,EACjBC,sBAAqB,EACrBC,OAAM,EACNC,QAAO,EACPC,iBAAgB,EAChBC,wBAAuB,EAwBxB,EAAE;IACD,MAAMC,YAAYf,cAAc;IAChC,MAAMgB,0BAA0B;QAC9BtB;QACAQ;QACAC;QACAC;QACAI;QACAK;QACAZ;QACAgB,KAAKrB,iBAAAA,KAAAA,IAAAA,OAAQsB,OAAO;IACtB;IAEA,MAAMC,SAAS,IAAIC,kBAAS,CAAC;QAC3B1B;QACA2B,MAAMV;QACNW,aAAa,IAAI;QACjBC,iBAAiB;YACf5B;YACA6B,gBAAgBT,YAAYU,IAAAA,0BAAgB,EAAC9B,QAAQA,IAAI;YACzDK;YACAG;YACAuB,kBAAkB;gBAChBd;gBACAe,SAASC,yBAAc,CAACC,gBAAgB;gBACxCC,qBAAqB,IAAI;gBACzBC,yBAAyB,IAAI;gBAC7BxB;gBACAE;gBACAC;YACF;YACAL;YACAC;YACAQ;YACAkB,eAAe,OAAOC,WAAa;gBACjC,IAAIA,aAAatC,MAAM;oBACrB,OAAO;wBACL,GAAGqB,uBAAuB;wBAC1BkB,WAAWrC,QAAQqB,OAAO;wBAC1BiB,YAAYtC,QAAQc,MAAM,IAAI,CAAC;wBAC/ByB,gBAAgBvC,QAAQuC,cAAc;wBACtCC,oBAAoBxC,QAAQwC,kBAAkB;wBAC9CC,gBAAgBzC,QAAQyC,cAAc;wBACtCC,cAAc1C;wBACdkB,WAAW,CAAC,CAAClB,QAAQ2C,4BAA4B;wBACjDP;oBACF;gBACF,CAAC;gBAED,kEAAkE;gBAClE,IAAIA,aAAa,UAAUlC,aAAa;oBACtC,OAAO;wBACL,GAAGiB,uBAAuB;wBAC1BkB,WAAWnC,YAAYmB,OAAO;wBAC9BiB,YAAYpC,YAAYY,MAAM,IAAI,CAAC;wBACnCyB,gBAAgBrC,YAAYqC,cAAc;wBAC1CC,oBAAoBtC,YAAYsC,kBAAkB;wBAClDC,gBAAgBvC,YAAYuC,cAAc;wBAC1CC,cAAcxC;wBACdkC;oBACF;gBACF,CAAC;gBAED,IAAIA,aAAa,WAAW;oBAC1B,OAAO;wBACL,GAAGjB,uBAAuB;wBAC1BkB,WAAWpC,SAASoB,OAAO;wBAC3BiB,YAAYrC,SAASa,MAAM,IAAI,CAAC;wBAChCyB,gBAAgBtC,SAASsC,cAAc;wBACvCC,oBAAoBvC,SAASuC,kBAAkB;wBAC/CC,gBAAgBxC,SAASwC,cAAc;wBACvCC,cAAczC;wBACdmC;oBACF;gBACF,CAAC;gBAED,OAAO,IAAI;YACb;QACF;IACF;IACA,MAAMQ,iBAAiBtB,OAAOuB,iBAAiB;IAE/C,OAAO,eAAeC,OAAOC,OAAgB,EAAE;QAC7C,MAAMC,cAAc,IAAIC,mBAAc,CAACF;QACvC,MAAMG,cAAc,IAAIC,oBAAe;QACvCP,eAAeI,aAAaE;QAC5B,OAAO,MAAMA,YAAYE,UAAU;IACrC;AACF"}
|
|
@@ -49,7 +49,7 @@ async function transformSource(source, sourceMap) {
|
|
|
49
49
|
}
|
|
50
50
|
if (assumedSourceType === "module") {
|
|
51
51
|
if (clientRefs.includes("*")) {
|
|
52
|
-
return callback(new Error(`It's currently
|
|
52
|
+
return callback(new Error(`It's currently unsupported to use "export *" in a client boundary. Please use named exports instead.`));
|
|
53
53
|
}
|
|
54
54
|
let esmSource = `\
|
|
55
55
|
import { createProxy } from "${moduleProxy}"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../src/build/webpack/loaders/next-flight-loader/index.ts"],"names":["transformSource","noopHeadPath","require","resolve","source","sourceMap","buildInfo","Error","moduleProxy","_compiler","name","callback","async","getModuleBuildInfo","_module","rsc","getRSCModuleInformation","type","RSC_MODULE_TYPES","client","sourceType","parser","detectedClientEntryType","clientEntryType","clientRefs","assumedSourceType","length","includes","esmSource","resourcePath","cnt","ref","warnOnce","replace","RSC_MOD_REF_PROXY_ALIAS"],"mappings":";;;;+BAQA;;;eAA8BA;;;2BARU;4BACP;0BACR;mCACe;oCACL;AAEnC,MAAMC,eAAeC,QAAQC,OAAO,CAAC;AAEtB,eAAeH,gBAE5BI,MAAc,EACdC,SAAc,EACd;QAmBIC,gBA+DAA;IAjFJ,8BAA8B;IAC9B,IAAI,OAAOF,WAAW,UAAU;QAC9B,MAAM,IAAIG,MAAM,yDAAwD;IAC1E,CAAC;IAED,MAAMC,cACJ,IAAI,CAACC,SAAS,CAACC,IAAI,KAAK,gBACpB,wEACA,iEAAiE;IAEvE,MAAMC,WAAW,IAAI,CAACC,KAAK;IAE3B,gDAAgD;IAChD,mEAAmE;IACnE,MAAMN,YAAYO,IAAAA,sCAAkB,EAAC,IAAI,CAACC,OAAO;IACjDR,UAAUS,GAAG,GAAGC,IAAAA,0CAAuB,EAACZ;IAExC,qBAAqB;IACrB,IAAIE,CAAAA,CAAAA,iBAAAA,UAAUS,GAAG,YAAbT,KAAAA,IAAAA,eAAeW,IAAI,AAAD,MAAMC,4BAAgB,CAACC,MAAM,EAAE;YAChC;QAAnB,MAAMC,aAAa,CAAA,gBAAA,IAAI,CAACN,OAAO,YAAZ,KAAA,IAAA,wBAAA,cAAcO,kBAAd,KAAA,yBAAsBD,UAAF;QACvC,MAAME,0BAA0BhB,UAAUS,GAAG,CAACQ,eAAe;QAC7D,MAAMC,aAAalB,UAAUS,GAAG,CAACS,UAAU;QAE3C,4EAA4E;QAC5E,6EAA6E;QAC7E,4DAA4D;QAC5D,IAAIC,oBAAoBL;QACxB,IAAIK,sBAAsB,UAAUH,4BAA4B,QAAQ;YACtE,IACEE,WAAWE,MAAM,KAAK,KACrBF,WAAWE,MAAM,KAAK,KAAKF,UAAU,CAAC,EAAE,KAAK,IAC9C;gBACA,uEAAuE;gBACvE,yEAAyE;gBACzE,oBAAoB;gBACpBC,oBAAoB;YACtB,OAAO,IAAI,CAACD,WAAWG,QAAQ,CAAC,MAAM;gBACpC,2CAA2C;gBAC3CF,oBAAoB;YACtB,CAAC;QACH,CAAC;QAED,IAAIA,sBAAsB,UAAU;YAClC,IAAID,WAAWG,QAAQ,CAAC,MAAM;gBAC5B,OAAOhB,SACL,IAAIJ,MACF,CAAC,
|
|
1
|
+
{"version":3,"sources":["../../../../../src/build/webpack/loaders/next-flight-loader/index.ts"],"names":["transformSource","noopHeadPath","require","resolve","source","sourceMap","buildInfo","Error","moduleProxy","_compiler","name","callback","async","getModuleBuildInfo","_module","rsc","getRSCModuleInformation","type","RSC_MODULE_TYPES","client","sourceType","parser","detectedClientEntryType","clientEntryType","clientRefs","assumedSourceType","length","includes","esmSource","resourcePath","cnt","ref","warnOnce","replace","RSC_MOD_REF_PROXY_ALIAS"],"mappings":";;;;+BAQA;;;eAA8BA;;;2BARU;4BACP;0BACR;mCACe;oCACL;AAEnC,MAAMC,eAAeC,QAAQC,OAAO,CAAC;AAEtB,eAAeH,gBAE5BI,MAAc,EACdC,SAAc,EACd;QAmBIC,gBA+DAA;IAjFJ,8BAA8B;IAC9B,IAAI,OAAOF,WAAW,UAAU;QAC9B,MAAM,IAAIG,MAAM,yDAAwD;IAC1E,CAAC;IAED,MAAMC,cACJ,IAAI,CAACC,SAAS,CAACC,IAAI,KAAK,gBACpB,wEACA,iEAAiE;IAEvE,MAAMC,WAAW,IAAI,CAACC,KAAK;IAE3B,gDAAgD;IAChD,mEAAmE;IACnE,MAAMN,YAAYO,IAAAA,sCAAkB,EAAC,IAAI,CAACC,OAAO;IACjDR,UAAUS,GAAG,GAAGC,IAAAA,0CAAuB,EAACZ;IAExC,qBAAqB;IACrB,IAAIE,CAAAA,CAAAA,iBAAAA,UAAUS,GAAG,YAAbT,KAAAA,IAAAA,eAAeW,IAAI,AAAD,MAAMC,4BAAgB,CAACC,MAAM,EAAE;YAChC;QAAnB,MAAMC,aAAa,CAAA,gBAAA,IAAI,CAACN,OAAO,YAAZ,KAAA,IAAA,wBAAA,cAAcO,kBAAd,KAAA,yBAAsBD,UAAF;QACvC,MAAME,0BAA0BhB,UAAUS,GAAG,CAACQ,eAAe;QAC7D,MAAMC,aAAalB,UAAUS,GAAG,CAACS,UAAU;QAE3C,4EAA4E;QAC5E,6EAA6E;QAC7E,4DAA4D;QAC5D,IAAIC,oBAAoBL;QACxB,IAAIK,sBAAsB,UAAUH,4BAA4B,QAAQ;YACtE,IACEE,WAAWE,MAAM,KAAK,KACrBF,WAAWE,MAAM,KAAK,KAAKF,UAAU,CAAC,EAAE,KAAK,IAC9C;gBACA,uEAAuE;gBACvE,yEAAyE;gBACzE,oBAAoB;gBACpBC,oBAAoB;YACtB,OAAO,IAAI,CAACD,WAAWG,QAAQ,CAAC,MAAM;gBACpC,2CAA2C;gBAC3CF,oBAAoB;YACtB,CAAC;QACH,CAAC;QAED,IAAIA,sBAAsB,UAAU;YAClC,IAAID,WAAWG,QAAQ,CAAC,MAAM;gBAC5B,OAAOhB,SACL,IAAIJ,MACF,CAAC,oGAAoG,CAAC;YAG5G,CAAC;YAED,IAAIqB,YAAY,CAAC;6BACM,EAAEpB,YAAY;sCACL,EAAE,IAAI,CAACqB,YAAY,CAAC;;;;;;;;AAQ1D,CAAC;YACK,IAAIC,MAAM;YACV,KAAK,MAAMC,OAAOP,WAAY;gBAC5B,IAAIO,QAAQ,IAAI;oBACdH,aAAa,CAAC,0BAA0B,CAAC;gBAC3C,OAAO,IAAIG,QAAQ,WAAW;oBAC5BH,aAAa,CAAC;;2BAEG,CAAC;gBACpB,OAAO;oBACLA,aAAa,CAAC;OACjB,EAAEE,IAAI,UAAU,EAAEC,IAAI;UACnB,EAAED,MAAM,IAAI,EAAEC,IAAI,GAAG,CAAC;gBACxB,CAAC;YACH;YAEA,OAAOpB,SAAS,IAAI,EAAEiB,WAAWvB;QACnC,CAAC;IACH,CAAC;IAED,IAAIC,CAAAA,CAAAA,kBAAAA,UAAUS,GAAG,YAAbT,KAAAA,IAAAA,gBAAeW,IAAI,AAAD,MAAMC,4BAAgB,CAACC,MAAM,EAAE;QACnD,IAAIlB,iBAAiB,IAAI,CAAC4B,YAAY,EAAE;YACtCG,IAAAA,kBAAQ,EACN,CAAC,+LAA+L,CAAC;QAErM,CAAC;IACH,CAAC;IAED,OAAOrB,SACL,IAAI,EACJP,OAAO6B,OAAO,CAACC,kCAAuB,EAAE1B,cACxCH;AAEJ"}
|
|
@@ -211,13 +211,17 @@ class ClientReferenceEntryPlugin {
|
|
|
211
211
|
clientActionImports.forEach(([dep, names])=>actionEntryImports.set(dep, names));
|
|
212
212
|
}
|
|
213
213
|
if (actionEntryImports.size > 0) {
|
|
214
|
-
if (!
|
|
215
|
-
|
|
214
|
+
if (!this.useServerActions) {
|
|
215
|
+
compilation.errors.push(new Error("Server Actions require `experimental.serverActions` option to be enabled in your Next.js config: https://nextjs.org/docs/app/building-your-application/data-fetching/server-actions"));
|
|
216
|
+
} else {
|
|
217
|
+
if (!actionMapsPerClientEntry[name]) {
|
|
218
|
+
actionMapsPerClientEntry[name] = new Map();
|
|
219
|
+
}
|
|
220
|
+
actionMapsPerClientEntry[name] = new Map([
|
|
221
|
+
...actionMapsPerClientEntry[name],
|
|
222
|
+
...actionEntryImports
|
|
223
|
+
]);
|
|
216
224
|
}
|
|
217
|
-
actionMapsPerClientEntry[name] = new Map([
|
|
218
|
-
...actionMapsPerClientEntry[name],
|
|
219
|
-
...actionEntryImports
|
|
220
|
-
]);
|
|
221
225
|
}
|
|
222
226
|
});
|
|
223
227
|
for (const [name, actionEntryImports] of Object.entries(actionMapsPerClientEntry)){
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/build/webpack/plugins/flight-client-entry-plugin.ts"],"names":["ClientReferenceEntryPlugin","PLUGIN_NAME","pluginState","getProxiedPluginState","serverActions","edgeServerActions","actionModServerId","actionModEdgeServerId","serverCSSManifest","edgeServerCSSManifest","serverModuleIds","edgeServerModuleIds","ASYNC_CLIENT_MODULES","injectedClientEntries","constructor","options","dev","appDir","isEdgeServer","useServerActions","assetPrefix","apply","compiler","hooks","compilation","tap","normalModuleFactory","dependencyFactories","set","webpack","dependencies","ModuleDependency","dependencyTemplates","NullDependency","Template","finishMake","tapPromise","createClientEntries","afterCompile","recordModule","modId","mod","modResource","resourceResolveData","path","resource","layer","WEBPACK_LAYERS","client","ssrNamedModuleId","relative","context","startsWith","normalizePathSep","replace","traverseModules","_chunk","_chunkGroup","request","buildInfo","rsc","moduleGraph","isAsync","push","String","make","processAssets","name","stage","Compilation","PROCESS_ASSETS_STAGE_OPTIMIZE_HASH","assets","createActionAssets","addClientEntryAndSSRModulesList","addActionEntryList","actionMapsPerEntry","forEachEntryModule","entryModule","internalClientComponentEntryImports","Set","actionEntryImports","Map","connection","getOutgoingConnections","entryDependency","dependency","entryRequest","clientImports","actionImports","collectComponentInfoFromDependencies","forEach","dep","names","isAbsoluteRequest","isAbsolute","value","add","relativeRequest","bundlePath","injectClientEntryAndSSRModules","entryName","absolutePagePath","APP_CLIENT_INTERNALS","size","errors","Error","Object","entries","injectActionEntry","actions","collectClientEntryDependencyMap","clientEntryDependencyMap","entry","get","includeDependencies","getResolvedModule","finishModules","addedClientActionEntryList","actionMapsPerClientEntry","tracked","has","clientActionImports","fromClient","Promise","all","afterOptimizeModules","cssImportsForChunk","cssManifest","collectModule","isCSSMod","chunkGroups","chunkGroup","chunks","chunk","endsWith","join","chunkModules","chunkGraph","getChunkModulesIterable","anyModule","modules","concatenatedMod","entryCSSInfo","cssModules","cssImports","assign","data","manifest","JSON","stringify","undefined","FLIGHT_SERVER_CSS_MANIFEST","sources","RawSource","invalidator","getInvalidator","outputPath","some","shouldInvalidate","invalidate","COMPILER_NAMES","map","addClientEntryAndSSRModules","visitedBySegment","clientComponentImports","CSSImports","filterClientComponents","dependencyToFilter","inClientComponentBoundary","isCSS","modRequest","query","storeKey","isClientComponent","isClientComponentEntryModule","getActions","sideEffectFree","factoryMeta","unused","getExportsInfo","isModuleUsed","EDGE_RUNTIME_WEBPACK","test","Array","from","loaderOptions","server","clientLoader","importPath","sep","clientSSRLoader","getEntries","pageKey","getEntryKey","type","EntryTypes","CHILD_ENTRY","parentEntries","absoluteEntryFilePath","dispose","lastActiveTime","Date","now","entryData","clientComponentEntryDep","EntryPlugin","createDependency","addEntry","actionsArray","actionLoader","__client_imported__","currentCompilerServerActions","p","id","generateActionId","workers","action","actionEntryDep","resolve","reject","call","addModuleTree","contextInfo","issuerLayer","err","module","failedEntry","succeedEntry","mapping","json","node","edge","SERVER_REFERENCE_MANIFEST"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../../../../src/build/webpack/plugins/flight-client-entry-plugin.ts"],"names":["ClientReferenceEntryPlugin","PLUGIN_NAME","pluginState","getProxiedPluginState","serverActions","edgeServerActions","actionModServerId","actionModEdgeServerId","serverCSSManifest","edgeServerCSSManifest","serverModuleIds","edgeServerModuleIds","ASYNC_CLIENT_MODULES","injectedClientEntries","constructor","options","dev","appDir","isEdgeServer","useServerActions","assetPrefix","apply","compiler","hooks","compilation","tap","normalModuleFactory","dependencyFactories","set","webpack","dependencies","ModuleDependency","dependencyTemplates","NullDependency","Template","finishMake","tapPromise","createClientEntries","afterCompile","recordModule","modId","mod","modResource","resourceResolveData","path","resource","layer","WEBPACK_LAYERS","client","ssrNamedModuleId","relative","context","startsWith","normalizePathSep","replace","traverseModules","_chunk","_chunkGroup","request","buildInfo","rsc","moduleGraph","isAsync","push","String","make","processAssets","name","stage","Compilation","PROCESS_ASSETS_STAGE_OPTIMIZE_HASH","assets","createActionAssets","addClientEntryAndSSRModulesList","addActionEntryList","actionMapsPerEntry","forEachEntryModule","entryModule","internalClientComponentEntryImports","Set","actionEntryImports","Map","connection","getOutgoingConnections","entryDependency","dependency","entryRequest","clientImports","actionImports","collectComponentInfoFromDependencies","forEach","dep","names","isAbsoluteRequest","isAbsolute","value","add","relativeRequest","bundlePath","injectClientEntryAndSSRModules","entryName","absolutePagePath","APP_CLIENT_INTERNALS","size","errors","Error","Object","entries","injectActionEntry","actions","collectClientEntryDependencyMap","clientEntryDependencyMap","entry","get","includeDependencies","getResolvedModule","finishModules","addedClientActionEntryList","actionMapsPerClientEntry","tracked","has","clientActionImports","fromClient","Promise","all","afterOptimizeModules","cssImportsForChunk","cssManifest","collectModule","isCSSMod","chunkGroups","chunkGroup","chunks","chunk","endsWith","join","chunkModules","chunkGraph","getChunkModulesIterable","anyModule","modules","concatenatedMod","entryCSSInfo","cssModules","cssImports","assign","data","manifest","JSON","stringify","undefined","FLIGHT_SERVER_CSS_MANIFEST","sources","RawSource","invalidator","getInvalidator","outputPath","some","shouldInvalidate","invalidate","COMPILER_NAMES","map","addClientEntryAndSSRModules","visitedBySegment","clientComponentImports","CSSImports","filterClientComponents","dependencyToFilter","inClientComponentBoundary","isCSS","modRequest","query","storeKey","isClientComponent","isClientComponentEntryModule","getActions","sideEffectFree","factoryMeta","unused","getExportsInfo","isModuleUsed","EDGE_RUNTIME_WEBPACK","test","Array","from","loaderOptions","server","clientLoader","importPath","sep","clientSSRLoader","getEntries","pageKey","getEntryKey","type","EntryTypes","CHILD_ENTRY","parentEntries","absoluteEntryFilePath","dispose","lastActiveTime","Date","now","entryData","clientComponentEntryDep","EntryPlugin","createDependency","addEntry","actionsArray","actionLoader","__client_imported__","currentCompilerServerActions","p","id","generateActionId","workers","action","actionEntryDep","resolve","reject","call","addModuleTree","contextInfo","issuerLayer","err","module","failedEntry","succeedEntry","mapping","json","node","edge","SERVER_REFERENCE_MANIFEST"],"mappings":"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"}
|
|
@@ -44,6 +44,7 @@ export declare function getDefineEnv({ dev, config, distDir, isClient, hasRewrit
|
|
|
44
44
|
'process.env.__NEXT_HAS_WEB_VITALS_ATTRIBUTION': string;
|
|
45
45
|
'process.env.__NEXT_WEB_VITALS_ATTRIBUTION': string;
|
|
46
46
|
'process.env.__NEXT_DIST_DIR'?: string | undefined;
|
|
47
|
+
'process.turbopack': string;
|
|
47
48
|
'process.env.NODE_ENV': string;
|
|
48
49
|
'process.env.NEXT_RUNTIME': string;
|
|
49
50
|
'process.env.__NEXT_FETCH_CACHE_KEY_PREFIX': string;
|
|
@@ -236,6 +236,7 @@ function getDefineEnv({ dev , config , distDir , isClient , hasRewrites , isNode
|
|
|
236
236
|
* the runtime they are running with, if it's not using `edge-runtime`
|
|
237
237
|
*/ process.env.NEXT_EDGE_RUNTIME_PROVIDER || "edge-runtime")
|
|
238
238
|
},
|
|
239
|
+
"process.turbopack": JSON.stringify(false),
|
|
239
240
|
// TODO: enforce `NODE_ENV` on `process.env`, and add a test:
|
|
240
241
|
"process.env.NODE_ENV": JSON.stringify(dev ? "development" : "production"),
|
|
241
242
|
"process.env.NEXT_RUNTIME": JSON.stringify(isEdgeServer ? "edge" : isNodeServer ? "nodejs" : undefined),
|
|
@@ -315,12 +316,13 @@ function getDefineEnv({ dev , config , distDir , isClient , hasRewrites , isNode
|
|
|
315
316
|
} : {}
|
|
316
317
|
};
|
|
317
318
|
}
|
|
318
|
-
function
|
|
319
|
+
function createRSCAliases(bundledReactChannel, opts) {
|
|
319
320
|
const alias = {
|
|
320
321
|
react$: `next/dist/compiled/react${bundledReactChannel}`,
|
|
321
322
|
"react-dom$": `next/dist/compiled/react-dom${bundledReactChannel}`,
|
|
322
323
|
"react/jsx-runtime$": `next/dist/compiled/react${bundledReactChannel}/jsx-runtime`,
|
|
323
324
|
"react/jsx-dev-runtime$": `next/dist/compiled/react${bundledReactChannel}/jsx-dev-runtime`,
|
|
325
|
+
"react-dom/client$": `next/dist/compiled/react-dom${bundledReactChannel}/client`,
|
|
324
326
|
"react-dom/server$": `next/dist/compiled/react-dom${bundledReactChannel}/server`,
|
|
325
327
|
"react-dom/server.edge$": `next/dist/compiled/react-dom${bundledReactChannel}/server.edge`,
|
|
326
328
|
"react-dom/server.browser$": `next/dist/compiled/react-dom${bundledReactChannel}/server.browser`,
|
|
@@ -337,6 +339,18 @@ function createReactAliases(bundledReactChannel, opts) {
|
|
|
337
339
|
if (opts.reactDomServerRenderingStub) {
|
|
338
340
|
alias["react-dom$"] = `next/dist/compiled/react-dom${bundledReactChannel}/server-rendering-stub`;
|
|
339
341
|
}
|
|
342
|
+
// Alias `server-only` and `client-only` modules to their server/client only, vendored versions.
|
|
343
|
+
// These aliases are necessary if the user doesn't have those two packages installed manually.
|
|
344
|
+
if (typeof opts.reactServerCondition !== "undefined") {
|
|
345
|
+
if (opts.reactServerCondition) {
|
|
346
|
+
// Alias to the `react-server` exports.
|
|
347
|
+
alias["server-only$"] = "next/dist/compiled/server-only/empty";
|
|
348
|
+
alias["client-only$"] = "next/dist/compiled/client-only/error";
|
|
349
|
+
} else {
|
|
350
|
+
alias["server-only$"] = "next/dist/compiled/server-only/index";
|
|
351
|
+
alias["client-only$"] = "next/dist/compiled/client-only/index";
|
|
352
|
+
}
|
|
353
|
+
}
|
|
340
354
|
return alias;
|
|
341
355
|
}
|
|
342
356
|
const devtoolRevertWarning = (0, _utils.execOnce)((devtool)=>{
|
|
@@ -614,8 +628,8 @@ async function getBaseWebpackConfig(dir, { buildId , config , compilerType , dev
|
|
|
614
628
|
rootDir: dir,
|
|
615
629
|
pagesDir,
|
|
616
630
|
appDir,
|
|
617
|
-
hasServerComponents,
|
|
618
631
|
hasReactRefresh: dev && isClient,
|
|
632
|
+
hasServerComponents: true,
|
|
619
633
|
fileReading: config.experimental.swcFileReading,
|
|
620
634
|
nextConfig: config,
|
|
621
635
|
jsConfig,
|
|
@@ -643,6 +657,7 @@ async function getBaseWebpackConfig(dir, { buildId , config , compilerType , dev
|
|
|
643
657
|
] : [];
|
|
644
658
|
const swcLoaderForClientLayer = hasServerComponents ? useSWCLoader ? [
|
|
645
659
|
getSwcLoader({
|
|
660
|
+
hasServerComponents,
|
|
646
661
|
isServerLayer: false
|
|
647
662
|
})
|
|
648
663
|
] : // as an additional pass to handle RSC correctly.
|
|
@@ -654,6 +669,9 @@ async function getBaseWebpackConfig(dir, { buildId , config , compilerType , dev
|
|
|
654
669
|
}),
|
|
655
670
|
getBabelLoader()
|
|
656
671
|
] : [];
|
|
672
|
+
const swcLoaderForMiddlewareLayer = useSWCLoader ? getSwcLoader({
|
|
673
|
+
hasServerComponents: false
|
|
674
|
+
}) : getBabelLoader();
|
|
657
675
|
// Loader for API routes needs to be differently configured as it shouldn't
|
|
658
676
|
// have RSC transpiler enabled, so syntax checks such as invalid imports won't
|
|
659
677
|
// be performed.
|
|
@@ -767,6 +785,7 @@ async function getBaseWebpackConfig(dir, { buildId , config , compilerType , dev
|
|
|
767
785
|
"next/dist/shared": "next/dist/esm/shared",
|
|
768
786
|
"next/dist/pages": "next/dist/esm/pages",
|
|
769
787
|
"next/dist/lib": "next/dist/esm/lib",
|
|
788
|
+
"next/dist/server": "next/dist/esm/server",
|
|
770
789
|
// Alias the usage of next public APIs
|
|
771
790
|
[require.resolve("next/dist/client/link")]: "next/dist/esm/client/link",
|
|
772
791
|
[require.resolve("next/dist/client/image")]: "next/dist/esm/client/image",
|
|
@@ -776,8 +795,8 @@ async function getBaseWebpackConfig(dir, { buildId , config , compilerType , dev
|
|
|
776
795
|
[require.resolve("next/dist/shared/lib/dynamic")]: "next/dist/esm/shared/lib/dynamic",
|
|
777
796
|
[require.resolve("next/dist/pages/_document")]: "next/dist/esm/pages/_document",
|
|
778
797
|
[require.resolve("next/dist/pages/_app")]: "next/dist/esm/pages/_app",
|
|
779
|
-
[require.resolve("next/dist/client/components/navigation")]: "next/dist/client/components/navigation",
|
|
780
|
-
[require.resolve("next/dist/client/components/headers")]: "next/dist/client/components/headers"
|
|
798
|
+
[require.resolve("next/dist/client/components/navigation")]: "next/dist/esm/client/components/navigation",
|
|
799
|
+
[require.resolve("next/dist/client/components/headers")]: "next/dist/esm/client/components/headers"
|
|
781
800
|
} : undefined,
|
|
782
801
|
// For RSC server bundle
|
|
783
802
|
...!hasExternalOtelApiPackage && {
|
|
@@ -1328,7 +1347,7 @@ async function getBaseWebpackConfig(dir, { buildId , config , compilerType , dev
|
|
|
1328
1347
|
[require.resolve("next/head")]: require.resolve("next/dist/client/components/noop-head"),
|
|
1329
1348
|
// Alias next/dynamic
|
|
1330
1349
|
[require.resolve("next/dynamic")]: require.resolve("next/dist/shared/lib/app-dynamic"),
|
|
1331
|
-
...
|
|
1350
|
+
...createRSCAliases(bundledReactChannel, {
|
|
1332
1351
|
reactSharedSubset: false,
|
|
1333
1352
|
reactDomServerRenderingStub: false
|
|
1334
1353
|
})
|
|
@@ -1363,9 +1382,10 @@ async function getBaseWebpackConfig(dir, { buildId , config , compilerType , dev
|
|
|
1363
1382
|
// If missing the alias override here, the default alias will be used which aliases
|
|
1364
1383
|
// react to the direct file path, not the package name. In that case the condition
|
|
1365
1384
|
// will be ignored completely.
|
|
1366
|
-
...
|
|
1385
|
+
...createRSCAliases(bundledReactChannel, {
|
|
1367
1386
|
reactSharedSubset: true,
|
|
1368
|
-
reactDomServerRenderingStub: true
|
|
1387
|
+
reactDomServerRenderingStub: true,
|
|
1388
|
+
reactServerCondition: true
|
|
1369
1389
|
})
|
|
1370
1390
|
}
|
|
1371
1391
|
},
|
|
@@ -1430,9 +1450,10 @@ async function getBaseWebpackConfig(dir, { buildId , config , compilerType , dev
|
|
|
1430
1450
|
// It needs `conditionNames` here to require the proper asset,
|
|
1431
1451
|
// when react is acting as dependency of compiled/react-dom.
|
|
1432
1452
|
alias: {
|
|
1433
|
-
...
|
|
1453
|
+
...createRSCAliases(bundledReactChannel, {
|
|
1434
1454
|
reactSharedSubset: true,
|
|
1435
|
-
reactDomServerRenderingStub: true
|
|
1455
|
+
reactDomServerRenderingStub: true,
|
|
1456
|
+
reactServerCondition: true
|
|
1436
1457
|
})
|
|
1437
1458
|
}
|
|
1438
1459
|
}
|
|
@@ -1442,9 +1463,10 @@ async function getBaseWebpackConfig(dir, { buildId , config , compilerType , dev
|
|
|
1442
1463
|
issuerLayer: _constants.WEBPACK_LAYERS.client,
|
|
1443
1464
|
resolve: {
|
|
1444
1465
|
alias: {
|
|
1445
|
-
...
|
|
1466
|
+
...createRSCAliases(bundledReactChannel, {
|
|
1446
1467
|
reactSharedSubset: false,
|
|
1447
|
-
reactDomServerRenderingStub: true
|
|
1468
|
+
reactDomServerRenderingStub: true,
|
|
1469
|
+
reactServerCondition: false
|
|
1448
1470
|
})
|
|
1449
1471
|
}
|
|
1450
1472
|
}
|
|
@@ -1456,10 +1478,11 @@ async function getBaseWebpackConfig(dir, { buildId , config , compilerType , dev
|
|
|
1456
1478
|
issuerLayer: _constants.WEBPACK_LAYERS.appClient,
|
|
1457
1479
|
resolve: {
|
|
1458
1480
|
alias: {
|
|
1459
|
-
...
|
|
1481
|
+
...createRSCAliases(bundledReactChannel, {
|
|
1460
1482
|
// Only alias server rendering stub in client SSR layer.
|
|
1461
1483
|
reactSharedSubset: false,
|
|
1462
|
-
reactDomServerRenderingStub: false
|
|
1484
|
+
reactDomServerRenderingStub: false,
|
|
1485
|
+
reactServerCondition: false
|
|
1463
1486
|
})
|
|
1464
1487
|
}
|
|
1465
1488
|
}
|
|
@@ -1479,7 +1502,7 @@ async function getBaseWebpackConfig(dir, { buildId , config , compilerType , dev
|
|
|
1479
1502
|
{
|
|
1480
1503
|
test: codeCondition.test,
|
|
1481
1504
|
issuerLayer: _constants.WEBPACK_LAYERS.middleware,
|
|
1482
|
-
use:
|
|
1505
|
+
use: swcLoaderForMiddlewareLayer
|
|
1483
1506
|
},
|
|
1484
1507
|
...hasServerComponents ? [
|
|
1485
1508
|
{
|
|
@@ -1624,7 +1647,7 @@ async function getBaseWebpackConfig(dir, { buildId , config , compilerType , dev
|
|
|
1624
1647
|
}
|
|
1625
1648
|
] : [],
|
|
1626
1649
|
{
|
|
1627
|
-
test: /node_modules[/\\]client-only[/\\]error.js/,
|
|
1650
|
+
test: /(node_modules|next[/\\]dist[/\\]compiled)[/\\]client-only[/\\]error.js/,
|
|
1628
1651
|
loader: "next-invalid-import-error-loader",
|
|
1629
1652
|
issuerLayer: {
|
|
1630
1653
|
or: [
|
|
@@ -1637,7 +1660,7 @@ async function getBaseWebpackConfig(dir, { buildId , config , compilerType , dev
|
|
|
1637
1660
|
}
|
|
1638
1661
|
},
|
|
1639
1662
|
{
|
|
1640
|
-
test: /node_modules[/\\]server-only[/\\]index.js/,
|
|
1663
|
+
test: /(node_modules|next[/\\]dist[/\\]compiled)[/\\]server-only[/\\]index.js/,
|
|
1641
1664
|
loader: "next-invalid-import-error-loader",
|
|
1642
1665
|
issuerLayer: _constants.WEBPACK_LAYERS.client,
|
|
1643
1666
|
options: {
|
|
@@ -1750,7 +1773,7 @@ async function getBaseWebpackConfig(dir, { buildId , config , compilerType , dev
|
|
|
1750
1773
|
new _wellknownerrorsplugin.WellKnownErrorsPlugin(),
|
|
1751
1774
|
isClient && new _copyfileplugin.CopyFilePlugin({
|
|
1752
1775
|
filePath: require.resolve("./polyfills/polyfill-nomodule"),
|
|
1753
|
-
cacheKey: "13.4.4
|
|
1776
|
+
cacheKey: "13.4.4",
|
|
1754
1777
|
name: `static/chunks/polyfills${dev ? "" : "-[hash]"}.js`,
|
|
1755
1778
|
minimize: false,
|
|
1756
1779
|
info: {
|
|
@@ -1980,7 +2003,7 @@ async function getBaseWebpackConfig(dir, { buildId , config , compilerType , dev
|
|
|
1980
2003
|
// Includes:
|
|
1981
2004
|
// - Next.js version
|
|
1982
2005
|
// - next.config.js keys that affect compilation
|
|
1983
|
-
version: `${"13.4.4
|
|
2006
|
+
version: `${"13.4.4"}|${configVars}`,
|
|
1984
2007
|
cacheDirectory: _path.default.join(distDir, "cache", "webpack")
|
|
1985
2008
|
};
|
|
1986
2009
|
// Adds `next.config.js` as a buildDependency when custom webpack config is provided
|