@vercel/build-utils 2.14.1-canary.0 → 2.14.1-canary.3

package/.turbo/turbo-build.log

@@ -18,16 +18,16 @@ ncc: Using typescript@4.3.4 (local user-provided)
    1kB  dist/main/schemas.d.ts
    1kB  dist/main/prerender.d.ts
    1kB  dist/main/nodejs-lambda.d.ts
-   1kB  dist/main/lambda.d.ts
    1kB  dist/main/file-ref.d.ts
    1kB  dist/main/file-fs-ref.d.ts
    1kB  dist/main/file-blob.d.ts
    1kB  dist/main/errors.d.ts
    1kB  dist/main/detect-file-system-api.d.ts
    1kB  dist/main/detect-builders.d.ts
+   2kB  dist/main/lambda.d.ts
    2kB  dist/main/index.d.ts
    2kB  dist/main/detectors/filesystem.d.ts
    4kB  dist/main/fs/run-user-scripts.d.ts
   10kB  dist/main/types.d.ts
-1231kB  dist/main/index.js
-1259kB  [7510ms] - ncc 0.24.0
+1232kB  dist/main/index.js
+1261kB  [9158ms] - ncc 0.24.0

package/dist/detect-builders.js

@@ -32,12 +32,12 @@ function detectApiDirectory(builders) {
 exports.detectApiDirectory = detectApiDirectory;
 // TODO: Replace this function with `config.outputDirectory`
 function getPublicBuilder(builders) {
+    var _a;
     for (const builder of builders) {
         if (typeof builder.src === 'string' &&
             _1.isOfficialRuntime('static', builder.use) &&
             /^.*\/\*\*\/\*$/.test(builder.src) &&
-            builder.config &&
-            builder.config.zeroConfig === true) {
+            ((_a = builder.config) === null || _a === void 0 ? void 0 : _a.zeroConfig) === true) {
             return builder;
         }
     }

package/dist/fs/run-user-scripts.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="node" />
 import { SpawnOptions } from 'child_process';
 import { Meta, PackageJson, NodeVersion, Config } from '../types';
-export declare type CliType = 'yarn' | 'npm';
+export declare type CliType = 'yarn' | 'npm' | 'pnpm';
 export interface ScanParentDirsResult {
     /**
-     * "yarn" or "npm", depending on the presence of lockfiles.
+     * "yarn", "npm", or "pnpm" depending on the presence of lockfiles.
      */
     cliType: CliType;
     /**

package/dist/fs/run-user-scripts.js

@@ -12,6 +12,7 @@ const cross_spawn_1 = __importDefault(require("cross-spawn"));
 const util_1 = require("util");
 const errors_1 = require("../errors");
 const node_version_1 = require("./node-version");
+const read_config_file_1 = require("./read-config-file");
 function spawnAsync(command, args, opts = {}) {
     return new Promise((resolve, reject) => {
         const stderrLogs = [];
@@ -164,7 +165,7 @@ async function scanParentDirs(destPath, readPackageJson = false) {
                 packageJson = JSON.parse(await fs_extra_1.default.readFile(packageJsonPath, 'utf8'));
             }
             // eslint-disable-next-line no-await-in-loop
-            const [packageLockJson, hasYarnLock] = await Promise.all([
+            const [packageLockJson, hasYarnLock, pnpmLockYaml] = await Promise.all([
                 fs_extra_1.default
                     .readJson(path_1.default.join(currentDestPath, 'package-lock.json'))
                     .catch(error => {
@@ -175,15 +176,21 @@ async function scanParentDirs(destPath, readPackageJson = false) {
                     throw error;
                 }),
                 fs_extra_1.default.pathExists(path_1.default.join(currentDestPath, 'yarn.lock')),
+                read_config_file_1.readConfigFile(path_1.default.join(currentDestPath, 'pnpm-lock.yaml')),
             ]);
-            if (packageLockJson && !hasYarnLock) {
+            if (packageLockJson && !hasYarnLock && !pnpmLockYaml) {
                 cliType = 'npm';
                 lockfileVersion = packageLockJson.lockfileVersion;
             }
+            if (!packageLockJson && !hasYarnLock && pnpmLockYaml) {
+                cliType = 'pnpm';
+                // just ensure that it is read as a number and not a string
+                lockfileVersion = Number(pnpmLockYaml.lockfileVersion);
+            }
             // Only stop iterating if a lockfile was found, because it's possible
             // that the lockfile is in a higher path than where the `package.json`
             // file was found.
-            if (packageLockJson || hasYarnLock) {
+            if (packageLockJson || hasYarnLock || pnpmLockYaml) {
                 break;
             }
         }
@@ -234,6 +241,14 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
             .filter(a => a !== '--prefer-offline')
             .concat(['install', '--no-audit', '--unsafe-perm']);
     }
+    else if (cliType === 'pnpm') {
+        // PNPM's install command is similar to NPM's but without the audit nonsense
+        // @see options https://pnpm.io/cli/install
+        opts.prettyCommand = 'pnpm install';
+        commandArgs = args
+            .filter(a => a !== '--prefer-offline')
+            .concat(['install', '--unsafe-perm']);
+    }
     else {
         opts.prettyCommand = 'yarn install';
         commandArgs = ['install', ...args];

package/dist/index.js

@@ -28255,7 +28255,7 @@ exports.frameworks = [
             }));
             return (config && config.publishDir) || 'public';
         },
-        defaultVersion: '0.58.2',
+        defaultVersion: '0.92.2',
     },
     {
         name: 'Jekyll',
@@ -28393,7 +28393,7 @@ exports.frameworks = [
             },
         },
         getOutputDirName: async () => 'public',
-        defaultVersion: '0.13.0',
+        defaultVersion: '0.15.3',
     },
     {
         name: 'Vite',
@@ -32813,12 +32813,12 @@ function detectApiDirectory(builders) {
 exports.detectApiDirectory = detectApiDirectory;
 // TODO: Replace this function with `config.outputDirectory`
 function getPublicBuilder(builders) {
+    var _a;
     for (const builder of builders) {
         if (typeof builder.src === 'string' &&
             _1.isOfficialRuntime('static', builder.use) &&
             /^.*\/\*\*\/\*$/.test(builder.src) &&
-            builder.config &&
-            builder.config.zeroConfig === true) {
+            ((_a = builder.config) === null || _a === void 0 ? void 0 : _a.zeroConfig) === true) {
             return builder;
         }
     }
@@ -34583,6 +34583,7 @@ const cross_spawn_1 = __importDefault(__webpack_require__(7618));
 const util_1 = __webpack_require__(1669);
 const errors_1 = __webpack_require__(3983);
 const node_version_1 = __webpack_require__(7903);
+const read_config_file_1 = __webpack_require__(7792);
 function spawnAsync(command, args, opts = {}) {
     return new Promise((resolve, reject) => {
         const stderrLogs = [];
@@ -34735,7 +34736,7 @@ async function scanParentDirs(destPath, readPackageJson = false) {
                 packageJson = JSON.parse(await fs_extra_1.default.readFile(packageJsonPath, 'utf8'));
             }
             // eslint-disable-next-line no-await-in-loop
-            const [packageLockJson, hasYarnLock] = await Promise.all([
+            const [packageLockJson, hasYarnLock, pnpmLockYaml] = await Promise.all([
                 fs_extra_1.default
                     .readJson(path_1.default.join(currentDestPath, 'package-lock.json'))
                     .catch(error => {
@@ -34746,15 +34747,21 @@ async function scanParentDirs(destPath, readPackageJson = false) {
                     throw error;
                 }),
                 fs_extra_1.default.pathExists(path_1.default.join(currentDestPath, 'yarn.lock')),
+                read_config_file_1.readConfigFile(path_1.default.join(currentDestPath, 'pnpm-lock.yaml')),
             ]);
-            if (packageLockJson && !hasYarnLock) {
+            if (packageLockJson && !hasYarnLock && !pnpmLockYaml) {
                 cliType = 'npm';
                 lockfileVersion = packageLockJson.lockfileVersion;
             }
+            if (!packageLockJson && !hasYarnLock && pnpmLockYaml) {
+                cliType = 'pnpm';
+                // just ensure that it is read as a number and not a string
+                lockfileVersion = Number(pnpmLockYaml.lockfileVersion);
+            }
             // Only stop iterating if a lockfile was found, because it's possible
             // that the lockfile is in a higher path than where the `package.json`
             // file was found.
-            if (packageLockJson || hasYarnLock) {
+            if (packageLockJson || hasYarnLock || pnpmLockYaml) {
                 break;
             }
         }
@@ -34805,6 +34812,14 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
             .filter(a => a !== '--prefer-offline')
             .concat(['install', '--no-audit', '--unsafe-perm']);
     }
+    else if (cliType === 'pnpm') {
+        // PNPM's install command is similar to NPM's but without the audit nonsense
+        // @see options https://pnpm.io/cli/install
+        opts.prettyCommand = 'pnpm install';
+        commandArgs = args
+            .filter(a => a !== '--prefer-offline')
+            .concat(['install', '--unsafe-perm']);
+    }
     else {
         opts.prettyCommand = 'yarn install';
         commandArgs = ['install', ...args];
@@ -35207,9 +35222,13 @@ const fs_extra_1 = __webpack_require__(5392);
 const download_1 = __webpack_require__(1611);
 const stream_to_buffer_1 = __importDefault(__webpack_require__(2560));
 class Lambda {
-    constructor({ files, handler, runtime, maxDuration, memory, environment = {}, allowQuery, regions, zipBuffer, }) {
-        if (!zipBuffer) {
-            assert_1.default(typeof files === 'object', '"files" must be an object');
+    constructor(opts) {
+        const { handler, runtime, maxDuration, memory, environment = {}, allowQuery, regions, } = opts;
+        if ('files' in opts) {
+            assert_1.default(typeof opts.files === 'object', '"files" must be an object');
+        }
+        if ('zipBuffer' in opts) {
+            assert_1.default(Buffer.isBuffer(opts.zipBuffer), '"zipBuffer" must be a Buffer');
         }
         assert_1.default(typeof handler === 'string', '"handler" is not a string');
         assert_1.default(typeof runtime === 'string', '"runtime" is not a string');
@@ -35229,7 +35248,7 @@ class Lambda {
             assert_1.default(regions.every(r => typeof r === 'string'), '"regions" is not a string Array');
         }
         this.type = 'Lambda';
-        this.files = files;
+        this.files = 'files' in opts ? opts.files : undefined;
         this.handler = handler;
         this.runtime = runtime;
         this.memory = memory;
@@ -35237,11 +35256,14 @@ class Lambda {
         this.environment = environment;
         this.allowQuery = allowQuery;
         this.regions = regions;
-        this.zipBuffer = zipBuffer;
+        this.zipBuffer = 'zipBuffer' in opts ? opts.zipBuffer : undefined;
     }
     async createZip() {
         let { zipBuffer } = this;
         if (!zipBuffer) {
+            if (!this.files) {
+                throw new Error('`files` is not defined');
+            }
             await sema.acquire();
             try {
                 zipBuffer = await createZip(this.files);

package/dist/lambda.d.ts

@@ -3,8 +3,8 @@ import { Files, Config } from './types';
 interface Environment {
     [key: string]: string;
 }
-export interface LambdaOptions {
-    files: Files;
+export declare type LambdaOptions = LambdaOptionsWithFiles | LambdaOptionsWithZipBuffer;
+export interface LambdaOptionsBase {
     handler: string;
     runtime: string;
     memory?: number;
@@ -12,10 +12,18 @@ export interface LambdaOptions {
     environment?: Environment;
     allowQuery?: string[];
     regions?: string[];
+}
+export interface LambdaOptionsWithFiles extends LambdaOptionsBase {
+    files: Files;
+}
+/**
+ * @deprecated Use `LambdaOptionsWithFiles` instead.
+ */
+export interface LambdaOptionsWithZipBuffer extends LambdaOptionsBase {
     /**
      * @deprecated Use `files` property instead.
      */
-    zipBuffer?: Buffer;
+    zipBuffer: Buffer;
 }
 interface GetLambdaOptionsFromFunctionOptions {
     sourceFile: string;
@@ -23,7 +31,7 @@ interface GetLambdaOptionsFromFunctionOptions {
 }
 export declare class Lambda {
     type: 'Lambda';
-    files: Files;
+    files?: Files;
     handler: string;
     runtime: string;
     memory?: number;
@@ -35,7 +43,7 @@ export declare class Lambda {
      * @deprecated Use `await lambda.createZip()` instead.
      */
     zipBuffer?: Buffer;
-    constructor({ files, handler, runtime, maxDuration, memory, environment, allowQuery, regions, zipBuffer, }: LambdaOptions);
+    constructor(opts: LambdaOptions);
     createZip(): Promise<Buffer>;
 }
 /**

package/dist/lambda.js

@@ -12,9 +12,13 @@ const fs_extra_1 = require("fs-extra");
 const download_1 = require("./fs/download");
 const stream_to_buffer_1 = __importDefault(require("./fs/stream-to-buffer"));
 class Lambda {
-    constructor({ files, handler, runtime, maxDuration, memory, environment = {}, allowQuery, regions, zipBuffer, }) {
-        if (!zipBuffer) {
-            assert_1.default(typeof files === 'object', '"files" must be an object');
+    constructor(opts) {
+        const { handler, runtime, maxDuration, memory, environment = {}, allowQuery, regions, } = opts;
+        if ('files' in opts) {
+            assert_1.default(typeof opts.files === 'object', '"files" must be an object');
+        }
+        if ('zipBuffer' in opts) {
+            assert_1.default(Buffer.isBuffer(opts.zipBuffer), '"zipBuffer" must be a Buffer');
         }
         assert_1.default(typeof handler === 'string', '"handler" is not a string');
         assert_1.default(typeof runtime === 'string', '"runtime" is not a string');
@@ -34,7 +38,7 @@ class Lambda {
             assert_1.default(regions.every(r => typeof r === 'string'), '"regions" is not a string Array');
         }
         this.type = 'Lambda';
-        this.files = files;
+        this.files = 'files' in opts ? opts.files : undefined;
         this.handler = handler;
         this.runtime = runtime;
         this.memory = memory;
@@ -42,11 +46,14 @@ class Lambda {
         this.environment = environment;
         this.allowQuery = allowQuery;
         this.regions = regions;
-        this.zipBuffer = zipBuffer;
+        this.zipBuffer = 'zipBuffer' in opts ? opts.zipBuffer : undefined;
     }
     async createZip() {
         let { zipBuffer } = this;
         if (!zipBuffer) {
+            if (!this.files) {
+                throw new Error('`files` is not defined');
+            }
             await sema.acquire();
             try {
                 zipBuffer = await createZip(this.files);

package/dist/nodejs-lambda.d.ts

@@ -1,5 +1,5 @@
-import { Lambda, LambdaOptions } from './lambda';
-interface NodejsLambdaOptions extends LambdaOptions {
+import { Lambda, LambdaOptionsWithFiles } from './lambda';
+interface NodejsLambdaOptions extends LambdaOptionsWithFiles {
     shouldAddHelpers: boolean;
     shouldAddSourcemapSupport: boolean;
     awsLambdaHandler?: string;

package/dist/types.d.ts

@@ -2,6 +2,7 @@
 import FileRef from './file-ref';
 import FileFsRef from './file-fs-ref';
 import { Lambda } from './lambda';
+import { Prerender } from './prerender';
 export interface Env {
     [name: string]: string | undefined;
 }
@@ -339,10 +340,10 @@ export interface Images {
     formats?: ImageFormat[];
 }
 export interface BuildResultV2 {
-    routes: any[];
+    routes?: any[];
     images?: Images;
     output: {
-        [key: string]: File | Lambda;
+        [key: string]: File | Lambda | Prerender;
     };
     wildcard?: Array<{
         domain: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "2.14.1-canary.0",
+  "version": "2.14.1-canary.3",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -30,7 +30,7 @@
     "@types/node-fetch": "^2.1.6",
     "@types/semver": "6.0.0",
     "@types/yazl": "^2.4.1",
-    "@vercel/frameworks": "0.6.1-canary.0",
+    "@vercel/frameworks": "0.6.1-canary.2",
     "@vercel/ncc": "0.24.0",
     "aggregate-error": "3.0.1",
     "async-retry": "1.2.3",
@@ -49,5 +49,5 @@
     "typescript": "4.3.4",
     "yazl": "2.4.3"
   },
-  "gitHead": "04029013a60ed96c86ed369990cef6dd284d1724"
+  "gitHead": "a17f3a96ec12483a28667894dcdc3bb57675ead3"
 }