@vercel/next 3.1.1 → 3.1.2
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/index.js +63 -21
- package/dist/server-build.js +29 -10
- package/dist/utils.js +6 -6
- package/package.json +3 -3
package/dist/index.js
CHANGED
@@ -43443,11 +43443,34 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
|
|
43443
43443
|
const apiLambdaGroups = [];
|
43444
43444
|
const pageLambdaGroups = [];
|
43445
43445
|
if (isSharedLambdas) {
|
43446
|
-
const initialPageLambdaGroups = await (0, utils_1.getPageLambdaGroups)(
|
43447
|
-
|
43448
|
-
|
43449
|
-
|
43450
|
-
|
43446
|
+
const initialPageLambdaGroups = await (0, utils_1.getPageLambdaGroups)({
|
43447
|
+
entryPath,
|
43448
|
+
config,
|
43449
|
+
pages: nonApiPages,
|
43450
|
+
prerenderRoutes: new Set(),
|
43451
|
+
pageTraces,
|
43452
|
+
compressedPages,
|
43453
|
+
tracedPseudoLayer: tracedPseudoLayer?.pseudoLayer || {},
|
43454
|
+
initialPseudoLayer: { pseudoLayer: {}, pseudoLayerBytes: 0 },
|
43455
|
+
initialPseudoLayerUncompressed: 0,
|
43456
|
+
lambdaCompressedByteLimit,
|
43457
|
+
// internal pages are already referenced in traces for serverless
|
43458
|
+
// like builds
|
43459
|
+
internalPages: [],
|
43460
|
+
});
|
43461
|
+
const initialApiLambdaGroups = await (0, utils_1.getPageLambdaGroups)({
|
43462
|
+
entryPath,
|
43463
|
+
config,
|
43464
|
+
pages: apiPages,
|
43465
|
+
prerenderRoutes: new Set(),
|
43466
|
+
pageTraces,
|
43467
|
+
compressedPages,
|
43468
|
+
tracedPseudoLayer: tracedPseudoLayer?.pseudoLayer || {},
|
43469
|
+
initialPseudoLayer: { pseudoLayer: {}, pseudoLayerBytes: 0 },
|
43470
|
+
initialPseudoLayerUncompressed: 0,
|
43471
|
+
lambdaCompressedByteLimit,
|
43472
|
+
internalPages: [],
|
43473
|
+
});
|
43451
43474
|
(0, build_utils_1.debug)(JSON.stringify({
|
43452
43475
|
apiLambdaGroups: initialApiLambdaGroups.map(group => ({
|
43453
43476
|
pages: group.pages,
|
@@ -44814,9 +44837,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
|
|
44814
44837
|
Object.assign(initialPseudoLayer.pseudoLayer, requiredFilesLayer.pseudoLayer);
|
44815
44838
|
initialPseudoLayer.pseudoLayerBytes += requiredFilesLayer.pseudoLayerBytes;
|
44816
44839
|
const uncompressedInitialSize = Object.keys(initialPseudoLayer.pseudoLayer).reduce((prev, cur) => {
|
44817
|
-
|
44818
|
-
|
44819
|
-
.uncompressedSize || 0);
|
44840
|
+
const file = initialPseudoLayer.pseudoLayer[cur];
|
44841
|
+
return prev + file.uncompressedSize || 0;
|
44820
44842
|
}, 0);
|
44821
44843
|
(0, build_utils_1.debug)(JSON.stringify({
|
44822
44844
|
uncompressedInitialSize,
|
@@ -44911,13 +44933,34 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
|
|
44911
44933
|
Object.assign(prev, pageTraces[page]);
|
44912
44934
|
return prev;
|
44913
44935
|
}, {}));
|
44914
|
-
const initialPseudoLayerSize = Object.keys(initialPseudoLayer.pseudoLayer).reduce((prev, cur) => {
|
44915
|
-
const file = initialPseudoLayer.pseudoLayer[cur];
|
44916
|
-
return prev + file.uncompressedSize || 0;
|
44917
|
-
}, 0);
|
44918
44936
|
const pageExtensions = requiredServerFilesManifest.config?.pageExtensions;
|
44919
|
-
const pageLambdaGroups = await (0, utils_1.getPageLambdaGroups)(
|
44920
|
-
|
44937
|
+
const pageLambdaGroups = await (0, utils_1.getPageLambdaGroups)({
|
44938
|
+
entryPath: requiredServerFilesManifest.appDir || entryPath,
|
44939
|
+
config,
|
44940
|
+
pages: nonApiPages,
|
44941
|
+
prerenderRoutes,
|
44942
|
+
pageTraces,
|
44943
|
+
compressedPages,
|
44944
|
+
tracedPseudoLayer: tracedPseudoLayer.pseudoLayer,
|
44945
|
+
initialPseudoLayer,
|
44946
|
+
lambdaCompressedByteLimit,
|
44947
|
+
initialPseudoLayerUncompressed: uncompressedInitialSize,
|
44948
|
+
internalPages,
|
44949
|
+
pageExtensions,
|
44950
|
+
});
|
44951
|
+
const apiLambdaGroups = await (0, utils_1.getPageLambdaGroups)({
|
44952
|
+
entryPath: requiredServerFilesManifest.appDir || entryPath,
|
44953
|
+
config,
|
44954
|
+
pages: apiPages,
|
44955
|
+
prerenderRoutes,
|
44956
|
+
pageTraces,
|
44957
|
+
compressedPages,
|
44958
|
+
tracedPseudoLayer: tracedPseudoLayer.pseudoLayer,
|
44959
|
+
initialPseudoLayer,
|
44960
|
+
initialPseudoLayerUncompressed: uncompressedInitialSize,
|
44961
|
+
lambdaCompressedByteLimit,
|
44962
|
+
internalPages,
|
44963
|
+
});
|
44921
44964
|
(0, build_utils_1.debug)(JSON.stringify({
|
44922
44965
|
apiLambdaGroups: apiLambdaGroups.map(group => ({
|
44923
44966
|
pages: group.pages,
|
@@ -44939,7 +44982,6 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
|
|
44939
44982
|
const lambda = await (0, utils_1.createLambdaFromPseudoLayers)({
|
44940
44983
|
files: launcherFiles,
|
44941
44984
|
layers: [
|
44942
|
-
initialPseudoLayer.pseudoLayer,
|
44943
44985
|
group.pseudoLayer,
|
44944
44986
|
[...group.pages, ...internalPages].reduce((prev, page) => {
|
44945
44987
|
const pageFileName = path_1.default.normalize(path_1.default.relative(baseDir, lambdaPages[page].fsPath));
|
@@ -46398,7 +46440,7 @@ exports.addLocaleOrDefault = addLocaleOrDefault;
|
|
46398
46440
|
exports.MAX_UNCOMPRESSED_LAMBDA_SIZE = 250 * 1000 * 1000; // 250MB
|
46399
46441
|
const LAMBDA_RESERVED_UNCOMPRESSED_SIZE = 2.5 * 1000 * 1000; // 2.5MB
|
46400
46442
|
const LAMBDA_RESERVED_COMPRESSED_SIZE = 250 * 1000; // 250KB
|
46401
|
-
async function getPageLambdaGroups(entryPath, config, pages, prerenderRoutes, pageTraces, compressedPages, tracedPseudoLayer,
|
46443
|
+
async function getPageLambdaGroups({ entryPath, config, pages, prerenderRoutes, pageTraces, compressedPages, tracedPseudoLayer, initialPseudoLayer, initialPseudoLayerUncompressed, lambdaCompressedByteLimit, internalPages, pageExtensions, }) {
|
46402
46444
|
const groups = [];
|
46403
46445
|
for (const page of pages) {
|
46404
46446
|
const newPages = [...internalPages, page];
|
@@ -46435,9 +46477,9 @@ async function getPageLambdaGroups(entryPath, config, pages, prerenderRoutes, pa
|
|
46435
46477
|
newTracedFilesUncompressedSize +=
|
46436
46478
|
compressedPages[newPage].uncompressedSize;
|
46437
46479
|
}
|
46438
|
-
const underUncompressedLimit = newTracedFilesUncompressedSize
|
46480
|
+
const underUncompressedLimit = newTracedFilesUncompressedSize <
|
46439
46481
|
exports.MAX_UNCOMPRESSED_LAMBDA_SIZE - LAMBDA_RESERVED_UNCOMPRESSED_SIZE;
|
46440
|
-
const underCompressedLimit = newTracedFilesSize
|
46482
|
+
const underCompressedLimit = newTracedFilesSize <
|
46441
46483
|
lambdaCompressedByteLimit - LAMBDA_RESERVED_COMPRESSED_SIZE;
|
46442
46484
|
return underUncompressedLimit && underCompressedLimit;
|
46443
46485
|
}
|
@@ -46451,9 +46493,9 @@ async function getPageLambdaGroups(entryPath, config, pages, prerenderRoutes, pa
|
|
46451
46493
|
pages: [page],
|
46452
46494
|
...opts,
|
46453
46495
|
isPrerenders: isPrerenderRoute,
|
46454
|
-
pseudoLayerBytes:
|
46455
|
-
pseudoLayerUncompressedBytes:
|
46456
|
-
pseudoLayer: {},
|
46496
|
+
pseudoLayerBytes: initialPseudoLayer.pseudoLayerBytes,
|
46497
|
+
pseudoLayerUncompressedBytes: initialPseudoLayerUncompressed,
|
46498
|
+
pseudoLayer: Object.assign({}, initialPseudoLayer.pseudoLayer),
|
46457
46499
|
};
|
46458
46500
|
groups.push(newGroup);
|
46459
46501
|
matchingGroup = newGroup;
|
package/dist/server-build.js
CHANGED
@@ -219,9 +219,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
|
|
219
219
|
Object.assign(initialPseudoLayer.pseudoLayer, requiredFilesLayer.pseudoLayer);
|
220
220
|
initialPseudoLayer.pseudoLayerBytes += requiredFilesLayer.pseudoLayerBytes;
|
221
221
|
const uncompressedInitialSize = Object.keys(initialPseudoLayer.pseudoLayer).reduce((prev, cur) => {
|
222
|
-
|
223
|
-
|
224
|
-
.uncompressedSize || 0);
|
222
|
+
const file = initialPseudoLayer.pseudoLayer[cur];
|
223
|
+
return prev + file.uncompressedSize || 0;
|
225
224
|
}, 0);
|
226
225
|
(0, build_utils_1.debug)(JSON.stringify({
|
227
226
|
uncompressedInitialSize,
|
@@ -316,13 +315,34 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
|
|
316
315
|
Object.assign(prev, pageTraces[page]);
|
317
316
|
return prev;
|
318
317
|
}, {}));
|
319
|
-
const initialPseudoLayerSize = Object.keys(initialPseudoLayer.pseudoLayer).reduce((prev, cur) => {
|
320
|
-
const file = initialPseudoLayer.pseudoLayer[cur];
|
321
|
-
return prev + file.uncompressedSize || 0;
|
322
|
-
}, 0);
|
323
318
|
const pageExtensions = requiredServerFilesManifest.config?.pageExtensions;
|
324
|
-
const pageLambdaGroups = await (0, utils_1.getPageLambdaGroups)(
|
325
|
-
|
319
|
+
const pageLambdaGroups = await (0, utils_1.getPageLambdaGroups)({
|
320
|
+
entryPath: requiredServerFilesManifest.appDir || entryPath,
|
321
|
+
config,
|
322
|
+
pages: nonApiPages,
|
323
|
+
prerenderRoutes,
|
324
|
+
pageTraces,
|
325
|
+
compressedPages,
|
326
|
+
tracedPseudoLayer: tracedPseudoLayer.pseudoLayer,
|
327
|
+
initialPseudoLayer,
|
328
|
+
lambdaCompressedByteLimit,
|
329
|
+
initialPseudoLayerUncompressed: uncompressedInitialSize,
|
330
|
+
internalPages,
|
331
|
+
pageExtensions,
|
332
|
+
});
|
333
|
+
const apiLambdaGroups = await (0, utils_1.getPageLambdaGroups)({
|
334
|
+
entryPath: requiredServerFilesManifest.appDir || entryPath,
|
335
|
+
config,
|
336
|
+
pages: apiPages,
|
337
|
+
prerenderRoutes,
|
338
|
+
pageTraces,
|
339
|
+
compressedPages,
|
340
|
+
tracedPseudoLayer: tracedPseudoLayer.pseudoLayer,
|
341
|
+
initialPseudoLayer,
|
342
|
+
initialPseudoLayerUncompressed: uncompressedInitialSize,
|
343
|
+
lambdaCompressedByteLimit,
|
344
|
+
internalPages,
|
345
|
+
});
|
326
346
|
(0, build_utils_1.debug)(JSON.stringify({
|
327
347
|
apiLambdaGroups: apiLambdaGroups.map(group => ({
|
328
348
|
pages: group.pages,
|
@@ -344,7 +364,6 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
|
|
344
364
|
const lambda = await (0, utils_1.createLambdaFromPseudoLayers)({
|
345
365
|
files: launcherFiles,
|
346
366
|
layers: [
|
347
|
-
initialPseudoLayer.pseudoLayer,
|
348
367
|
group.pseudoLayer,
|
349
368
|
[...group.pages, ...internalPages].reduce((prev, page) => {
|
350
369
|
const pageFileName = path_1.default.normalize(path_1.default.relative(baseDir, lambdaPages[page].fsPath));
|
package/dist/utils.js
CHANGED
@@ -783,7 +783,7 @@ exports.addLocaleOrDefault = addLocaleOrDefault;
|
|
783
783
|
exports.MAX_UNCOMPRESSED_LAMBDA_SIZE = 250 * 1000 * 1000; // 250MB
|
784
784
|
const LAMBDA_RESERVED_UNCOMPRESSED_SIZE = 2.5 * 1000 * 1000; // 2.5MB
|
785
785
|
const LAMBDA_RESERVED_COMPRESSED_SIZE = 250 * 1000; // 250KB
|
786
|
-
async function getPageLambdaGroups(entryPath, config, pages, prerenderRoutes, pageTraces, compressedPages, tracedPseudoLayer,
|
786
|
+
async function getPageLambdaGroups({ entryPath, config, pages, prerenderRoutes, pageTraces, compressedPages, tracedPseudoLayer, initialPseudoLayer, initialPseudoLayerUncompressed, lambdaCompressedByteLimit, internalPages, pageExtensions, }) {
|
787
787
|
const groups = [];
|
788
788
|
for (const page of pages) {
|
789
789
|
const newPages = [...internalPages, page];
|
@@ -820,9 +820,9 @@ async function getPageLambdaGroups(entryPath, config, pages, prerenderRoutes, pa
|
|
820
820
|
newTracedFilesUncompressedSize +=
|
821
821
|
compressedPages[newPage].uncompressedSize;
|
822
822
|
}
|
823
|
-
const underUncompressedLimit = newTracedFilesUncompressedSize
|
823
|
+
const underUncompressedLimit = newTracedFilesUncompressedSize <
|
824
824
|
exports.MAX_UNCOMPRESSED_LAMBDA_SIZE - LAMBDA_RESERVED_UNCOMPRESSED_SIZE;
|
825
|
-
const underCompressedLimit = newTracedFilesSize
|
825
|
+
const underCompressedLimit = newTracedFilesSize <
|
826
826
|
lambdaCompressedByteLimit - LAMBDA_RESERVED_COMPRESSED_SIZE;
|
827
827
|
return underUncompressedLimit && underCompressedLimit;
|
828
828
|
}
|
@@ -836,9 +836,9 @@ async function getPageLambdaGroups(entryPath, config, pages, prerenderRoutes, pa
|
|
836
836
|
pages: [page],
|
837
837
|
...opts,
|
838
838
|
isPrerenders: isPrerenderRoute,
|
839
|
-
pseudoLayerBytes:
|
840
|
-
pseudoLayerUncompressedBytes:
|
841
|
-
pseudoLayer: {},
|
839
|
+
pseudoLayerBytes: initialPseudoLayer.pseudoLayerBytes,
|
840
|
+
pseudoLayerUncompressedBytes: initialPseudoLayerUncompressed,
|
841
|
+
pseudoLayer: Object.assign({}, initialPseudoLayer.pseudoLayer),
|
842
842
|
};
|
843
843
|
groups.push(newGroup);
|
844
844
|
matchingGroup = newGroup;
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@vercel/next",
|
3
|
-
"version": "3.1.
|
3
|
+
"version": "3.1.2",
|
4
4
|
"license": "MIT",
|
5
5
|
"main": "./dist/index",
|
6
6
|
"homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
|
@@ -45,7 +45,7 @@
|
|
45
45
|
"@types/semver": "6.0.0",
|
46
46
|
"@types/text-table": "0.2.1",
|
47
47
|
"@types/webpack-sources": "3.2.0",
|
48
|
-
"@vercel/build-utils": "4.2.
|
48
|
+
"@vercel/build-utils": "4.2.1",
|
49
49
|
"@vercel/nft": "0.20.1",
|
50
50
|
"@vercel/routing-utils": "1.13.5",
|
51
51
|
"async-sema": "3.0.1",
|
@@ -70,5 +70,5 @@
|
|
70
70
|
"typescript": "4.5.2",
|
71
71
|
"webpack-sources": "3.2.3"
|
72
72
|
},
|
73
|
-
"gitHead": "
|
73
|
+
"gitHead": "547e88228e180e883e5f07ab815a16960767bbf5"
|
74
74
|
}
|