@vercel/static-build 1.3.30 → 1.3.32

package/dist/utils/gatsby.js

@@ -27,6 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPluginSymlinks = exports.cleanupGatsbyFiles = exports.injectPlugins = void 0;
+const error_utils_1 = require("@vercel/error-utils");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path = __importStar(require("path"));
 const semver_1 = __importDefault(require("semver"));
@@ -41,12 +42,19 @@ 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`)),
 };
+let GLOBAL_EXIT_HANDLER;
 async function injectPlugins(detectedVersion, dir) {
     const plugins = new Set();
     if (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');
+            if (!GLOBAL_EXIT_HANDLER) {
+                GLOBAL_EXIT_HANDLER = () => {
+                    cleanupGatsbyFiles(dir);
+                };
+                process.on('exit', GLOBAL_EXIT_HANDLER);
+            }
         }
     }
     if (process.env.VERCEL_ANALYTICS_ID) {
@@ -271,28 +279,35 @@ 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);
+// must remain sync because it's called in an exit handler
+function cleanupGatsbyFiles(dir) {
+    try {
+        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 = tryReadFileSync(baseFilePath);
+                const backupFileContent = tryReadFileSync(backupFilePath);
+                if (baseFileContent &&
+                    baseFileContent.startsWith(GENERATED_FILE_COMMENT)) {
+                    fs_extra_1.default.rmSync(baseFilePath);
+                }
+                if (backupFileContent) {
+                    fs_extra_1.default.renameSync(backupFilePath, baseFilePath);
+                }
             }
         }
     }
+    catch (error) {
+        console.error(error);
+        if (GLOBAL_EXIT_HANDLER) {
+            process.off('exit', GLOBAL_EXIT_HANDLER);
+        }
+    }
 }
 exports.cleanupGatsbyFiles = cleanupGatsbyFiles;
 async function createPluginSymlinks(dir) {
@@ -302,3 +317,19 @@ async function createPluginSymlinks(dir) {
     await Promise.all(PLUGINS.map(name => fs_extra_1.default.symlink(PLUGIN_PATHS[name], path.join(nodeModulesDir, name))));
 }
 exports.createPluginSymlinks = createPluginSymlinks;
+function tryReadFileSync(filePath) {
+    try {
+        return fs_extra_1.default.readFileSync(filePath, 'utf-8');
+    }
+    catch (error) {
+        if ((0, error_utils_1.isErrnoException)(error)) {
+            if (error.code !== 'ENOENT') {
+                console.error(error);
+            }
+        }
+        else {
+            console.error(error);
+        }
+        return undefined;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/static-build",
-  "version": "1.3.30",
+  "version": "1.3.32",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/build-step",
@@ -12,15 +12,9 @@
     "url": "https://github.com/vercel/vercel.git",
     "directory": "packages/static-build"
   },
-  "scripts": {
-    "build": "node build",
-    "test": "jest --env node --verbose --bail --runInBand",
-    "test-unit": "pnpm test test/build.test.ts test/gatsby.test.ts test/prepare-cache.test.ts",
-    "test-e2e": "pnpm test test/integration-*.test.js"
-  },
   "dependencies": {
     "@vercel/gatsby-plugin-vercel-analytics": "1.0.10",
-    "@vercel/gatsby-plugin-vercel-builder": "1.3.3"
+    "@vercel/gatsby-plugin-vercel-builder": "1.3.5"
   },
   "devDependencies": {
     "@types/aws-lambda": "8.10.64",
@@ -32,7 +26,7 @@
     "@types/node-fetch": "2.5.4",
     "@types/promise-timeout": "1.3.0",
     "@types/semver": "7.3.13",
-    "@vercel/build-utils": "6.7.2",
+    "@vercel/build-utils": "6.7.3",
     "@vercel/error-utils": "1.0.10",
     "@vercel/frameworks": "1.4.2",
     "@vercel/fs-detectors": "3.9.2",
@@ -50,5 +44,10 @@
     "tree-kill": "1.2.2",
     "ts-morph": "12.0.0"
   },
-  "gitHead": "d1d3e9384d139a06acca521348f8f9209bb3d214"
-}
+  "scripts": {
+    "build": "node build",
+    "test": "jest --env node --verbose --bail --runInBand",
+    "test-unit": "pnpm test test/build.test.ts test/gatsby.test.ts test/prepare-cache.test.ts",
+    "test-e2e": "pnpm test test/integration-*.test.js"
+  }
+}