@vercel/next 3.0.0 → 3.0.1-canary.0

package/dist/index.js

@@ -15907,214 +15907,6 @@ exports.getRoot = function getRoot(file) {
 };
 
 
-/***/ }),
-
-/***/ 3197:
-/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
-
-var concatMap = __webpack_require__(4527);
-var balanced = __webpack_require__(3353);
-
-module.exports = expandTop;
-
-var escSlash = '\0SLASH'+Math.random()+'\0';
-var escOpen = '\0OPEN'+Math.random()+'\0';
-var escClose = '\0CLOSE'+Math.random()+'\0';
-var escComma = '\0COMMA'+Math.random()+'\0';
-var escPeriod = '\0PERIOD'+Math.random()+'\0';
-
-function numeric(str) {
-  return parseInt(str, 10) == str
-    ? parseInt(str, 10)
-    : str.charCodeAt(0);
-}
-
-function escapeBraces(str) {
-  return str.split('\\\\').join(escSlash)
-            .split('\\{').join(escOpen)
-            .split('\\}').join(escClose)
-            .split('\\,').join(escComma)
-            .split('\\.').join(escPeriod);
-}
-
-function unescapeBraces(str) {
-  return str.split(escSlash).join('\\')
-            .split(escOpen).join('{')
-            .split(escClose).join('}')
-            .split(escComma).join(',')
-            .split(escPeriod).join('.');
-}
-
-
-// Basically just str.split(","), but handling cases
-// where we have nested braced sections, which should be
-// treated as individual members, like {a,{b,c},d}
-function parseCommaParts(str) {
-  if (!str)
-    return [''];
-
-  var parts = [];
-  var m = balanced('{', '}', str);
-
-  if (!m)
-    return str.split(',');
-
-  var pre = m.pre;
-  var body = m.body;
-  var post = m.post;
-  var p = pre.split(',');
-
-  p[p.length-1] += '{' + body + '}';
-  var postParts = parseCommaParts(post);
-  if (post.length) {
-    p[p.length-1] += postParts.shift();
-    p.push.apply(p, postParts);
-  }
-
-  parts.push.apply(parts, p);
-
-  return parts;
-}
-
-function expandTop(str) {
-  if (!str)
-    return [];
-
-  // I don't know why Bash 4.3 does this, but it does.
-  // Anything starting with {} will have the first two bytes preserved
-  // but *only* at the top level, so {},a}b will not expand to anything,
-  // but a{},b}c will be expanded to [a}c,abc].
-  // One could argue that this is a bug in Bash, but since the goal of
-  // this module is to match Bash's rules, we escape a leading {}
-  if (str.substr(0, 2) === '{}') {
-    str = '\\{\\}' + str.substr(2);
-  }
-
-  return expand(escapeBraces(str), true).map(unescapeBraces);
-}
-
-function identity(e) {
-  return e;
-}
-
-function embrace(str) {
-  return '{' + str + '}';
-}
-function isPadded(el) {
-  return /^-?0\d/.test(el);
-}
-
-function lte(i, y) {
-  return i <= y;
-}
-function gte(i, y) {
-  return i >= y;
-}
-
-function expand(str, isTop) {
-  var expansions = [];
-
-  var m = balanced('{', '}', str);
-  if (!m || /\$$/.test(m.pre)) return [str];
-
-  var isNumericSequence = /^-?\d+\.\.-?\d+(?:\.\.-?\d+)?$/.test(m.body);
-  var isAlphaSequence = /^[a-zA-Z]\.\.[a-zA-Z](?:\.\.-?\d+)?$/.test(m.body);
-  var isSequence = isNumericSequence || isAlphaSequence;
-  var isOptions = m.body.indexOf(',') >= 0;
-  if (!isSequence && !isOptions) {
-    // {a},b}
-    if (m.post.match(/,.*\}/)) {
-      str = m.pre + '{' + m.body + escClose + m.post;
-      return expand(str);
-    }
-    return [str];
-  }
-
-  var n;
-  if (isSequence) {
-    n = m.body.split(/\.\./);
-  } else {
-    n = parseCommaParts(m.body);
-    if (n.length === 1) {
-      // x{{a,b}}y ==> x{a}y x{b}y
-      n = expand(n[0], false).map(embrace);
-      if (n.length === 1) {
-        var post = m.post.length
-          ? expand(m.post, false)
-          : [''];
-        return post.map(function(p) {
-          return m.pre + n[0] + p;
-        });
-      }
-    }
-  }
-
-  // at this point, n is the parts, and we know it's not a comma set
-  // with a single entry.
-
-  // no need to expand pre, since it is guaranteed to be free of brace-sets
-  var pre = m.pre;
-  var post = m.post.length
-    ? expand(m.post, false)
-    : [''];
-
-  var N;
-
-  if (isSequence) {
-    var x = numeric(n[0]);
-    var y = numeric(n[1]);
-    var width = Math.max(n[0].length, n[1].length)
-    var incr = n.length == 3
-      ? Math.abs(numeric(n[2]))
-      : 1;
-    var test = lte;
-    var reverse = y < x;
-    if (reverse) {
-      incr *= -1;
-      test = gte;
-    }
-    var pad = n.some(isPadded);
-
-    N = [];
-
-    for (var i = x; test(i, y); i += incr) {
-      var c;
-      if (isAlphaSequence) {
-        c = String.fromCharCode(i);
-        if (c === '\\')
-          c = '';
-      } else {
-        c = String(i);
-        if (pad) {
-          var need = width - c.length;
-          if (need > 0) {
-            var z = new Array(need + 1).join('0');
-            if (i < 0)
-              c = '-' + z + c.slice(1);
-            else
-              c = z + c;
-          }
-        }
-      }
-      N.push(c);
-    }
-  } else {
-    N = concatMap(n, function(el) { return expand(el, false) });
-  }
-
-  for (var j = 0; j < N.length; j++) {
-    for (var k = 0; k < post.length; k++) {
-      var expansion = pre + N[j] + post[k];
-      if (!isTop || isSequence || expansion)
-        expansions.push(expansion);
-    }
-  }
-
-  return expansions;
-}
-
-
-
 /***/ }),
 
 /***/ 538:
