@nx/webpack 19.0.0-beta.6 → 19.0.0-beta.7

package/app-plugin.d.ts

@@ -0,0 +1,2 @@
+export { NxAppWebpackPlugin } from './src/plugins/nx-webpack-plugin/nx-app-webpack-plugin';
+export type { NxAppWebpackPluginOptions } from './src/plugins/nx-webpack-plugin/nx-app-webpack-plugin-options';

package/app-plugin.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NxAppWebpackPlugin = void 0;
+var nx_app_webpack_plugin_1 = require("./src/plugins/nx-webpack-plugin/nx-app-webpack-plugin");
+Object.defineProperty(exports, "NxAppWebpackPlugin", { enumerable: true, get: function () { return nx_app_webpack_plugin_1.NxAppWebpackPlugin; } });

package/index.d.ts

@@ -1,7 +1,13 @@
 import { configurationGenerator } from './src/generators/configuration/configuration';
+import { NxAppWebpackPlugin } from './src/plugins/nx-webpack-plugin/nx-app-webpack-plugin';
+import { NxTsconfigPathsWebpackPlugin as _NxTsconfigPathsWebpackPlugin } from './src/plugins/nx-typescript-webpack-plugin/nx-tsconfig-paths-webpack-plugin';
 export { configurationGenerator };
 /** @deprecated Use `configurationGenerator` instead. */
 export declare const webpackProjectGenerator: typeof configurationGenerator;
+/** @deprecated Use NxAppWebpackPlugin from `@nx/webpack/app-plugin` instead. */
+export declare const NxWebpackPlugin: typeof NxAppWebpackPlugin;
+/** @deprecated Use NxTsconfigPathsWebpackPlugin from `@nx/webpack/tsconfig-paths-plugin` instead. */
+export declare const NxTsconfigPathsWebpackPlugin: typeof _NxTsconfigPathsWebpackPlugin;
 export * from './src/utils/create-copy-plugin';
 export * from './src/utils/config';
 export { webpackInitGenerator } from './src/generators/init/init';
@@ -14,5 +20,3 @@ export * from './src/utils/get-css-module-local-ident';
 export * from './src/utils/with-nx';
 export * from './src/utils/with-web';
 export * from './src/utils/module-federation/public-api';
-export { NxWebpackPlugin } from './src/plugins/nx-webpack-plugin/nx-webpack-plugin';
-export { NxTsconfigPathsWebpackPlugin } from './src/plugins/nx-typescript-webpack-plugin/nx-tsconfig-paths-webpack-plugin';

package/index.js

@@ -1,12 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NxTsconfigPathsWebpackPlugin = exports.NxWebpackPlugin = exports.webpackInitGenerator = exports.webpackProjectGenerator = exports.configurationGenerator = void 0;
+exports.webpackInitGenerator = exports.NxTsconfigPathsWebpackPlugin = exports.NxWebpackPlugin = 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; } });
+const nx_app_webpack_plugin_1 = require("./src/plugins/nx-webpack-plugin/nx-app-webpack-plugin");
+const nx_tsconfig_paths_webpack_plugin_1 = require("./src/plugins/nx-typescript-webpack-plugin/nx-tsconfig-paths-webpack-plugin");
 // Exported for backwards compatibility in case a plugin is using the old name.
 /** @deprecated Use `configurationGenerator` instead. */
 exports.webpackProjectGenerator = configuration_1.configurationGenerator;
+// TODO(v20): Remove this in favor of deep imports in order to load configs faster (150-200ms faster).
+/** @deprecated Use NxAppWebpackPlugin from `@nx/webpack/app-plugin` instead. */
+exports.NxWebpackPlugin = nx_app_webpack_plugin_1.NxAppWebpackPlugin;
+/** @deprecated Use NxTsconfigPathsWebpackPlugin from `@nx/webpack/tsconfig-paths-plugin` instead. */
+exports.NxTsconfigPathsWebpackPlugin = nx_tsconfig_paths_webpack_plugin_1.NxTsconfigPathsWebpackPlugin;
 tslib_1.__exportStar(require("./src/utils/create-copy-plugin"), exports);
 tslib_1.__exportStar(require("./src/utils/config"), exports);
 var init_1 = require("./src/generators/init/init");
@@ -18,7 +25,3 @@ tslib_1.__exportStar(require("./src/utils/get-css-module-local-ident"), exports)
 tslib_1.__exportStar(require("./src/utils/with-nx"), exports);
 tslib_1.__exportStar(require("./src/utils/with-web"), exports);
 tslib_1.__exportStar(require("./src/utils/module-federation/public-api"), exports);
