@nx-extend/vercel 1.2.0 → 1.3.1

package/CHANGELOG.md

@@ -1,4 +1,17 @@
  
+## [1.3.1](https://github.com/TriPSs/nx-extend/compare/vercel@1.3.0...vercel@1.3.1) (2022-09-14)
+
+
+
+# [1.3.0](https://github.com/TriPSs/nx-extend/compare/vercel@1.2.0...vercel@1.3.0) (2022-09-13)
+
+
+### Features
+
+* **vercel:** Added support for `envVars` option ([55e8e14](https://github.com/TriPSs/nx-extend/commit/55e8e14d2f7304a6833bc49881cfd3554a051192))
+
+
+
 # [1.2.0](https://github.com/TriPSs/nx-extend/compare/vercel@1.1.1...vercel@1.2.0) (2022-09-06)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx-extend/vercel",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "keywords": [
     "nx",
     "vercel"
@@ -19,7 +19,7 @@
   "generators": "./generators.json",
   "typings": "./src/index.d.ts",
   "dependencies": {
-    "@nx-extend/core": "1.2.2",
+    "@nx-extend/core": "1.3.1",
     "shelljs": "^0.8.5"
   },
   "peerDependencies": {}

package/src/executors/build/build.impl.d.ts

@@ -3,6 +3,7 @@ export interface ExecutorSchema {
     projectId: string;
     orgId: string;
     debug?: boolean;
+    envVars?: Record<string, string>;
 }
 export declare function buildExecutor(options: ExecutorSchema, context: ExecutorContext): Promise<{
     success: boolean;

package/src/executors/build/build.impl.js

@@ -3,9 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildExecutor = void 0;
 const devkit_1 = require("@nrwl/devkit");
 const core_1 = require("@nx-extend/core");
+const path_1 = require("path");
+const add_env_variables_to_file_1 = require("../../utils/add-env-variables-to-file");
+const get_env_vars_1 = require("../../utils/get-env-vars");
 function buildExecutor(options, context) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     const { targets } = context.workspace.projects[context.projectName];
+    if (!options.orgId) {
+        throw new Error(`"orgId" option is required!`);
+    }
+    if (!options.projectId) {
+        throw new Error(`"projectId" option is required!`);
+    }
     if (!targets['build-next']) {
         throw new Error(`"${context.projectName}" is missing the original "build-next" target!`);
     }
@@ -22,10 +31,23 @@ function buildExecutor(options, context) {
     (0, core_1.execCommand)((0, core_1.buildCommand)([
         'npx vercel pull --yes',
         context.configurationName === 'production' && '--environment=production',
+        context.configurationName !== 'production' && '--environment=preview',
         options.debug && '--debug'
     ]));
+    const vercelDirectory = '.vercel';
+    const vercelProjectJson = `./${vercelDirectory}/project.json`;
+    const outputDirectory = (_d = (_c = targets['build-next']) === null || _c === void 0 ? void 0 : _c.options) === null || _d === void 0 ? void 0 : _d.outputPath;
+    const vercelEnironment = context.configurationName === 'production'
+        ? 'production'
+        : 'preview';
+    const vercelEnvFile = `.env.${vercelEnironment}.local`;
+    const vercelEnvFileLocation = (0, path_1.join)(context.root, vercelDirectory);
+    const envVars = (0, get_env_vars_1.getEnvVars)(options.envVars, true);
+    if (envVars.length > 0) {
+        (0, add_env_variables_to_file_1.addEnvVariablesToFile)((0, path_1.join)(vercelEnvFileLocation, vercelEnvFile), envVars);
+    }
     // Update the project json with the correct settings
-    (0, devkit_1.writeJsonFile)('./.vercel/project.json', {
+    (0, devkit_1.writeJsonFile)(vercelProjectJson, {
         projectId: options.projectId,
         orgId: options.orgId,
         settings: {
@@ -33,8 +55,8 @@ function buildExecutor(options, context) {
             framework: 'nextjs',
             devCommand: null,
             installCommand: 'echo \'\'',
-            buildCommand: `nx build-next ${context.projectName} --prod`,
-            outputDirectory: `${(_d = (_c = targets['build-next']) === null || _c === void 0 ? void 0 : _c.options) === null || _d === void 0 ? void 0 : _d.outputPath}/.next`,
+            buildCommand: `nx build-next ${context.projectName}${context.configurationName === 'production' ? ' --prod' : ''}`,
+            outputDirectory: `${(_f = (_e = targets['build-next']) === null || _e === void 0 ? void 0 : _e.options) === null || _f === void 0 ? void 0 : _f.outputPath}/.next`,
             rootDirectory: null,
             directoryListing: false,
             nodeVersion: '16.x'
@@ -42,11 +64,14 @@ function buildExecutor(options, context) {
     });
     const { success } = (0, core_1.execCommand)((0, core_1.buildCommand)([
         'npx vercel build',
-        `--output ${(_f = (_e = targets['build-next']) === null || _e === void 0 ? void 0 : _e.options) === null || _f === void 0 ? void 0 : _f.outputPath}/.vercel/output`,
+        `--output ${(_h = (_g = targets['build-next']) === null || _g === void 0 ? void 0 : _g.options) === null || _h === void 0 ? void 0 : _h.outputPath}/.vercel/output`,
         options.debug && '--debug'
     ]));
     if (success) {
-        (0, devkit_1.writeJsonFile)(`${(_h = (_g = targets['build-next']) === null || _g === void 0 ? void 0 : _g.options) === null || _h === void 0 ? void 0 : _h.outputPath}/.vercel/project.json`, (0, devkit_1.readJsonFile)('./.vercel/project.json'));
+        // Write the project.json to the .vercel directory
+        (0, devkit_1.writeJsonFile)((0, path_1.join)(outputDirectory, vercelDirectory, 'project.json'), (0, devkit_1.readJsonFile)(vercelProjectJson));
+        // Also copy over the env files
+        (0, core_1.copyFile)(vercelEnvFileLocation, (0, path_1.join)(outputDirectory, vercelDirectory), vercelEnvFile);
     }
     return Promise.resolve({ success });
 }

package/src/executors/build/build.impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"build.impl.js","sourceRoot":"","sources":["../../../../../../packages/vercel/src/executors/build/build.impl.ts"],"names":[],"mappings":";;;AAAA,yCAA0D;AAC1D,0CAA2D;AAU3D,SAAgB,aAAa,CAC3B,OAAuB,EACvB,OAAwB;;IAExB,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IAEnE,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QAC1B,MAAM,IAAI,KAAK,CAAC,IAAI,OAAO,CAAC,WAAW,gDAAgD,CAAC,CAAA;KACzF;IAED,IAAI,CAAC,CAAA,MAAA,MAAA,OAAO,CAAC,YAAY,CAAC,0CAAE,OAAO,0CAAE,UAAU,CAAA,EAAE;QAC/C,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAA;KACvE;IAED,kDAAkD;IAClD,IAAA,sBAAa,EAAC,wBAAwB,EAAE;QACtC,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,QAAQ,EAAE,EAAE;KACb,CAAC,CAAA;IAEF,cAAc;IACd,IAAA,kBAAW,EAAC,IAAA,mBAAY,EAAC;QACvB,uBAAuB;QACvB,OAAO,CAAC,iBAAiB,KAAK,YAAY,IAAI,0BAA0B;QAExE,OAAO,CAAC,KAAK,IAAI,SAAS;KAC3B,CAAC,CAAC,CAAA;IAEH,oDAAoD;IACpD,IAAA,sBAAa,EAAC,wBAAwB,EAAE;QACtC,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,QAAQ,EAAE;YACR,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE;YAC/B,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,IAAI;YAChB,cAAc,EAAE,WAAW;YAC3B,YAAY,EAAE,iBAAiB,OAAO,CAAC,WAAW,SAAS;YAC3D,eAAe,EAAE,GAAG,MAAA,MAAA,OAAO,CAAC,YAAY,CAAC,0CAAE,OAAO,0CAAE,UAAU,QAAQ;YACtE,aAAa,EAAE,IAAI;YACnB,gBAAgB,EAAE,KAAK;YACvB,WAAW,EAAE,MAAM;SACpB;KACF,CAAC,CAAA;IAEF,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,kBAAW,EAAC,IAAA,mBAAY,EAAC;QAC3C,kBAAkB;QAClB,YAAY,MAAA,MAAA,OAAO,CAAC,YAAY,CAAC,0CAAE,OAAO,0CAAE,UAAU,iBAAiB;QAEvE,OAAO,CAAC,KAAK,IAAI,SAAS;KAC3B,CAAC,CAAC,CAAA;IAEH,IAAI,OAAO,EAAE;QACX,IAAA,sBAAa,EAAC,GAAG,MAAA,MAAA,OAAO,CAAC,YAAY,CAAC,0CAAE,OAAO,0CAAE,UAAU,uBAAuB,EAAE,IAAA,qBAAY,EAAC,wBAAwB,CAAC,CAAC,CAAA;KAC5H;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;AACrC,CAAC;AA1DD,sCA0DC;AAED,kBAAe,aAAa,CAAA"}
+{"version":3,"file":"build.impl.js","sourceRoot":"","sources":["../../../../../../packages/vercel/src/executors/build/build.impl.ts"],"names":[],"mappings":"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"}

package/src/executors/build/build.impl.ts

@@ -1,12 +1,17 @@
 import { readJsonFile, writeJsonFile } from '@nrwl/devkit'
-import { buildCommand, execCommand } from '@nx-extend/core'
+import { buildCommand, copyFile, execCommand } from '@nx-extend/core'
+import { join } from 'path'
 
 import type { ExecutorContext } from '@nrwl/devkit'
 
+import { addEnvVariablesToFile } from '../../utils/add-env-variables-to-file'
+import { getEnvVars } from '../../utils/get-env-vars'
+
 export interface ExecutorSchema {
   projectId: string
   orgId: string
   debug?: boolean
+  envVars?: Record<string, string>
 }
 
 export function buildExecutor(
@@ -15,6 +20,14 @@ export function buildExecutor(
 ): Promise<{ success: boolean }> {
   const { targets } = context.workspace.projects[context.projectName]
 
+  if (!options.orgId) {
+    throw new Error(`"orgId" option is required!`)
+  }
+
+  if (!options.projectId) {
+    throw new Error(`"projectId" option is required!`)
+  }
+
   if (!targets['build-next']) {
     throw new Error(`"${context.projectName}" is missing the original "build-next" target!`)
   }
@@ -34,12 +47,29 @@ export function buildExecutor(
   execCommand(buildCommand([
     'npx vercel pull --yes',
     context.configurationName === 'production' && '--environment=production',
+    context.configurationName !== 'production' && '--environment=preview',
 
     options.debug && '--debug'
   ]))
 
+  const vercelDirectory = '.vercel'
+  const vercelProjectJson = `./${vercelDirectory}/project.json`
+  const outputDirectory = targets['build-next']?.options?.outputPath
+
+  const vercelEnironment = context.configurationName === 'production'
+    ? 'production'
+    : 'preview'
+
+  const vercelEnvFile = `.env.${vercelEnironment}.local`
+  const vercelEnvFileLocation = join(context.root, vercelDirectory)
+
+  const envVars = getEnvVars(options.envVars, true)
+  if (envVars.length > 0) {
+    addEnvVariablesToFile(join(vercelEnvFileLocation, vercelEnvFile), envVars)
+  }
+
   // Update the project json with the correct settings
-  writeJsonFile('./.vercel/project.json', {
+  writeJsonFile(vercelProjectJson, {
     projectId: options.projectId,
     orgId: options.orgId,
     settings: {
@@ -47,7 +77,7 @@ export function buildExecutor(
       framework: 'nextjs',
       devCommand: null,
       installCommand: 'echo \'\'',
-      buildCommand: `nx build-next ${context.projectName} --prod`,
+      buildCommand: `nx build-next ${context.projectName}${context.configurationName === 'production' ? ' --prod' : ''}`,
       outputDirectory: `${targets['build-next']?.options?.outputPath}/.next`,
       rootDirectory: null,
       directoryListing: false,
@@ -63,7 +93,10 @@ export function buildExecutor(
   ]))
 
   if (success) {
-    writeJsonFile(`${targets['build-next']?.options?.outputPath}/.vercel/project.json`, readJsonFile('./.vercel/project.json'))
+    // Write the project.json to the .vercel directory
+    writeJsonFile(join(outputDirectory, vercelDirectory, 'project.json'), readJsonFile(vercelProjectJson))
+    // Also copy over the env files
+    copyFile(vercelEnvFileLocation, join(outputDirectory, vercelDirectory), vercelEnvFile)
   }
 
   return Promise.resolve({ success })

package/src/executors/build/schema.json

@@ -3,15 +3,15 @@
   "type": "object",
   "cli": "nx",
   "title": "Deploy executor",
-  "description": "Deploy to Firebase Hosting",
+  "description": "Deploy to Vercel",
   "properties": {
     "projectId": {
       "type": "string",
-      "description": "Site name in Firebase Hosting"
+      "description": "Project ID in Vercel"
     },
     "orgId": {
       "type": "string",
-      "description": "Site name in Firebase Hosting"
+      "description": "Origination ID in Vercel"
     }
   }
 }

package/src/utils/add-env-variables-to-file.d.ts

@@ -0,0 +1 @@
+export declare const addEnvVariablesToFile: (envFile: string, envVars: string[]) => void;

package/src/utils/add-env-variables-to-file.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addEnvVariablesToFile = void 0;
+const fs_1 = require("fs");
+const addEnvVariablesToFile = (envFile, envVars) => {
+    if ((0, fs_1.existsSync)(envFile)) {
+        (0, fs_1.appendFileSync)(envFile, envVars.join('\r\n'));
+    }
+};
+exports.addEnvVariablesToFile = addEnvVariablesToFile;
+//# sourceMappingURL=add-env-variables-to-file.js.map

package/src/utils/add-env-variables-to-file.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-env-variables-to-file.js","sourceRoot":"","sources":["../../../../../packages/vercel/src/utils/add-env-variables-to-file.ts"],"names":[],"mappings":";;;AAAA,2BAA+C;AAExC,MAAM,qBAAqB,GAAG,CAAC,OAAe,EAAE,OAAiB,EAAE,EAAE;IAC1E,IAAI,IAAA,eAAU,EAAC,OAAO,CAAC,EAAE;QACvB,IAAA,mBAAc,EAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;KAC9C;AACH,CAAC,CAAA;AAJY,QAAA,qBAAqB,yBAIjC"}

package/src/utils/get-env-vars.d.ts

@@ -0,0 +1 @@
+export declare const getEnvVars: (envVars?: Record<string, string>, escape?: boolean, isProduction?: boolean) => string[];

package/src/utils/get-env-vars.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEnvVars = void 0;
+const getEnvVars = (envVars = {}, escape, isProduction) => {
+    return Object.keys(envVars).reduce((env, envVar) => {
+        env.push(`${envVar}=${escape ? '"' : ''}${envVars[envVar]}${escape ? '"' : ''}`);
+        return env;
+    }, [
+        isProduction && 'NODE_ENV=production'
+    ]).filter(Boolean);
+};
+exports.getEnvVars = getEnvVars;
+//# sourceMappingURL=get-env-vars.js.map

package/src/utils/get-env-vars.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-env-vars.js","sourceRoot":"","sources":["../../../../../packages/vercel/src/utils/get-env-vars.ts"],"names":[],"mappings":";;;AAAO,MAAM,UAAU,GAAG,CAAC,UAAkC,EAAE,EAAE,MAAgB,EAAE,YAAsB,EAAE,EAAE;IAC3G,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;QACjD,GAAG,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;QAEhF,OAAO,GAAG,CAAA;IACZ,CAAC,EAAE;QACD,YAAY,IAAI,qBAAqB;KACtC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;AACpB,CAAC,CAAA;AARY,QAAA,UAAU,cAQtB"}