@vercel/next 3.9.2 → 3.9.4

package/dist/index.js

@@ -41589,7 +41589,7 @@ const build = async ({ files, workPath, repoRootPath, entrypoint, config = {}, m
         });
         const canUsePreviewMode = Object.keys(pages).some(page => (0, utils_1.isApiPage)(pages[page].fsPath));
         const originalStaticPages = await (0, build_utils_1.glob)('**/*.html', pagesDir);
-        staticPages = await (0, utils_1.filterStaticPages)(originalStaticPages, dynamicPages, entryDirectory, exports.htmlContentType, prerenderManifest, routesManifest);
+        staticPages = (0, utils_1.filterStaticPages)(originalStaticPages, dynamicPages, entryDirectory, exports.htmlContentType, prerenderManifest, routesManifest);
         hasStatic500 = !!staticPages[path_1.default.posix.join(entryDirectory, '500')];
         // this can be either 404.html in latest versions
         // or _errors/404.html versions while this was experimental
@@ -42708,6 +42708,7 @@ async function getServerlessPages(params) {
             ? Promise.all([
                 (0, build_utils_1.glob)('**/page.js', path_1.default.join(params.pagesDir, '../app')),
                 (0, build_utils_1.glob)('**/route.js', path_1.default.join(params.pagesDir, '../app')),
+                (0, build_utils_1.glob)('**/_not-found.js', path_1.default.join(params.pagesDir, '../app')),
             ]).then(items => Object.assign(...items))
             : Promise.resolve({}),
         (0, utils_1.getMiddlewareManifest)(params.entryPath, params.outputDirectory),
@@ -44278,7 +44279,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.stringifySourceMap = exports.fileToSource = exports.raw = exports.sourcemapped = void 0;
+exports.removeInlinedSourceMap = exports.stringifySourceMap = exports.fileToSource = exports.raw = exports.sourcemapped = void 0;
 const convert_source_map_1 = __importDefault(__webpack_require__(7101));
 const fs_extra_1 = __importDefault(__webpack_require__(2650));
 const webpack_sources_1 = __webpack_require__(5013);
@@ -44325,7 +44326,7 @@ exports.raw = raw;
  */
 async function fileToSource(content, sourceName, fullFilePath) {
     const sourcemap = await getSourceMap(content, fullFilePath);
-    const cleanContent = convert_source_map_1.default.removeComments(content);
+    const cleanContent = removeInlinedSourceMap(content);
     return sourcemap
         ? new webpack_sources_1.SourceMapSource(cleanContent, sourceName, sourcemap)
         : new webpack_sources_1.OriginalSource(cleanContent, sourceName);
@@ -44362,6 +44363,38 @@ function stringifySourceMap(sourceMap) {
     return JSON.stringify(obj);
 }
 exports.stringifySourceMap = stringifySourceMap;
+// Based on https://github.com/thlorenz/convert-source-map/blob/f1ed815b4edacfa9c3c5552dd342e71a3cffbb0a/index.js#L4 (MIT license)
+// Groups: 1: media type, 2: MIME type, 3: charset, 4: encoding, 5: data.
+const SOURCE_MAP_COMMENT_REGEX = /^\s*?\/[/*][@#]\s+?sourceMappingURL=data:(((?:application|text)\/json)(?:;charset=([^;,]+?)?)?)?(?:;(base64))?,(.*?)$/gm;
+function isValidSourceMapData(encoding, data) {
+    if (encoding !== 'base64') {
+        // Unknown encoding. I think the comment is short (e.g. URL) if it's not
+        // base64 encoded, so let's keep it to be safe.
+        return false;
+    }
+    // Remove any spaces and "*/" of the source map comment. They should not be
+    // considered as a part of the source map data.
+    data = data.replace(/\s/g, '').replace(/\*\//g, '');
+    // If it's an invalid base64 string, it must be a sourceMappingURL
+    // inside a template literal like the follwoing.
+    // https://github.com/webpack-contrib/style-loader/blob/16e401b17a39544d5c8ca47c9032f02e2b60d8f5/src/runtime/styleDomAPI.js#L35C1-L40C1
+    return /^[a-zA-Z0-9+=/]+$/.test(data);
+}
+/*
+ * Removes sourceMappingURL comments from a string.
+ */
+function removeInlinedSourceMap(source) {
+    for (const m of source.matchAll(SOURCE_MAP_COMMENT_REGEX)) {
+        // Check if it's certainly a sourceMappingURL in a comment, not a part
+        // of JavaScript code (e.g. template literal).
+        if (!isValidSourceMapData(m[4], m[5])) {
+            continue;
+        }
+        source = source.replace(m[0], '');
+    }
+    return source;
+}
+exports.removeInlinedSourceMap = removeInlinedSourceMap;
 
 
 /***/ }),

package/dist/sourcemapped.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stringifySourceMap = exports.fileToSource = exports.raw = exports.sourcemapped = void 0;
+exports.removeInlinedSourceMap = exports.stringifySourceMap = exports.fileToSource = exports.raw = exports.sourcemapped = void 0;
 const convert_source_map_1 = __importDefault(require("convert-source-map"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const webpack_sources_1 = require("webpack-sources");
@@ -50,7 +50,7 @@ exports.raw = raw;
  */
 async function fileToSource(content, sourceName, fullFilePath) {
     const sourcemap = await getSourceMap(content, fullFilePath);
-    const cleanContent = convert_source_map_1.default.removeComments(content);
+    const cleanContent = removeInlinedSourceMap(content);
     return sourcemap
         ? new webpack_sources_1.SourceMapSource(cleanContent, sourceName, sourcemap)
         : new webpack_sources_1.OriginalSource(cleanContent, sourceName);
@@ -87,3 +87,35 @@ function stringifySourceMap(sourceMap) {
     return JSON.stringify(obj);
 }
 exports.stringifySourceMap = stringifySourceMap;
+// Based on https://github.com/thlorenz/convert-source-map/blob/f1ed815b4edacfa9c3c5552dd342e71a3cffbb0a/index.js#L4 (MIT license)
+// Groups: 1: media type, 2: MIME type, 3: charset, 4: encoding, 5: data.
+const SOURCE_MAP_COMMENT_REGEX = /^\s*?\/[/*][@#]\s+?sourceMappingURL=data:(((?:application|text)\/json)(?:;charset=([^;,]+?)?)?)?(?:;(base64))?,(.*?)$/gm;
+function isValidSourceMapData(encoding, data) {
+    if (encoding !== 'base64') {
+        // Unknown encoding. I think the comment is short (e.g. URL) if it's not
+        // base64 encoded, so let's keep it to be safe.
+        return false;
+    }
+    // Remove any spaces and "*/" of the source map comment. They should not be
+    // considered as a part of the source map data.
+    data = data.replace(/\s/g, '').replace(/\*\//g, '');
+    // If it's an invalid base64 string, it must be a sourceMappingURL
+    // inside a template literal like the follwoing.
+    // https://github.com/webpack-contrib/style-loader/blob/16e401b17a39544d5c8ca47c9032f02e2b60d8f5/src/runtime/styleDomAPI.js#L35C1-L40C1
+    return /^[a-zA-Z0-9+=/]+$/.test(data);
+}
+/*
+ * Removes sourceMappingURL comments from a string.
+ */
+function removeInlinedSourceMap(source) {
+    for (const m of source.matchAll(SOURCE_MAP_COMMENT_REGEX)) {
+        // Check if it's certainly a sourceMappingURL in a comment, not a part
+        // of JavaScript code (e.g. template literal).
+        if (!isValidSourceMapData(m[4], m[5])) {
+            continue;
+        }
+        source = source.replace(m[0], '');
+    }
+    return source;
+}
+exports.removeInlinedSourceMap = removeInlinedSourceMap;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.9.2",
+  "version": "3.9.4",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -26,7 +26,7 @@
     "@types/semver": "6.0.0",
     "@types/text-table": "0.2.1",
     "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "6.8.2",
+    "@vercel/build-utils": "6.8.3",
     "@vercel/nft": "0.22.5",
     "@vercel/routing-utils": "2.2.1",
     "async-sema": "3.0.1",