@nx/webpack 19.0.0 → 19.0.2

package/package.json

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

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

@@ -84,6 +84,8 @@ export interface WebpackExecutorOptions {
   stylePreprocessorOptions?: any;
   styles?: Array<ExtraEntryPointClass | string>;
   subresourceIntegrity?: boolean;
+  publicPath?: string;
+  rebaseRootRelative?: boolean;
 }
 
 export interface NormalizedWebpackExecutorOptions

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 19. 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 20. See https://nx.dev/recipes/webpack/webpack-config-setup."
     },
     "standardWebpackConfigFunction": {
       "type": "boolean",
@@ -299,6 +299,14 @@
       "type": "string",
       "description": "Path to the babel configuration file of your project. If not provided, Nx will default to the .babelrc file at the root of your project. See https://babeljs.io/docs/en/config-files",
       "x-completion-type": "file"
+    },
+    "publicPath": {
+      "type": "string",
+      "description": "Set a public path for assets resources with absolute paths."
+    },
+    "rebaseRootRelative": {
+      "type": "boolean",
+      "description": "Whether to rebase absolute path for assets in postcss cli resources."
     }
   },
   "required": [],

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

@@ -68,27 +68,22 @@ function applyNxIndependentConfig(options, config) {
                 : false;
     config.output = {
         ...config.output,
-        libraryTarget: (config.output?.libraryTarget ??
-            options.target === 'node')
-            ? 'commonjs'
-            : undefined,
+        libraryTarget: config.output?.libraryTarget ??
+            (options.target === 'node' ? 'commonjs' : undefined),
         path: config.output?.path ??
             (options.outputPath
                 ? path.join(options.root, options.outputPath)
                 : undefined),
-        filename: config.output?.filename ?? options.outputHashing
-            ? `[name]${hashFormat.script}.js`
-            : '[name].js',
-        chunkFilename: config.output?.chunkFilename ?? options.outputHashing
-            ? `[name]${hashFormat.chunk}.js`
-            : '[name].js',
+        filename: config.output?.filename ??
+            (options.outputHashing ? `[name]${hashFormat.script}.js` : '[name].js'),
+        chunkFilename: config.output?.chunkFilename ??
+            (options.outputHashing ? `[name]${hashFormat.chunk}.js` : '[name].js'),
         hashFunction: config.output?.hashFunction ?? 'xxhash64',
         // Disabled for performance
         pathinfo: config.output?.pathinfo ?? false,
         // Use CJS for Node since it has the widest support.
-        scriptType: config.output?.scriptType ?? options.target === 'node'
-            ? undefined
-            : 'module',
+        scriptType: config.output?.scriptType ??
+            (options.target === 'node' ? undefined : 'module'),
     };
     config.watch = options.watch;
     config.watchOptions = {

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

@@ -46,14 +46,18 @@ function createLoaderFromCompiler(options) {
                 },
             };
         case 'babel':
-            const tsConfig = (0, js_1.readTsConfig)(path.join(options.root, options.tsConfig));
+            const tsConfig = options.tsConfig
+                ? (0, js_1.readTsConfig)(path.join(options.root, options.tsConfig))
+                : undefined;
             const babelConfig = {
                 test: /\.([jt])sx?$/,
                 loader: path.join(__dirname, '../../../utils/web-babel-loader'),
                 exclude: /node_modules/,
                 options: {
                     cwd: path.join(options.root, options.sourceRoot),
-                    emitDecoratorMetadata: tsConfig.options.emitDecoratorMetadata,
+                    emitDecoratorMetadata: tsConfig
+                        ? tsConfig.options.emitDecoratorMetadata
+                        : false,
                     isModern: true,
                     isTest: process.env.NX_CYPRESS_COMPONENT_TEST === 'true',
                     envName: process.env.BABEL_ENV ?? process.env.NODE_ENV,

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

@@ -103,6 +103,8 @@ function postcssOptionsCreator(options, { includePaths, forCssModules = false, }
                         deployUrl: options.deployUrl,
                         loader,
                         filename: `[name]${hashFormat.file}.[ext]`,
+                        publicPath: options.publicPath,
+                        rebaseRootRelative: options.rebaseRootRelative,
                     }),
                     autoprefixer(),
                 ]),

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

