Fix next/image 404 when basePath and trailingSlash defined

[styfle]

• Fixes [BUG] ImageComponent does not work when combine trailingSlash and basePath #36681

[ijjk]

Stats from current PR

Default Build (Decrease detected ✓)

General Overall decrease ✓

	vercel/next.js canary	vercel/next.js styfle/next-322-images-fail	Change
buildDuration	35.3s	34.1s	-1.2s
buildDurationCached	14.5s	10s	-4.5s
nodeModulesSize	95 MB	95 MB	✓
nextStartRea..uration (ms)	284ms	275ms	-9ms

Client Bundles (main, webpack)

	vercel/next.js canary	vercel/next.js styfle/next-322-images-fail	Change
152-HASH.js gzip	64.5 kB	64.5 kB	✓
53.HASH.js gzip	182 B	182 B	✓
main-app-HASH.js gzip	205 B	205 B	✓
main-HASH.js gzip	79.2 kB	79.2 kB	✓
webpack-HASH.js gzip	1.7 kB	1.7 kB	✓
Overall change	146 kB	146 kB	✓

Legacy Client Bundles (polyfills)

	vercel/next.js canary	vercel/next.js styfle/next-322-images-fail	Change
polyfills-HASH.js gzip	31 kB	31 kB	✓
Overall change	31 kB	31 kB	✓

Client Pages

	vercel/next.js canary	vercel/next.js styfle/next-322-images-fail	Change
_app-HASH.js gzip	192 B	192 B	✓
_error-HASH.js gzip	179 B	179 B	✓
amp-HASH.js gzip	484 B	484 B	✓
css-HASH.js gzip	804 B	804 B	✓
dynamic-HASH.js gzip	2.29 kB	2.29 kB	✓
edge-ssr-HASH.js gzip	255 B	255 B	✓
head-HASH.js gzip	827 B	827 B	✓
hooks-HASH.js gzip	848 B	848 B	✓
image-HASH.js gzip	4.3 kB	4.3 kB	✓
index-HASH.js gzip	252 B	252 B	✓
link-HASH.js gzip	2.69 kB	2.69 kB	✓
routerDirect..HASH.js gzip	782 B	782 B	✓
script-HASH.js gzip	857 B	857 B	✓
withRouter-HASH.js gzip	781 B	781 B	✓
85e02e95b279..7e3.css gzip	107 B	107 B	✓
Overall change	15.6 kB	15.6 kB	✓

Client Build Manifests

	vercel/next.js canary	vercel/next.js styfle/next-322-images-fail	Change
_buildManifest.js gzip	481 B	481 B	✓
Overall change	481 B	481 B	✓

Rendered Page Sizes

	vercel/next.js canary	vercel/next.js styfle/next-322-images-fail	Change
index.html gzip	490 B	490 B	✓
link.html gzip	505 B	505 B	✓
withRouter.html gzip	485 B	485 B	✓
Overall change	1.48 kB	1.48 kB	✓

Edge SSR bundle Size Overall increase ⚠️

	vercel/next.js canary	vercel/next.js styfle/next-322-images-fail	Change
edge-ssr.js gzip	110 kB	110 kB	✓
page.js gzip	98.4 kB	98.4 kB	⚠️ +2 B
Overall change	209 kB	209 kB	⚠️ +2 B

Middleware size Overall increase ⚠️

	vercel/next.js canary	vercel/next.js styfle/next-322-images-fail	Change
middleware-b..fest.js gzip	584 B	585 B	⚠️ +1 B
middleware-r..fest.js gzip	145 B	145 B	✓
middleware.js gzip	27 kB	27 kB	✓
edge-runtime..pack.js gzip	1.83 kB	1.83 kB	✓
Overall change	29.6 kB	29.6 kB	⚠️ +1 B

Diffs

Diff for page.js

@@ -8618,14 +8618,11 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       /***/
     },
 
-    /***/ 1036: /***/ (
+    /***/ 7997: /***/ (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
     ) => {
-      Promise.resolve(/* import() eager */).then(
-        __webpack_require__.bind(__webpack_require__, 1210)
-      );
       Promise.resolve(/* import() eager */).then(
         __webpack_require__.bind(__webpack_require__, 2973)
       );
@@ -8635,6 +8632,9 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`;
       Promise.resolve(/* import() eager */).then(
         __webpack_require__.bind(__webpack_require__, 9916)
       );
+      Promise.resolve(/* import() eager */).then(
+        __webpack_require__.bind(__webpack_require__, 1210)
+      );
 
       /***/
     },

Diff for middleware-b..-manifest.js

@@ -9,7 +9,7 @@ self.__BUILD_MANIFEST = {
   rootMainFiles: [
     "static/chunks/webpack-c452a3e31b73f504.js",
     "static/chunks/152-8467c9cd7467a603.js",
-    "static/chunks/main-app-c9a0aaff35eafcb5.js"
+    "static/chunks/main-app-98f540113bfd845b.js"
   ],
   pages: {
     "/": [

Diff for main-app-HASH.js

@@ -1,14 +1,11 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [744],
   {
-    /***/ 9915: /***/ function(
+    /***/ 2014: /***/ function(
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
     ) {
-      Promise.resolve(/* import() eager */).then(
-        __webpack_require__.t.bind(__webpack_require__, 429, 23)
-      );
       Promise.resolve(/* import() eager */).then(
         __webpack_require__.t.bind(__webpack_require__, 1161, 23)
       );
@@ -18,6 +15,9 @@
       Promise.resolve(/* import() eager */).then(
         __webpack_require__.t.bind(__webpack_require__, 9379, 23)
       );
+      Promise.resolve(/* import() eager */).then(
+        __webpack_require__.t.bind(__webpack_require__, 429, 23)
+      );
 
       /***/
     }
@@ -28,7 +28,7 @@
       return __webpack_require__((__webpack_require__.s = moduleId));
     };
     /******/ __webpack_require__.O(0, [152], function() {
-      return __webpack_exec__(7070), __webpack_exec__(9915);
+      return __webpack_exec__(7070), __webpack_exec__(2014);
     });
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;

Commit: ab7ef0d