Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(edge-runtime): undefined global in edge runtime. #38769

Merged
merged 3 commits into from
Jul 20, 2022

Conversation

feugy
Copy link
Member

@feugy feugy commented Jul 18, 2022

How to reproduce

  1. create a next.js app with a middleware (or an edge route) that imports a node.js module:

    // middleware.js
    import { NextResponse } from 'next/server'
    import { basename } from 'path'
    
    export default async function middleware() {
      basename()
      return NextResponse.next()
    }
  2. deploy it to vercel with vc

  3. go to the your function logs in Vercel Front (https://vercel.com/$user/$project/$deployment/functions)

  4. in another tab, query your application

    it results in a 500 page:

    image

    in the logs you should see:

    image

Expected behavior

The route should fail indeed in a 500, because Edge runtime does not support node.js modules. However the error in logs should be completely different:

error - Error: The edge runtime does not support Node.js 'path' module.
Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime

Notes to reviewers

I introduced this issue in #38234.
Prior to the PR above, the app would not even build, as we were checking imported node.js module during the build with AST analysis.
Since #38234, the app would build and should fail at runtime, with an appropriate error.

The mistake was to declare __import_unsupported function in the sandbox's context, that is only used in next dev and next start, but not shipped to Vercel platform.

By loading it inside webpack loaders (both middleware and edge route), we ensure it will be defined on Vercel as well.

The existing test suite (pnpm testheadless --testPathPattern=runtime-module-error) covers them.

@ijjk
Copy link
Member

ijjk commented Jul 18, 2022

Stats from current PR

Default Build (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary feugy/next.js fix/__import_unsupported-is-undefined Change
buildDuration 21.7s 21.2s -467ms
buildDurationCached 7.3s 7.3s ⚠️ +27ms
nodeModulesSize 2.26 GB 2.26 GB ⚠️ +646 B
nextStartRea..uration (ms) 303ms 297ms -6ms
nextDevReadyDuration 322ms 330ms ⚠️ +8ms
Page Load Tests Overall decrease ⚠️
vercel/next.js canary feugy/next.js fix/__import_unsupported-is-undefined Change
/ failed reqs 0 0
/ total time (seconds) 4.646 4.7 ⚠️ +0.05
/ avg req/sec 538.09 531.92 ⚠️ -6.17
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.883 1.941 ⚠️ +0.06
/error-in-render avg req/sec 1327.43 1287.89 ⚠️ -39.54
Client Bundles (main, webpack) Overall decrease ✓
vercel/next.js canary feugy/next.js fix/__import_unsupported-is-undefined Change
299.HASH.js gzip 179 B 180 B ⚠️ +1 B
framework-HASH.js gzip 42 kB 42 kB
main-HASH.js gzip 30.7 kB 30.7 kB -20 B
webpack-HASH.js gzip 1.54 kB 1.54 kB ⚠️ +1 B
Overall change 74.5 kB 74.5 kB -18 B
Legacy Client Bundles (polyfills)
vercel/next.js canary feugy/next.js fix/__import_unsupported-is-undefined Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages Overall decrease ✓
vercel/next.js canary feugy/next.js fix/__import_unsupported-is-undefined Change
_app-HASH.js gzip 831 B 828 B -3 B
_error-HASH.js gzip 194 B 194 B
amp-HASH.js gzip 495 B 498 B ⚠️ +3 B
css-HASH.js gzip 328 B 328 B
dynamic-HASH.js gzip 2.47 kB 2.47 kB
head-HASH.js gzip 356 B 353 B -3 B
hooks-HASH.js gzip 805 B 805 B
image-HASH.js gzip 5.21 kB 5.2 kB -9 B
index-HASH.js gzip 263 B 263 B
link-HASH.js gzip 2.42 kB 2.42 kB ⚠️ +3 B
routerDirect..HASH.js gzip 321 B 320 B -1 B
script-HASH.js gzip 391 B 392 B ⚠️ +1 B
withRouter-HASH.js gzip 318 B 319 B ⚠️ +1 B
85e02e95b279..7e3.css gzip 107 B 107 B
Overall change 14.5 kB 14.5 kB -8 B
Client Build Manifests
vercel/next.js canary feugy/next.js fix/__import_unsupported-is-undefined Change
_buildManifest.js gzip 459 B 459 B
Overall change 459 B 459 B
Rendered Page Sizes Overall increase ⚠️
vercel/next.js canary feugy/next.js fix/__import_unsupported-is-undefined Change
index.html gzip 519 B 522 B ⚠️ +3 B
link.html gzip 534 B 537 B ⚠️ +3 B
withRouter.html gzip 515 B 516 B ⚠️ +1 B
Overall change 1.57 kB 1.57 kB ⚠️ +7 B
Middleware size Overall increase ⚠️
vercel/next.js canary feugy/next.js fix/__import_unsupported-is-undefined Change
middleware.js gzip 16.9 kB 17.4 kB ⚠️ +418 B
edge-runtime..pack.js gzip 1.83 kB 1.83 kB
Overall change 18.8 kB 19.2 kB ⚠️ +418 B

Diffs

Diff for middleware.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [826],
   {
-    /***/ 776: /***/ (
+    /***/ 457: /***/ (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -14,17 +14,13 @@
         /* harmony export */
       });
       /* harmony import */ var next_dist_server_web_adapter__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(
-        222
+        35
       );
 
-      // The condition is true when the "process" module is provided
-      if (process !== __webpack_require__.g.process) {
-        // prefer local process but global.process has correct "env"
-        process.env = __webpack_require__.g.process.env;
-        __webpack_require__.g.process = process;
-      }
+      (0,
+      next_dist_server_web_adapter__WEBPACK_IMPORTED_MODULE_0__ /* .enhanceGlobals */.gL)();
 
-      var mod = __webpack_require__(561);
+      var mod = __webpack_require__(429);
       var handler = mod.middleware || mod.default;
 
       if (typeof handler !== "function") {
@@ -50,7 +46,7 @@
       /***/
     },
 
-    /***/ 561: /***/ (
+    /***/ 429: /***/ (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -62,7 +58,7 @@
         /* harmony export */
       });
       /* harmony import */ var next_server__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(
-        335
+        897
       );
       /* harmony import */ var next_server__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(
         next_server__WEBPACK_IMPORTED_MODULE_0__
@@ -75,7 +71,7 @@
       /***/
     },
 
-    /***/ 436: /***/ (__unused_webpack_module, exports) => {
+    /***/ 7: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -95,7 +91,7 @@
       /***/
     },
 
-    /***/ 249: /***/ (__unused_webpack_module, exports) => {
+    /***/ 363: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -133,7 +129,7 @@
       /***/
     },
 
-    /***/ 719: /***/ (__unused_webpack_module, exports) => {
+    /***/ 427: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -165,7 +161,7 @@
       /***/
     },
 
-    /***/ 604: /***/ (
+    /***/ 858: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -176,8 +172,8 @@
         value: true
       });
       exports.addLocale = addLocale;
-      var _addPathPrefix = __webpack_require__(341);
-      var _pathHasPrefix = __webpack_require__(919);
+      var _addPathPrefix = __webpack_require__(280);
+      var _pathHasPrefix = __webpack_require__(26);
       function addLocale(path, locale, defaultLocale, ignorePrefix) {
         if (
           locale &&
@@ -197,7 +193,7 @@
       /***/
     },
 
-    /***/ 341: /***/ (
+    /***/ 280: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -208,7 +204,7 @@
         value: true
       });
       exports.addPathPrefix = addPathPrefix;
-      var _parsePath = __webpack_require__(445);
+      var _parsePath = __webpack_require__(747);
       function addPathPrefix(path, prefix) {
         if (!path.startsWith("/") || !prefix) {
           return path;
@@ -220,7 +216,7 @@
       /***/
     },
 
-    /***/ 706: /***/ (
+    /***/ 575: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -231,7 +227,7 @@
         value: true
       });
       exports.addPathSuffix = addPathSuffix;
-      var _parsePath = __webpack_require__(445);
+      var _parsePath = __webpack_require__(747);
       function addPathSuffix(path, suffix) {
         if (!path.startsWith("/") || !suffix) {
           return path;
@@ -243,7 +239,7 @@
       /***/
     },
 
-    /***/ 705: /***/ (
+    /***/ 512: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -254,10 +250,10 @@
         value: true
       });
       exports.formatNextPathnameInfo = formatNextPathnameInfo;
-      var _removeTrailingSlash = __webpack_require__(930);
-      var _addPathPrefix = __webpack_require__(341);
-      var _addPathSuffix = __webpack_require__(706);
-      var _addLocale = __webpack_require__(604);
+      var _removeTrailingSlash = __webpack_require__(106);
+      var _addPathPrefix = __webpack_require__(280);
+      var _addPathSuffix = __webpack_require__(575);
+      var _addLocale = __webpack_require__(858);
       function formatNextPathnameInfo(info) {
         let pathname = (0, _addLocale).addLocale(
           info.pathname,
@@ -285,7 +281,7 @@
       /***/
     },
 
-    /***/ 599: /***/ (
+    /***/ 399: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -296,9 +292,9 @@
         value: true
       });
       exports.getNextPathnameInfo = getNextPathnameInfo;
-      var _normalizeLocalePath = __webpack_require__(719);
-      var _removePathPrefix = __webpack_require__(217);
-      var _pathHasPrefix = __webpack_require__(919);
+      var _normalizeLocalePath = __webpack_require__(427);
+      var _removePathPrefix = __webpack_require__(751);
+      var _pathHasPrefix = __webpack_require__(26);
       function getNextPathnameInfo(pathname, options) {
         var _nextConfig;
         const { basePath, i18n, trailingSlash } =
@@ -348,7 +344,7 @@
       /***/
     },
 
-    /***/ 445: /***/ (__unused_webpack_module, exports) => {
+    /***/ 747: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -384,18 +380,14 @@
       /***/
     },
 
-    /***/ 919: /***/ (
-      __unused_webpack_module,
-      exports,
-      __webpack_require__
-    ) => {
+    /***/ 26: /***/ (__unused_webpack_module, exports, __webpack_require__) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
       exports.pathHasPrefix = pathHasPrefix;
-      var _parsePath = __webpack_require__(445);
+      var _parsePath = __webpack_require__(747);
       function pathHasPrefix(path, prefix) {
         if (typeof path !== "string") {
           return false;
@@ -407,7 +399,7 @@
       /***/
     },
 
-    /***/ 142: /***/ (__unused_webpack_module, exports) => {
+    /***/ 753: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -426,7 +418,7 @@
       /***/
     },
 
-    /***/ 217: /***/ (
+    /***/ 751: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -437,7 +429,7 @@
         value: true
       });
       exports.removePathPrefix = removePathPrefix;
-      var _pathHasPrefix = __webpack_require__(919);
+      var _pathHasPrefix = __webpack_require__(26);
       function removePathPrefix(path, prefix) {
         if ((0, _pathHasPrefix).pathHasPrefix(path, prefix)) {
           const withoutPrefix = path.slice(prefix.length);
@@ -451,7 +443,7 @@
       /***/
     },
 
-    /***/ 930: /***/ (__unused_webpack_module, exports) => {
+    /***/ 106: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -465,7 +457,7 @@
       /***/
     },
 
-    /***/ 748: /***/ module => {
+    /***/ 54: /***/ module => {
       var __dirname = "/";
       (() => {
         "use strict";
@@ -593,7 +585,7 @@
       /***/
     },
 
-    /***/ 491: /***/ (module, exports, __webpack_require__) => {
+    /***/ 826: /***/ (module, exports, __webpack_require__) => {
       var __dirname = "/";
       var __WEBPACK_AMD_DEFINE_RESULT__;
       (() => {
@@ -1435,11 +1427,7 @@
       /***/
     },
 
-    /***/ 222: /***/ (
-      __unused_webpack_module,
-      exports,
-      __webpack_require__
-    ) => {
+    /***/ 35: /***/ (__unused_webpack_module, exports, __webpack_require__) => {
       "use strict";
       var __webpack_unused_export__;
 
@@ -1448,13 +1436,14 @@
       };
       exports.VL = adapter;
       exports.OT = blockUnallowedResponse;
-      var _error = __webpack_require__(626);
-      var _utils = __webpack_require__(20);
-      var _fetchEvent = __webpack_require__(575);
-      var _request = __webpack_require__(989);
-      var _response = __webpack_require__(690);
-      var _relativizeUrl = __webpack_require__(142);
-      var _nextUrl = __webpack_require__(685);
+      exports.gL = enhanceGlobals;
+      var _error = __webpack_require__(182);
+      var _utils = __webpack_require__(93);
+      var _fetchEvent = __webpack_require__(339);
+      var _request = __webpack_require__(67);
+      var _response = __webpack_require__(367);
+      var _relativizeUrl = __webpack_require__(753);
+      var _nextUrl = __webpack_require__(322);
       async function adapter(params) {
         const requestUrl = new _nextUrl.NextURL(params.request.url, {
           headers: params.request.headers,
@@ -1593,6 +1582,51 @@
           return result;
         });
       }
+      function enhanceGlobals() {
+        // The condition is true when the "process" module is provided
+        if (process !== __webpack_require__.g.process) {
+          // prefer local process but global.process has correct "env"
+          process.env = __webpack_require__.g.process.env;
+          __webpack_require__.g.process = process;
+        }
+        // to allow building code that import but does not use node.js modules,
+        // webpack will expect this function to exist in global scope
+        Object.defineProperty(globalThis, "__import_unsupported", {
+          value: __import_unsupported,
+          enumerable: false,
+          configurable: false
+        });
+      }
+      function __import_unsupported(moduleName) {
+        const proxy = new Proxy(function() {}, {
+          get(_obj, prop) {
+            if (prop === "then") {
+              return {};
+            }
+            throw new Error(getUnsupportedModuleErrorMessage(moduleName));
+          },
+          construct() {
+            throw new Error(getUnsupportedModuleErrorMessage(moduleName));
+          },
+          apply(_target, _this, args) {
+            if (typeof args[0] === "function") {
+              return args[0](proxy);
+            }
+            throw new Error(getUnsupportedModuleErrorMessage(moduleName));
+          }
+        });
+        return new Proxy(
+          {},
+          {
+            get: () => proxy
+          }
+        );
+      }
+      function getUnsupportedModuleErrorMessage(module) {
+        // warning: if you change these messages, you must adjust how react-dev-overlay's middleware detects modules not found
+        return `The edge runtime does not support Node.js '${module}' module.
+Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
+      }
       class NextRequestHint extends _request.NextRequest {
         constructor(params) {
           super(params.input, params.init);
@@ -1620,7 +1654,7 @@
       /***/
     },
 
-    /***/ 626: /***/ (__unused_webpack_module, exports) => {
+    /***/ 182: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -1661,7 +1695,7 @@
       /***/
     },
 
-    /***/ 685: /***/ (
+    /***/ 322: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1671,10 +1705,10 @@
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
-      var _detectDomainLocale = __webpack_require__(249);
-      var _formatNextPathnameInfo = __webpack_require__(705);
-      var _getHostname = __webpack_require__(436);
-      var _getNextPathnameInfo = __webpack_require__(599);
+      var _detectDomainLocale = __webpack_require__(363);
+      var _formatNextPathnameInfo = __webpack_require__(512);
+      var _getHostname = __webpack_require__(7);
+      var _getNextPathnameInfo = __webpack_require__(399);
       const Internal = Symbol("NextURLInternal");
       class NextURL {
         constructor(input, baseOrOpts, opts) {
@@ -1895,7 +1929,7 @@
       /***/
     },
 
-    /***/ 114: /***/ (
+    /***/ 256: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1911,8 +1945,8 @@
           return _types.CookieSerializeOptions;
         }
       });
-      var _cookie = _interopRequireDefault(__webpack_require__(748));
-      var _types = __webpack_require__(229);
+      var _cookie = _interopRequireDefault(__webpack_require__(54));
+      var _types = __webpack_require__(880);
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -2044,7 +2078,7 @@
       /***/
     },
 
-    /***/ 575: /***/ (
+    /***/ 339: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -2055,7 +2089,7 @@
         value: true
       });
       exports.waitUntilSymbol = void 0;
-      var _error = __webpack_require__(626);
+      var _error = __webpack_require__(182);
       const responseSymbol = Symbol("response");
       const passThroughSymbol = Symbol("passThrough");
       const waitUntilSymbol = Symbol("waitUntil");
@@ -2108,21 +2142,17 @@
       /***/
     },
 
-    /***/ 989: /***/ (
-      __unused_webpack_module,
-      exports,
-      __webpack_require__
-    ) => {
+    /***/ 67: /***/ (__unused_webpack_module, exports, __webpack_require__) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
       exports.INTERNALS = void 0;
-      var _nextUrl = __webpack_require__(685);
-      var _utils = __webpack_require__(20);
-      var _error = __webpack_require__(626);
-      var _cookies = __webpack_require__(114);
+      var _nextUrl = __webpack_require__(322);
+      var _utils = __webpack_require__(93);
+      var _error = __webpack_require__(182);
+      var _cookies = __webpack_require__(256);
       const INTERNALS = Symbol("internal request");
       exports.INTERNALS = INTERNALS;
       class NextRequest extends Request {
@@ -2169,7 +2199,7 @@
       /***/
     },
 
-    /***/ 690: /***/ (
+    /***/ 367: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -2179,9 +2209,9 @@
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
-      var _nextUrl = __webpack_require__(685);
-      var _utils = __webpack_require__(20);
-      var _cookies = __webpack_require__(114);
+      var _nextUrl = __webpack_require__(322);
+      var _utils = __webpack_require__(93);
+      var _cookies = __webpack_require__(256);
       const INTERNALS = Symbol("internal response");
       const REDIRECTS = new Set([301, 302, 303, 307, 308]);
       class NextResponse extends Response {
@@ -2256,7 +2286,7 @@
       /***/
     },
 
-    /***/ 240: /***/ (
+    /***/ 932: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -2270,7 +2300,7 @@
       __webpack_unused_export__ = isBot;
       exports.Nf = userAgentFromString;
       exports.WE = userAgent;
-      var _uaParserJs = _interopRequireDefault(__webpack_require__(491));
+      var _uaParserJs = _interopRequireDefault(__webpack_require__(826));
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -2298,7 +2328,7 @@
       /***/
     },
 
-    /***/ 229: /***/ (__unused_webpack_module, exports) => {
+    /***/ 880: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -2310,7 +2340,7 @@
       /***/
     },
 
-    /***/ 20: /***/ (__unused_webpack_module, exports) => {
+    /***/ 93: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -2425,17 +2455,17 @@
       /***/
     },
 
-    /***/ 335: /***/ (
+    /***/ 897: /***/ (
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) => {
       module.exports = {
-        NextRequest: __webpack_require__(989).NextRequest,
-        NextResponse: __webpack_require__(690).NextResponse,
-        userAgentFromString: __webpack_require__(240) /* .userAgentFromString */
+        NextRequest: __webpack_require__(67).NextRequest,
+        NextResponse: __webpack_require__(367).NextResponse,
+        userAgentFromString: __webpack_require__(932) /* .userAgentFromString */
           .Nf,
-        userAgent: __webpack_require__(240) /* .userAgent */.WE
+        userAgent: __webpack_require__(932) /* .userAgent */.WE
       };
 
       /***/
@@ -2445,7 +2475,7 @@
     // webpackRuntimeModules
     /******/ var __webpack_exec__ = moduleId =>
       __webpack_require__((__webpack_require__.s = moduleId));
-    /******/ var __webpack_exports__ = __webpack_exec__(776);
+    /******/ var __webpack_exports__ = __webpack_exec__(457);
     /******/ (_ENTRIES =
       typeof _ENTRIES === "undefined"
         ? {}
Diff for _buildManifest.js
@@ -1,25 +1,25 @@
 self.__BUILD_MANIFEST = {
   __rewrites: { beforeFiles: [], afterFiles: [], fallback: [] },
-  "/": ["static\u002Fchunks\u002Fpages\u002Findex-006025f296d93d1f.js"],
-  "/_error": ["static\u002Fchunks\u002Fpages\u002F_error-ec6f2dc249481230.js"],
-  "/amp": ["static\u002Fchunks\u002Fpages\u002Famp-a331316989d05f14.js"],
+  "/": ["static\u002Fchunks\u002Fpages\u002Findex-1ecb7a225a122304.js"],
+  "/_error": ["static\u002Fchunks\u002Fpages\u002F_error-7c674188292aca70.js"],
+  "/amp": ["static\u002Fchunks\u002Fpages\u002Famp-abb2ab71d4fb2340.js"],
   "/css": [
     "static\u002Fcss\u002F94fdbc56eafa2039.css",
-    "static\u002Fchunks\u002Fpages\u002Fcss-68d7610c482ac563.js"
+    "static\u002Fchunks\u002Fpages\u002Fcss-100e45427e857c65.js"
   ],
   "/dynamic": [
-    "static\u002Fchunks\u002Fpages\u002Fdynamic-3137f3fcef911984.js"
+    "static\u002Fchunks\u002Fpages\u002Fdynamic-f7dcf0e6a86067b9.js"
   ],
-  "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-c040cbe8d466bcb1.js"],
-  "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-691547ee2366d57c.js"],
-  "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-d0e0710bc503b145.js"],
-  "/link": ["static\u002Fchunks\u002Fpages\u002Flink-be3e9efacb7d72bc.js"],
+  "/head": ["static\u002Fchunks\u002Fpages\u002Fhead-d456b89ea2e58ccb.js"],
+  "/hooks": ["static\u002Fchunks\u002Fpages\u002Fhooks-0b406ece32365f1b.js"],
+  "/image": ["static\u002Fchunks\u002Fpages\u002Fimage-91ab0fd4386a6eb0.js"],
+  "/link": ["static\u002Fchunks\u002Fpages\u002Flink-283f4ef6a5db960d.js"],
   "/routerDirect": [
-    "static\u002Fchunks\u002Fpages\u002FrouterDirect-19c824ccc8950973.js"
+    "static\u002Fchunks\u002Fpages\u002FrouterDirect-8a036a4ae9e5d6ed.js"
   ],
-  "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-c3bfac97d4fbba00.js"],
+  "/script": ["static\u002Fchunks\u002Fpages\u002Fscript-d318755acc6c0b22.js"],
   "/withRouter": [
-    "static\u002Fchunks\u002Fpages\u002FwithRouter-d6891bab587638a3.js"
+    "static\u002Fchunks\u002Fpages\u002FwithRouter-dee19dca16003991.js"
   ],
   sortedPages: [
     "\u002F",
Diff for _app-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [888],
   {
-    /***/ 3479: /***/ function(
+    /***/ 122: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/_app",
         function() {
-          return __webpack_require__(5909);
+          return __webpack_require__(777);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 5909: /***/ function(
+    /***/ 777: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -35,7 +35,7 @@
         .Z;
       var _createSuper = __webpack_require__(6320) /* ["default"] */.Z;
       var _runtimeJs = /*#__PURE__*/ _interopRequireDefault(
-        __webpack_require__(739)
+        __webpack_require__(3994)
       );
       Object.defineProperty(exports, "__esModule", {
         value: true
@@ -54,7 +54,7 @@
       });
       exports["default"] = void 0;
       var _react = _interopRequireDefault1(__webpack_require__(9496));
-      var _utils = __webpack_require__(2973);
+      var _utils = __webpack_require__(6326);
       function asyncGeneratorStep(
         gen,
         resolve,
@@ -184,7 +184,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 179], function() {
-      return __webpack_exec__(3479), __webpack_exec__(3668);
+      return __webpack_exec__(122), __webpack_exec__(7489);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for _error-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [820],
   {
-    /***/ 2929: /***/ function(
+    /***/ 3560: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/_error",
         function() {
-          return __webpack_require__(9103);
+          return __webpack_require__(2509);
         }
       ]);
       if (false) {
@@ -24,7 +24,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 774, 179], function() {
-      return __webpack_exec__(2929);
+      return __webpack_exec__(3560);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for amp-HASH.js
@@ -1,17 +1,17 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [216],
   {
-    /***/ 94: /***/ function(
+    /***/ 7941: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(2562);
+      module.exports = __webpack_require__(6824);
 
       /***/
     },
 
-    /***/ 9028: /***/ function(
+    /***/ 8958: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -19,7 +19,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/amp",
         function() {
-          return __webpack_require__(6385);
+          return __webpack_require__(9302);
         }
       ]);
       if (false) {
@@ -28,7 +28,7 @@
       /***/
     },
 
-    /***/ 2562: /***/ function(module, exports, __webpack_require__) {
+    /***/ 6824: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -36,8 +36,8 @@
       });
       exports.useAmp = useAmp;
       var _react = _interopRequireDefault(__webpack_require__(9496));
-      var _ampContext = __webpack_require__(2556);
-      var _ampMode = __webpack_require__(7853);
+      var _ampContext = __webpack_require__(5789);
+      var _ampMode = __webpack_require__(9208);
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -66,7 +66,7 @@
       /***/
     },
 
-    /***/ 6385: /***/ function(
+    /***/ 9302: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -83,7 +83,7 @@
         /* harmony export */
       });
       /* harmony import */ var next_amp__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(
-        94
+        7941
       );
       /* harmony import */ var next_amp__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(
         next_amp__WEBPACK_IMPORTED_MODULE_0__
@@ -107,7 +107,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 774, 179], function() {
-      return __webpack_exec__(9028);
+      return __webpack_exec__(8958);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for css-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [706],
   {
-    /***/ 8281: /***/ function(
+    /***/ 9557: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/css",
         function() {
-          return __webpack_require__(4347);
+          return __webpack_require__(79);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 4347: /***/ function(
+    /***/ 79: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -29,7 +29,7 @@
         4637
       );
       /* harmony import */ var _css_module_css__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        4542
+        2054
       );
       /* harmony import */ var _css_module_css__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
         _css_module_css__WEBPACK_IMPORTED_MODULE_1__
@@ -48,7 +48,7 @@
       /***/
     },
 
-    /***/ 4542: /***/ function(module) {
+    /***/ 2054: /***/ function(module) {
       // extracted by mini-css-extract-plugin
       module.exports = { helloWorld: "css_helloWorld__qqNwY" };
 
@@ -61,7 +61,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(8281);
+      return __webpack_exec__(9557);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for dynamic-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [739],
   {
-    /***/ 2744: /***/ function(
+    /***/ 5695: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/dynamic",
         function() {
-          return __webpack_require__(5547);
+          return __webpack_require__(9525);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 3005: /***/ function(module, exports, __webpack_require__) {
+    /***/ 6014: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -31,7 +31,7 @@
       exports["default"] = dynamic;
       exports.noSSR = noSSR;
       var _react = _interopRequireDefault(__webpack_require__(9496));
-      var _loadable = _interopRequireDefault(__webpack_require__(9675));
+      var _loadable = _interopRequireDefault(__webpack_require__(7679));
       function dynamic(dynamicOptions, options) {
         var loadableFn = _loadable.default;
         var loadableOptions = {
@@ -150,7 +150,7 @@
       /***/
     },
 
-    /***/ 577: /***/ function(
+    /***/ 8416: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -177,7 +177,7 @@
       /***/
     },
 
-    /***/ 9675: /***/ function(
+    /***/ 7679: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -194,7 +194,7 @@
       });
       exports["default"] = void 0;
       var _react = _interopRequireDefault(__webpack_require__(9496));
-      var _loadableContext = __webpack_require__(577);
+      var _loadableContext = __webpack_require__(8416);
       function _extends() {
         _extends =
           Object.assign ||
@@ -531,7 +531,7 @@
       /***/
     },
 
-    /***/ 5547: /***/ function(
+    /***/ 9525: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -548,7 +548,7 @@
         4637
       );
       /* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        1605
+        2123
       );
       /* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
         next_dynamic__WEBPACK_IMPORTED_MODULE_1__
@@ -557,13 +557,13 @@
       var DynamicHello = next_dynamic__WEBPACK_IMPORTED_MODULE_1___default()(
         function() {
           return __webpack_require__
-            .e(/* import() */ 299)
-            .then(__webpack_require__.bind(__webpack_require__, 5299));
+            .e(/* import() */ 128)
+            .then(__webpack_require__.bind(__webpack_require__, 5128));
         },
         {
           loadableGenerated: {
             webpack: function() {
-              return [/*require.resolve*/ 5299];
+              return [/*require.resolve*/ 5128];
             }
           }
         }
@@ -593,12 +593,12 @@
       /***/
     },
 
-    /***/ 1605: /***/ function(
+    /***/ 2123: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(3005);
+      module.exports = __webpack_require__(6014);
 
       /***/
     },
@@ -700,7 +700,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(2744);
+      return __webpack_exec__(5695);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for head-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [645],
   {
-    /***/ 4337: /***/ function(
+    /***/ 7148: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/head",
         function() {
-          return __webpack_require__(9288);
+          return __webpack_require__(7481);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 9288: /***/ function(
+    /***/ 7481: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -35,7 +35,7 @@
         4637
       );
       /* harmony import */ var next_head__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        8915
+        4616
       );
       /* harmony import */ var next_head__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
         next_head__WEBPACK_IMPORTED_MODULE_1__
@@ -71,12 +71,12 @@
       /***/
     },
 
-    /***/ 8915: /***/ function(
+    /***/ 4616: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(681);
+      module.exports = __webpack_require__(4790);
 
       /***/
     }
@@ -87,7 +87,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(4337);
+      return __webpack_exec__(7148);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for hooks-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [757],
   {
-    /***/ 4853: /***/ function(
+    /***/ 3515: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/hooks",
         function() {
-          return __webpack_require__(8367);
+          return __webpack_require__(1253);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 8367: /***/ function(
+    /***/ 1253: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -132,7 +132,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(4853);
+      return __webpack_exec__(3515);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for image-HASH.js
@@ -26,7 +26,7 @@
       /***/
     },
 
-    /***/ 7570: /***/ function(
+    /***/ 1487: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -34,7 +34,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/image",
         function() {
-          return __webpack_require__(1576);
+          return __webpack_require__(4789);
         }
       ]);
       if (false) {
@@ -43,7 +43,7 @@
       /***/
     },
 
-    /***/ 8976: /***/ function(module, exports, __webpack_require__) {
+    /***/ 361: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -57,12 +57,12 @@
       });
       exports["default"] = Image;
       var _react = _interopRequireWildcard(__webpack_require__(9496));
-      var _head = _interopRequireDefault(__webpack_require__(681));
-      var _imageConfig = __webpack_require__(5282);
-      var _useIntersection = __webpack_require__(227);
-      var _imageConfigContext = __webpack_require__(8584);
-      var _utils = __webpack_require__(2973);
-      var _normalizeTrailingSlash = __webpack_require__(3892);
+      var _head = _interopRequireDefault(__webpack_require__(4790));
+      var _imageConfig = __webpack_require__(5676);
+      var _useIntersection = __webpack_require__(5668);
+      var _imageConfigContext = __webpack_require__(76);
+      var _utils = __webpack_require__(6326);
+      var _normalizeTrailingSlash = __webpack_require__(7600);
       function Image(_param) {
         var src = _param.src,
           sizes = _param.sizes,
@@ -1004,7 +1004,7 @@
       /***/
     },
 
-    /***/ 227: /***/ function(module, exports, __webpack_require__) {
+    /***/ 5668: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -1016,7 +1016,7 @@
       });
       exports.useIntersection = useIntersection;
       var _react = __webpack_require__(9496);
-      var _requestIdleCallback = __webpack_require__(5757);
+      var _requestIdleCallback = __webpack_require__(5617);
       var hasIntersectionObserver = typeof IntersectionObserver === "function";
       function useIntersection(param) {
         var rootRef = param.rootRef,
@@ -1149,7 +1149,7 @@
       /***/
     },
 
-    /***/ 1576: /***/ function(
+    /***/ 4789: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -1170,8 +1170,8 @@
 
       // EXTERNAL MODULE: ./node_modules/.pnpm/[email protected]/node_modules/react/jsx-runtime.js
       var jsx_runtime = __webpack_require__(4637);
-      // EXTERNAL MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_sfoxds7t5ydpegc3knd667wn6m/node_modules/next/image.js
-      var next_image = __webpack_require__(8114);
+      // EXTERNAL MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_sfoxds7t5ydpegc3knd667wn6m/node_modules/next/image.js
+      var next_image = __webpack_require__(4033);
       var image_default = /*#__PURE__*/ __webpack_require__.n(next_image); // CONCATENATED MODULE: ./pages/nextjs.png
       /* harmony default export */ var nextjs = {
         src: "/_next/static/media/nextjs.cae0b805.png",
@@ -1199,12 +1199,12 @@
       /***/
     },
 
-    /***/ 8114: /***/ function(
+    /***/ 4033: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(8976);
+      module.exports = __webpack_require__(361);
 
       /***/
     }
@@ -1215,7 +1215,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(7570);
+      return __webpack_exec__(1487);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for index-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [405],
   {
-    /***/ 4786: /***/ function(
+    /***/ 6967: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/",
         function() {
-          return __webpack_require__(5355);
+          return __webpack_require__(3973);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 5355: /***/ function(
+    /***/ 3973: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -46,7 +46,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [888, 774, 179], function() {
-      return __webpack_exec__(4786);
+      return __webpack_exec__(6967);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for link-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [644],
   {
-    /***/ 2783: /***/ function(
+    /***/ 9367: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/link",
         function() {
-          return __webpack_require__(4917);
+          return __webpack_require__(1849);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 8494: /***/ function(module, exports) {
+    /***/ 1908: /***/ function(module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -54,7 +54,7 @@
       /***/
     },
 
-    /***/ 861: /***/ function(module, exports, __webpack_require__) {
+    /***/ 882: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -67,13 +67,13 @@
       });
       exports["default"] = void 0;
       var _react = _interopRequireDefault(__webpack_require__(9496));
-      var _router = __webpack_require__(7733);
-      var _addLocale = __webpack_require__(6049);
-      var _routerContext = __webpack_require__(2488);
-      var _appRouterContext = __webpack_require__(1849);
-      var _useIntersection = __webpack_require__(227);
-      var _getDomainLocale = __webpack_require__(8494);
-      var _addBasePath = __webpack_require__(5090);
+      var _router = __webpack_require__(8340);
+      var _addLocale = __webpack_require__(9465);
+      var _routerContext = __webpack_require__(1349);
+      var _appRouterContext = __webpack_require__(3407);
+      var _useIntersection = __webpack_require__(5668);
+      var _getDomainLocale = __webpack_require__(1908);
+      var _addBasePath = __webpack_require__(8126);
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -428,7 +428,7 @@
       /***/
     },
 
-    /***/ 227: /***/ function(module, exports, __webpack_require__) {
+    /***/ 5668: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -440,7 +440,7 @@
       });
       exports.useIntersection = useIntersection;
       var _react = __webpack_require__(9496);
-      var _requestIdleCallback = __webpack_require__(5757);
+      var _requestIdleCallback = __webpack_require__(5617);
       var hasIntersectionObserver = typeof IntersectionObserver === "function";
       function useIntersection(param) {
         var rootRef = param.rootRef,
@@ -573,7 +573,7 @@
       /***/
     },
 
-    /***/ 1849: /***/ function(
+    /***/ 3407: /***/ function(
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -604,7 +604,7 @@
       /***/
     },
 
-    /***/ 4917: /***/ function(
+    /***/ 1849: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -621,7 +621,7 @@
         4637
       );
       /* harmony import */ var next_link__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        8168
+        8728
       );
       /* harmony import */ var next_link__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
         next_link__WEBPACK_IMPORTED_MODULE_1__
@@ -652,12 +652,12 @@
       /***/
     },
 
-    /***/ 8168: /***/ function(
+    /***/ 8728: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(861);
+      module.exports = __webpack_require__(882);
 
       /***/
     }
@@ -668,7 +668,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(2783);
+      return __webpack_exec__(9367);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for routerDirect-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [58],
   {
-    /***/ 5863: /***/ function(
+    /***/ 4538: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/routerDirect",
         function() {
-          return __webpack_require__(7585);
+          return __webpack_require__(7451);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 7585: /***/ function(
+    /***/ 7451: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -35,7 +35,7 @@
         4637
       );
       /* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        9393
+        7084
       );
       /* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
         next_router__WEBPACK_IMPORTED_MODULE_1__
@@ -57,12 +57,12 @@
       /***/
     },
 
-    /***/ 9393: /***/ function(
+    /***/ 7084: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(3668);
+      module.exports = __webpack_require__(7489);
 
       /***/
     }
@@ -73,7 +73,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(5863);
+      return __webpack_exec__(4538);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for script-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [797],
   {
-    /***/ 581: /***/ function(
+    /***/ 2644: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/script",
         function() {
-          return __webpack_require__(6723);
+          return __webpack_require__(5292);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 6723: /***/ function(
+    /***/ 5292: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -35,7 +35,7 @@
         4637
       );
       /* harmony import */ var next_script__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        2311
+        7635
       );
       /* harmony import */ var next_script__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
         next_script__WEBPACK_IMPORTED_MODULE_1__
@@ -70,12 +70,12 @@
       /***/
     },
 
-    /***/ 2311: /***/ function(
+    /***/ 7635: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(3948);
+      module.exports = __webpack_require__(3951);
 
       /***/
     }
@@ -86,7 +86,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(581);
+      return __webpack_exec__(2644);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for withRouter-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [807],
   {
-    /***/ 4573: /***/ function(
+    /***/ 5577: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/withRouter",
         function() {
-          return __webpack_require__(667);
+          return __webpack_require__(2161);
         }
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 667: /***/ function(
+    /***/ 2161: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -35,7 +35,7 @@
         4637
       );
       /* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(
-        9393
+        7084
       );
       /* harmony import */ var next_router__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
         next_router__WEBPACK_IMPORTED_MODULE_1__
@@ -54,12 +54,12 @@
       /***/
     },
 
-    /***/ 9393: /***/ function(
+    /***/ 7084: /***/ function(
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      module.exports = __webpack_require__(3668);
+      module.exports = __webpack_require__(7489);
 
       /***/
     }
@@ -70,7 +70,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [774, 888, 179], function() {
-      return __webpack_exec__(4573);
+      return __webpack_exec__(5577);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for 299.HASH.js
@@ -1,8 +1,8 @@
 "use strict";
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
-  [299],
+  [128],
   {
-    /***/ 5299: /***/ function(
+    /***/ 5128: /***/ function(
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
Diff for framework-HASH.js
@@ -19,7 +19,7 @@
  Modernizr 3.0.0pre (Custom Build) | MIT
 */
       var aa = __webpack_require__(9496),
-        m = __webpack_require__(9260),
+        m = __webpack_require__(2048),
         r = __webpack_require__(8051);
       function y(a) {
         for (
@@ -7895,7 +7895,7 @@
        * This source code is licensed under the MIT license found in the
        * LICENSE file in the root directory of this source tree.
        */
-      __webpack_require__(9260);
+      __webpack_require__(2048);
       var f = __webpack_require__(9496),
         g = 60103;
       exports.Fragment = 60107;
@@ -7948,7 +7948,7 @@
        * This source code is licensed under the MIT license found in the
        * LICENSE file in the root directory of this source tree.
        */
-      var l = __webpack_require__(9260),
+      var l = __webpack_require__(2048),
         n = 60103,
         p = 60106;
       exports.Fragment = 60107;
Diff for main-HASH.js
@@ -736,7 +736,7 @@
       /***/
     },
 
-    /***/ 9260: /***/ function(module) {
+    /***/ 2048: /***/ function(module) {
       "use strict";
 
       var assign = Object.assign.bind(Object);
@@ -748,7 +748,7 @@
       /***/
     },
 
-    /***/ 1326: /***/ function() {
+    /***/ 3071: /***/ function() {
       "trimStart" in String.prototype ||
         (String.prototype.trimStart = String.prototype.trimLeft),
         "trimEnd" in String.prototype ||
@@ -792,15 +792,15 @@
       /***/
     },
 
-    /***/ 5090: /***/ function(module, exports, __webpack_require__) {
+    /***/ 8126: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
       exports.addBasePath = addBasePath;
-      var _addPathPrefix = __webpack_require__(3795);
-      var _normalizeTrailingSlash = __webpack_require__(3892);
+      var _addPathPrefix = __webpack_require__(6341);
+      var _normalizeTrailingSlash = __webpack_require__(7600);
       var basePath = false || "";
       function addBasePath(path, required) {
         if (false) {
@@ -824,7 +824,7 @@
       /***/
     },
 
-    /***/ 6049: /***/ function(module, exports, __webpack_require__) {
+    /***/ 9465: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -835,7 +835,7 @@
         value: true
       });
       exports.addLocale = void 0;
-      var _normalizeTrailingSlash = __webpack_require__(3892);
+      var _normalizeTrailingSlash = __webpack_require__(7600);
       var addLocale = function(path) {
         for (
           var _len = arguments.length,
@@ -867,7 +867,7 @@
       /***/
     },
 
-    /***/ 4354: /***/ function(module, exports, __webpack_require__) {
+    /***/ 5770: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -906,14 +906,14 @@
       /***/
     },
 
-    /***/ 6926: /***/ function(module, exports, __webpack_require__) {
+    /***/ 6298: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
       exports.hasBasePath = hasBasePath;
-      var _pathHasPrefix = __webpack_require__(4298);
+      var _pathHasPrefix = __webpack_require__(7189);
       var basePath = false || "";
       function hasBasePath(path) {
         return (0, _pathHasPrefix).pathHasPrefix(path, basePath);
@@ -933,7 +933,7 @@
       /***/
     },
 
-    /***/ 7172: /***/ function(module, exports, __webpack_require__) {
+    /***/ 4862: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -1111,7 +1111,7 @@
       /***/
     },
 
-    /***/ 3215: /***/ function(module, exports, __webpack_require__) {
+    /***/ 864: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -1127,7 +1127,7 @@
       var _slicedToArray = __webpack_require__(8693) /* ["default"] */.Z;
       var _createSuper = __webpack_require__(6320) /* ["default"] */.Z;
       var _runtimeJs = /*#__PURE__*/ _interopRequireDefault(
-        __webpack_require__(739)
+        __webpack_require__(3994)
       );
       Object.defineProperty(exports, "__esModule", {
         value: true
@@ -1135,27 +1135,27 @@
       exports.initialize = initialize;
       exports.hydrate = hydrate;
       exports.emitter = exports.router = exports.version = void 0;
-      __webpack_require__(1326);
+      __webpack_require__(3071);
       var _react = _interopRequireWildcard1(__webpack_require__(9496));
-      var _headManagerContext = __webpack_require__(9043);
-      var _mitt = _interopRequireDefault1(__webpack_require__(7097));
-      var _routerContext = __webpack_require__(2488);
-      var _isDynamic = __webpack_require__(7046);
-      var _querystring = __webpack_require__(3742);
-      var _runtimeConfig = __webpack_require__(5780);
-      var _utils = __webpack_require__(2973);
-      var _portal = __webpack_require__(2321);
-      var _headManager = _interopRequireDefault1(__webpack_require__(7172));
-      var _pageLoader = _interopRequireDefault1(__webpack_require__(7822));
+      var _headManagerContext = __webpack_require__(5533);
+      var _mitt = _interopRequireDefault1(__webpack_require__(5228));
+      var _routerContext = __webpack_require__(1349);
+      var _isDynamic = __webpack_require__(8227);
+      var _querystring = __webpack_require__(8418);
+      var _runtimeConfig = __webpack_require__(537);
+      var _utils = __webpack_require__(6326);
+      var _portal = __webpack_require__(1278);
+      var _headManager = _interopRequireDefault1(__webpack_require__(4862));
+      var _pageLoader = _interopRequireDefault1(__webpack_require__(689));
       var _performanceRelayer = _interopRequireDefault1(
-        __webpack_require__(3367)
+        __webpack_require__(5148)
       );
-      var _routeAnnouncer = __webpack_require__(9851);
-      var _router = __webpack_require__(3668);
-      var _isError = __webpack_require__(467);
-      var _imageConfigContext = __webpack_require__(8584);
-      var _removeBasePath = __webpack_require__(8117);
-      var _hasBasePath = __webpack_require__(6926);
+      var _routeAnnouncer = __webpack_require__(6314);
+      var _router = __webpack_require__(7489);
+      var _isError = __webpack_require__(6040);
+      var _imageConfigContext = __webpack_require__(76);
+      var _removeBasePath = __webpack_require__(976);
+      var _hasBasePath = __webpack_require__(6298);
       function asyncGeneratorStep(
         gen,
         resolve,
@@ -1456,7 +1456,7 @@
                     if (false) {
                     }
                     if (initialData.scriptLoader) {
-                      initScriptLoader = __webpack_require__(3948)
+                      initScriptLoader = __webpack_require__(3951)
                         .initScriptLoader;
                       initScriptLoader(initialData.scriptLoader);
                     }
@@ -1776,7 +1776,7 @@
               ? Promise.resolve()
                   .then(function() {
                     return /*#__PURE__*/ _interopRequireWildcard(
-                      __webpack_require__(9103)
+                      __webpack_require__(2509)
                     );
                   })
                   .then(function(m) {
@@ -2202,10 +2202,10 @@
       /***/
     },
 
-    /***/ 7205: /***/ function(module, exports, __webpack_require__) {
+    /***/ 9916: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
-      var _ = __webpack_require__(3215);
+      var _ = __webpack_require__(864);
       window.next = {
         version: _.version,
         // router is initialized later so it has to be live-binded
@@ -2235,15 +2235,15 @@
       /***/
     },
 
-    /***/ 3892: /***/ function(module, exports, __webpack_require__) {
+    /***/ 7600: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
       exports.normalizePathTrailingSlash = void 0;
-      var _removeTrailingSlash = __webpack_require__(7131);
-      var _parsePath = __webpack_require__(2478);
+      var _removeTrailingSlash = __webpack_require__(390);
+      var _parsePath = __webpack_require__(3429);
       var normalizePathTrailingSlash = function(path) {
         if (!path.startsWith("/")) {
           return path;
@@ -2275,7 +2275,7 @@
       /***/
     },
 
-    /***/ 7822: /***/ function(module, exports, __webpack_require__) {
+    /***/ 689: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -2287,16 +2287,16 @@
         value: true
       });
       exports["default"] = void 0;
-      var _addBasePath = __webpack_require__(5090);
-      var _router = __webpack_require__(7733);
+      var _addBasePath = __webpack_require__(8126);
+      var _router = __webpack_require__(8340);
       var _getAssetPathFromRoute = _interopRequireDefault(
-        __webpack_require__(7862)
+        __webpack_require__(8153)
       );
-      var _addLocale = __webpack_require__(6049);
-      var _isDynamic = __webpack_require__(7046);
-      var _parseRelativeUrl = __webpack_require__(860);
-      var _removeTrailingSlash = __webpack_require__(7131);
-      var _routeLoader = __webpack_require__(9042);
+      var _addLocale = __webpack_require__(9465);
+      var _isDynamic = __webpack_require__(8227);
+      var _parseRelativeUrl = __webpack_require__(6893);
+      var _removeTrailingSlash = __webpack_require__(390);
+      var _routeLoader = __webpack_require__(4358);
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -2448,14 +2448,14 @@
       /***/
     },
 
-    /***/ 3367: /***/ function(module, exports, __webpack_require__) {
+    /***/ 5148: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
       exports["default"] = void 0;
-      var _webVitals = __webpack_require__(5583);
+      var _webVitals = __webpack_require__(4867);
       var initialHref = location.href;
       var isRegistered = false;
       var userReportHandler;
@@ -2503,7 +2503,7 @@
       /***/
     },
 
-    /***/ 2321: /***/ function(module, exports, __webpack_require__) {
+    /***/ 1278: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -2565,14 +2565,14 @@
       /***/
     },
 
-    /***/ 8117: /***/ function(module, exports, __webpack_require__) {
+    /***/ 976: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
       exports.removeBasePath = removeBasePath;
-      var _hasBasePath = __webpack_require__(6926);
+      var _hasBasePath = __webpack_require__(6298);
       var basePath = false || "";
       function removeBasePath(path) {
         if (false) {
@@ -2596,14 +2596,14 @@
       /***/
     },
 
-    /***/ 6736: /***/ function(module, exports, __webpack_require__) {
+    /***/ 8953: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
       exports.removeLocale = removeLocale;
-      var _parsePath = __webpack_require__(2478);
+      var _parsePath = __webpack_require__(3429);
       function removeLocale(path, locale) {
         if (false) {
           var localeLower, pathLower, pathname;
@@ -2625,7 +2625,7 @@
       /***/
     },
 
-    /***/ 5757: /***/ function(module, exports) {
+    /***/ 5617: /***/ function(module, exports) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -2671,7 +2671,7 @@
       /***/
     },
 
-    /***/ 9851: /***/ function(module, exports, __webpack_require__) {
+    /***/ 6314: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -2684,7 +2684,7 @@
       exports.RouteAnnouncer = RouteAnnouncer;
       exports["default"] = void 0;
       var _react = _interopRequireDefault(__webpack_require__(9496));
-      var _router = __webpack_require__(3668);
+      var _router = __webpack_require__(7489);
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule
           ? obj
@@ -2768,7 +2768,7 @@
       /***/
     },
 
-    /***/ 9042: /***/ function(module, exports, __webpack_require__) {
+    /***/ 4358: /***/ function(module, exports, __webpack_require__) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -2779,10 +2779,10 @@
       exports.getClientBuil
Post job cleanup.
[command]/usr/bin/git version
git version 2.37.1
Temporarily overriding HOME='/home/runner/work/_temp/daf21bd5-2f6f-4c40-a219-50cbcd8fe83c' before making global git config changes
Adding repository directory to the temporary git global config as a safe directory
[command]/usr/bin/git config --global --add safe.directory /home/runner/work/next.js/next.js
[command]/usr/bin/git config --local --name-only --get-regexp core\.sshCommand
[command]/usr/bin/git submodule foreach --recursive git config --local --name-only --get-regexp 'core\.sshCommand' && git config --local --unset-all 'core.sshCommand' || :
[command]/usr/bin/git config --local --name-only --get-regexp http\.https\:\/\/github\.com\/\.extraheader
http.https://github.com/.extraheader
[command]/usr/bin/git config --local --unset-all http.https://github.com/.extraheader
[command]/usr/bin/git submodule foreach --recursive git config --local --name-only --get-regexp 'http\.https\:\/\/github\.com\/\.extraheader' && git config --local --unset-all 'http.https://github.com/.extraheader' || :
Cleaning up orphan processes
Commit: e37a7ed5d39a6570d5c8b7c5c12ed9485c7f956e

Copy link
Member

@ijjk ijjk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for looking into this! It seems I'm still seeing this error on this test deployment with these changes applied

Do we need to ensure enhanceGlobals is called in the adapter itself as well?

When running on Vercel middleware or edge function importing a node.js modules, the result is a 500 error with  "ReferenceError: __import_unsupported is not defined" message
@feugy feugy force-pushed the fix/__import_unsupported-is-undefined branch from 62fbd10 to 85445fe Compare July 19, 2022 12:13
@feugy
Copy link
Member Author

feugy commented Jul 19, 2022

@ijjk thanks for the true-end-to-end-testing!
I managed to reproduce it, and to get it fixed. Webpack is magically handling global variable, and my code in the adapter was run, but not extending the "real" global object.
I've solved it by being explicitly using globalThis.__import_unsupported in middleware-plugin.ts and in the adapter.

Now it's producing the expected error in Vercel logs:
image

Copy link
Member

@ijjk ijjk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@kodiakhq kodiakhq bot merged commit 851e9ae into vercel:canary Jul 20, 2022
feugy added a commit to feugy/next.js that referenced this pull request Jul 20, 2022
## How to reproduce

1. create a next.js app with a middleware (or an edge route) that imports a node.js module:
   ```js
   // middleware.js
   import { NextResponse } from 'next/server'
   import { basename } from 'path'
   
   export default async function middleware() {
     basename()
     return NextResponse.next()
   }
   ```
2. deploy it to vercel with `vc`
3. go to the your function logs in Vercel Front (https://vercel.com/$user/$project/$deployment/functions)
4. in another tab, query your application
   > it results in a 500 page:
   <img width="517" alt="image" src="https://user-images.githubusercontent.com/186268/179557102-72568ca9-bcfd-49e2-9b9c-c51c3064f2d7.png">

    >  in the logs you should see:
   <img width="1220" alt="image" src="https://user-images.githubusercontent.com/186268/179557266-498f3290-b7df-46ac-8816-7bb396821245.png">

## Expected behavior

The route should fail indeed in a 500, because Edge runtime **does not support node.js modules**. However the error in logs should be completely different:
```shell
error - Error: The edge runtime does not support Node.js 'path' module.
Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime
```

## Notes to reviewers

I introduced this issue in vercel#38234.
Prior to the PR above, the app would not even build, as we were checking imported node.js module during the build with AST analysis.
Since vercel#38234, the app would build and should fail at runtime, with an appropriate error.

The mistake was to declare `__import_unsupported` function in the sandbox's context, that is only used in `next dev` and `next start`, but not shipped to Vercel platform.

By loading it inside webpack loaders (both middleware and edge route), we ensure it will be defined on Vercel as well. 

The existing test suite (`pnpm testheadless --testPathPattern=runtime-module-error`) covers them.
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 20, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants