@vercel/static-build 1.2.1 → 1.3.0

package/dist/index.js

@@ -241716,16 +241716,7 @@ const build = async ({ files, entrypoint, workPath, config, meta = {}, }) => {
                 process.env[key] = value;
             }
             if (framework.slug === 'gatsby') {
-                const injectedPlugins = await GatsbyUtils.injectPlugins(detectedVersion, entrypointDir);
-                if (injectedPlugins) {
-                    const packageManager = await fs_detectors_1.detectFramework({
-                        fs: localFileSystemDetector,
-                        frameworkList: fs_detectors_1.packageManagers,
-                    });
-                    if (packageManager === 'pnpm') {
-                        await build_utils_1.execCommand('pnpm install --lockfile-only');
-                    }
-                }
+                await GatsbyUtils.injectPlugins(detectedVersion, entrypointDir);
             }
             if (process.env.VERCEL_ANALYTICS_ID) {
                 const frameworkDirectory = path_1.default.join(workPath, path_1.default.dirname(entrypoint));
@@ -241827,6 +241818,9 @@ const build = async ({ files, entrypoint, workPath, config, meta = {}, }) => {
                 }
             }
         }
+        if (framework?.slug === 'gatsby') {
+            await GatsbyUtils.createPluginSymlinks(entrypointDir);
+        }
         let gemHome = undefined;
         const pathList = [];
         if (isNpmInstall || (pkg && (buildCommand || devCommand))) {
@@ -241910,20 +241904,27 @@ const build = async ({ files, entrypoint, workPath, config, meta = {}, }) => {
             if (buildCommand) {
                 build_utils_1.debug(`Executing "${buildCommand}"`);
             }
-            const found = typeof buildCommand === 'string'
-                ? await build_utils_1.execCommand(buildCommand, {
-                    ...spawnOpts,
-                    // Yarn v2 PnP mode may be activated, so force
-                    // "node-modules" linker style
-                    env: {
-                        YARN_NODE_LINKER: 'node-modules',
-                        ...spawnOpts.env,
-                    },
-                    cwd: entrypointDir,
-                })
-                : await build_utils_1.runPackageJsonScript(entrypointDir, ['vercel-build', 'now-build', 'build'], spawnOpts);
-            if (!found) {
-                throw new Error(`Missing required "${buildCommand || 'vercel-build'}" script in "${entrypoint}"`);
+            try {
+                const found = typeof buildCommand === 'string'
+                    ? await build_utils_1.execCommand(buildCommand, {
+                        ...spawnOpts,
+                        // Yarn v2 PnP mode may be activated, so force
+                        // "node-modules" linker style
+                        env: {
+                            YARN_NODE_LINKER: 'node-modules',
+                            ...spawnOpts.env,
+                        },
+                        cwd: entrypointDir,
+                    })
+                    : await build_utils_1.runPackageJsonScript(entrypointDir, ['vercel-build', 'now-build', 'build'], spawnOpts);
+                if (!found) {
+                    throw new Error(`Missing required "${buildCommand || 'vercel-build'}" script in "${entrypoint}"`);
+                }
+            }
+            finally {
+                if (framework?.slug === 'gatsby') {
+                    await GatsbyUtils.cleanupGatsbyFiles(entrypointDir);
+                }
             }
             const outputDirPrefix = path_1.default.join(workPath, path_1.default.dirname(entrypoint));
             distPath =
@@ -242533,22 +242534,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.injectPlugins = void 0;
-const fs_1 = __webpack_require__(5747);
+exports.createPluginSymlinks = exports.cleanupGatsbyFiles = exports.injectPlugins = void 0;
+const fs_extra_1 = __importDefault(__webpack_require__(6365));
 const path = __importStar(__webpack_require__(5622));
 const semver_1 = __importDefault(__webpack_require__(7013));
-const url_1 = __webpack_require__(8835);
 const _shared_1 = __webpack_require__(54);
-const { VERCEL_CLI_VERSION } = process.env;
 const PLUGINS = [
     '@vercel/gatsby-plugin-vercel-analytics',
     '@vercel/gatsby-plugin-vercel-builder',
 ];
 const GATSBY_CONFIG_FILE = 'gatsby-config';
 const GATSBY_NODE_FILE = 'gatsby-node';
+const PLUGIN_PATHS = {
+    '@vercel/gatsby-plugin-vercel-analytics': path.dirname(eval('require').resolve(`@vercel/gatsby-plugin-vercel-analytics/package.json`)),
+    '@vercel/gatsby-plugin-vercel-builder': path.dirname(eval('require').resolve(`@vercel/gatsby-plugin-vercel-builder/package.json`)),
+};
 async function injectPlugins(detectedVersion, dir) {
     const plugins = new Set();
-    if (process.env.VERCEL_GATSBY_BUILDER_PLUGIN && detectedVersion) {
+    if (process.env.VERCEL_GATSBY_BUILDER_PLUGIN === '1' && detectedVersion) {
         const version = semver_1.default.coerce(detectedVersion);
         if (version && semver_1.default.satisfies(version, '>=4.0.0')) {
             plugins.add('@vercel/gatsby-plugin-vercel-builder');
@@ -242561,7 +242564,14 @@ async function injectPlugins(detectedVersion, dir) {
     if (plugins.size === 0) {
         return false;
     }
-    const ops = [addGatsbyPackage(dir, plugins)];
+    let pluginsStr = 'plugin';
+    if (plugins.size > 1) {
+        pluginsStr += 's';
+    }
+    console.log(`Injecting Gatsby.js ${pluginsStr} ${Array.from(plugins)
+        .map(p => `"${p}"`)
+        .join(', ')}`);
+    const ops = [];
     if (plugins.has('@vercel/gatsby-plugin-vercel-analytics')) {
         ops.push(updateGatsbyConfig(dir, ['@vercel/gatsby-plugin-vercel-analytics']));
     }
@@ -242572,64 +242582,33 @@ async function injectPlugins(detectedVersion, dir) {
     return true;
 }
 exports.injectPlugins = injectPlugins;
-function printInjectingPlugins(plugins, configPath) {
-    const pluginsArray = Array.from(plugins);
-    let pluginsStr = 'plugin';
-    if (pluginsArray.length > 1) {
-        pluginsStr += 's';
-    }
-    console.log(`Injecting Gatsby.js ${pluginsStr} ${pluginsArray
-        .map(p => `"${p}"`)
-        .join(', ')} to \`${configPath}\``);
-}
-async function addGatsbyPackage(dir, plugins) {
-    const pkgJson = (await _shared_1.readPackageJson(dir));
-    if (!pkgJson.dependencies) {
-        pkgJson.dependencies = {};
-    }
-    for (const plugin of plugins) {
-        if (!pkgJson.dependencies[plugin]) {
-            console.log(`Adding "${plugin}" to \`package.json\` "dependencies"`);
-            let version = 'latest';
-            // Use the tarball URL for E2E tests
-            if (VERCEL_CLI_VERSION?.startsWith('https://')) {
-                version = new url_1.URL(`./${plugin}.tgz`, VERCEL_CLI_VERSION).href;
-            }
-            pkgJson.dependencies[plugin] = version;
-        }
-    }
-    await _shared_1.writePackageJson(dir, pkgJson);
-}
 async function updateGatsbyConfig(dir, plugins) {
     const gatsbyConfigPathTs = path.join(dir, `${GATSBY_CONFIG_FILE}.ts`);
     const gatsbyConfigPathMjs = path.join(dir, `${GATSBY_CONFIG_FILE}.mjs`);
     const gatsbyConfigPathJs = path.join(dir, `${GATSBY_CONFIG_FILE}.js`);
     if (await _shared_1.fileExists(gatsbyConfigPathTs)) {
-        printInjectingPlugins(plugins, gatsbyConfigPathTs);
         await updateGatsbyConfigTs(gatsbyConfigPathTs, plugins);
     }
     else if (await _shared_1.fileExists(gatsbyConfigPathMjs)) {
-        printInjectingPlugins(plugins, gatsbyConfigPathMjs);
         await updateGatsbyConfigMjs(gatsbyConfigPathMjs, plugins);
     }
+    else if (await _shared_1.fileExists(gatsbyConfigPathJs)) {
+        await updateGatsbyConfigJs(gatsbyConfigPathJs, plugins);
+    }
     else {
-        printInjectingPlugins(plugins, gatsbyConfigPathJs);
-        if (await _shared_1.fileExists(gatsbyConfigPathJs)) {
-            await updateGatsbyConfigJs(gatsbyConfigPathJs, plugins);
-        }
-        else {
-            await fs_1.promises.writeFile(gatsbyConfigPathJs, `module.exports = ${JSON.stringify({
-                plugins: Array.from(plugins),
-            })}`);
-        }
+        await fs_extra_1.default.writeFile(gatsbyConfigPathJs, `module.exports = ${JSON.stringify({
+            plugins,
+        })}`);
     }
 }
+const GENERATED_FILE_COMMENT = `// This file was generated by @vercel/static-build`;
 async function updateGatsbyConfigTs(configPath, plugins) {
     const renamedPath = `${configPath}.__vercel_builder_backup__.ts`;
     if (!(await _shared_1.fileExists(renamedPath))) {
-        await fs_1.promises.rename(configPath, renamedPath);
+        await fs_extra_1.default.rename(configPath, renamedPath);
     }
-    await fs_1.promises.writeFile(configPath, `import userConfig from "./gatsby-config.ts.__vercel_builder_backup__.ts";
+    await fs_extra_1.default.writeFile(configPath, `${GENERATED_FILE_COMMENT}
+import userConfig from "./gatsby-config.ts.__vercel_builder_backup__.ts";
 import type { PluginRef } from "gatsby";
 
 const preferDefault = (m: any) => (m && m.default) || m;
@@ -242643,7 +242622,7 @@ if (!vercelConfig.plugins) {
   vercelConfig.plugins = [];
 }
 
-for (const plugin of ${JSON.stringify(Array.from(plugins))}) {
+for (const plugin of ${JSON.stringify(plugins)}) {
   const hasPlugin = vercelConfig.plugins.find(
     (p: PluginRef) =>
       p && (p === plugin || p.resolve === plugin)
@@ -242661,9 +242640,10 @@ export default vercelConfig;
 async function updateGatsbyConfigMjs(configPath, plugins) {
     const renamedPath = `${configPath}.__vercel_builder_backup__.mjs`;
     if (!(await _shared_1.fileExists(renamedPath))) {
-        await fs_1.promises.rename(configPath, renamedPath);
+        await fs_extra_1.default.rename(configPath, renamedPath);
     }
-    await fs_1.promises.writeFile(configPath, `import userConfig from "./gatsby-config.mjs.__vercel_builder_backup__.mjs";
+    await fs_extra_1.default.writeFile(configPath, `${GENERATED_FILE_COMMENT}
+import userConfig from "./gatsby-config.mjs.__vercel_builder_backup__.mjs";
 
 const preferDefault = (m) => (m && m.default) || m;
 
@@ -242671,11 +242651,12 @@ const vercelConfig = Object.assign(
   {},
   preferDefault(userConfig)
 );
+
 if (!vercelConfig.plugins) {
   vercelConfig.plugins = [];
 }
 
-for (const plugin of ${JSON.stringify(Array.from(plugins))}) {
+for (const plugin of ${JSON.stringify(plugins)}) {
   const hasPlugin = vercelConfig.plugins.find(
     (p) => p && (p === plugin || p.resolve === plugin)
   );
@@ -242692,9 +242673,10 @@ export default vercelConfig;
 async function updateGatsbyConfigJs(configPath, plugins) {
     const renamedPath = `${configPath}.__vercel_builder_backup__.js`;
     if (!(await _shared_1.fileExists(renamedPath))) {
-        await fs_1.promises.rename(configPath, renamedPath);
+        await fs_extra_1.default.rename(configPath, renamedPath);
     }
-    await fs_1.promises.writeFile(configPath, `const userConfig = require("./gatsby-config.js.__vercel_builder_backup__.js");
+    await fs_extra_1.default.writeFile(configPath, `${GENERATED_FILE_COMMENT}
+const userConfig = require("./gatsby-config.js.__vercel_builder_backup__.js");
 
 const preferDefault = m => (m && m.default) || m;
 
@@ -242702,11 +242684,12 @@ const vercelConfig = Object.assign(
   {},
   preferDefault(userConfig)
 );
+
 if (!vercelConfig.plugins) {
   vercelConfig.plugins = [];
 }
 
-for (const plugin of ${JSON.stringify(Array.from(plugins))}) {
+for (const plugin of ${JSON.stringify(plugins)}) {
   const hasPlugin = vercelConfig.plugins.find(
     (p) => p && (p === plugin || p.resolve === plugin)
   );
@@ -242733,15 +242716,16 @@ async function updateGatsbyNode(dir) {
         await updateGatsbyNodeJs(gatsbyNodePathJs);
     }
     else {
-        await fs_1.promises.writeFile(gatsbyNodePathJs, `module.exports = require('@vercel/gatsby-plugin-vercel-builder/gatsby-node.js');`);
+        await fs_extra_1.default.writeFile(gatsbyNodePathJs, `module.exports = require('@vercel/gatsby-plugin-vercel-builder/gatsby-node.js');`);
     }
 }
 async function updateGatsbyNodeTs(configPath) {
     const renamedPath = `${configPath}.__vercel_builder_backup__.ts`;
     if (!(await _shared_1.fileExists(renamedPath))) {
-        await fs_1.promises.rename(configPath, renamedPath);
+        await fs_extra_1.default.rename(configPath, renamedPath);
     }
-    await fs_1.promises.writeFile(configPath, `import type { GatsbyNode } from 'gatsby';
+    await fs_extra_1.default.writeFile(configPath, `${GENERATED_FILE_COMMENT}
+import type { GatsbyNode } from 'gatsby';
 import * as vercelBuilder from '@vercel/gatsby-plugin-vercel-builder/gatsby-node.js';
 import * as gatsbyNode from './gatsby-node.ts.__vercel_builder_backup__.ts';
 
@@ -242758,9 +242742,10 @@ export const onPostBuild: GatsbyNode['onPostBuild'] = async (args, options) => {
 async function updateGatsbyNodeMjs(configPath) {
     const renamedPath = `${configPath}.__vercel_builder_backup__.mjs`;
     if (!(await _shared_1.fileExists(renamedPath))) {
-        await fs_1.promises.rename(configPath, renamedPath);
+        await fs_extra_1.default.rename(configPath, renamedPath);
     }
-    await fs_1.promises.writeFile(configPath, `import * as vercelBuilder from '@vercel/gatsby-plugin-vercel-builder/gatsby-node.js';
+    await fs_extra_1.default.writeFile(configPath, `${GENERATED_FILE_COMMENT}
+import * as vercelBuilder from '@vercel/gatsby-plugin-vercel-builder/gatsby-node.js';
 import * as gatsbyNode from './gatsby-node.mjs.__vercel_builder_backup__.mjs';
 
 export * from './gatsby-node.mjs.__vercel_builder_backup__.mjs';
@@ -242776,9 +242761,10 @@ export const onPostBuild = async (args, options) => {
 async function updateGatsbyNodeJs(configPath) {
     const renamedPath = `${configPath}.__vercel_builder_backup__.js`;
     if (!(await _shared_1.fileExists(renamedPath))) {
-        await fs_1.promises.rename(configPath, renamedPath);
+        await fs_extra_1.default.rename(configPath, renamedPath);
     }
-    await fs_1.promises.writeFile(configPath, `const vercelBuilder = require('@vercel/gatsby-plugin-vercel-builder/gatsby-node.js');
+    await fs_extra_1.default.writeFile(configPath, `${GENERATED_FILE_COMMENT}
+const vercelBuilder = require('@vercel/gatsby-plugin-vercel-builder/gatsby-node.js');
 const gatsbyNode = require('./gatsby-node.js.__vercel_builder_backup__.js');
 
 const origOnPostBuild = gatsbyNode.onPostBuild;
@@ -242793,6 +242779,37 @@ gatsbyNode.onPostBuild = async (args, options) => {
 module.exports = gatsbyNode;
 `);
 }
+async function cleanupGatsbyFiles(dir) {
+    const backup = '.__vercel_builder_backup__';
+    const fileEndings = ['.js', '.ts', '.mjs'];
+    for (const fileName of [GATSBY_CONFIG_FILE, GATSBY_NODE_FILE]) {
+        for (const fileEnding of fileEndings) {
+            const baseFile = `${fileName}${fileEnding}`;
+            const baseFilePath = path.join(dir, baseFile);
+            const backupFile = `${baseFile}${backup}${fileEnding}`;
+            const backupFilePath = path.join(dir, backupFile);
+            const [baseFileContent, backupFileContent] = await Promise.all([
+                fs_extra_1.default.readFile(baseFilePath, 'utf-8').catch(() => null),
+                fs_extra_1.default.readFile(backupFilePath, 'utf-8').catch(() => null),
+            ]);
+            if (baseFileContent &&
+                baseFileContent.startsWith(GENERATED_FILE_COMMENT)) {
+                await fs_extra_1.default.rm(baseFilePath);
+            }
+            if (backupFileContent) {
+                await fs_extra_1.default.rename(backupFilePath, baseFilePath);
+            }
+        }
+    }
+}
+exports.cleanupGatsbyFiles = cleanupGatsbyFiles;
+async function createPluginSymlinks(dir) {
+    const nodeModulesDir = path.join(dir, 'node_modules');
+    await fs_extra_1.default.ensureDir(path.join(nodeModulesDir, '@vercel'));
+    await Promise.all(PLUGINS.map(name => fs_extra_1.default.remove(path.join(nodeModulesDir, name))));
+    await Promise.all(PLUGINS.map(name => fs_extra_1.default.symlink(PLUGIN_PATHS[name], path.join(nodeModulesDir, name))));
+}
+exports.createPluginSymlinks = createPluginSymlinks;
 
 
 /***/ }),

package/dist/utils/gatsby.js

@@ -22,22 +22,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.injectPlugins = void 0;
-const fs_1 = require("fs");
+exports.createPluginSymlinks = exports.cleanupGatsbyFiles = exports.injectPlugins = void 0;
+const fs_extra_1 = __importDefault(require("fs-extra"));
 const path = __importStar(require("path"));
 const semver_1 = __importDefault(require("semver"));
-const url_1 = require("url");
 const _shared_1 = require("./_shared");
-const { VERCEL_CLI_VERSION } = process.env;
 const PLUGINS = [
     '@vercel/gatsby-plugin-vercel-analytics',
     '@vercel/gatsby-plugin-vercel-builder',
 ];
 const GATSBY_CONFIG_FILE = 'gatsby-config';
 const GATSBY_NODE_FILE = 'gatsby-node';
+const PLUGIN_PATHS = {
+    '@vercel/gatsby-plugin-vercel-analytics': path.dirname(eval('require').resolve(`@vercel/gatsby-plugin-vercel-analytics/package.json`)),
+    '@vercel/gatsby-plugin-vercel-builder': path.dirname(eval('require').resolve(`@vercel/gatsby-plugin-vercel-builder/package.json`)),
+};
 async function injectPlugins(detectedVersion, dir) {
     const plugins = new Set();
-    if (process.env.VERCEL_GATSBY_BUILDER_PLUGIN && detectedVersion) {
+    if (process.env.VERCEL_GATSBY_BUILDER_PLUGIN === '1' && detectedVersion) {
         const version = semver_1.default.coerce(detectedVersion);
         if (version && semver_1.default.satisfies(version, '>=4.0.0')) {
             plugins.add('@vercel/gatsby-plugin-vercel-builder');
@@ -50,7 +52,14 @@ async function injectPlugins(detectedVersion, dir) {
     if (plugins.size === 0) {
         return false;
     }
-    const ops = [addGatsbyPackage(dir, plugins)];
+    let pluginsStr = 'plugin';
+    if (plugins.size > 1) {
+        pluginsStr += 's';
+    }
+    console.log(`Injecting Gatsby.js ${pluginsStr} ${Array.from(plugins)
+        .map(p => `"${p}"`)
+        .join(', ')}`);
+    const ops = [];
     if (plugins.has('@vercel/gatsby-plugin-vercel-analytics')) {
         ops.push(updateGatsbyConfig(dir, ['@vercel/gatsby-plugin-vercel-analytics']));
     }
@@ -61,64 +70,33 @@ async function injectPlugins(detectedVersion, dir) {
     return true;
 }
 exports.injectPlugins = injectPlugins;
-function printInjectingPlugins(plugins, configPath) {
-    const pluginsArray = Array.from(plugins);
-    let pluginsStr = 'plugin';
-    if (pluginsArray.length > 1) {
-        pluginsStr += 's';
-    }
-    console.log(`Injecting Gatsby.js ${pluginsStr} ${pluginsArray
-        .map(p => `"${p}"`)
-        .join(', ')} to \`${configPath}\``);
-}
-async function addGatsbyPackage(dir, plugins) {
-    const pkgJson = (await _shared_1.readPackageJson(dir));
-    if (!pkgJson.dependencies) {
-        pkgJson.dependencies = {};
-    }
-    for (const plugin of plugins) {
-        if (!pkgJson.dependencies[plugin]) {
-            console.log(`Adding "${plugin}" to \`package.json\` "dependencies"`);
-            let version = 'latest';
-            // Use the tarball URL for E2E tests
-            if (VERCEL_CLI_VERSION?.startsWith('https://')) {
-                version = new url_1.URL(`./${plugin}.tgz`, VERCEL_CLI_VERSION).href;
-            }
-            pkgJson.dependencies[plugin] = version;
-        }
-    }
-    await _shared_1.writePackageJson(dir, pkgJson);
-}
 async function updateGatsbyConfig(dir, plugins) {
     const gatsbyConfigPathTs = path.join(dir, `${GATSBY_CONFIG_FILE}.ts`);
     const gatsbyConfigPathMjs = path.join(dir, `${GATSBY_CONFIG_FILE}.mjs`);
     const gatsbyConfigPathJs = path.join(dir, `${GATSBY_CONFIG_FILE}.js`);
     if (await _shared_1.fileExists(gatsbyConfigPathTs)) {
-        printInjectingPlugins(plugins, gatsbyConfigPathTs);
         await updateGatsbyConfigTs(gatsbyConfigPathTs, plugins);
     }
     else if (await _shared_1.fileExists(gatsbyConfigPathMjs)) {
-        printInjectingPlugins(plugins, gatsbyConfigPathMjs);
         await updateGatsbyConfigMjs(gatsbyConfigPathMjs, plugins);
     }
+    else if (await _shared_1.fileExists(gatsbyConfigPathJs)) {
+        await updateGatsbyConfigJs(gatsbyConfigPathJs, plugins);
+    }
     else {
-        printInjectingPlugins(plugins, gatsbyConfigPathJs);
-        if (await _shared_1.fileExists(gatsbyConfigPathJs)) {
-            await updateGatsbyConfigJs(gatsbyConfigPathJs, plugins);
-        }
-        else {
-            await fs_1.promises.writeFile(gatsbyConfigPathJs, `module.exports = ${JSON.stringify({
-                plugins: Array.from(plugins),
-            })}`);
-        }
+        await fs_extra_1.default.writeFile(gatsbyConfigPathJs, `module.exports = ${JSON.stringify({
+            plugins,
+        })}`);
     }
 }
+const GENERATED_FILE_COMMENT = `// This file was generated by @vercel/static-build`;
 async function updateGatsbyConfigTs(configPath, plugins) {
     const renamedPath = `${configPath}.__vercel_builder_backup__.ts`;
     if (!(await _shared_1.fileExists(renamedPath))) {
-        await fs_1.promises.rename(configPath, renamedPath);
+        await fs_extra_1.default.rename(configPath, renamedPath);
     }
-    await fs_1.promises.writeFile(configPath, `import userConfig from "./gatsby-config.ts.__vercel_builder_backup__.ts";
+    await fs_extra_1.default.writeFile(configPath, `${GENERATED_FILE_COMMENT}
+import userConfig from "./gatsby-config.ts.__vercel_builder_backup__.ts";
 import type { PluginRef } from "gatsby";
 
 const preferDefault = (m: any) => (m && m.default) || m;
@@ -132,7 +110,7 @@ if (!vercelConfig.plugins) {
   vercelConfig.plugins = [];
 }
 
-for (const plugin of ${JSON.stringify(Array.from(plugins))}) {
+for (const plugin of ${JSON.stringify(plugins)}) {
   const hasPlugin = vercelConfig.plugins.find(
     (p: PluginRef) =>
       p && (p === plugin || p.resolve === plugin)
@@ -150,9 +128,10 @@ export default vercelConfig;
 async function updateGatsbyConfigMjs(configPath, plugins) {
     const renamedPath = `${configPath}.__vercel_builder_backup__.mjs`;
     if (!(await _shared_1.fileExists(renamedPath))) {
-        await fs_1.promises.rename(configPath, renamedPath);
+        await fs_extra_1.default.rename(configPath, renamedPath);
     }
-    await fs_1.promises.writeFile(configPath, `import userConfig from "./gatsby-config.mjs.__vercel_builder_backup__.mjs";
+    await fs_extra_1.default.writeFile(configPath, `${GENERATED_FILE_COMMENT}
+import userConfig from "./gatsby-config.mjs.__vercel_builder_backup__.mjs";
 
 const preferDefault = (m) => (m && m.default) || m;
 
@@ -160,11 +139,12 @@ const vercelConfig = Object.assign(
   {},
   preferDefault(userConfig)
 );
+
 if (!vercelConfig.plugins) {
   vercelConfig.plugins = [];
 }
 
-for (const plugin of ${JSON.stringify(Array.from(plugins))}) {
+for (const plugin of ${JSON.stringify(plugins)}) {
   const hasPlugin = vercelConfig.plugins.find(
     (p) => p && (p === plugin || p.resolve === plugin)
   );
@@ -181,9 +161,10 @@ export default vercelConfig;
 async function updateGatsbyConfigJs(configPath, plugins) {
     const renamedPath = `${configPath}.__vercel_builder_backup__.js`;
     if (!(await _shared_1.fileExists(renamedPath))) {
-        await fs_1.promises.rename(configPath, renamedPath);
+        await fs_extra_1.default.rename(configPath, renamedPath);
     }
-    await fs_1.promises.writeFile(configPath, `const userConfig = require("./gatsby-config.js.__vercel_builder_backup__.js");
+    await fs_extra_1.default.writeFile(configPath, `${GENERATED_FILE_COMMENT}
+const userConfig = require("./gatsby-config.js.__vercel_builder_backup__.js");
 
 const preferDefault = m => (m && m.default) || m;
 
@@ -191,11 +172,12 @@ const vercelConfig = Object.assign(
   {},
   preferDefault(userConfig)
 );
+
 if (!vercelConfig.plugins) {
   vercelConfig.plugins = [];
 }
 
-for (const plugin of ${JSON.stringify(Array.from(plugins))}) {
+for (const plugin of ${JSON.stringify(plugins)}) {
   const hasPlugin = vercelConfig.plugins.find(
     (p) => p && (p === plugin || p.resolve === plugin)
   );
@@ -222,15 +204,16 @@ async function updateGatsbyNode(dir) {
         await updateGatsbyNodeJs(gatsbyNodePathJs);
     }
     else {
-        await fs_1.promises.writeFile(gatsbyNodePathJs, `module.exports = require('@vercel/gatsby-plugin-vercel-builder/gatsby-node.js');`);
+        await fs_extra_1.default.writeFile(gatsbyNodePathJs, `module.exports = require('@vercel/gatsby-plugin-vercel-builder/gatsby-node.js');`);
     }
 }
 async function updateGatsbyNodeTs(configPath) {
     const renamedPath = `${configPath}.__vercel_builder_backup__.ts`;
     if (!(await _shared_1.fileExists(renamedPath))) {
-        await fs_1.promises.rename(configPath, renamedPath);
+        await fs_extra_1.default.rename(configPath, renamedPath);
     }
-    await fs_1.promises.writeFile(configPath, `import type { GatsbyNode } from 'gatsby';
+    await fs_extra_1.default.writeFile(configPath, `${GENERATED_FILE_COMMENT}
+import type { GatsbyNode } from 'gatsby';
 import * as vercelBuilder from '@vercel/gatsby-plugin-vercel-builder/gatsby-node.js';
 import * as gatsbyNode from './gatsby-node.ts.__vercel_builder_backup__.ts';
 
@@ -247,9 +230,10 @@ export const onPostBuild: GatsbyNode['onPostBuild'] = async (args, options) => {
 async function updateGatsbyNodeMjs(configPath) {
     const renamedPath = `${configPath}.__vercel_builder_backup__.mjs`;
     if (!(await _shared_1.fileExists(renamedPath))) {
-        await fs_1.promises.rename(configPath, renamedPath);
+        await fs_extra_1.default.rename(configPath, renamedPath);
     }
-    await fs_1.promises.writeFile(configPath, `import * as vercelBuilder from '@vercel/gatsby-plugin-vercel-builder/gatsby-node.js';
+    await fs_extra_1.default.writeFile(configPath, `${GENERATED_FILE_COMMENT}
+import * as vercelBuilder from '@vercel/gatsby-plugin-vercel-builder/gatsby-node.js';
 import * as gatsbyNode from './gatsby-node.mjs.__vercel_builder_backup__.mjs';
 
 export * from './gatsby-node.mjs.__vercel_builder_backup__.mjs';
@@ -265,9 +249,10 @@ export const onPostBuild = async (args, options) => {
 async function updateGatsbyNodeJs(configPath) {
     const renamedPath = `${configPath}.__vercel_builder_backup__.js`;
     if (!(await _shared_1.fileExists(renamedPath))) {
-        await fs_1.promises.rename(configPath, renamedPath);
+        await fs_extra_1.default.rename(configPath, renamedPath);
     }
-    await fs_1.promises.writeFile(configPath, `const vercelBuilder = require('@vercel/gatsby-plugin-vercel-builder/gatsby-node.js');
+    await fs_extra_1.default.writeFile(configPath, `${GENERATED_FILE_COMMENT}
+const vercelBuilder = require('@vercel/gatsby-plugin-vercel-builder/gatsby-node.js');
 const gatsbyNode = require('./gatsby-node.js.__vercel_builder_backup__.js');
 
 const origOnPostBuild = gatsbyNode.onPostBuild;
@@ -282,3 +267,34 @@ gatsbyNode.onPostBuild = async (args, options) => {
 module.exports = gatsbyNode;
 `);
 }
+async function cleanupGatsbyFiles(dir) {
+    const backup = '.__vercel_builder_backup__';
+    const fileEndings = ['.js', '.ts', '.mjs'];
+    for (const fileName of [GATSBY_CONFIG_FILE, GATSBY_NODE_FILE]) {
+        for (const fileEnding of fileEndings) {
+            const baseFile = `${fileName}${fileEnding}`;
+            const baseFilePath = path.join(dir, baseFile);
+            const backupFile = `${baseFile}${backup}${fileEnding}`;
+            const backupFilePath = path.join(dir, backupFile);
+            const [baseFileContent, backupFileContent] = await Promise.all([
+                fs_extra_1.default.readFile(baseFilePath, 'utf-8').catch(() => null),
+                fs_extra_1.default.readFile(backupFilePath, 'utf-8').catch(() => null),
+            ]);
+            if (baseFileContent &&
+                baseFileContent.startsWith(GENERATED_FILE_COMMENT)) {
+                await fs_extra_1.default.rm(baseFilePath);
+            }
+            if (backupFileContent) {
+                await fs_extra_1.default.rename(backupFilePath, baseFilePath);
+            }
+        }
+    }
+}
+exports.cleanupGatsbyFiles = cleanupGatsbyFiles;
+async function createPluginSymlinks(dir) {
+    const nodeModulesDir = path.join(dir, 'node_modules');
+    await fs_extra_1.default.ensureDir(path.join(nodeModulesDir, '@vercel'));
+    await Promise.all(PLUGINS.map(name => fs_extra_1.default.remove(path.join(nodeModulesDir, name))));
+    await Promise.all(PLUGINS.map(name => fs_extra_1.default.symlink(PLUGIN_PATHS[name], path.join(nodeModulesDir, name))));
+}
+exports.createPluginSymlinks = createPluginSymlinks;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/static-build",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/build-step",
@@ -15,7 +15,7 @@
   "scripts": {
     "build": "node build",
     "test": "jest --env node --verbose --bail --runInBand",
-    "test-unit": "pnpm test test/build.test.ts test/gatsby.test.js test/prepare-cache.test.ts",
+    "test-unit": "pnpm test test/build.test.ts test/gatsby.test.ts test/prepare-cache.test.ts",
     "test-integration-once": "pnpm test test/integration-*.test.js"
   },
   "jest": {
@@ -28,6 +28,10 @@
       }
     }
   },
+  "dependencies": {
+    "@vercel/gatsby-plugin-vercel-analytics": "1.0.7",
+    "@vercel/gatsby-plugin-vercel-builder": "1.0.2"
+  },
   "devDependencies": {
     "@types/aws-lambda": "8.10.64",
     "@types/cross-spawn": "6.0.0",
@@ -41,8 +45,6 @@
     "@vercel/build-utils": "6.0.0",
     "@vercel/frameworks": "1.3.0",
     "@vercel/fs-detectors": "3.7.6",
-    "@vercel/gatsby-plugin-vercel-analytics": "1.0.7",
-    "@vercel/gatsby-plugin-vercel-builder": "1.0.1",
     "@vercel/ncc": "0.24.0",
     "@vercel/routing-utils": "2.1.8",
     "@vercel/static-config": "2.0.11",
@@ -58,5 +60,5 @@
     "ts-morph": "12.0.0",
     "typescript": "4.3.4"
   },
-  "gitHead": "25f6595d3698546ba69c7fe9f601a906167fef3f"
+  "gitHead": "9317543c48a039bda0ae91f0819f38f789d98338"
 }