@nx/webpack 18.1.1 → 18.2.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "18.1.1",
+  "version": "18.2.0-beta.0",
   "private": false,
   "description": "The Nx Plugin for Webpack contains executors and generators that support building applications using Webpack.",
   "repository": {
@@ -63,9 +63,9 @@
     "webpack-dev-server": "^4.9.3",
     "webpack-node-externals": "^3.0.0",
     "webpack-subresource-integrity": "^5.1.0",
-    "@nx/devkit": "18.1.1",
-    "@nx/js": "18.1.1",
-    "@nrwl/webpack": "18.1.1"
+    "@nx/devkit": "18.2.0-beta.0",
+    "@nx/js": "18.2.0-beta.0",
+    "@nrwl/webpack": "18.2.0-beta.0"
   },
   "publishConfig": {
     "access": "public"

package/src/plugins/nx-webpack-plugin/lib/apply-web-config.js

@@ -126,7 +126,7 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
             use: [
                 ...(0, stylesheet_loaders_1.getCommonLoadersForCssModules)(options, includePaths),
                 {
-                    loader: path.join(__dirname, 'webpack/deprecated-stylus-loader.js'),
+                    loader: path.join(__dirname, '../../../utils/webpack/deprecated-stylus-loader.js'),
                     options: {
                         stylusOptions: {
                             include: includePaths,
@@ -185,7 +185,7 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
             use: [
                 ...(0, stylesheet_loaders_1.getCommonLoadersForGlobalCss)(options, includePaths),
                 {
-                    loader: path.join(__dirname, 'webpack/deprecated-stylus-loader.js'),
+                    loader: path.join(__dirname, '../../../utils/webpack/deprecated-stylus-loader.js'),
                     options: {
                         sourceMap: !!options.sourceMap,
                         stylusOptions: {
@@ -245,7 +245,7 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
             use: [
                 ...(0, stylesheet_loaders_1.getCommonLoadersForGlobalStyle)(options, includePaths),
                 {
-                    loader: require.resolve('stylus-loader'),
+                    loader: path.join(__dirname, '../../../utils/webpack/deprecated-stylus-loader.js'),
                     options: {
                         sourceMap: !!options.sourceMap,
                         stylusOptions: {
@@ -335,7 +335,7 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
                 type: 'asset',
                 parser: {
                     dataUrlCondition: {
-                        maxSize: 10000, // 10 kB
+                        maxSize: 10_000, // 10 kB
                     },
                 },
                 generator: {
@@ -348,7 +348,7 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
                 type: 'asset',
                 parser: {
                     dataUrlCondition: {
-                        maxSize: 10000, // 10 kB
+                        maxSize: 10_000, // 10 kB
                     },
                 },
                 generator: {

package/src/utils/get-client-environment.js

@@ -1,12 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getClientEnvironment = void 0;
+// Prevent sensitive keys from being bundled when source code uses entire `process.env` object rather than individual keys (e.g. `process.env.NX_FOO`).
+// TODO(v19): Only env vars prefixed with NX_PUBLIC should be bundled. This is a breaking change so we won't do it in v18.
+const excludedKeys = ['NX_CLOUD_ACCESS_TOKEN', 'NX_CLOUD_ENCRYPTION_KEY'];
 function getClientEnvironment(mode) {
     // Grab NODE_ENV and NX_* environment variables and prepare them to be
     // injected into the application via DefinePlugin in webpack configuration.
     const NX_APP = /^NX_/i;
     const raw = Object.keys(process.env)
-        .filter((key) => NX_APP.test(key))
+        .filter((key) => !excludedKeys.includes(key) && NX_APP.test(key))
         .reduce((env, key) => {
         env[key] = process.env[key];
         return env;

package/src/utils/webpack/interpolate-env-variables-to-index.js

@@ -7,8 +7,11 @@ function interpolateEnvironmentVariablesToIndex(contents, deployUrl) {
 }
 exports.interpolateEnvironmentVariablesToIndex = interpolateEnvironmentVariablesToIndex;
 const NX_PREFIX = /^NX_/i;
+// Prevent sensitive keys from being bundled when source code uses entire `process.env` object rather than individual keys (e.g. `process.env.NX_FOO`).
+// TODO(v19): Only env vars prefixed with NX_PUBLIC should be bundled. This is a breaking change so we won't do it in v18.
+const excludedKeys = ['NX_CLOUD_ACCESS_TOKEN', 'NX_CLOUD_ENCRYPTION_KEY'];
 function isNxEnvironmentKey(x) {
-    return NX_PREFIX.test(x);
+    return !excludedKeys.includes(x) && NX_PREFIX.test(x);
 }
 function getClientEnvironment(deployUrl) {
     return Object.keys(process.env)