@vercel/build-utils 5.0.7 → 5.1.1

package/dist/fs/download.d.ts

@@ -1,7 +1,8 @@
 import FileFsRef from '../file-fs-ref';
-import { Files, Meta } from '../types';
+import { File, Files, Meta } from '../types';
 export interface DownloadedFiles {
     [filePath: string]: FileFsRef;
 }
 export declare function isSymbolicLink(mode: number): boolean;
+export declare function downloadFile(file: File, fsPath: string): Promise<FileFsRef>;
 export default function download(files: Files, basePath: string, meta?: Meta): Promise<DownloadedFiles>;

package/dist/fs/download.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSymbolicLink = void 0;
+exports.downloadFile = exports.isSymbolicLink = void 0;
 const path_1 = __importDefault(require("path"));
 const debug_1 = __importDefault(require("../debug"));
 const file_fs_ref_1 = __importDefault(require("../file-fs-ref"));
@@ -22,7 +22,7 @@ async function prepareSymlinkTarget(file, fsPath) {
         return target;
     }
     if (file.type === 'FileRef' || file.type === 'FileBlob') {
-        const targetPathBufferPromise = await stream_to_buffer_1.default(await file.toStreamAsync());
+        const targetPathBufferPromise = stream_to_buffer_1.default(await file.toStreamAsync());
         const [targetPathBuffer] = await Promise.all([
             targetPathBufferPromise,
             mkdirPromise,
@@ -33,6 +33,9 @@ async function prepareSymlinkTarget(file, fsPath) {
 }
 async function downloadFile(file, fsPath) {
     const { mode } = file;
+    // If the source is a symlink, try to create it instead of copying the file.
+    // Note: creating symlinks on Windows requires admin priviliges or symlinks
+    // enabled in the group policy. We may want to improve the error message.
     if (isSymbolicLink(mode)) {
         const target = await prepareSymlinkTarget(file, fsPath);
         await fs_extra_1.symlink(target, fsPath);
@@ -41,6 +44,7 @@ async function downloadFile(file, fsPath) {
     const stream = file.toStream();
     return file_fs_ref_1.default.fromStream({ mode, stream, fsPath });
 }
+exports.downloadFile = downloadFile;
 async function removeFile(basePath, fileMatched) {
     const file = path_1.default.join(basePath, fileMatched);
     await fs_extra_1.remove(file);
@@ -67,6 +71,20 @@ async function download(files, basePath, meta) {
         if (Array.isArray(filesChanged) && !filesChanged.includes(name)) {
             return;
         }
+        // Some builders resolve symlinks and return both
+        // a file, node_modules/<symlink>/package.json, and
+        // node_modules/<symlink>, a symlink.
+        // Removing the file matches how the yazl lambda zip
+        // behaves so we can use download() with `vercel build`.
+        const parts = name.split('/');
+        for (let i = 1; i < parts.length; i++) {
+            const dir = parts.slice(0, i).join('/');
+            const parent = files[dir];
+            if (parent && isSymbolicLink(parent.mode)) {
+                console.warn(`Warning: file "${name}" is within a symlinked directory "${dir}" and will be ignored`);
+                return;
+            }
+        }
         const file = files[name];
         const fsPath = path_1.default.join(basePath, name);
         files2[name] = await downloadFile(file, fsPath);

package/dist/index.d.ts

@@ -4,7 +4,7 @@ import FileRef from './file-ref';
 import { Lambda, createLambda, getLambdaOptionsFromFunction } from './lambda';
 import { NodejsLambda } from './nodejs-lambda';
 import { Prerender } from './prerender';
-import download, { DownloadedFiles, isSymbolicLink } from './fs/download';
+import download, { downloadFile, DownloadedFiles, isSymbolicLink } from './fs/download';
 import getWriteableDirectory from './fs/get-writable-directory';
 import glob, { GlobOptions } from './fs/glob';
 import rename from './fs/rename';
@@ -14,7 +14,7 @@ import streamToBuffer from './fs/stream-to-buffer';
 import debug from './debug';
 import getIgnoreFilter from './get-ignore-filter';
 import { getPlatformEnv } from './get-platform-env';
-export { FileBlob, FileFsRef, FileRef, Lambda, NodejsLambda, createLambda, Prerender, download, DownloadedFiles, getWriteableDirectory, glob, GlobOptions, rename, execAsync, spawnAsync, getScriptName, installDependencies, runPackageJsonScript, execCommand, spawnCommand, walkParentDirs, getNodeBinPath, runNpmInstall, runBundleInstall, runPipInstall, runShellScript, runCustomInstallCommand, getEnvForPackageManager, getNodeVersion, getLatestNodeVersion, getDiscontinuedNodeVersions, getSpawnOptions, getPlatformEnv, streamToBuffer, debug, isSymbolicLink, getLambdaOptionsFromFunction, scanParentDirs, getIgnoreFilter, };
+export { FileBlob, FileFsRef, FileRef, Lambda, NodejsLambda, createLambda, Prerender, download, downloadFile, DownloadedFiles, getWriteableDirectory, glob, GlobOptions, rename, execAsync, spawnAsync, getScriptName, installDependencies, runPackageJsonScript, execCommand, spawnCommand, walkParentDirs, getNodeBinPath, runNpmInstall, runBundleInstall, runPipInstall, runShellScript, runCustomInstallCommand, getEnvForPackageManager, getNodeVersion, getLatestNodeVersion, getDiscontinuedNodeVersions, getSpawnOptions, getPlatformEnv, streamToBuffer, debug, isSymbolicLink, getLambdaOptionsFromFunction, scanParentDirs, getIgnoreFilter, };
 export { EdgeFunction } from './edge-function';
 export { readConfigFile } from './fs/read-config-file';
 export { normalizePath } from './fs/normalize-path';

package/dist/index.js

@@ -30471,7 +30471,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.isSymbolicLink = void 0;
+exports.downloadFile = exports.isSymbolicLink = void 0;
 const path_1 = __importDefault(__webpack_require__(5622));
 const debug_1 = __importDefault(__webpack_require__(1868));
 const file_fs_ref_1 = __importDefault(__webpack_require__(9331));
@@ -30490,7 +30490,7 @@ async function prepareSymlinkTarget(file, fsPath) {
         return target;
     }
     if (file.type === 'FileRef' || file.type === 'FileBlob') {
-        const targetPathBufferPromise = await stream_to_buffer_1.default(await file.toStreamAsync());
+        const targetPathBufferPromise = stream_to_buffer_1.default(await file.toStreamAsync());
         const [targetPathBuffer] = await Promise.all([
             targetPathBufferPromise,
             mkdirPromise,
@@ -30501,6 +30501,9 @@ async function prepareSymlinkTarget(file, fsPath) {
 }
 async function downloadFile(file, fsPath) {
     const { mode } = file;
+    // If the source is a symlink, try to create it instead of copying the file.
+    // Note: creating symlinks on Windows requires admin priviliges or symlinks
+    // enabled in the group policy. We may want to improve the error message.
     if (isSymbolicLink(mode)) {
         const target = await prepareSymlinkTarget(file, fsPath);
         await fs_extra_1.symlink(target, fsPath);
@@ -30509,6 +30512,7 @@ async function downloadFile(file, fsPath) {
     const stream = file.toStream();
     return file_fs_ref_1.default.fromStream({ mode, stream, fsPath });
 }
+exports.downloadFile = downloadFile;
 async function removeFile(basePath, fileMatched) {
     const file = path_1.default.join(basePath, fileMatched);
     await fs_extra_1.remove(file);
@@ -30535,6 +30539,20 @@ async function download(files, basePath, meta) {
         if (Array.isArray(filesChanged) && !filesChanged.includes(name)) {
             return;
         }
+        // Some builders resolve symlinks and return both
+        // a file, node_modules/<symlink>/package.json, and
+        // node_modules/<symlink>, a symlink.
+        // Removing the file matches how the yazl lambda zip
+        // behaves so we can use download() with `vercel build`.
+        const parts = name.split('/');
+        for (let i = 1; i < parts.length; i++) {
+            const dir = parts.slice(0, i).join('/');
+            const parent = files[dir];
+            if (parent && isSymbolicLink(parent.mode)) {
+                console.warn(`Warning: file "${name}" is within a symlinked directory "${dir}" and will be ignored`);
+                return;
+            }
+        }
         const file = files[name];
         const fsPath = path_1.default.join(basePath, name);
         files2[name] = await downloadFile(file, fsPath);
@@ -31444,7 +31462,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.normalizePath = exports.readConfigFile = exports.EdgeFunction = exports.getIgnoreFilter = exports.scanParentDirs = exports.getLambdaOptionsFromFunction = exports.isSymbolicLink = exports.debug = exports.streamToBuffer = exports.getPlatformEnv = exports.getSpawnOptions = exports.getDiscontinuedNodeVersions = exports.getLatestNodeVersion = exports.getNodeVersion = exports.getEnvForPackageManager = exports.runCustomInstallCommand = exports.runShellScript = exports.runPipInstall = exports.runBundleInstall = exports.runNpmInstall = exports.getNodeBinPath = exports.walkParentDirs = exports.spawnCommand = exports.execCommand = exports.runPackageJsonScript = exports.installDependencies = exports.getScriptName = exports.spawnAsync = exports.execAsync = exports.rename = exports.glob = exports.getWriteableDirectory = exports.download = exports.Prerender = exports.createLambda = exports.NodejsLambda = exports.Lambda = exports.FileRef = exports.FileFsRef = exports.FileBlob = void 0;
+exports.normalizePath = exports.readConfigFile = exports.EdgeFunction = exports.getIgnoreFilter = exports.scanParentDirs = exports.getLambdaOptionsFromFunction = exports.isSymbolicLink = exports.debug = exports.streamToBuffer = exports.getPlatformEnv = exports.getSpawnOptions = exports.getDiscontinuedNodeVersions = exports.getLatestNodeVersion = exports.getNodeVersion = exports.getEnvForPackageManager = exports.runCustomInstallCommand = exports.runShellScript = exports.runPipInstall = exports.runBundleInstall = exports.runNpmInstall = exports.getNodeBinPath = exports.walkParentDirs = exports.spawnCommand = exports.execCommand = exports.runPackageJsonScript = exports.installDependencies = exports.getScriptName = exports.spawnAsync = exports.execAsync = exports.rename = exports.glob = exports.getWriteableDirectory = exports.downloadFile = exports.download = exports.Prerender = exports.createLambda = exports.NodejsLambda = exports.Lambda = exports.FileRef = exports.FileFsRef = exports.FileBlob = void 0;
 const file_blob_1 = __importDefault(__webpack_require__(2397));
 exports.FileBlob = file_blob_1.default;
 const file_fs_ref_1 = __importDefault(__webpack_require__(9331));
@@ -31461,6 +31479,7 @@ const prerender_1 = __webpack_require__(2850);
 Object.defineProperty(exports, "Prerender", ({ enumerable: true, get: function () { return prerender_1.Prerender; } }));
 const download_1 = __importStar(__webpack_require__(1611));
 exports.download = download_1.default;
+Object.defineProperty(exports, "downloadFile", ({ enumerable: true, get: function () { return download_1.downloadFile; } }));
 Object.defineProperty(exports, "isSymbolicLink", ({ enumerable: true, get: function () { return download_1.isSymbolicLink; } }));
 const get_writable_directory_1 = __importDefault(__webpack_require__(3838));
 exports.getWriteableDirectory = get_writable_directory_1.default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "5.0.7",
+  "version": "5.1.1",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -14,8 +14,7 @@
     "build": "node build",
     "test": "jest --env node --verbose --runInBand --bail",
     "test-unit": "yarn test test/unit.*test.*",
-    "test-integration-once": "yarn test test/integration.test.ts",
-    "prepublishOnly": "node build"
+    "test-integration-once": "yarn test test/integration.test.ts"
   },
   "devDependencies": {
     "@iarna/toml": "2.2.3",
@@ -48,5 +47,5 @@
     "typescript": "4.3.4",
     "yazl": "2.5.1"
   },
-  "gitHead": "e8c7db59cf2746422f1f7e14cc6b7f901c243d50"
+  "gitHead": "5eb8b16cbdf6215618b4b8125673941757fa1a8e"
 }