@@ -22714,7 +22506,7 @@ try {
 } catch (er) {}
 
 var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}
-var expand = __webpack_require__(3197)
+var expand = __webpack_require__(1561)
 
 var plTypes = {
   '!': { open: '(?:(?!(?:', close: '))[^/]*?)'},
@@ -23630,6 +23422,214 @@ function regExpEscape (s) {
 }
 
 
+/***/ }),
+
+/***/ 1561:
+/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
+
+var concatMap = __webpack_require__(4527);
+var balanced = __webpack_require__(3353);
+
+module.exports = expandTop;
+
+var escSlash = '\0SLASH'+Math.random()+'\0';
+var escOpen = '\0OPEN'+Math.random()+'\0';
+var escClose = '\0CLOSE'+Math.random()+'\0';
+var escComma = '\0COMMA'+Math.random()+'\0';
+var escPeriod = '\0PERIOD'+Math.random()+'\0';
+
+function numeric(str) {
+  return parseInt(str, 10) == str
+    ? parseInt(str, 10)
+    : str.charCodeAt(0);
+}
+
+function escapeBraces(str) {
+  return str.split('\\\\').join(escSlash)
+            .split('\\{').join(escOpen)
+            .split('\\}').join(escClose)
+            .split('\\,').join(escComma)
+            .split('\\.').join(escPeriod);
+}
+
+function unescapeBraces(str) {
+  return str.split(escSlash).join('\\')
+            .split(escOpen).join('{')
+            .split(escClose).join('}')
+            .split(escComma).join(',')
+            .split(escPeriod).join('.');
+}
+
+
+// Basically just str.split(","), but handling cases
+// where we have nested braced sections, which should be
+// treated as individual members, like {a,{b,c},d}
+function parseCommaParts(str) {
+  if (!str)
+    return [''];
+
+  var parts = [];
+  var m = balanced('{', '}', str);
+
+  if (!m)
+    return str.split(',');
+
+  var pre = m.pre;
+  var body = m.body;
+  var post = m.post;
+  var p = pre.split(',');
+
+  p[p.length-1] += '{' + body + '}';
+  var postParts = parseCommaParts(post);
+  if (post.length) {
+    p[p.length-1] += postParts.shift();
+    p.push.apply(p, postParts);
+  }
+
+  parts.push.apply(parts, p);
+
+  return parts;
+}
+
+function expandTop(str) {
+  if (!str)
+    return [];
+
+  // I don't know why Bash 4.3 does this, but it does.
+  // Anything starting with {} will have the first two bytes preserved
+  // but *only* at the top level, so {},a}b will not expand to anything,
+  // but a{},b}c will be expanded to [a}c,abc].
+  // One could argue that this is a bug in Bash, but since the goal of
+  // this module is to match Bash's rules, we escape a leading {}
+  if (str.substr(0, 2) === '{}') {
+    str = '\\{\\}' + str.substr(2);
+  }
+
+  return expand(escapeBraces(str), true).map(unescapeBraces);
+}
+
+function identity(e) {
+  return e;
+}
+
+function embrace(str) {
+  return '{' + str + '}';
+}
+function isPadded(el) {
+  return /^-?0\d/.test(el);
+}
+
+function lte(i, y) {
+  return i <= y;
+}
+function gte(i, y) {
+  return i >= y;
+}
+
+function expand(str, isTop) {
+  var expansions = [];
+
+  var m = balanced('{', '}', str);
+  if (!m || /\$$/.test(m.pre)) return [str];
+
+  var isNumericSequence = /^-?\d+\.\.-?\d+(?:\.\.-?\d+)?$/.test(m.body);
+  var isAlphaSequence = /^[a-zA-Z]\.\.[a-zA-Z](?:\.\.-?\d+)?$/.test(m.body);
+  var isSequence = isNumericSequence || isAlphaSequence;
+  var isOptions = m.body.indexOf(',') >= 0;
+  if (!isSequence && !isOptions) {
+    // {a},b}
+    if (m.post.match(/,.*\}/)) {
+      str = m.pre + '{' + m.body + escClose + m.post;
+      return expand(str);
+    }
+    return [str];
+  }
+
+  var n;
+  if (isSequence) {
+    n = m.body.split(/\.\./);
+  } else {
+    n = parseCommaParts(m.body);
+    if (n.length === 1) {
+      // x{{a,b}}y ==> x{a}y x{b}y
+      n = expand(n[0], false).map(embrace);
+      if (n.length === 1) {
+        var post = m.post.length
+          ? expand(m.post, false)
+          : [''];
+        return post.map(function(p) {
+          return m.pre + n[0] + p;
+        });
+      }
+    }
+  }
+
+  // at this point, n is the parts, and we know it's not a comma set
+  // with a single entry.
+
+  // no need to expand pre, since it is guaranteed to be free of brace-sets
+  var pre = m.pre;
+  var post = m.post.length
+    ? expand(m.post, false)
+    : [''];
+
+  var N;
+
+  if (isSequence) {
+    var x = numeric(n[0]);
+    var y = numeric(n[1]);
+    var width = Math.max(n[0].length, n[1].length)
+    var incr = n.length == 3
+      ? Math.abs(numeric(n[2]))
+      : 1;
+    var test = lte;
+    var reverse = y < x;
+    if (reverse) {
+      incr *= -1;
+      test = gte;
+    }
+    var pad = n.some(isPadded);
+
+    N = [];
+
+    for (var i = x; test(i, y); i += incr) {
+      var c;
+      if (isAlphaSequence) {
+        c = String.fromCharCode(i);
+        if (c === '\\')
+          c = '';
+      } else {
+        c = String(i);
+        if (pad) {
+          var need = width - c.length;
+          if (need > 0) {
+            var z = new Array(need + 1).join('0');
+            if (i < 0)
+              c = '-' + z + c.slice(1);
+            else
+              c = z + c;
+          }
+        }
+      }
+      N.push(c);
+    }
+  } else {
+    N = concatMap(n, function(el) { return expand(el, false) });
+  }
+
+  for (var j = 0; j < N.length; j++) {
+    for (var k = 0; k < post.length; k++) {
+      var expansion = pre + N[j] + post[k];
+      if (!isTop || isSequence || expansion)
+        expansions.push(expansion);
+    }
+  }
+
+  return expansions;
+}
+
+
+
 /***/ }),
 
 /***/ 3277:
