@vercel/next 3.1.22 → 3.1.25

package/dist/index.js

@@ -12930,15 +12930,12 @@ class Job {
             return;
         if (path.endsWith('.node'))
             return await sharedlib_emit_1.sharedLibEmit(path, this);
-        const handlePjsonBoundary = async (item) => {
-            // js files require the "type": "module" lookup, so always emit the package.json
-            if (item.endsWith(".js")) {
-                const pjsonBoundary = await this.getPjsonBoundary(item);
-                if (pjsonBoundary)
-                    await this.emitFile(pjsonBoundary + path_1.sep + "package.json", "resolve", item);
-            }
-        };
-        await handlePjsonBoundary(path);
+        // js files require the "type": "module" lookup, so always emit the package.json
+        if (path.endsWith('.js')) {
+            const pjsonBoundary = await this.getPjsonBoundary(path);
+            if (pjsonBoundary)
+                await this.emitFile(pjsonBoundary + path_1.sep + 'package.json', 'resolve', path);
+        }
         let analyzeResult;
         const cachedAnalysis = this.analysisCache.get(path);
         if (cachedAnalysis) {
@@ -12959,8 +12956,12 @@ class Job {
             this.esmFileList.add(path_1.relative(this.base, path));
         await Promise.all([
             ...[...assets].map(async (asset) => {
-                await handlePjsonBoundary(asset);
-                await this.emitFile(asset, 'asset', path);
+                const ext = path_1.extname(asset);
+                if (ext === '.js' || ext === '.mjs' || ext === '.node' || ext === '' ||
+                    this.ts && (ext === '.ts' || ext === '.tsx') && asset.startsWith(this.base) && asset.slice(this.base.length).indexOf(path_1.sep + 'node_modules' + path_1.sep) === -1)
+                    await this.emitDependency(asset, path);
+                else
+                    await this.emitFile(asset, 'asset', path);
             }),
             ...[...deps].map(async (dep) => {
                 try {
@@ -44471,7 +44472,7 @@ async function getServerlessPages(params) {
     const normalizedAppPaths = {};
     if (params.appPathRoutesManifest) {
         for (const [entry, normalizedEntry] of Object.entries(params.appPathRoutesManifest)) {
-            const normalizedPath = `${path_1.default.join('.', normalizedEntry)}.js`;
+            const normalizedPath = `${path_1.default.join('.', normalizedEntry === '/' ? '/index' : normalizedEntry)}.js`;
             const globPath = `${path_1.default.join('.', entry)}.js`;
             if (appPaths[globPath]) {
                 normalizedAppPaths[normalizedPath] = appPaths[globPath];
@@ -47452,7 +47453,22 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
         };
         for (const worker of workerConfigs.values()) {
             const edgeFile = worker.edgeFunction.name;
-            const shortPath = edgeFile.replace(/^pages\//, '');
+            let shortPath = edgeFile;
+            // Replacing the folder prefix for the page
+            //
+            // For `pages/`, use file base name directly:
+            //    pages/index -> index
+            // For `app/`, use folder name, handle the root page as index:
+            //    app/route/page -> route
+            //    app/page -> index
+            //    app/index/page -> index/index
+            if (shortPath.startsWith('pages/')) {
+                shortPath = shortPath.replace(/^pages\//, '');
+            }
+            else if (shortPath.startsWith('app/') && shortPath.endsWith('/page')) {
+                shortPath =
+                    shortPath.replace(/^app\//, '').replace(/(^|\/)page$/, '') || 'index';
+            }
             worker.edgeFunction.name = shortPath;
             source.edgeFunctions[shortPath] = worker.edgeFunction;
             // we don't add the route for edge functions as these

package/dist/utils.js

@@ -1454,7 +1454,22 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
         };
         for (const worker of workerConfigs.values()) {
             const edgeFile = worker.edgeFunction.name;
-            const shortPath = edgeFile.replace(/^pages\//, '');
+            let shortPath = edgeFile;
+            // Replacing the folder prefix for the page
+            //
+            // For `pages/`, use file base name directly:
+            //    pages/index -> index
+            // For `app/`, use folder name, handle the root page as index:
+            //    app/route/page -> route
+            //    app/page -> index
+            //    app/index/page -> index/index
+            if (shortPath.startsWith('pages/')) {
+                shortPath = shortPath.replace(/^pages\//, '');
+            }
+            else if (shortPath.startsWith('app/') && shortPath.endsWith('/page')) {
+                shortPath =
+                    shortPath.replace(/^app\//, '').replace(/(^|\/)page$/, '') || 'index';
+            }
             worker.edgeFunction.name = shortPath;
             source.edgeFunctions[shortPath] = worker.edgeFunction;
             // we don't add the route for edge functions as these

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.1.22",
+  "version": "3.1.25",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -44,8 +44,8 @@
     "@types/semver": "6.0.0",
     "@types/text-table": "0.2.1",
     "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "5.4.0",
-    "@vercel/nft": "0.22.0",
+    "@vercel/build-utils": "5.4.2",
+    "@vercel/nft": "0.22.1",
     "@vercel/routing-utils": "2.0.2",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",
@@ -69,5 +69,5 @@
     "typescript": "4.5.2",
     "webpack-sources": "3.2.3"
   },
-  "gitHead": "e7e0a55b72bc73c26661f7b2a3caa0884a5d1764"
+  "gitHead": "d5537500d8957985c1ffb3798659a611cc2e5d5d"
 }