feat(misc): remove dotenv from executors (#18719)

nrwl · Aug 23, 2023 · 9d5a383 · 9d5a383 · vercel · Aug 23, 2023
1 parent 8f6f71e
commit 9d5a383
Show file tree

Hide file tree

Showing 25 changed files with 37 additions and 25 deletions.
diff --git a/e2e/node/src/node.test.ts b/e2e/node/src/node.test.ts
@@ -144,6 +144,43 @@ describe('Node Applications', () => {
     expect(additionalResult).toContain('Hello Additional World!');
   }, 60000);
 
+  it('should be able to generate an empty application with variable in .env file', async () => {
+    const originalEnvPort = process.env.PORT;
+    const port = 3457;
+    process.env.PORT = `${port}`;
+    const nodeapp = uniq('nodeapp');
+
+    runCLI(
+      `generate @nx/node:app ${nodeapp} --linter=eslint --bundler=webpack --framework=none`
+    );
+    await setMaxWorkers();
+
+    updateFile('.env', `NX_FOOBAR="test foo bar"`);
+
+    updateFile(
+      `apps/${nodeapp}/src/main.ts`,
+      `console.log('foobar: ' + process.env['NX_FOOBAR']);`
+    );
+
+    await runCLIAsync(`build ${nodeapp}`);
+    checkFilesExist(`dist/apps/${nodeapp}/main.js`);
+
+    // check serving
+    const p = await runCommandUntil(
+      `serve ${nodeapp} --port=${port} --watch=false`,
+      (output) => {
+        process.stdout.write(output);
+        return output.includes(`foobar: test foo bar`);
+      }
+    );
+    try {
+      await promisifiedTreeKill(p.pid, 'SIGKILL');
+      await killPorts(port);
+    } finally {
+      process.env.port = originalEnvPort;
+    }
+  }, 60000);
+
   it('should be able to generate an express application', async () => {
     const nodeapp = uniq('nodeapp');
     const originalEnvPort = process.env.PORT;

diff --git a/packages/cypress/package.json b/packages/cypress/package.json
@@ -36,7 +36,6 @@
   "dependencies": {
     "@phenomnomnominal/tsquery": "~5.0.1",
     "detect-port": "^1.5.1",
-    "dotenv": "~16.3.1",
     "semver": "7.5.3",
     "tslib": "^2.3.0",
     "@nx/devkit": "file:../devkit",

diff --git a/packages/cypress/src/executors/cypress/cypress.impl.ts b/packages/cypress/src/executors/cypress/cypress.impl.ts
@@ -10,7 +10,6 @@ import {
   output,
 } from '@nx/devkit';
 import { getExecutorInformation } from 'nx/src/command-line/run/executor-utils';
-import 'dotenv/config';
 import { existsSync, readdirSync, unlinkSync, writeFileSync } from 'fs';
 import { basename, dirname, join } from 'path';
 import { getTempTailwindPath } from '../../utils/ct-helpers';

diff --git a/packages/esbuild/package.json b/packages/esbuild/package.json
@@ -30,7 +30,6 @@
   },
   "dependencies": {
     "chalk": "^4.1.0",
-    "dotenv": "~16.3.1",
     "fast-glob": "3.2.7",
     "fs-extra": "^11.1.0",
     "tslib": "^2.3.0",

diff --git a/packages/esbuild/src/executors/esbuild/esbuild.impl.ts b/packages/esbuild/src/executors/esbuild/esbuild.impl.ts
@@ -1,4 +1,3 @@
-import 'dotenv/config';
 import * as chalk from 'chalk';
 import type { ExecutorContext } from '@nx/devkit';
 import { cacheDir, joinPathFragments, logger, stripIndents } from '@nx/devkit';

diff --git a/packages/jest/package.json b/packages/jest/package.json
@@ -38,7 +38,6 @@
     "@jest/test-result": "^29.4.1",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "chalk": "^4.1.0",
-    "dotenv": "~16.3.1",
     "identity-obj-proxy": "3.0.0",
     "jest-config": "^29.4.1",
     "jest-resolve": "^29.4.1",

diff --git a/packages/jest/src/executors/jest/jest.impl.ts b/packages/jest/src/executors/jest/jest.impl.ts
@@ -1,4 +1,3 @@
-import 'dotenv/config';
 import { runCLI } from 'jest';
 import { readConfig, readConfigs } from 'jest-config';
 import { utils as jestReporterUtils } from '@jest/reporters';

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -38,7 +38,6 @@
     "@svgr/webpack": "^8.0.1",
     "chalk": "^4.1.0",
     "copy-webpack-plugin": "^10.2.4",
-    "dotenv": "~16.3.1",
     "fs-extra": "^11.1.0",
     "ignore": "^5.0.4",
     "semver": "7.5.3",

diff --git a/packages/next/src/executors/build/build.impl.ts b/packages/next/src/executors/build/build.impl.ts
@@ -1,4 +1,3 @@
-import 'dotenv/config';
 import {
   ExecutorContext,
   logger,

diff --git a/packages/next/src/executors/export/export.impl.ts b/packages/next/src/executors/export/export.impl.ts
@@ -1,4 +1,3 @@
-import 'dotenv/config';
 import {
   ExecutorContext,
   parseTargetString,

diff --git a/packages/next/src/executors/server/custom-server.impl.ts b/packages/next/src/executors/server/custom-server.impl.ts
@@ -1,4 +1,3 @@
-import 'dotenv/config';
 import { ExecutorContext, parseTargetString, runExecutor } from '@nx/devkit';
 import { join } from 'path';
 

diff --git a/packages/next/src/executors/server/server.impl.ts b/packages/next/src/executors/server/server.impl.ts
@@ -1,4 +1,3 @@
-import 'dotenv/config';
 import {
   ExecutorContext,
   parseTargetString,

diff --git a/packages/plugin/package.json b/packages/plugin/package.json
@@ -29,7 +29,6 @@
   },
   "dependencies": {
     "@phenomnomnominal/tsquery": "~5.0.1",
-    "dotenv": "~16.3.1",
     "fs-extra": "^11.1.0",
     "tslib": "^2.3.0",
     "@nx/devkit": "file:../devkit",

diff --git a/packages/plugin/src/executors/e2e/e2e.impl.ts b/packages/plugin/src/executors/e2e/e2e.impl.ts
@@ -1,5 +1,3 @@
-import 'dotenv/config';
-
 import type { ExecutorContext } from '@nx/devkit';
 
 import {

diff --git a/packages/rollup/package.json b/packages/rollup/package.json
@@ -37,7 +37,6 @@
     "autoprefixer": "^10.4.9",
     "babel-plugin-transform-async-to-promises": "^0.8.15",
     "chalk": "^4.1.0",
-    "dotenv": "~16.3.1",
     "fast-glob": "^3.2.7",
     "postcss": "^8.4.14",
     "rollup": "^2.56.2",

diff --git a/packages/rollup/src/executors/rollup/rollup.impl.ts b/packages/rollup/src/executors/rollup/rollup.impl.ts
@@ -1,4 +1,3 @@
-import 'dotenv/config';
 import * as ts from 'typescript';
 import * as rollup from 'rollup';
 import * as peerDepsExternal from 'rollup-plugin-peer-deps-external';

diff --git a/packages/storybook/package.json b/packages/storybook/package.json
@@ -30,7 +30,6 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "dotenv": "~16.3.1",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "semver": "7.5.3",
     "tslib": "^2.3.0",

diff --git a/packages/storybook/src/executors/build-storybook/build-storybook.impl.ts b/packages/storybook/src/executors/build-storybook/build-storybook.impl.ts
@@ -1,7 +1,6 @@
 import { ExecutorContext, logger } from '@nx/devkit';
 import * as build from '@storybook/core-server';
 import { CLIOptions } from '@storybook/types';
-import 'dotenv/config';
 import {
   pleaseUpgrade,
   storybookConfigExistsCheck,

diff --git a/packages/storybook/src/executors/storybook/storybook.impl.ts b/packages/storybook/src/executors/storybook/storybook.impl.ts
@@ -1,6 +1,5 @@
 import { ExecutorContext, logger } from '@nx/devkit';
 import * as build from '@storybook/core-server';
-import 'dotenv/config';
 import {
   pleaseUpgrade,
   storybookConfigExistsCheck,

diff --git a/packages/storybook/src/executors/utils.ts b/packages/storybook/src/executors/utils.ts
@@ -2,7 +2,6 @@
 
 import { joinPathFragments, logger } from '@nx/devkit';
 import { findNodes } from '@nx/js';
-import 'dotenv/config';
 import { existsSync, readFileSync } from 'fs';
 import { join } from 'path';
 import { gte } from 'semver';

diff --git a/packages/vite/package.json b/packages/vite/package.json
@@ -31,7 +31,6 @@
   "dependencies": {
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@swc/helpers": "~0.5.0",
-    "dotenv": "~16.3.1",
     "enquirer": "~2.3.6",
     "@nx/devkit": "file:../devkit",
     "@nx/js": "file:../js",

diff --git a/packages/vite/src/executors/build/build.impl.ts b/packages/vite/src/executors/build/build.impl.ts
@@ -1,4 +1,3 @@
-import 'dotenv/config';
 import {
   ExecutorContext,
   logger,

diff --git a/packages/vite/src/executors/dev-server/dev-server.impl.ts b/packages/vite/src/executors/dev-server/dev-server.impl.ts
@@ -1,4 +1,3 @@
-import 'dotenv/config';
 import { ExecutorContext } from '@nx/devkit';
 import { createServer, InlineConfig, mergeConfig, ViteDevServer } from 'vite';
 

diff --git a/packages/webpack/package.json b/packages/webpack/package.json
@@ -38,7 +38,6 @@
     "copy-webpack-plugin": "^10.2.4",
     "css-loader": "^6.4.0",
     "css-minimizer-webpack-plugin": "^5.0.0",
-    "dotenv": "~16.3.1",
     "fork-ts-checker-webpack-plugin": "7.2.13",
     "ignore": "^5.0.4",
     "less": "4.1.3",

diff --git a/packages/webpack/src/executors/webpack/webpack.impl.ts b/packages/webpack/src/executors/webpack/webpack.impl.ts
@@ -1,4 +1,3 @@
-import 'dotenv/config';
 import { ExecutorContext, logger, stripIndents } from '@nx/devkit';
 import { eachValueFrom } from '@nx/devkit/src/utils/rxjs-for-await';
 import type { Configuration, Stats } from 'webpack';