@@ -47010,6 +47010,7 @@ const escape_string_regexp_1 = __importDefault(__webpack_require__(1426));
 const pretty_bytes_1 = __importDefault(__webpack_require__(539));
 // related PR: https://github.com/vercel/next.js/pull/30046
 const CORRECT_NOT_FOUND_ROUTES_VERSION = 'v12.0.1';
+const CORRECT_MIDDLEWARE_ORDER_VERSION = 'v12.1.7-canary.29';
 async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs, baseDir, workPath, entryPath, nodeVersion, escapedBuildId, dynamicPrefix, entryDirectory, outputDirectory, redirects, beforeFilesRewrites, afterFilesRewrites, fallbackRewrites, headers, dataRoutes, hasIsr404Page, imagesManifest, wildcardConfig, routesManifest, staticPages, lambdaPages, nextVersion, canUsePreviewMode, prerenderManifest, omittedPrerenderRoutes, trailingSlashRedirects, isCorrectLocaleAPIRoutes, lambdaCompressedByteLimit, requiredServerFilesManifest, }) {
     const lambdas = {};
     const prerenders = {};
@@ -47017,6 +47018,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
     const internalPages = ['_app.js', '_error.js', '_document.js'];
     const pageBuildTraces = await (0, build_utils_1.glob)('**/*.js.nft.json', pagesDir);
     const isCorrectNotFoundRoutes = semver_1.default.gte(nextVersion, CORRECT_NOT_FOUND_ROUTES_VERSION);
+    const isCorrectMiddlewareOrder = semver_1.default.gte(nextVersion, CORRECT_MIDDLEWARE_ORDER_VERSION);
     let hasStatic500 = !!staticPages[path_1.default.join(entryDirectory, '500')];
     if (lambdaPageKeys.length === 0) {
         throw new build_utils_1.NowBuildError({
@@ -47406,6 +47408,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         entryPath,
         outputDirectory,
         routesManifest,
+        isCorrectMiddlewareOrder,
     });
     const dynamicRoutes = await (0, utils_1.getDynamicRoutes)(entryPath, entryDirectory, dynamicPages, false, routesManifest, omittedPrerenderRoutes, canUsePreviewMode, prerenderManifest.bypassToken || '', true, middleware.dynamicRouteMap).then(arr => (0, utils_1.localizeDynamicRoutes)(arr, dynamicPrefix, entryDirectory, staticPages, prerenderManifest, routesManifest, true, isCorrectLocaleAPIRoutes));
     const { staticFiles, publicDirectoryFiles, staticDirectoryFiles } = await (0, utils_1.getStaticFiles)(entryPath, entryDirectory, outputDirectory);
@@ -47572,6 +47575,9 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             ...notFoundPreviewRoutes,
             ...headers,
             ...redirects,
+            // middleware comes directly after redirects but before
+            // beforeFiles rewrites as middleware is not a "file" route
+            ...(isCorrectMiddlewareOrder ? middleware.staticRoutes : []),
             ...beforeFilesRewrites,
             // Make sure to 404 for the /404 path itself
             ...(i18n
@@ -47611,7 +47617,10 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                             continue: true,
                         },
                     ]),
