@vercel/static-build 0.23.1 → 0.23.2-canary.2

package/dist/index.js

@@ -13731,7 +13731,8 @@ const frameworks_1 = __importDefault(__webpack_require__(8438));
 const fs_1 = __webpack_require__(5747);
 const os_1 = __webpack_require__(2087);
 const build_utils_1 = __webpack_require__(3445);
-const read_build_output_1 = __webpack_require__(315);
+const BuildOutputV1 = __importStar(__webpack_require__(5497));
+const BuildOutputV3 = __importStar(__webpack_require__(8939));
 const GatsbyUtils = __importStar(__webpack_require__(8573));
 const NuxtUtils = __importStar(__webpack_require__(431));
 const sleep = (n) => new Promise(resolve => setTimeout(resolve, n));
@@ -13896,7 +13897,7 @@ async function fetchBinary(url, framework, version) {
         throw new build_utils_1.NowBuildError({
             code: 'STATIC_BUILD_BINARY_NOT_FOUND',
             message: `Version ${version} of ${framework} does not exist. Please specify a different one.`,
-            link: 'https://vercel.com/docs/v2/build-step#framework-versioning',
+            link: 'https://vercel.link/framework-versioning',
         });
     }
     await build_utils_1.spawnAsync(`curl -sSL ${url} | tar -zx -C /usr/local/bin`, [], {
@@ -13908,9 +13909,7 @@ const build = async ({ files, entrypoint, workPath, config, meta = {}, }) => {
     await build_utils_1.download(files, workPath, meta);
     const mountpoint = path_1.default.dirname(entrypoint);
     const entrypointDir = path_1.default.join(workPath, mountpoint);
-    let distPath = path_1.default.join(workPath, path_1.default.dirname(entrypoint), (config && config.distDir) ||
-        config.outputDirectory ||
-        'dist');
+    let distPath = path_1.default.join(workPath, path_1.default.dirname(entrypoint), config.distDir || config.outputDirectory || 'dist');
     const pkg = getPkg(entrypoint, workPath);
     const devScript = pkg ? getScriptName(pkg, 'dev', config) : null;
     const framework = getFramework(config, pkg);
@@ -13985,12 +13984,12 @@ const build = async ({ files, entrypoint, workPath, config, meta = {}, }) => {
         Node.js will load 'false' as a string, not a boolean, so it's truthy still.
         This is to ensure we don't accidentally break other packages that check
         if process.env.CI is true somewhere.
-        
+    
         https://github.com/facebook/create-react-app/issues/2453
         https://github.com/facebook/create-react-app/pull/2501
         https://github.com/vercel/community/discussions/30
         */
-        if (framework && framework.slug === 'create-react-app') {
+        if ((framework === null || framework === void 0 ? void 0 : framework.slug) === 'create-react-app') {
             if (!spawnOpts.env) {
                 spawnOpts.env = {};
             }
@@ -14009,10 +14008,7 @@ const build = async ({ files, entrypoint, workPath, config, meta = {}, }) => {
             };
             if (!config.zeroConfig) {
                 build_utils_1.debug('Detected "builds" - not zero config');
-                printInstall();
-                const installTime = Date.now();
                 await build_utils_1.runNpmInstall(entrypointDir, [], spawnOpts, meta, nodeVersion);
-                build_utils_1.debug(`Install complete [${Date.now() - installTime}ms]`);
                 isNpmInstall = true;
             }
             else if (typeof installCommand === 'string') {
@@ -14076,11 +14072,7 @@ const build = async ({ files, entrypoint, workPath, config, meta = {}, }) => {
                     isPipInstall = true;
                 }
                 if (pkg) {
-                    console.log('Detected package.json');
-                    printInstall();
-                    const installTime = Date.now();
                     await build_utils_1.runNpmInstall(entrypointDir, [], spawnOpts, meta, nodeVersion);
-                    build_utils_1.debug(`Install complete [${Date.now() - installTime}ms]`);
                     isNpmInstall = true;
                 }
             }
@@ -14184,6 +14176,27 @@ const build = async ({ files, entrypoint, workPath, config, meta = {}, }) => {
                 throw new Error(`Missing required "${buildCommand || 'vercel-build'}" script in "${entrypoint}"`);
             }
             const outputDirPrefix = path_1.default.join(workPath, path_1.default.dirname(entrypoint));
+            // If the Build Command or Framework output files according to the
+            // Build Output v3 API, then stop processing here in `static-build`
+            // since the output is already in its final form.
+            const buildOutputPath = await BuildOutputV3.getBuildOutputDirectory(outputDirPrefix);
+            if (buildOutputPath) {
+                // Ensure that `vercel build` is being used for this Deployment
+                if (!meta.cliVersion) {
+                    let buildCommandName;
+                    if (buildCommand)
+                        buildCommandName = `"${buildCommand}"`;
+                    else if (framework)
+                        buildCommandName = framework.name;
+                    else
+                        buildCommandName = 'the "build" script';
+                    throw new Error(`Detected Build Output v3 from ${buildCommandName}, but this Deployment is not using \`vercel build\`.\nPlease set the \`ENABLE_VC_BUILD=1\` environment variable.`);
+                }
+                return {
+                    buildOutputVersion: 3,
+                    buildOutputPath,
+                };
+            }
             if (framework) {
                 const outputDirName = config.outputDirectory
                     ? config.outputDirectory
@@ -14199,7 +14212,7 @@ const build = async ({ files, entrypoint, workPath, config, meta = {}, }) => {
                     distPath = publicPath;
                 }
             }
-            const extraOutputs = await read_build_output_1.readBuildOutputDirectory({
+            const extraOutputs = await BuildOutputV1.readBuildOutputDirectory({
                 workPath,
                 nodeVersion,
             });
@@ -14265,7 +14278,7 @@ exports.build = build;
 const prepareCache = async ({ entrypoint, workPath, config, }) => {
     const cacheFiles = {};
     // File System API v1 cache files
-    const buildConfig = await read_build_output_1.readBuildOutputConfig({
+    const buildConfig = await BuildOutputV1.readBuildOutputConfig({
         workPath,
         configFileName: 'build.json',
     });
@@ -14337,141 +14350,7 @@ exports.isObjectEmpty = isObjectEmpty;
 
 /***/ }),
 
-/***/ 8573:
-/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
-
-"use strict";
-
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.injectVercelAnalyticsPlugin = void 0;
-const fs_1 = __webpack_require__(5747);
-const path = __importStar(__webpack_require__(5622));
-const _shared_1 = __webpack_require__(2229);
-const defaultConfig = {
-    plugins: [
-        {
-            resolve: 'gatsby-plugin-vercel',
-            options: {},
-        },
-    ],
-};
-async function injectVercelAnalyticsPlugin(dir) {
-    // Gatsby requires a special variable name for environment variables to be
-    // exposed to the client-side JavaScript bundles:
-    process.env.GATSBY_VERCEL_ANALYTICS_ID = process.env.VERCEL_ANALYTICS_ID;
-    const gatsbyConfigName = 'gatsby-config.js';
-    const gatsbyPluginPackageName = 'gatsby-plugin-vercel';
-    const gatsbyConfigPath = path.join(dir, gatsbyConfigName);
-    console.log(`Injecting Gatsby.js analytics plugin "${gatsbyPluginPackageName}" to \`${gatsbyConfigPath}\``);
-    const pkgJson = (await _shared_1.readPackageJson(dir));
-    if (!pkgJson.dependencies) {
-        pkgJson.dependencies = {};
-    }
-    if (!pkgJson.dependencies[gatsbyPluginPackageName]) {
-        console.log(`Adding "${gatsbyPluginPackageName}" to \`package.json\` "dependencies"`);
-        pkgJson.dependencies[gatsbyPluginPackageName] = 'latest';
-        await _shared_1.writePackageJson(dir, pkgJson);
-    }
-    if (await _shared_1.fileExists(gatsbyConfigPath)) {
-        await fs_1.promises.rename(gatsbyConfigPath, gatsbyConfigPath + '.__vercel_builder_backup__.js');
-        await fs_1.promises.writeFile(gatsbyConfigPath, `const userConfig = require("./gatsby-config.js.__vercel_builder_backup__.js");
-
-// https://github.com/gatsbyjs/gatsby/blob/354003fb2908e02ff12109ca3a02978a5a6e608c/packages/gatsby/src/bootstrap/prefer-default.ts
-const preferDefault = m => (m && m.default) || m;
-
-const vercelConfig = Object.assign(
-  {},
-
-  // https://github.com/gatsbyjs/gatsby/blob/a6ecfb2b01d761e8a3612b8ea132c698659923d9/packages/gatsby/src/services/initialize.ts#L113-L117
-  preferDefault(userConfig)
-);
-if (!vercelConfig.plugins) {
-  vercelConfig.plugins = [];
-}
-
-const hasPlugin = vercelConfig.plugins.find(
-  (p) =>
-    p && (p === "gatsby-plugin-vercel" || p.resolve === "gatsby-plugin-vercel")
-);
-if (!hasPlugin) {
-  vercelConfig.plugins = vercelConfig.plugins.slice();
-  vercelConfig.plugins.push({
-    resolve: "gatsby-plugin-vercel",
-    options: {},
-  });
-}
-
-module.exports = vercelConfig;
-`);
-    }
-    else {
-        await fs_1.promises.writeFile(gatsbyConfigPath, `module.exports = ${JSON.stringify(defaultConfig)}`);
-    }
-}
-exports.injectVercelAnalyticsPlugin = injectVercelAnalyticsPlugin;
-
-
-/***/ }),
-
-/***/ 431:
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.injectVercelAnalyticsPlugin = void 0;
-const path_1 = __webpack_require__(5622);
-const rc9_1 = __webpack_require__(6649);
-const _shared_1 = __webpack_require__(2229);
-// https://github.com/nuxt-community/web-vitals-module
-const ANALYTICS_PLUGIN_PACKAGE = '@nuxtjs/web-vitals';
-async function injectVercelAnalyticsPlugin(dir) {
-    // First update the `.nuxtrc` file to inject the analytics plugin.
-    // See: https://gist.github.com/pi0/23b5253ac19b4ed5a70add3b971545c9
-    const nuxtrcPath = path_1.join(dir, '.nuxtrc');
-    console.log(`Injecting Nuxt.js analytics plugin "${ANALYTICS_PLUGIN_PACKAGE}" to \`${nuxtrcPath}\``);
-    rc9_1.update({
-        'modules[]': ANALYTICS_PLUGIN_PACKAGE,
-    }, {
-        name: nuxtrcPath,
-    });
-    // The dependency needs to be listed in `package.json` as well so
-    // that `npm i` installs the package.
-    const pkgJson = (await _shared_1.readPackageJson(dir));
-    if (!pkgJson.dependencies) {
-        pkgJson.dependencies = {};
-    }
-    if (!pkgJson.dependencies[ANALYTICS_PLUGIN_PACKAGE]) {
-        pkgJson.dependencies[ANALYTICS_PLUGIN_PACKAGE] = 'latest';
-        console.log(`Adding "${ANALYTICS_PLUGIN_PACKAGE}" to \`package.json\` "dependencies"`);
-        await _shared_1.writePackageJson(dir, pkgJson);
-    }
-}
-exports.injectVercelAnalyticsPlugin = injectVercelAnalyticsPlugin;
-
-
-/***/ }),
-
-/***/ 315:
+/***/ 5497:
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
@@ -14671,6 +14550,173 @@ async function readBuildOutputConfig({ workPath, configFileName, }) {
 exports.readBuildOutputConfig = readBuildOutputConfig;
 
 
+/***/ }),
+
+/***/ 8939:
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.getBuildOutputDirectory = void 0;
+const path_1 = __webpack_require__(5622);
+const fs_1 = __webpack_require__(5747);
+const BUILD_OUTPUT_DIR = '.vercel/output';
+/**
+ * Returns the path to the Build Output v3 directory when the
+ * `config.json` file was created by the framework / build script,
+ * or `undefined` if the framework did not create the v3 output.
+ */
+async function getBuildOutputDirectory(path) {
+    try {
+        const outputDir = path_1.join(path, BUILD_OUTPUT_DIR);
+        const configPath = path_1.join(outputDir, 'config.json');
+        await fs_1.promises.stat(configPath);
+        return outputDir;
+    }
+    catch (err) {
+        if (err.code !== 'ENOENT')
+            throw err;
+    }
+    return undefined;
+}
+exports.getBuildOutputDirectory = getBuildOutputDirectory;
+
+
+/***/ }),
+
+/***/ 8573:
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.injectVercelAnalyticsPlugin = void 0;
+const fs_1 = __webpack_require__(5747);
+const path = __importStar(__webpack_require__(5622));
+const _shared_1 = __webpack_require__(2229);
+const defaultConfig = {
+    plugins: [
+        {
+            resolve: 'gatsby-plugin-vercel',
+            options: {},
+        },
+    ],
+};
+async function injectVercelAnalyticsPlugin(dir) {
+    // Gatsby requires a special variable name for environment variables to be
+    // exposed to the client-side JavaScript bundles:
+    process.env.GATSBY_VERCEL_ANALYTICS_ID = process.env.VERCEL_ANALYTICS_ID;
+    const gatsbyConfigName = 'gatsby-config.js';
+    const gatsbyPluginPackageName = 'gatsby-plugin-vercel';
+    const gatsbyConfigPath = path.join(dir, gatsbyConfigName);
+    console.log(`Injecting Gatsby.js analytics plugin "${gatsbyPluginPackageName}" to \`${gatsbyConfigPath}\``);
+    const pkgJson = (await _shared_1.readPackageJson(dir));
+    if (!pkgJson.dependencies) {
+        pkgJson.dependencies = {};
+    }
+    if (!pkgJson.dependencies[gatsbyPluginPackageName]) {
+        console.log(`Adding "${gatsbyPluginPackageName}" to \`package.json\` "dependencies"`);
+        pkgJson.dependencies[gatsbyPluginPackageName] = 'latest';
+        await _shared_1.writePackageJson(dir, pkgJson);
+    }
+    if (await _shared_1.fileExists(gatsbyConfigPath)) {
+        await fs_1.promises.rename(gatsbyConfigPath, gatsbyConfigPath + '.__vercel_builder_backup__.js');
+        await fs_1.promises.writeFile(gatsbyConfigPath, `const userConfig = require("./gatsby-config.js.__vercel_builder_backup__.js");
+
+// https://github.com/gatsbyjs/gatsby/blob/354003fb2908e02ff12109ca3a02978a5a6e608c/packages/gatsby/src/bootstrap/prefer-default.ts
+const preferDefault = m => (m && m.default) || m;
+
+const vercelConfig = Object.assign(
+  {},
+
+  // https://github.com/gatsbyjs/gatsby/blob/a6ecfb2b01d761e8a3612b8ea132c698659923d9/packages/gatsby/src/services/initialize.ts#L113-L117
+  preferDefault(userConfig)
+);
+if (!vercelConfig.plugins) {
+  vercelConfig.plugins = [];
+}
+
+const hasPlugin = vercelConfig.plugins.find(
+  (p) =>
+    p && (p === "gatsby-plugin-vercel" || p.resolve === "gatsby-plugin-vercel")
+);
+if (!hasPlugin) {
+  vercelConfig.plugins = vercelConfig.plugins.slice();
+  vercelConfig.plugins.push({
+    resolve: "gatsby-plugin-vercel",
+    options: {},
+  });
+}
+
+module.exports = vercelConfig;
+`);
+    }
+    else {
+        await fs_1.promises.writeFile(gatsbyConfigPath, `module.exports = ${JSON.stringify(defaultConfig)}`);
+    }
+}
+exports.injectVercelAnalyticsPlugin = injectVercelAnalyticsPlugin;
+
+
+/***/ }),
+
+/***/ 431:
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.injectVercelAnalyticsPlugin = void 0;
+const path_1 = __webpack_require__(5622);
+const rc9_1 = __webpack_require__(6649);
+const _shared_1 = __webpack_require__(2229);
+// https://github.com/nuxt-community/web-vitals-module
+const ANALYTICS_PLUGIN_PACKAGE = '@nuxtjs/web-vitals';
+async function injectVercelAnalyticsPlugin(dir) {
+    // First update the `.nuxtrc` file to inject the analytics plugin.
+    // See: https://gist.github.com/pi0/23b5253ac19b4ed5a70add3b971545c9
+    const nuxtrcPath = path_1.join(dir, '.nuxtrc');
+    console.log(`Injecting Nuxt.js analytics plugin "${ANALYTICS_PLUGIN_PACKAGE}" to \`${nuxtrcPath}\``);
+    rc9_1.update({
+        'modules[]': ANALYTICS_PLUGIN_PACKAGE,
+    }, {
+        name: nuxtrcPath,
+    });
+    // The dependency needs to be listed in `package.json` as well so
+    // that `npm i` installs the package.
+    const pkgJson = (await _shared_1.readPackageJson(dir));
+    if (!pkgJson.dependencies) {
+        pkgJson.dependencies = {};
+    }
+    if (!pkgJson.dependencies[ANALYTICS_PLUGIN_PACKAGE]) {
+        pkgJson.dependencies[ANALYTICS_PLUGIN_PACKAGE] = 'latest';
+        console.log(`Adding "${ANALYTICS_PLUGIN_PACKAGE}" to \`package.json\` "dependencies"`);
+        await _shared_1.writePackageJson(dir, pkgJson);
+    }
+}
+exports.injectVercelAnalyticsPlugin = injectVercelAnalyticsPlugin;
+
+
 /***/ }),
 
 /***/ 5685:

