@nx/webpack 18.0.0-beta.0 → 18.0.0-beta.2

package/generators.json

@@ -3,7 +3,7 @@
   "version": "0.1",
   "generators": {
     "init": {
-      "factory": "./src/generators/init/init#webpackInitGenerator",
+      "factory": "./src/generators/init/init#webpackInitGeneratorInternal",
       "schema": "./src/generators/init/schema.json",
       "description": "Initialize the `@nrwl/webpack` plugin.",
       "aliases": ["ng-add"],
@@ -11,7 +11,7 @@
     },
     "configuration": {
       "aliases": ["webpack-project"],
-      "factory": "./src/generators/configuration/configuration",
+      "factory": "./src/generators/configuration/configuration#configurationGeneratorInternal",
       "schema": "./src/generators/configuration/schema.json",
       "description": "Add webpack configuration to a project.",
       "hidden": true

package/index.d.ts

@@ -4,7 +4,7 @@ export { configurationGenerator };
 export declare const webpackProjectGenerator: typeof configurationGenerator;
 export * from './src/utils/create-copy-plugin';
 export * from './src/utils/config';
-export * from './src/generators/init/init';
+export { webpackInitGenerator } from './src/generators/init/init';
 export type { WebDevServerOptions } from './src/executors/dev-server/schema';
 export * from './src/executors/dev-server/dev-server.impl';
 export * from './src/executors/webpack/lib/normalize-options';

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NxTsconfigPathsWebpackPlugin = exports.NxWebpackPlugin = exports.webpackProjectGenerator = exports.configurationGenerator = void 0;
+exports.NxTsconfigPathsWebpackPlugin = exports.NxWebpackPlugin = exports.webpackInitGenerator = exports.webpackProjectGenerator = exports.configurationGenerator = void 0;
 const tslib_1 = require("tslib");
 const configuration_1 = require("./src/generators/configuration/configuration");
 Object.defineProperty(exports, "configurationGenerator", { enumerable: true, get: function () { return configuration_1.configurationGenerator; } });
@@ -9,7 +9,8 @@ Object.defineProperty(exports, "configurationGenerator", { enumerable: true, get
 exports.webpackProjectGenerator = configuration_1.configurationGenerator;
 tslib_1.__exportStar(require("./src/utils/create-copy-plugin"), exports);
 tslib_1.__exportStar(require("./src/utils/config"), exports);
-tslib_1.__exportStar(require("./src/generators/init/init"), exports);
+var init_1 = require("./src/generators/init/init");
+Object.defineProperty(exports, "webpackInitGenerator", { enumerable: true, get: function () { return init_1.webpackInitGenerator; } });
 tslib_1.__exportStar(require("./src/executors/dev-server/dev-server.impl"), exports);
 tslib_1.__exportStar(require("./src/executors/webpack/lib/normalize-options"), exports);
 tslib_1.__exportStar(require("./src/executors/webpack/webpack.impl"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "18.0.0-beta.0",
+  "version": "18.0.0-beta.2",
   "private": false,
   "description": "The Nx Plugin for Webpack contains executors and generators that support building applications using Webpack.",
   "repository": {
@@ -29,7 +29,7 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@babel/core": "^7.22.9",
+    "@babel/core": "^7.23.2",
     "autoprefixer": "^10.4.9",
     "babel-loader": "^9.1.2",
     "browserslist": "^4.21.4",
@@ -62,9 +62,9 @@
     "webpack-dev-server": "^4.9.3",
     "webpack-node-externals": "^3.0.0",
     "webpack-subresource-integrity": "^5.1.0",
-    "@nx/devkit": "18.0.0-beta.0",
-    "@nx/js": "18.0.0-beta.0",
-    "@nrwl/webpack": "18.0.0-beta.0"
+    "@nx/devkit": "18.0.0-beta.2",
+    "@nx/js": "18.0.0-beta.2",
+    "@nrwl/webpack": "18.0.0-beta.2"
   },
   "publishConfig": {
     "access": "public"

package/src/executors/webpack/schema.d.ts

@@ -47,7 +47,7 @@ export interface WebpackExecutorOptions {
   extractLicenses?: boolean;
   fileReplacements?: FileReplacement[];
   generatePackageJson?: boolean;
-  // TODO(v18): Remove this option
+  // TODO(v19): Remove this option
   /** @deprecated set webpackConfig and provide an explicit webpack.config.js file (See: https://nx.dev/recipes/webpack/webpack-config-setup) */
   isolatedConfig?: boolean;
   standardWebpackConfigFunction?: boolean;

package/src/executors/webpack/schema.json

@@ -235,7 +235,7 @@
       "type": "boolean",
       "description": "Do not apply Nx webpack plugins automatically. Plugins need to be applied in the project's webpack.config.js file (e.g. withNx, withReact, etc.).",
       "default": true,
-      "x-deprecated": "Automatic configuration of Webpack is deprecated in favor of an explicit 'webpack.config.js' file. This option will be removed in Nx 18. See https://nx.dev/recipes/webpack/webpack-config-setup."
+      "x-deprecated": "Automatic configuration of Webpack is deprecated in favor of an explicit 'webpack.config.js' file. This option will be removed in Nx 19. See https://nx.dev/recipes/webpack/webpack-config-setup."
     },
     "standardWebpackConfigFunction": {
       "type": "boolean",

package/src/generators/configuration/configuration.d.ts

@@ -1,4 +1,5 @@
 import { Tree } from '@nx/devkit';
 import { ConfigurationGeneratorSchema } from './schema';
 export declare function configurationGenerator(tree: Tree, options: ConfigurationGeneratorSchema): Promise<import("@nx/devkit").GeneratorCallback>;
+export declare function configurationGeneratorInternal(tree: Tree, options: ConfigurationGeneratorSchema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default configurationGenerator;

package/src/generators/configuration/configuration.js

@@ -1,11 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.configurationGenerator = void 0;
+exports.configurationGeneratorInternal = exports.configurationGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const init_1 = require("../init/init");
 const has_plugin_1 = require("../../utils/has-plugin");
 const add_build_target_defaults_1 = require("@nx/devkit/src/generators/add-build-target-defaults");
-async function configurationGenerator(tree, options) {
+function configurationGenerator(tree, options) {
+    return configurationGeneratorInternal(tree, { addPlugin: false, ...options });
+}
+exports.configurationGenerator = configurationGenerator;
+async function configurationGeneratorInternal(tree, options) {
+    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     const task = await (0, init_1.webpackInitGenerator)(tree, {
         ...options,
         skipFormat: true,
@@ -23,7 +28,7 @@ async function configurationGenerator(tree, options) {
     }
     return task;
 }
-exports.configurationGenerator = configurationGenerator;
+exports.configurationGeneratorInternal = configurationGeneratorInternal;
 function checkForTargetConflicts(tree, options) {
     if (options.skipValidation)
         return;
@@ -49,10 +54,11 @@ function createWebpackConfig(tree, options) {
         tree.write((0, devkit_1.joinPathFragments)(project.root, 'webpack.config.js'), (0, has_plugin_1.hasPlugin)(tree)
             ? `
 const { NxWebpackPlugin } = require('@nx/webpack');
+const { join } = require('path');
 
 module.exports = {
   output: {
-    path: '${buildOptions.outputPath}',
+    path: join(__dirname, '${buildOptions.outputPath}'),
   },
   plugins: [
     new NxWebpackPlugin({
@@ -79,10 +85,11 @@ module.exports = composePlugins(withNx(), withWeb(), (config) => {
         tree.write((0, devkit_1.joinPathFragments)(project.root, 'webpack.config.js'), (0, has_plugin_1.hasPlugin)(tree)
             ? `
 const { NxWebpackPlugin } = require('@nx/webpack');
+const { join } = require('path');
 
 module.exports = {
   output: {
-    path: '${buildOptions.outputPath}',
+    path: join(__dirname, '${buildOptions.outputPath}'),
   },
   plugins: [
     new NxWebpackPlugin({

package/src/generators/configuration/schema.d.ts

@@ -10,4 +10,5 @@ export interface ConfigurationGeneratorSchema {
   target?: 'node' | 'web' | 'webworker';
   webpackConfig?: string;
   babelConfig?: string;
+  addPlugin?: boolean;
 }

package/src/generators/configuration/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxWebpackProject",
   "cli": "nx",
   "title": "Add Webpack Configuration to a project",

package/src/generators/init/init.d.ts

@@ -1,4 +1,5 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Schema } from './schema';
 export declare function webpackInitGenerator(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
+export declare function webpackInitGeneratorInternal(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default webpackInitGenerator;

package/src/generators/init/init.js

@@ -1,13 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.webpackInitGenerator = void 0;
+exports.webpackInitGeneratorInternal = exports.webpackInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const update_package_scripts_1 = require("@nx/devkit/src/utils/update-package-scripts");
 const plugin_1 = require("../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
-async function webpackInitGenerator(tree, schema) {
-    const shouldAddPlugin = process.env.NX_PCV3 === 'true';
-    if (shouldAddPlugin) {
+function webpackInitGenerator(tree, schema) {
+    return webpackInitGeneratorInternal(tree, { addPlugin: false, ...schema });
+}
+exports.webpackInitGenerator = webpackInitGenerator;
+async function webpackInitGeneratorInternal(tree, schema) {
+    schema.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
+    if (schema.addPlugin) {
         addPlugin(tree);
     }
     let installTask = () => { };
@@ -16,7 +20,7 @@ async function webpackInitGenerator(tree, schema) {
             '@nx/webpack': versions_1.nxVersion,
             '@nx/web': versions_1.nxVersion,
         };
-        if (shouldAddPlugin) {
+        if (schema.addPlugin) {
             devDependencies['webpack-cli'] = versions_1.webpackCliVersion;
         }
         installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies, undefined, schema.keepExistingVersions);
@@ -29,7 +33,7 @@ async function webpackInitGenerator(tree, schema) {
     }
     return installTask;
 }
-exports.webpackInitGenerator = webpackInitGenerator;
+exports.webpackInitGeneratorInternal = webpackInitGeneratorInternal;
 function addPlugin(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     nxJson.plugins ??= [];

package/src/generators/init/schema.d.ts

@@ -3,4 +3,5 @@ export interface Schema {
   skipPackageJson?: boolean;
   keepExistingVersions?: boolean;
   updatePackageScripts?: boolean;
+  addPlugin?: boolean;
 }

package/src/generators/init/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxWebpackInit",
   "cli": "nx",
   "title": "Init Webpack Plugin",

package/src/plugins/nx-webpack-plugin/lib/compiler-loaders.js

@@ -46,7 +46,7 @@ function createLoaderFromCompiler(options) {
                 },
             };
         case 'babel':
-            const tsConfig = (0, js_1.readTsConfig)(options.tsConfig);
+            const tsConfig = (0, js_1.readTsConfig)(path.join(options.root, options.tsConfig));
             const babelConfig = {
                 test: /\.([jt])sx?$/,
                 loader: path.join(__dirname, '../../../utils/web-babel-loader'),

package/src/plugins/plugin.js

@@ -57,9 +57,7 @@ exports.createNodes = [
 ];
 async function createWebpackTargets(configFilePath, projectRoot, options, context) {
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
-    global.NX_GRAPH_CREATION = true;
     const webpackConfig = (0, resolve_user_defined_webpack_config_1.resolveUserDefinedWebpackConfig)((0, path_1.join)(context.workspaceRoot, configFilePath), (0, js_1.getRootTsConfigPath)(), true);
-    delete global.NX_GRAPH_CREATION;
     const webpackOptions = await (0, read_webpack_options_1.readWebpackOptions)(webpackConfig);
     const outputPath = normalizeOutputPath(webpackOptions.output?.path, projectRoot);
     const targets = {};

package/src/utils/module-federation/secondary-entry-points.js

@@ -6,7 +6,7 @@ const fs_1 = require("fs");
 const devkit_1 = require("@nx/devkit");
 const nx_1 = require("@nx/devkit/nx");
 let { readModulePackageJson } = (0, nx_1.requireNx)();
-// TODO: Remove this in Nx 18 when Nx 16.7.0 is no longer supported
+// TODO: Remove this in Nx 19 when Nx 16.7.0 is no longer supported
 readModulePackageJson =
     readModulePackageJson ??
         require('nx/src/utils/package-json').readModulePackageJson;

package/src/utils/module-federation/typescript.js

@@ -4,18 +4,23 @@ exports.getRootTsConfigPath = exports.readTsConfig = exports.readTsPathMappings
 const fs_1 = require("fs");
 const path_1 = require("path");
 const devkit_1 = require("@nx/devkit");
-let tsConfig;
-let tsPathMappings;
+let tsConfig = new Map();
+let tsPathMappings = new Map();
 function readTsPathMappings(tsConfigPath = process.env.NX_TSCONFIG_PATH ?? getRootTsConfigPath()) {
-    if (tsPathMappings) {
-        return tsPathMappings;
+    if (tsPathMappings.has(tsConfigPath)) {
+        return tsPathMappings.get(tsConfigPath);
     }
-    tsConfig ??= readTsConfiguration(tsConfigPath);
-    tsPathMappings = {};
-    Object.entries(tsConfig.options?.paths ?? {}).forEach(([alias, paths]) => {
-        tsPathMappings[alias] = paths.map((path) => path.replace(/^\.\//, ''));
+    if (!tsConfig.has(tsConfigPath)) {
+        tsConfig.set(tsConfigPath, readTsConfiguration(tsConfigPath));
+    }
+    tsPathMappings.set(tsConfigPath, {});
+    Object.entries(tsConfig.get(tsConfigPath).options?.paths ?? {}).forEach(([alias, paths]) => {
+        tsPathMappings.set(tsConfigPath, {
+            ...tsPathMappings.get(tsConfigPath),
+            [alias]: paths.map((path) => path.replace(/^\.\//, '')),
+        });
     });
-    return tsPathMappings;
+    return tsPathMappings.get(tsConfigPath);
 }
 exports.readTsPathMappings = readTsPathMappings;
 function readTsConfiguration(tsConfigPath) {

package/src/utils/webpack/deprecated-stylus-loader.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const devkit_1 = require("@nx/devkit");
 // @ts-ignore
 const stylusLoader = require("stylus-loader");
-// TOOD(v18): Remove this file and stylus support.
+// TOOD(v19): Remove this file and stylus support.
 function default_1(source) {
-    devkit_1.logger.warn(`Stylus is support is deprecated and will be removed in Nx 18. We recommend that you migrate to Sass by renaming \`.styl\` files to \`.scss\` and ensuring that the content is valid Sass.`);
+    devkit_1.logger.warn(`Stylus is support is deprecated and will be removed in Nx 19. We recommend that you migrate to Sass by renaming \`.styl\` files to \`.scss\` and ensuring that the content is valid Sass.`);
     return stylusLoader.call(this, source);
 }
 exports.default = default_1;

package/src/utils/webpack/plugins/postcss-cli-resources.js

@@ -122,7 +122,7 @@ function PostcssCliResources(options) {
             const resourceCache = new Map();
             return Promise.all(urlDeclarations.map(async (decl) => {
                 const value = decl.value;
-                const urlRegex = /url\(\s*(?:"([^"]+)"|'([^']+)'|(.+?))\s*\)/g;
+                const urlRegex = /url(?:\(\s*['"]?)(.*?)(?:['"]?\s*\))/g;
                 const segments = [];
                 let match;
                 let lastIndex = 0;
@@ -131,7 +131,7 @@ function PostcssCliResources(options) {
                 const inputFile = decl.source && decl.source.input.file;
                 const context = (inputFile && path.dirname(inputFile)) || loader.context;
                 while ((match = urlRegex.exec(value))) {
-                    const originalUrl = match[1] || match[2] || match[3];
+                    const originalUrl = match[1];
                     let processedUrl;
                     try {
                         processedUrl = await process(originalUrl, context, resourceCache);