@vercel/build-utils 2.12.3-canary.38 → 2.12.3-canary.39

package/dist/convert-runtime-to-plugin.js

@@ -78,7 +78,6 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
         `api-routes-${pluginName}`);
         await fs_extra_1.default.ensureDir(traceDir);
         let newPathsRuntime = new Set();
-        let linkersRuntime = [];
         const entryDir = path_1.join('.output', 'server', 'pages');
         const entryRoot = path_1.join(workPath, entryDir);
         for (const entrypoint of Object.keys(entrypoints)) {
@@ -185,56 +184,22 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
                     }
                 }
             }
-            const tracedFiles = [];
-            const linkers = Object.entries(lambdaFiles).map(async ([relPath, file]) => {
-                const newPath = path_1.join(traceDir, relPath);
-                // The handler was already moved into position above.
-                if (relPath === handlerFileBase) {
-                    return;
-                }
-                tracedFiles.push({ absolutePath: newPath, relativePath: relPath });
-                const { fsPath, type } = file;
-                if (fsPath) {
-                    await fs_extra_1.default.ensureDir(path_1.dirname(newPath));
-                    const isNewFile = newFilesEntrypoint.includes(fsPath);
-                    const isInsideNewDirectory = newDirectoriesEntrypoint.some(dirPath => {
-                        return fsPath.startsWith(dirPath);
-                    });
-                    // With this, we're making sure that files in the `workPath` that existed
-                    // before the Legacy Runtime was invoked (source files) are linked from
-                    // `.output` instead of copying there (the latter only happens if linking fails),
-                    // which is the fastest solution. However, files that are created fresh
-                    // by the Legacy Runtimes are always copied, because their link destinations
-                    // are likely to be overwritten every time an entrypoint is processed by
-                    // the Legacy Runtime. This is likely to overwrite the destination on subsequent
-                    // runs, but that's also how `workPath` used to work originally, without
-                    // the File System API (meaning that there was one `workPath` for all entrypoints).
-                    if (isNewFile || isInsideNewDirectory) {
-                        _1.debug(`Copying from ${fsPath} to ${newPath}`);
-                        await fs_extra_1.default.copy(fsPath, newPath);
-                    }
-                    else {
-                        await linkOrCopy(fsPath, newPath);
-                    }
-                }
-                else if (type === 'FileBlob') {
-                    const { data, mode } = file;
-                    await fs_extra_1.default.writeFile(newPath, data, { mode });
-                }
-                else {
-                    throw new Error(`Unknown file type: ${type}`);
-                }
-            });
-            linkersRuntime = linkersRuntime.concat(linkers);
             const nft = `${entry}.nft.json`;
             const json = JSON.stringify({
-                version: 1,
-                files: tracedFiles.map(file => ({
-                    input: normalize_path_1.normalizePath(path_1.relative(path_1.dirname(nft), file.absolutePath)),
-                    // We'd like to place all the dependency files right next
-                    // to the final launcher file inside of the Lambda.
-                    output: normalize_path_1.normalizePath(path_1.join(entryDir, 'api', file.relativePath)),
-                })),
+                version: 2,
+                files: Object.keys(lambdaFiles)
+                    .map(file => {
+                    const { fsPath } = lambdaFiles[file];
+                    if (!fsPath) {
+                        throw new Error(`File "${file}" is missing valid \`fsPath\` property`);
+                    }
+                    // The handler was already moved into position above.
+                    if (file === handlerFileBase) {
+                        return;
+                    }
+                    return normalize_path_1.normalizePath(path_1.relative(path_1.dirname(nft), fsPath));
+                })
+                    .filter(Boolean),
             });
             await fs_extra_1.default.ensureDir(path_1.dirname(nft));
             await fs_extra_1.default.writeFile(nft, json);
@@ -261,11 +226,6 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
                 allowQuery: output.allowQuery,
             };
         }
-        // Instead of of waiting for all of the linking to be done for every
-        // entrypoint before processing the next one, we immediately handle all
-        // of them one after the other, while then waiting for the linking
-        // to finish right here, before we clean up newly created files below.
-        await Promise.all(linkersRuntime);
         // A list of all the files that were created by the Legacy Runtime,
         // which we'd like to remove from the File System.
         const toRemove = Array.from(newPathsRuntime).map(path => {
@@ -284,16 +244,6 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
     };
 }
 exports.convertRuntimeToPlugin = convertRuntimeToPlugin;
