@vercel/static-build 1.0.37 → 1.0.39

package/dist/index.js

@@ -187104,6 +187104,132 @@ module.exports = function(num) {
 };
 
 
+/***/ }),
+
+/***/ 3255:
+/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
+
+"use strict";
+
+
+var childProcess = __webpack_require__(3129);
+var spawn = childProcess.spawn;
+var exec = childProcess.exec;
+
+module.exports = function (pid, signal, callback) {
+    if (typeof signal === 'function' && callback === undefined) {
+        callback = signal;
+        signal = undefined;
+    }
+
+    pid = parseInt(pid);
+    if (Number.isNaN(pid)) {
+        if (callback) {
+            return callback(new Error("pid must be a number"));
+        } else {
+            throw new Error("pid must be a number");
+        }
+    }
+
+    var tree = {};
+    var pidsToProcess = {};
+    tree[pid] = [];
+    pidsToProcess[pid] = 1;
+
+    switch (process.platform) {
+    case 'win32':
+        exec('taskkill /pid ' + pid + ' /T /F', callback);
+        break;
+    case 'darwin':
+        buildProcessTree(pid, tree, pidsToProcess, function (parentPid) {
+          return spawn('pgrep', ['-P', parentPid]);
+        }, function () {
+            killAll(tree, signal, callback);
+        });
+        break;
+    // case 'sunos':
+    //     buildProcessTreeSunOS(pid, tree, pidsToProcess, function () {
+    //         killAll(tree, signal, callback);
+    //     });
+    //     break;
+    default: // Linux
+        buildProcessTree(pid, tree, pidsToProcess, function (parentPid) {
+          return spawn('ps', ['-o', 'pid', '--no-headers', '--ppid', parentPid]);
+        }, function () {
+            killAll(tree, signal, callback);
+        });
+        break;
+    }
+};
+
+function killAll (tree, signal, callback) {
+    var killed = {};
+    try {
+        Object.keys(tree).forEach(function (pid) {
+            tree[pid].forEach(function (pidpid) {
+                if (!killed[pidpid]) {
+                    killPid(pidpid, signal);
+                    killed[pidpid] = 1;
+                }
+            });
+            if (!killed[pid]) {
+                killPid(pid, signal);
+                killed[pid] = 1;
+            }
+        });
+    } catch (err) {
+        if (callback) {
+            return callback(err);
+        } else {
+            throw err;
+        }
+    }
+    if (callback) {
+        return callback();
+    }
+}
+
+function killPid(pid, signal) {
+    try {
+        process.kill(parseInt(pid, 10), signal);
+    }
+    catch (err) {
+        if (err.code !== 'ESRCH') throw err;
+    }
+}
+
+function buildProcessTree (parentPid, tree, pidsToProcess, spawnChildProcessesList, cb) {
+    var ps = spawnChildProcessesList(parentPid);
+    var allData = '';
+    ps.stdout.on('data', function (data) {
+        var data = data.toString('ascii');
+        allData += data;
+    });
+
+    var onClose = function (code) {
+        delete pidsToProcess[parentPid];
+
+        if (code != 0) {
+            // no more parent processes
+            if (Object.keys(pidsToProcess).length == 0) {
+                cb();
+            }
+            return;
+        }
+
+        allData.match(/\d+/g).forEach(function (pid) {
+          pid = parseInt(pid, 10);
+          tree[parentPid].push(pid);
+          tree[pid] = [];
+          pidsToProcess[pid] = 1;
+          buildProcessTree(pid, tree, pidsToProcess, spawnChildProcessesList, cb);
+        });
+    };
+
+    ps.on('close', onClose);
+}
+
+
 /***/ }),
 
 /***/ 4490:
@@ -224025,6 +224151,7 @@ const BuildOutputV2 = __importStar(__webpack_require__(5154));
 const BuildOutputV3 = __importStar(__webpack_require__(8939));
 const GatsbyUtils = __importStar(__webpack_require__(8573));
 const NuxtUtils = __importStar(__webpack_require__(431));