@@ -202,6 +202,14 @@ export interface NxAppWebpackPluginOptions {
      * Watch for file changes.
      */
     watch?: boolean;
+    /**
+     * Set a public path for assets resources with absolute paths.
+     */
+    publicPath?: string;
+    /**
+     * Whether to rebase absolute path for assets in postcss cli resources.
+     */
+    rebaseRootRelative?: boolean;
 }
 export interface NormalizedNxAppWebpackPluginOptions extends NxAppWebpackPluginOptions {
     projectName: string;

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

@@ -22,15 +22,22 @@ function shareWorkspaceLibraries(workspaceLibs, tsConfigPath = process.env.NX_TS
     if (!Object.keys(tsconfigPathAliases).length) {
         return getEmptySharedLibrariesConfig();
     }
+    // Nested projects must come first, sort them as such
+    const sortedTsConfigPathAliases = {};
+    Object.keys(tsconfigPathAliases)
+        .sort((a, b) => {
+        return b.split('/').length - a.split('/').length;
+    })
+        .forEach((key) => (sortedTsConfigPathAliases[key] = tsconfigPathAliases[key]));
     const pathMappings = [];
-    for (const [key, paths] of Object.entries(tsconfigPathAliases)) {
+    for (const [key, paths] of Object.entries(sortedTsConfigPathAliases)) {
         const library = workspaceLibs.find((lib) => lib.importKey === key);
         if (!library) {
             continue;
         }
         // This is for Angular Projects that use ng-package.json
         // It will do nothing for React Projects
-        (0, secondary_entry_points_1.collectWorkspaceLibrarySecondaryEntryPoints)(library, tsconfigPathAliases).forEach(({ name, path }) => pathMappings.push({
+        (0, secondary_entry_points_1.collectWorkspaceLibrarySecondaryEntryPoints)(library, sortedTsConfigPathAliases).forEach(({ name, path }) => pathMappings.push({
             name,
             path,
         }));

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

@@ -5,7 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const stylusLoader = require("stylus-loader");
 // 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 19. 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 20. 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.d.ts

@@ -6,6 +6,7 @@ export interface PostcssCliResourcesOptions {
     rebaseRootRelative?: boolean;
     filename: string;
     loader: LoaderContext<unknown>;
+    publicPath: string;
 }
 export declare function PostcssCliResources(options: PostcssCliResourcesOptions): {
     postcssPlugin: string;

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

@@ -25,7 +25,7 @@ async function resolve(file, base, resolver) {
 }
 module.exports.postcss = true;
 function PostcssCliResources(options) {
-    const { deployUrl = '', baseHref = '', resourcesOutputPath = '', rebaseRootRelative = false, filename, loader, } = options;
+    const { deployUrl = '', baseHref = '', resourcesOutputPath = '', rebaseRootRelative = false, filename, loader, publicPath = '', } = options;
     const dedupeSlashes = (url) => url.replace(/\/\/+/g, '/');
     const process = async (inputUrl, context, resourceCache) => {
         // If root-relative, absolute or protocol relative url, leave as is
@@ -62,7 +62,7 @@ function PostcssCliResources(options) {
             }
             else {
                 // Join together base-href, deploy-url and the original URL.
-                outputUrl = dedupeSlashes(`/${baseHref}/${deployUrl}/${inputUrl}`);
+                outputUrl = dedupeSlashes(`/${baseHref}/${deployUrl}/${publicPath}/${inputUrl}`);
             }
             resourceCache.set(cacheKey, outputUrl);
             return outputUrl;