@vercel/static-build 1.0.36 → 1.0.38

package/dist/index.js

@@ -225074,7 +225074,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 +225082,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 +225181,7 @@ if (!hasPlugin) {
 
 module.exports = vercelConfig;
 `);
-    }
-    else {
-        await fs_1.promises.writeFile(gatsbyConfigPath, `module.exports = ${JSON.stringify(defaultConfig)}`);
-    }
 }
-exports.injectVercelAnalyticsPlugin = injectVercelAnalyticsPlugin;
 
 
 /***/ }),
@@ -225150,7 +225196,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.

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.36",
+  "version": "1.0.38",
   "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.7",
+    "@vercel/build-utils": "5.5.8",
     "@vercel/frameworks": "1.1.12",
     "@vercel/ncc": "0.24.0",
     "@vercel/routing-utils": "2.1.3",
@@ -49,5 +49,5 @@
     "rc9": "1.2.0",
     "typescript": "4.3.4"
   },
-  "gitHead": "1b211f28dfdcb112f1aecb53a2b9f257ecc58420"
+  "gitHead": "4159b498b93cc340ee483beb5dd1ef18dc762408"
 }