+const tree_kill_1 = __importDefault(__webpack_require__(3255));
 const sleep = (n) => new Promise(resolve => setTimeout(resolve, n));
 const DEV_SERVER_PORT_BIND_TIMEOUT = ms_1.default('5m');
 async function checkForPort(port, timeout) {
@@ -224117,10 +224244,10 @@ exports.version = 2;
 const nowDevScriptPorts = new Map();
 const nowDevChildProcesses = new Set();
 ['SIGINT', 'SIGTERM'].forEach(signal => {
-    process.once(signal, () => {
+    process.once(signal, async () => {
         for (const child of nowDevChildProcesses) {
             build_utils_1.debug(`Got ${signal}, killing dev server child process (pid=${child.pid})`);
-            process.kill(child.pid, signal);
+            await new Promise(resolve => tree_kill_1.default(child.pid, signal, resolve));
         }
         process.exit(0);
     });
@@ -224418,7 +224545,7 @@ const build = async ({ files, entrypoint, workPath, config, meta = {}, }) => {
                 };
                 const cmd = devCommand || `yarn run ${devScript}`;
                 const child = build_utils_1.spawnCommand(cmd, opts);
-                child.on('exit', () => nowDevScriptPorts.delete(entrypoint));
+                child.on('close', () => nowDevScriptPorts.delete(entrypoint));
                 nowDevChildProcesses.add(child);
                 // Wait for the server to have listened on `$PORT`, after which we
                 // will ProxyPass any requests to that development server that come in
@@ -225074,7 +225201,7 @@ exports.injectVercelAnalyticsPlugin = void 0;
 const fs_1 = __webpack_require__(5747);
 const path = __importStar(__webpack_require__(5622));
 const _shared_1 = __webpack_require__(2229);
-const defaultConfig = {
+const DEFAULT_CONFIG = {
     plugins: [
         {
             resolve: 'gatsby-plugin-vercel',
@@ -225082,26 +225209,77 @@ const defaultConfig = {
         },
     ],
 };
+const GATSBY_PLUGIN_PACKAGE_NAME = 'gatsby-plugin-vercel';
+const GATSBY_CONFIG_FILE = 'gatsby-config';
 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 gatsbyConfigPathJs = path.join(dir, `${GATSBY_CONFIG_FILE}.js`);
+    const gatsbyConfigPathTs = path.join(dir, `${GATSBY_CONFIG_FILE}.ts`);
+    if (await _shared_1.fileExists(gatsbyConfigPathTs)) {
+        console.log(`Injecting Gatsby.js analytics plugin "${GATSBY_PLUGIN_PACKAGE_NAME}" to \`${gatsbyConfigPathTs}\``);
+        await addGatsbyPackage(dir);
+        return updateGatsbyTsConfig(gatsbyConfigPathTs);
+    }
+    console.log(`Injecting Gatsby.js analytics plugin "${GATSBY_PLUGIN_PACKAGE_NAME}" to \`${gatsbyConfigPathJs}\``);
+    await addGatsbyPackage(dir);
+    if (await _shared_1.fileExists(gatsbyConfigPathJs)) {
+        await updateGatsbyJsConfig(gatsbyConfigPathJs);
+    }
+    else {
+        await fs_1.promises.writeFile(gatsbyConfigPathJs, `module.exports = ${JSON.stringify(DEFAULT_CONFIG)}`);
+    }
+}
+exports.injectVercelAnalyticsPlugin = injectVercelAnalyticsPlugin;
+async function addGatsbyPackage(dir) {
     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';
+    if (!pkgJson.dependencies[GATSBY_PLUGIN_PACKAGE_NAME]) {
+        console.log(`Adding "${GATSBY_PLUGIN_PACKAGE_NAME}" to \`package.json\` "dependencies"`);
+        pkgJson.dependencies[GATSBY_PLUGIN_PACKAGE_NAME] = '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");
+}
+async function updateGatsbyTsConfig(configPath) {
+    await fs_1.promises.rename(configPath, configPath + '.__vercel_builder_backup__.ts');
+    await fs_1.promises.writeFile(configPath, `import userConfig from "./gatsby-config.ts.__vercel_builder_backup__.ts";
+import type { PluginRef } from "gatsby";
+
+// https://github.com/gatsbyjs/gatsby/blob/354003fb2908e02ff12109ca3a02978a5a6e608c/packages/gatsby/src/bootstrap/prefer-default.ts
+const preferDefault = (m: any) => (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: PluginRef) =>
+    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: {},
+  });
+}
+
+export default vercelConfig;
+`);
+}
+async function updateGatsbyJsConfig(configPath) {
+    await fs_1.promises.rename(configPath, configPath + '.__vercel_builder_backup__.js');
+    await fs_1.promises.writeFile(configPath, `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;
@@ -225130,12 +225308,7 @@ if (!hasPlugin) {
 
 module.exports = vercelConfig;
 `);
-    }
-    else {
-        await fs_1.promises.writeFile(gatsbyConfigPath, `module.exports = ${JSON.stringify(defaultConfig)}`);
-    }
 }
-exports.injectVercelAnalyticsPlugin = injectVercelAnalyticsPlugin;
 
 
 /***/ }),
@@ -225150,7 +225323,7 @@ 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
+// https://github.com/nuxt-modules/web-vitals
 const ANALYTICS_PLUGIN_PACKAGE = '@nuxtjs/web-vitals';
 async function injectVercelAnalyticsPlugin(dir) {
     // First update the `.nuxtrc` file to inject the analytics plugin.
@@ -225299,6 +225472,14 @@ module.exports = require("buffer");
 
 /***/ }),
 
+/***/ 3129:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("child_process");
+
+/***/ }),
+
 /***/ 7619:
 /***/ ((module) => {
 

package/dist/utils/gatsby.js

@@ -23,7 +23,7 @@ exports.injectVercelAnalyticsPlugin = void 0;
 const fs_1 = require("fs");
 const path = __importStar(require("path"));
 const _shared_1 = require("./_shared");
-const defaultConfig = {
+const DEFAULT_CONFIG = {
     plugins: [
         {
             resolve: 'gatsby-plugin-vercel',
@@ -31,26 +31,77 @@ const defaultConfig = {
         },
     ],
 };
+const GATSBY_PLUGIN_PACKAGE_NAME = 'gatsby-plugin-vercel';
+const GATSBY_CONFIG_FILE = 'gatsby-config';
 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 gatsbyConfigPathJs = path.join(dir, `${GATSBY_CONFIG_FILE}.js`);
+    const gatsbyConfigPathTs = path.join(dir, `${GATSBY_CONFIG_FILE}.ts`);
+    if (await _shared_1.fileExists(gatsbyConfigPathTs)) {
+        console.log(`Injecting Gatsby.js analytics plugin "${GATSBY_PLUGIN_PACKAGE_NAME}" to \`${gatsbyConfigPathTs}\``);
+        await addGatsbyPackage(dir);
+        return updateGatsbyTsConfig(gatsbyConfigPathTs);
+    }
+    console.log(`Injecting Gatsby.js analytics plugin "${GATSBY_PLUGIN_PACKAGE_NAME}" to \`${gatsbyConfigPathJs}\``);
+    await addGatsbyPackage(dir);
+    if (await _shared_1.fileExists(gatsbyConfigPathJs)) {
+        await updateGatsbyJsConfig(gatsbyConfigPathJs);
+    }
+    else {
+        await fs_1.promises.writeFile(gatsbyConfigPathJs, `module.exports = ${JSON.stringify(DEFAULT_CONFIG)}`);
+    }
+}
+exports.injectVercelAnalyticsPlugin = injectVercelAnalyticsPlugin;
+async function addGatsbyPackage(dir) {
     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';
+    if (!pkgJson.dependencies[GATSBY_PLUGIN_PACKAGE_NAME]) {
+        console.log(`Adding "${GATSBY_PLUGIN_PACKAGE_NAME}" to \`package.json\` "dependencies"`);
+        pkgJson.dependencies[GATSBY_PLUGIN_PACKAGE_NAME] = '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");
+}
+async function updateGatsbyTsConfig(configPath) {
+    await fs_1.promises.rename(configPath, configPath + '.__vercel_builder_backup__.ts');
+    await fs_1.promises.writeFile(configPath, `import userConfig from "./gatsby-config.ts.__vercel_builder_backup__.ts";
+import type { PluginRef } from "gatsby";
+
+// https://github.com/gatsbyjs/gatsby/blob/354003fb2908e02ff12109ca3a02978a5a6e608c/packages/gatsby/src/bootstrap/prefer-default.ts
+const preferDefault = (m: any) => (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: PluginRef) =>
+    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: {},
+  });
+}
+
+export default vercelConfig;
+`);
+}
+async function updateGatsbyJsConfig(configPath) {
+    await fs_1.promises.rename(configPath, configPath + '.__vercel_builder_backup__.js');
+    await fs_1.promises.writeFile(configPath, `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;
@@ -79,9 +130,4 @@ if (!hasPlugin) {
 
 module.exports = vercelConfig;
 `);
-    }
-    else {
-        await fs_1.promises.writeFile(gatsbyConfigPath, `module.exports = ${JSON.stringify(defaultConfig)}`);
-    }
 }
-exports.injectVercelAnalyticsPlugin = injectVercelAnalyticsPlugin;

package/dist/utils/nuxt.js

@@ -4,7 +4,7 @@ exports.injectVercelAnalyticsPlugin = void 0;
 const path_1 = require("path");
 const rc9_1 = require("rc9");
 const _shared_1 = require("./_shared");
-// https://github.com/nuxt-community/web-vitals-module
+// https://github.com/nuxt-modules/web-vitals
 const ANALYTICS_PLUGIN_PACKAGE = '@nuxtjs/web-vitals';
 async function injectVercelAnalyticsPlugin(dir) {
     // First update the `.nuxtrc` file to inject the analytics plugin.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/static-build",
-  "version": "1.0.37",
+  "version": "1.0.39",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/build-step",
@@ -36,7 +36,7 @@
     "@types/ms": "0.7.31",
     "@types/node-fetch": "2.5.4",
     "@types/promise-timeout": "1.3.0",
-    "@vercel/build-utils": "5.5.8",
+    "@vercel/build-utils": "5.5.9",
     "@vercel/frameworks": "1.1.12",
     "@vercel/ncc": "0.24.0",
     "@vercel/routing-utils": "2.1.3",
@@ -47,7 +47,8 @@
     "ms": "2.1.2",
     "node-fetch": "2.6.7",
     "rc9": "1.2.0",
+    "tree-kill": "1.2.2",
     "typescript": "4.3.4"
   },
-  "gitHead": "74593e4d813cb3f9ae5bb44878461355c3a86849"
+  "gitHead": "7003531d5db7895fc3b2fa940c2d83b6e75bbd9e"
 }