-async function linkOrCopy(existingPath, newPath) {
-    try {
-        await fs_extra_1.default.createLink(existingPath, newPath);
-    }
-    catch (err) {
-        if (err.code !== 'EEXIST') {
-            await fs_extra_1.default.copyFile(existingPath, newPath);
-        }
-    }
-}
 async function readJson(filePath) {
     try {
         const str = await fs_extra_1.default.readFile(filePath, 'utf8');
@@ -314,7 +264,7 @@ async function updateFunctionsManifest({ workPath, pages, }) {
     const functionsManifestPath = path_1.join(workPath, '.output', 'functions-manifest.json');
     const functionsManifest = await readJson(functionsManifestPath);
     if (!functionsManifest.version)
-        functionsManifest.version = 1;
+        functionsManifest.version = 2;
     if (!functionsManifest.pages)
         functionsManifest.pages = {};
     for (const [pageKey, pageConfig] of Object.entries(pages)) {

package/dist/index.js

@@ -32760,7 +32760,6 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
         `api-routes-${pluginName}`);
         await fs_extra_1.default.ensureDir(traceDir);
         let newPathsRuntime = new Set();
-        let linkersRuntime = [];
         const entryDir = path_1.join('.output', 'server', 'pages');
         const entryRoot = path_1.join(workPath, entryDir);
         for (const entrypoint of Object.keys(entrypoints)) {
@@ -32867,56 +32866,22 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
                     }
                 }
             }
-            const tracedFiles = [];
-            const linkers = Object.entries(lambdaFiles).map(async ([relPath, file]) => {
-                const newPath = path_1.join(traceDir, relPath);
-                // The handler was already moved into position above.
-                if (relPath === handlerFileBase) {
-                    return;
-                }
-                tracedFiles.push({ absolutePath: newPath, relativePath: relPath });
-                const { fsPath, type } = file;
-                if (fsPath) {
-                    await fs_extra_1.default.ensureDir(path_1.dirname(newPath));
-                    const isNewFile = newFilesEntrypoint.includes(fsPath);
-                    const isInsideNewDirectory = newDirectoriesEntrypoint.some(dirPath => {
-                        return fsPath.startsWith(dirPath);
-                    });
-                    // With this, we're making sure that files in the `workPath` that existed
-                    // before the Legacy Runtime was invoked (source files) are linked from
-                    // `.output` instead of copying there (the latter only happens if linking fails),
-                    // which is the fastest solution. However, files that are created fresh
-                    // by the Legacy Runtimes are always copied, because their link destinations
-                    // are likely to be overwritten every time an entrypoint is processed by
-                    // the Legacy Runtime. This is likely to overwrite the destination on subsequent
-                    // runs, but that's also how `workPath` used to work originally, without
-                    // the File System API (meaning that there was one `workPath` for all entrypoints).
-                    if (isNewFile || isInsideNewDirectory) {
-                        _1.debug(`Copying from ${fsPath} to ${newPath}`);
-                        await fs_extra_1.default.copy(fsPath, newPath);
-                    }
-                    else {
-                        await linkOrCopy(fsPath, newPath);
-                    }
-                }
-                else if (type === 'FileBlob') {
-                    const { data, mode } = file;
-                    await fs_extra_1.default.writeFile(newPath, data, { mode });
-                }
-                else {
-                    throw new Error(`Unknown file type: ${type}`);
-                }
-            });
-            linkersRuntime = linkersRuntime.concat(linkers);
             const nft = `${entry}.nft.json`;
             const json = JSON.stringify({
-                version: 1,
-                files: tracedFiles.map(file => ({
-                    input: normalize_path_1.normalizePath(path_1.relative(path_1.dirname(nft), file.absolutePath)),
-                    // We'd like to place all the dependency files right next
-                    // to the final launcher file inside of the Lambda.
-                    output: normalize_path_1.normalizePath(path_1.join(entryDir, 'api', file.relativePath)),
-                })),
+                version: 2,
+                files: Object.keys(lambdaFiles)
+                    .map(file => {
+                    const { fsPath } = lambdaFiles[file];
+                    if (!fsPath) {
+                        throw new Error(`File "${file}" is missing valid \`fsPath\` property`);
+                    }
+                    // The handler was already moved into position above.
+                    if (file === handlerFileBase) {
+                        return;
+                    }
+                    return normalize_path_1.normalizePath(path_1.relative(path_1.dirname(nft), fsPath));
+                })
+                    .filter(Boolean),
             });
             await fs_extra_1.default.ensureDir(path_1.dirname(nft));
             await fs_extra_1.default.writeFile(nft, json);
@@ -32943,11 +32908,6 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
                 allowQuery: output.allowQuery,
             };
         }
-        // Instead of of waiting for all of the linking to be done for every
-        // entrypoint before processing the next one, we immediately handle all
-        // of them one after the other, while then waiting for the linking
-        // to finish right here, before we clean up newly created files below.
-        await Promise.all(linkersRuntime);
         // A list of all the files that were created by the Legacy Runtime,
         // which we'd like to remove from the File System.
         const toRemove = Array.from(newPathsRuntime).map(path => {
@@ -32966,16 +32926,6 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
     };
 }
 exports.convertRuntimeToPlugin = convertRuntimeToPlugin;
-async function linkOrCopy(existingPath, newPath) {
-    try {
-        await fs_extra_1.default.createLink(existingPath, newPath);
-    }
-    catch (err) {
-        if (err.code !== 'EEXIST') {
-            await fs_extra_1.default.copyFile(existingPath, newPath);
-        }
-    }
-}
 async function readJson(filePath) {
     try {
         const str = await fs_extra_1.default.readFile(filePath, 'utf8');
@@ -32996,7 +32946,7 @@ async function updateFunctionsManifest({ workPath, pages, }) {
     const functionsManifestPath = path_1.join(workPath, '.output', 'functions-manifest.json');
     const functionsManifest = await readJson(functionsManifestPath);
     if (!functionsManifest.version)
-        functionsManifest.version = 1;
+        functionsManifest.version = 2;
     if (!functionsManifest.pages)
         functionsManifest.pages = {};
     for (const [pageKey, pageConfig] of Object.entries(pages)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "2.12.3-canary.38",
+  "version": "2.12.3-canary.39",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -49,5 +49,5 @@
     "typescript": "4.3.4",
     "yazl": "2.4.3"
   },
-  "gitHead": "6792edf32a1a81f240cc1b5c9f9cc756a9a2b83b"
+  "gitHead": "2c86ac654ccde97426127fd0a6ffd04253227c50"
 }