@vercel/next 3.0.4 → 3.0.5
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 +14 -26
- package/dist/server-build.js +6 -11
- package/dist/utils.js +6 -6
- package/package.json +2 -2
package/dist/index.js
CHANGED
|
@@ -44849,7 +44849,6 @@ const create_serverless_config_1 = __importDefault(__webpack_require__(9892));
|
|
|
44849
44849
|
const legacy_versions_1 = __importDefault(__webpack_require__(1207));
|
|
44850
44850
|
const server_build_1 = __webpack_require__(5840);
|
|
44851
44851
|
const utils_1 = __webpack_require__(4411);
|
|
44852
|
-
const assert_1 = __importDefault(__webpack_require__(2357));
|
|
44853
44852
|
exports.version = 2;
|
|
44854
44853
|
exports.htmlContentType = 'text/html; charset=utf-8';
|
|
44855
44854
|
const SERVER_BUILD_MINIMUM_NEXT_VERSION = 'v10.0.9-canary.4';
|
|
@@ -45866,11 +45865,11 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
|
|
|
45866
45865
|
const apiLambdaGroups = [];
|
|
45867
45866
|
const pageLambdaGroups = [];
|
|
45868
45867
|
if (isSharedLambdas) {
|
|
45869
|
-
const initialPageLambdaGroups = await (0, utils_1.getPageLambdaGroups)(entryPath, config, nonApiPages, new Set(), pageTraces, compressedPages, tracedPseudoLayer?.pseudoLayer || {}, 0, 0, lambdaCompressedByteLimit,
|
|
45868
|
+
const initialPageLambdaGroups = await (0, utils_1.getPageLambdaGroups)(entryPath, config, nonApiPages, new Set(), pageTraces, compressedPages, tracedPseudoLayer?.pseudoLayer || {}, { pseudoLayer: {}, pseudoLayerBytes: 0 }, 0, lambdaCompressedByteLimit,
|
|
45870
45869
|
// internal pages are already referenced in traces for serverless
|
|
45871
45870
|
// like builds
|
|
45872
45871
|
[]);
|
|
45873
|
-
const initialApiLambdaGroups = await (0, utils_1.getPageLambdaGroups)(entryPath, config, apiPages, new Set(), pageTraces, compressedPages, tracedPseudoLayer?.pseudoLayer || {}, 0, 0, lambdaCompressedByteLimit, []);
|
|
45872
|
+
const initialApiLambdaGroups = await (0, utils_1.getPageLambdaGroups)(entryPath, config, apiPages, new Set(), pageTraces, compressedPages, tracedPseudoLayer?.pseudoLayer || {}, { pseudoLayer: {}, pseudoLayerBytes: 0 }, 0, lambdaCompressedByteLimit, []);
|
|
45874
45873
|
(0, build_utils_1.debug)(JSON.stringify({
|
|
45875
45874
|
apiLambdaGroups: initialApiLambdaGroups.map(group => ({
|
|
45876
45875
|
pages: group.pages,
|
|
@@ -46658,12 +46657,6 @@ async function getServerlessPages(params) {
|
|
|
46658
46657
|
]);
|
|
46659
46658
|
// Edge Functions do not consider as Serverless Functions
|
|
46660
46659
|
for (const edgeFunctionFile of Object.keys(middlewareManifest?.functions ?? {})) {
|
|
46661
|
-
// `getStaticProps` are expecting `Prerender` output which is a Serverless function
|
|
46662
|
-
// and not an Edge Function. Therefore we only remove API endpoints for now, as they
|
|
46663
|
-
// don't have `getStaticProps`.
|
|
46664
|
-
//
|
|
46665
|
-
// Context: https://github.com/vercel/vercel/pull/7905#discussion_r890213165
|
|
46666
|
-
(0, assert_1.default)(edgeFunctionFile.startsWith('/api/'), `Only API endpoints are currently supported for Edge endpoints.`);
|
|
46667
46660
|
delete pages[edgeFunctionFile.slice(1) + '.js'];
|
|
46668
46661
|
}
|
|
46669
46662
|
return pages;
|
|
@@ -47243,9 +47236,8 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
|
|
|
47243
47236
|
Object.assign(initialPseudoLayer.pseudoLayer, requiredFilesLayer.pseudoLayer);
|
|
47244
47237
|
initialPseudoLayer.pseudoLayerBytes += requiredFilesLayer.pseudoLayerBytes;
|
|
47245
47238
|
const uncompressedInitialSize = Object.keys(initialPseudoLayer.pseudoLayer).reduce((prev, cur) => {
|
|
47246
|
-
|
|
47247
|
-
|
|
47248
|
-
.uncompressedSize || 0);
|
|
47239
|
+
const file = initialPseudoLayer.pseudoLayer[cur];
|
|
47240
|
+
return prev + file.uncompressedSize || 0;
|
|
47249
47241
|
}, 0);
|
|
47250
47242
|
(0, build_utils_1.debug)(JSON.stringify({
|
|
47251
47243
|
uncompressedInitialSize,
|
|
@@ -47340,13 +47332,9 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
|
|
|
47340
47332
|
Object.assign(prev, pageTraces[page]);
|
|
47341
47333
|
return prev;
|
|
47342
47334
|
}, {}));
|
|
47343
|
-
const initialPseudoLayerSize = Object.keys(initialPseudoLayer.pseudoLayer).reduce((prev, cur) => {
|
|
47344
|
-
const file = initialPseudoLayer.pseudoLayer[cur];
|
|
47345
|
-
return prev + file.uncompressedSize || 0;
|
|
47346
|
-
}, 0);
|
|
47347
47335
|
const pageExtensions = requiredServerFilesManifest.config?.pageExtensions;
|
|
47348
|
-
const pageLambdaGroups = await (0, utils_1.getPageLambdaGroups)(requiredServerFilesManifest.appDir || entryPath, config, nonApiPages, prerenderRoutes, pageTraces, compressedPages, tracedPseudoLayer.pseudoLayer, initialPseudoLayer
|
|
47349
|
-
const apiLambdaGroups = await (0, utils_1.getPageLambdaGroups)(requiredServerFilesManifest.appDir || entryPath, config, apiPages, prerenderRoutes, pageTraces, compressedPages, tracedPseudoLayer.pseudoLayer, initialPseudoLayer
|
|
47336
|
+
const pageLambdaGroups = await (0, utils_1.getPageLambdaGroups)(requiredServerFilesManifest.appDir || entryPath, config, nonApiPages, prerenderRoutes, pageTraces, compressedPages, tracedPseudoLayer.pseudoLayer, initialPseudoLayer, lambdaCompressedByteLimit, uncompressedInitialSize, internalPages, pageExtensions);
|
|
47337
|
+
const apiLambdaGroups = await (0, utils_1.getPageLambdaGroups)(requiredServerFilesManifest.appDir || entryPath, config, apiPages, prerenderRoutes, pageTraces, compressedPages, tracedPseudoLayer.pseudoLayer, initialPseudoLayer, uncompressedInitialSize, lambdaCompressedByteLimit, internalPages);
|
|
47350
47338
|
(0, build_utils_1.debug)(JSON.stringify({
|
|
47351
47339
|
apiLambdaGroups: apiLambdaGroups.map(group => ({
|
|
47352
47340
|
pages: group.pages,
|
|
@@ -47368,7 +47356,6 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
|
|
|
47368
47356
|
const lambda = await (0, utils_1.createLambdaFromPseudoLayers)({
|
|
47369
47357
|
files: launcherFiles,
|
|
47370
47358
|
layers: [
|
|
47371
|
-
initialPseudoLayer.pseudoLayer,
|
|
47372
47359
|
group.pseudoLayer,
|
|
47373
47360
|
[...group.pages, ...internalPages].reduce((prev, page) => {
|
|
47374
47361
|
const pageFileName = path_1.default.normalize(path_1.default.relative(baseDir, lambdaPages[page].fsPath));
|
|
@@ -47535,8 +47522,9 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
|
|
|
47535
47522
|
continue: true,
|
|
47536
47523
|
...(isOverride ? { override: true } : {}),
|
|
47537
47524
|
},
|
|
47525
|
+
// handle non-trailing slash
|
|
47538
47526
|
{
|
|
47539
|
-
src: path_1.default.join('^/', entryDirectory, '((?!_next/)
|
|
47527
|
+
src: path_1.default.join('^/', entryDirectory, '((?!_next/)(?:.*[^/]|.*))/?$'),
|
|
47540
47528
|
has: [
|
|
47541
47529
|
{
|
|
47542
47530
|
type: 'header',
|
|
@@ -48826,7 +48814,7 @@ exports.addLocaleOrDefault = addLocaleOrDefault;
|
|
|
48826
48814
|
exports.MAX_UNCOMPRESSED_LAMBDA_SIZE = 250 * 1000 * 1000; // 250MB
|
|
48827
48815
|
const LAMBDA_RESERVED_UNCOMPRESSED_SIZE = 2.5 * 1000 * 1000; // 2.5MB
|
|
48828
48816
|
const LAMBDA_RESERVED_COMPRESSED_SIZE = 250 * 1000; // 250KB
|
|
48829
|
-
async function getPageLambdaGroups(entryPath, config, pages, prerenderRoutes, pageTraces, compressedPages, tracedPseudoLayer,
|
|
48817
|
+
async function getPageLambdaGroups(entryPath, config, pages, prerenderRoutes, pageTraces, compressedPages, tracedPseudoLayer, initialPseudoLayer, initialPseudoLayerUncompressed, lambdaCompressedByteLimit, internalPages, pageExtensions) {
|
|
48830
48818
|
const groups = [];
|
|
48831
48819
|
for (const page of pages) {
|
|
48832
48820
|
const newPages = [...internalPages, page];
|
|
@@ -48863,9 +48851,9 @@ async function getPageLambdaGroups(entryPath, config, pages, prerenderRoutes, pa
|
|
|
48863
48851
|
newTracedFilesUncompressedSize +=
|
|
48864
48852
|
compressedPages[newPage].uncompressedSize;
|
|
48865
48853
|
}
|
|
48866
|
-
const underUncompressedLimit = newTracedFilesUncompressedSize
|
|
48854
|
+
const underUncompressedLimit = newTracedFilesUncompressedSize <
|
|
48867
48855
|
exports.MAX_UNCOMPRESSED_LAMBDA_SIZE - LAMBDA_RESERVED_UNCOMPRESSED_SIZE;
|
|
48868
|
-
const underCompressedLimit = newTracedFilesSize
|
|
48856
|
+
const underCompressedLimit = newTracedFilesSize <
|
|
48869
48857
|
lambdaCompressedByteLimit - LAMBDA_RESERVED_COMPRESSED_SIZE;
|
|
48870
48858
|
return underUncompressedLimit && underCompressedLimit;
|
|
48871
48859
|
}
|
|
@@ -48879,9 +48867,9 @@ async function getPageLambdaGroups(entryPath, config, pages, prerenderRoutes, pa
|
|
|
48879
48867
|
pages: [page],
|
|
48880
48868
|
...opts,
|
|
48881
48869
|
isPrerenders: isPrerenderRoute,
|
|
48882
|
-
pseudoLayerBytes:
|
|
48883
|
-
pseudoLayerUncompressedBytes:
|
|
48884
|
-
pseudoLayer: {},
|
|
48870
|
+
pseudoLayerBytes: initialPseudoLayer.pseudoLayerBytes,
|
|
48871
|
+
pseudoLayerUncompressedBytes: initialPseudoLayerUncompressed,
|
|
48872
|
+
pseudoLayer: Object.assign({}, initialPseudoLayer.pseudoLayer),
|
|
48885
48873
|
};
|
|
48886
48874
|
groups.push(newGroup);
|
|
48887
48875
|
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,9 @@ 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)(requiredServerFilesManifest.appDir || entryPath, config, nonApiPages, prerenderRoutes, pageTraces, compressedPages, tracedPseudoLayer.pseudoLayer, initialPseudoLayer
|
|
325
|
-
const apiLambdaGroups = await (0, utils_1.getPageLambdaGroups)(requiredServerFilesManifest.appDir || entryPath, config, apiPages, prerenderRoutes, pageTraces, compressedPages, tracedPseudoLayer.pseudoLayer, initialPseudoLayer
|
|
319
|
+
const pageLambdaGroups = await (0, utils_1.getPageLambdaGroups)(requiredServerFilesManifest.appDir || entryPath, config, nonApiPages, prerenderRoutes, pageTraces, compressedPages, tracedPseudoLayer.pseudoLayer, initialPseudoLayer, lambdaCompressedByteLimit, uncompressedInitialSize, internalPages, pageExtensions);
|
|
320
|
+
const apiLambdaGroups = await (0, utils_1.getPageLambdaGroups)(requiredServerFilesManifest.appDir || entryPath, config, apiPages, prerenderRoutes, pageTraces, compressedPages, tracedPseudoLayer.pseudoLayer, initialPseudoLayer, uncompressedInitialSize, lambdaCompressedByteLimit, internalPages);
|
|
326
321
|
(0, build_utils_1.debug)(JSON.stringify({
|
|
327
322
|
apiLambdaGroups: apiLambdaGroups.map(group => ({
|
|
328
323
|
pages: group.pages,
|
|
@@ -344,7 +339,6 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
|
|
|
344
339
|
const lambda = await (0, utils_1.createLambdaFromPseudoLayers)({
|
|
345
340
|
files: launcherFiles,
|
|
346
341
|
layers: [
|
|
347
|
-
initialPseudoLayer.pseudoLayer,
|
|
348
342
|
group.pseudoLayer,
|
|
349
343
|
[...group.pages, ...internalPages].reduce((prev, page) => {
|
|
350
344
|
const pageFileName = path_1.default.normalize(path_1.default.relative(baseDir, lambdaPages[page].fsPath));
|
|
@@ -511,8 +505,9 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
|
|
|
511
505
|
continue: true,
|
|
512
506
|
...(isOverride ? { override: true } : {}),
|
|
513
507
|
},
|
|
508
|
+
// handle non-trailing slash
|
|
514
509
|
{
|
|
515
|
-
src: path_1.default.join('^/', entryDirectory, '((?!_next/)
|
|
510
|
+
src: path_1.default.join('^/', entryDirectory, '((?!_next/)(?:.*[^/]|.*))/?$'),
|
|
516
511
|
has: [
|
|
517
512
|
{
|
|
518
513
|
type: 'header',
|
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.0.
|
|
3
|
+
"version": "3.0.5",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"main": "./dist/index",
|
|
6
6
|
"homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
|
|
@@ -70,5 +70,5 @@
|
|
|
70
70
|
"typescript": "4.5.2",
|
|
71
71
|
"webpack-sources": "3.2.3"
|
|
72
72
|
},
|
|
73
|
-
"gitHead": "
|
|
73
|
+
"gitHead": "dc2ddf867be91beb8c1d0ab18371545c6b973e44"
|
|
74
74
|
}
|