-            ...middleware.staticRoutes,
+            // while middleware was in beta the order came right before
+            // handle: 'filesystem' we maintain this for older versions
+            // to prevent a local/deploy mismatch
+            ...(!isCorrectMiddlewareOrder ? middleware.staticRoutes : []),
             // Next.js page lambdas, `static/` folder, reserved assets, and `public/`
             // folder
             { handle: 'filesystem' },
@@ -49223,7 +49232,7 @@ async function getPrivateOutputs(dir, entries) {
     return { files, routes };
 }
 exports.getPrivateOutputs = getPrivateOutputs;
-async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest, }) {
+async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest, isCorrectMiddlewareOrder, }) {
     const middlewareManifest = await getMiddlewareManifest(entryPath, outputDirectory);
     if (middlewareManifest && middlewareManifest?.sortedMiddleware.length > 0) {
         const workerConfigs = await Promise.all(middlewareManifest.sortedMiddleware.map(async (key) => {
@@ -49293,10 +49302,12 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
             source.edgeFunctions[edgeFile] = worker.edgeFunction;
             const route = {
                 continue: true,
-                override: true,
                 middlewarePath: edgeFile,
                 src: worker.routeSrc,
             };
+            if (isCorrectMiddlewareOrder) {
+                route.override = true;
+            }
             if (routesManifest.version > 3 && isDynamicRoute(worker.page)) {
                 source.dynamicRouteMap.set(worker.page, route);
             }

package/dist/server-build.js

@@ -17,6 +17,7 @@ const escape_string_regexp_1 = __importDefault(require("escape-string-regexp"));
 const pretty_bytes_1 = __importDefault(require("pretty-bytes"));
 // related PR: https://github.com/vercel/next.js/pull/30046
 const CORRECT_NOT_FOUND_ROUTES_VERSION = 'v12.0.1';
+const CORRECT_MIDDLEWARE_ORDER_VERSION = 'v12.1.7-canary.29';
 async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs, baseDir, workPath, entryPath, nodeVersion, escapedBuildId, dynamicPrefix, entryDirectory, outputDirectory, redirects, beforeFilesRewrites, afterFilesRewrites, fallbackRewrites, headers, dataRoutes, hasIsr404Page, imagesManifest, wildcardConfig, routesManifest, staticPages, lambdaPages, nextVersion, canUsePreviewMode, prerenderManifest, omittedPrerenderRoutes, trailingSlashRedirects, isCorrectLocaleAPIRoutes, lambdaCompressedByteLimit, requiredServerFilesManifest, }) {
     const lambdas = {};
     const prerenders = {};
@@ -24,6 +25,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
     const internalPages = ['_app.js', '_error.js', '_document.js'];
     const pageBuildTraces = await (0, build_utils_1.glob)('**/*.js.nft.json', pagesDir);
     const isCorrectNotFoundRoutes = semver_1.default.gte(nextVersion, CORRECT_NOT_FOUND_ROUTES_VERSION);
+    const isCorrectMiddlewareOrder = semver_1.default.gte(nextVersion, CORRECT_MIDDLEWARE_ORDER_VERSION);
     let hasStatic500 = !!staticPages[path_1.default.join(entryDirectory, '500')];
     if (lambdaPageKeys.length === 0) {
         throw new build_utils_1.NowBuildError({
@@ -413,6 +415,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
         entryPath,
         outputDirectory,
         routesManifest,
+        isCorrectMiddlewareOrder,
     });
     const dynamicRoutes = await (0, utils_1.getDynamicRoutes)(entryPath, entryDirectory, dynamicPages, false, routesManifest, omittedPrerenderRoutes, canUsePreviewMode, prerenderManifest.bypassToken || '', true, middleware.dynamicRouteMap).then(arr => (0, utils_1.localizeDynamicRoutes)(arr, dynamicPrefix, entryDirectory, staticPages, prerenderManifest, routesManifest, true, isCorrectLocaleAPIRoutes));
     const { staticFiles, publicDirectoryFiles, staticDirectoryFiles } = await (0, utils_1.getStaticFiles)(entryPath, entryDirectory, outputDirectory);
@@ -579,6 +582,9 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             ...notFoundPreviewRoutes,
             ...headers,
             ...redirects,
+            // middleware comes directly after redirects but before
+            // beforeFiles rewrites as middleware is not a "file" route
+            ...(isCorrectMiddlewareOrder ? middleware.staticRoutes : []),
             ...beforeFilesRewrites,
             // Make sure to 404 for the /404 path itself
             ...(i18n
@@ -618,7 +624,10 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                             continue: true,
                         },
                     ]),
-            ...middleware.staticRoutes,
+            // while middleware was in beta the order came right before
+            // handle: 'filesystem' we maintain this for older versions
+            // to prevent a local/deploy mismatch
+            ...(!isCorrectMiddlewareOrder ? middleware.staticRoutes : []),
             // Next.js page lambdas, `static/` folder, reserved assets, and `public/`
             // folder
             { handle: 'filesystem' },

package/dist/utils.js

@@ -1334,7 +1334,7 @@ async function getPrivateOutputs(dir, entries) {
     return { files, routes };
 }
 exports.getPrivateOutputs = getPrivateOutputs;
-async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest, }) {
+async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest, isCorrectMiddlewareOrder, }) {
     const middlewareManifest = await getMiddlewareManifest(entryPath, outputDirectory);
     if (middlewareManifest && middlewareManifest?.sortedMiddleware.length > 0) {
         const workerConfigs = await Promise.all(middlewareManifest.sortedMiddleware.map(async (key) => {
@@ -1404,10 +1404,12 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
             source.edgeFunctions[edgeFile] = worker.edgeFunction;
             const route = {
                 continue: true,
-                override: true,
                 middlewarePath: edgeFile,
                 src: worker.routeSrc,
             };
+            if (isCorrectMiddlewareOrder) {
+                route.override = true;
+            }
             if (routesManifest.version > 3 && isDynamicRoute(worker.page)) {
                 source.dynamicRouteMap.set(worker.page, route);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.0.0",
+  "version": "3.0.1-canary.0",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -45,7 +45,7 @@
     "@types/semver": "6.0.0",
     "@types/text-table": "0.2.1",
     "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "4.0.0",
+    "@vercel/build-utils": "4.0.1-canary.0",
     "@vercel/nft": "0.19.1",
     "@vercel/routing-utils": "1.13.4",
     "async-sema": "3.0.1",
@@ -70,5 +70,5 @@
     "typescript": "4.5.2",
     "webpack-sources": "3.2.3"
   },
-  "gitHead": "de0d2fba0b32588726a2799015eaff4e6bb65ffb"
+  "gitHead": "39f758662131ec37c467ebba5d5b618cba0c753f"
 }