package/dist/utils/build-output-v3.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getBuildOutputDirectory = void 0;
+const path_1 = require("path");
+const fs_1 = require("fs");
+const BUILD_OUTPUT_DIR = '.vercel/output';
+/**
+ * Returns the path to the Build Output v3 directory when the
+ * `config.json` file was created by the framework / build script,
+ * or `undefined` if the framework did not create the v3 output.
+ */
+async function getBuildOutputDirectory(path) {
+    try {
+        const outputDir = path_1.join(path, BUILD_OUTPUT_DIR);
+        const configPath = path_1.join(outputDir, 'config.json');
+        await fs_1.promises.stat(configPath);
+        return outputDir;
+    }
+    catch (err) {
+        if (err.code !== 'ENOENT')
+            throw err;
+    }
+    return undefined;
+}
+exports.getBuildOutputDirectory = getBuildOutputDirectory;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/static-build",
-  "version": "0.23.1",
+  "version": "0.23.2-canary.2",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/build-step",
@@ -14,17 +14,28 @@
   },
   "scripts": {
     "build": "node build",
-    "test-unit": "jest --env node --verbose --runInBand --bail test/unit.test.js",
+    "test-unit": "jest --env node --verbose --bail test/build.test.ts test/prepare-cache.test.ts",
     "test-integration-once": "jest --env node --verbose --runInBand --bail test/integration.test.js",
     "prepublishOnly": "node build"
   },
+  "jest": {
+    "preset": "ts-jest/presets/default",
+    "testEnvironment": "node",
+    "globals": {
+      "ts-jest": {
+        "diagnostics": true,
+        "isolatedModules": true
+      }
+    }
+  },
   "devDependencies": {
     "@types/aws-lambda": "8.10.64",
     "@types/cross-spawn": "6.0.0",
+    "@types/jest": "27.4.1",
     "@types/ms": "0.7.31",
     "@types/node-fetch": "2.5.4",
     "@types/promise-timeout": "1.3.0",
-    "@vercel/build-utils": "2.15.1",
+    "@vercel/build-utils": "2.15.2-canary.2",
     "@vercel/frameworks": "0.7.1",
     "@vercel/ncc": "0.24.0",
     "@vercel/routing-utils": "1.13.1",
@@ -34,5 +45,5 @@
     "node-fetch": "2.6.1",
     "rc9": "1.2.0"
   },
-  "gitHead": "4a8504fc45092dc4a374bf7a518bd9a07f24fd41"
+  "gitHead": "b61f049f1186ccc804cea35bcf61d16583ed6ca2"
 }