-var nx_webpack_plugin_1 = require("./src/plugins/nx-webpack-plugin/nx-webpack-plugin");
-Object.defineProperty(exports, "NxWebpackPlugin", { enumerable: true, get: function () { return nx_webpack_plugin_1.NxWebpackPlugin; } });
-var nx_tsconfig_paths_webpack_plugin_1 = require("./src/plugins/nx-typescript-webpack-plugin/nx-tsconfig-paths-webpack-plugin");
-Object.defineProperty(exports, "NxTsconfigPathsWebpackPlugin", { enumerable: true, get: function () { return nx_tsconfig_paths_webpack_plugin_1.NxTsconfigPathsWebpackPlugin; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "19.0.0-beta.6",
+  "version": "19.0.0-beta.7",
   "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": "19.0.0-beta.6",
-    "@nx/js": "19.0.0-beta.6",
-    "@nrwl/webpack": "19.0.0-beta.6"
+    "@nx/devkit": "19.0.0-beta.7",
+    "@nx/js": "19.0.0-beta.7",
+    "@nrwl/webpack": "19.0.0-beta.7"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/configuration/configuration.js

@@ -63,7 +63,7 @@ function createWebpackConfig(tree, options) {
     if (options.target === 'web') {
         tree.write((0, devkit_1.joinPathFragments)(project.root, 'webpack.config.js'), (0, has_plugin_1.hasPlugin)(tree)
             ? `
-const { NxWebpackPlugin } = require('@nx/webpack');
+const { NxAppWebpackPlugin } = require('@nx/webpack/app-plugin');
 const { join } = require('path');
 
 module.exports = {
@@ -71,7 +71,7 @@ module.exports = {
     path: join(__dirname, '${(0, devkit_1.offsetFromRoot)(project.root)}${buildOptions.outputPath}'),
   },
   plugins: [
-    new NxWebpackPlugin({
+    new NxAppWebpackPlugin({
       target: '${buildOptions.target}',
       tsConfig: '${buildOptions.tsConfig}',
       compiler: '${buildOptions.compiler}',
@@ -95,7 +95,7 @@ module.exports = composePlugins(withNx(), withWeb(), (config) => {
     else {
         tree.write((0, devkit_1.joinPathFragments)(project.root, 'webpack.config.js'), (0, has_plugin_1.hasPlugin)(tree)
             ? `
-const { NxWebpackPlugin } = require('@nx/webpack');
+const { NxAppWebpackPlugin } = require('@nx/webpack/app-plugin');
 const { join } = require('path');
 
 module.exports = {
@@ -103,7 +103,7 @@ module.exports = {
     path: join(__dirname, '${(0, devkit_1.offsetFromRoot)(project.root)}${buildOptions.outputPath}'),
   },
   plugins: [
-    new NxWebpackPlugin({
+    new NxAppWebpackPlugin({
       target: '${buildOptions.target}',
       tsConfig: '${buildOptions.tsConfig}',
       compiler: '${buildOptions.compiler}',

package/src/plugins/nx-webpack-plugin/lib/apply-base-config.d.ts

@@ -1,5 +1,5 @@
 import { Configuration, WebpackOptionsNormalized } from 'webpack';
-import { NormalizedNxWebpackPluginOptions } from '../nx-webpack-plugin-options';
-export declare function applyBaseConfig(options: NormalizedNxWebpackPluginOptions, config?: Partial<WebpackOptionsNormalized | Configuration>, { useNormalizedEntry, }?: {
+import { NormalizedNxAppWebpackPluginOptions } from '../nx-app-webpack-plugin-options';
+export declare function applyBaseConfig(options: NormalizedNxAppWebpackPluginOptions, config?: Partial<WebpackOptionsNormalized | Configuration>, { useNormalizedEntry, }?: {
     useNormalizedEntry?: boolean;
 }): void;

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

@@ -1,5 +1,5 @@
 import { Configuration, WebpackOptionsNormalized } from 'webpack';
-import { NormalizedNxWebpackPluginOptions } from '../nx-webpack-plugin-options';
-export declare function applyWebConfig(options: NormalizedNxWebpackPluginOptions, config?: Partial<WebpackOptionsNormalized | Configuration>, { useNormalizedEntry, }?: {
+import { NormalizedNxAppWebpackPluginOptions } from '../nx-app-webpack-plugin-options';
+export declare function applyWebConfig(options: NormalizedNxAppWebpackPluginOptions, config?: Partial<WebpackOptionsNormalized | Configuration>, { useNormalizedEntry, }?: {
     useNormalizedEntry?: boolean;
 }): void;

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

@@ -1,5 +1,5 @@
-import { NormalizedNxWebpackPluginOptions } from '../nx-webpack-plugin-options';
-export declare function createLoaderFromCompiler(options: NormalizedNxWebpackPluginOptions): {
+import { NormalizedNxAppWebpackPluginOptions } from '../nx-app-webpack-plugin-options';
+export declare function createLoaderFromCompiler(options: NormalizedNxAppWebpackPluginOptions): {
     test: RegExp;
     loader: string;
     exclude: RegExp;

package/src/plugins/nx-webpack-plugin/lib/instantiate-script-plugins.d.ts

@@ -1,3 +1,3 @@
 import { WebpackPluginInstance } from 'webpack';
-import { NormalizedNxWebpackPluginOptions } from '../nx-webpack-plugin-options';
-export declare function instantiateScriptPlugins(options: NormalizedNxWebpackPluginOptions): WebpackPluginInstance[];
+import { NormalizedNxAppWebpackPluginOptions } from '../nx-app-webpack-plugin-options';
+export declare function instantiateScriptPlugins(options: NormalizedNxAppWebpackPluginOptions): WebpackPluginInstance[];

package/src/plugins/nx-webpack-plugin/lib/normalize-options.d.ts

@@ -1,4 +1,4 @@
-import { AssetGlobPattern, FileReplacement, NormalizedNxWebpackPluginOptions, NxWebpackPluginOptions } from '../nx-webpack-plugin-options';
-export declare function normalizeOptions(options: NxWebpackPluginOptions): NormalizedNxWebpackPluginOptions;
+import { AssetGlobPattern, FileReplacement, NormalizedNxAppWebpackPluginOptions, NxAppWebpackPluginOptions } from '../nx-app-webpack-plugin-options';
+export declare function normalizeOptions(options: NxAppWebpackPluginOptions): NormalizedNxAppWebpackPluginOptions;
 export declare function normalizeAssets(assets: any[], root: string, sourceRoot: string, projectRoot: string, resolveRelativePathsToProjectRoot?: boolean): AssetGlobPattern[];
 export declare function normalizeFileReplacements(root: string, fileReplacements: FileReplacement[]): FileReplacement[];

package/src/plugins/nx-webpack-plugin/lib/normalize-options.js

@@ -7,11 +7,20 @@ const devkit_1 = require("@nx/devkit");
 function normalizeOptions(options) {
     const combinedPluginAndMaybeExecutorOptions = {};
     const isProd = process.env.NODE_ENV === 'production';
-    const projectName = process.env.NX_TASK_TARGET_PROJECT;
-    const targetName = process.env.NX_TASK_TARGET_TARGET;
-    const configurationName = process.env.NX_TASK_TARGET_CONFIGURATION;
     // Since this is invoked by the executor, the graph has already been created and cached.
     const projectGraph = (0, devkit_1.readCachedProjectGraph)();
+    const taskDetailsFromBuildTarget = process.env.NX_BUILD_TARGET
+        ? (0, devkit_1.parseTargetString)(process.env.NX_BUILD_TARGET, projectGraph)
+        : undefined;
+    const projectName = taskDetailsFromBuildTarget
+        ? taskDetailsFromBuildTarget.project
+        : process.env.NX_TASK_TARGET_PROJECT;
+    const targetName = taskDetailsFromBuildTarget
+        ? taskDetailsFromBuildTarget.target
+        : process.env.NX_TASK_TARGET_TARGET;
+    const configurationName = taskDetailsFromBuildTarget
+        ? taskDetailsFromBuildTarget.configuration
+        : process.env.NX_TASK_TARGET_CONFIGURATION;
     const projectNode = projectGraph.nodes[projectName];
     const targetConfig = projectNode.data.targets[targetName];
     normalizeRelativePaths(projectNode.data.root, options);

package/src/plugins/nx-webpack-plugin/lib/stylesheet-loaders.d.ts

@@ -1,10 +1,10 @@
 import { getCSSModuleLocalIdent } from '../../../utils/get-css-module-local-ident';
-import { NormalizedNxWebpackPluginOptions } from '../nx-webpack-plugin-options';
+import { NormalizedNxAppWebpackPluginOptions } from '../nx-app-webpack-plugin-options';
 interface PostcssOptions {
     (loader: any): any;
     config?: string;
 }
-export declare function getCommonLoadersForCssModules(options: NormalizedNxWebpackPluginOptions, includePaths: string[]): ({
+export declare function getCommonLoadersForCssModules(options: NormalizedNxAppWebpackPluginOptions, includePaths: string[]): ({
     loader: any;
     options?: undefined;
 } | {
@@ -27,7 +27,7 @@ export declare function getCommonLoadersForCssModules(options: NormalizedNxWebpa
         importLoaders?: undefined;
     };
 })[];
-export declare function getCommonLoadersForGlobalCss(options: NormalizedNxWebpackPluginOptions, includePaths: string[]): ({
+export declare function getCommonLoadersForGlobalCss(options: NormalizedNxAppWebpackPluginOptions, includePaths: string[]): ({
     loader: any;
     options?: undefined;
 } | {
@@ -45,7 +45,7 @@ export declare function getCommonLoadersForGlobalCss(options: NormalizedNxWebpac
         url?: undefined;
     };
 })[];
-export declare function getCommonLoadersForGlobalStyle(options: NormalizedNxWebpackPluginOptions, includePaths: string[]): ({
+export declare function getCommonLoadersForGlobalStyle(options: NormalizedNxAppWebpackPluginOptions, includePaths: string[]): ({
     loader: any;
     options: {
         esModule: boolean;

package/src/plugins/nx-webpack-plugin/{nx-webpack-plugin-options.d.ts → nx-app-webpack-plugin-options.d.ts}

@@ -29,7 +29,7 @@ export interface OptimizationOptions {
     scripts: boolean;
     styles: boolean;
 }
-export interface NxWebpackPluginOptions {
+export interface NxAppWebpackPluginOptions {
     /**
      * The tsconfig file for the project. e.g. `tsconfig.json`
      */
@@ -203,7 +203,7 @@ export interface NxWebpackPluginOptions {
      */
     watch?: boolean;
 }
-export interface NormalizedNxWebpackPluginOptions extends NxWebpackPluginOptions {
+export interface NormalizedNxAppWebpackPluginOptions extends NxAppWebpackPluginOptions {
     projectName: string;
     root: string;
     projectRoot: string;

package/src/plugins/nx-webpack-plugin/{nx-webpack-plugin.d.ts → nx-app-webpack-plugin.d.ts}

@@ -1,5 +1,5 @@
 import { Compiler } from 'webpack';
-import { NxWebpackPluginOptions } from './nx-webpack-plugin-options';
+import { NxAppWebpackPluginOptions } from './nx-app-webpack-plugin-options';
 /**
  * This plugin provides features to build Node and Web applications.
  * - TS support (including tsconfig paths)
@@ -10,8 +10,8 @@ import { NxWebpackPluginOptions } from './nx-webpack-plugin-options';
  *
  * Web-only features, such as stylesheets and images, are only supported when `target` is 'web' or 'webworker'.
  */
-export declare class NxWebpackPlugin {
+export declare class NxAppWebpackPlugin {
     private readonly options;
-    constructor(options?: NxWebpackPluginOptions);
+    constructor(options?: NxAppWebpackPluginOptions);
     apply(compiler: Compiler): void;
 }

package/src/plugins/nx-webpack-plugin/{nx-webpack-plugin.js → nx-app-webpack-plugin.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NxWebpackPlugin = void 0;
+exports.NxAppWebpackPlugin = void 0;
 const normalize_options_1 = require("./lib/normalize-options");
 const fs_1 = require("../../utils/fs");
 const apply_base_config_1 = require("./lib/apply-base-config");
@@ -15,7 +15,7 @@ const apply_web_config_1 = require("./lib/apply-web-config");
  *
  * Web-only features, such as stylesheets and images, are only supported when `target` is 'web' or 'webworker'.
  */
-class NxWebpackPlugin {
+class NxAppWebpackPlugin {
     constructor(options = {}) {
         // If we're building inferred targets, skip normalizing build options.
         if (!global.NX_GRAPH_CREATION) {
@@ -45,4 +45,4 @@ class NxWebpackPlugin {
         }
     }
 }
-exports.NxWebpackPlugin = NxWebpackPlugin;
+exports.NxAppWebpackPlugin = NxAppWebpackPlugin;

package/src/utils/with-nx.d.ts

@@ -1,6 +1,6 @@
 import { NxComposableWebpackPlugin } from './config';
-import { NxWebpackPluginOptions } from '../plugins/nx-webpack-plugin/nx-webpack-plugin-options';
-export type WithNxOptions = Partial<NxWebpackPluginOptions>;
+import { NxAppWebpackPluginOptions } from '../plugins/nx-webpack-plugin/nx-app-webpack-plugin-options';
+export type WithNxOptions = Partial<NxAppWebpackPluginOptions>;
 /**
  * @param {WithNxOptions} pluginOptions
  * @returns {NxWebpackPlugin}

package/tsconfig-paths-plugin.d.ts

@@ -0,0 +1 @@
+export { NxTsconfigPathsWebpackPlugin } from './src/plugins/nx-typescript-webpack-plugin/nx-tsconfig-paths-webpack-plugin';

package/tsconfig-paths-plugin.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NxTsconfigPathsWebpackPlugin = void 0;
+var nx_tsconfig_paths_webpack_plugin_1 = require("./src/plugins/nx-typescript-webpack-plugin/nx-tsconfig-paths-webpack-plugin");
+Object.defineProperty(exports, "NxTsconfigPathsWebpackPlugin", { enumerable: true, get: function () { return nx_tsconfig_paths_webpack_plugin_1.NxTsconfigPathsWebpackPlugin; } });