@nx/angular-rspack 23.1.0 → 23.1.1

package/dist/lib/plugins/ng-rspack.js

@@ -9,6 +9,7 @@ const misc_helpers_1 = require("../utils/misc-helpers");
 const rspack_serve_env_1 = require("../utils/rspack-serve-env");
 const angular_rspack_plugin_1 = require("./angular-rspack-plugin");
 const angular_ssr_dev_server_1 = require("./angular-ssr-dev-server");
+const extract_licenses_plugin_1 = require("./extract-licenses-plugin");
 const i18n_inline_plugin_1 = require("./i18n-inline-plugin");
 const index_html_plugin_1 = require("./index-html-plugin");
 const progress_plugin_1 = require("./progress-plugin");
@@ -18,6 +19,8 @@ class NgRspackPlugin {
         this.pluginOptions = pluginOptions;
         this.i18n = extraOptions.i18nOptions;
         this.isPlatformServer = extraOptions.platform === 'server';
+        this.sharedLicenseInputs = extraOptions.sharedLicenseInputs;
+        this.sharedAngularPlugin = extraOptions.sharedAngularPlugin;
     }
     apply(compiler) {
         const root = this.pluginOptions.root;
@@ -29,6 +32,32 @@ class NgRspackPlugin {
                 new angular_ssr_dev_server_1.AngularSsrDevServer(this.pluginOptions).apply(compiler);
             }
         }
+        if (this.isPlatformServer) {
+            // The server bundle is CommonJS; the marker keeps Node loading it as
+            // such under a `"type": "module"` workspace package.json.
+            compiler.hooks.thisCompilation.tap('NgRspackPlugin', (compilation) => {
+                compilation.hooks.processAssets.tap({
+                    name: 'NgRspackPlugin',
+                    stage: compiler.rspack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONS,
+                }, () => {
+                    if (!compilation.getAsset('package.json')) {
+                        compilation.emitAsset('package.json', new compiler.rspack.sources.RawSource('{"type": "commonjs"}\n'));
+                    }
+                });
+            });
+        }
+        else {
+            // Deployment tooling reads this at the output root of every build; the
+            // PrerenderPlugin overwrites it with the rendered routes after emit.
+            compiler.hooks.thisCompilation.tap('NgRspackPlugin', (compilation) => {
+                compilation.hooks.processAssets.tap({
+                    name: 'NgRspackPlugin',
+                    stage: compiler.rspack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONS,
+                }, () => {
+                    compilation.emitAsset(node_path_1.posix.join(...(0, node_path_1.relative)(this.pluginOptions.outputPath.browser, this.pluginOptions.outputPath.base).split(node_path_1.sep), 'prerendered-routes.json'), new compiler.rspack.sources.RawSource(JSON.stringify({ routes: {} }, null, 2)));
+                });
+            });
+        }
         if (!isDevServer && this.pluginOptions.progress) {
             new progress_plugin_1.ProgressPlugin(this.isPlatformServer ? 'server' : 'browser').apply(compiler);
         }
@@ -75,22 +104,27 @@ class NgRspackPlugin {
             }).apply(compiler);
         }
         if (this.pluginOptions.extractLicenses) {
-            const { LicenseWebpackPlugin } = require('license-webpack-plugin');
-            new LicenseWebpackPlugin({
-                stats: {
-                    warnings: false,
-                    errors: false,
-                },
-                perChunkOutput: false,
+            new extract_licenses_plugin_1.ExtractLicensesPlugin({
                 outputFilename: node_path_1.posix.join((0, node_path_1.relative)(this.pluginOptions.outputPath.browser, this.pluginOptions.outputPath.base), '3rdpartylicenses.txt'),
-                skipChildCompilers: true,
+                rootDirectory: root,
+                sharedInputs: this.sharedLicenseInputs,
             }).apply(compiler);
         }
         if (this.i18n.shouldInline) {
             new i18n_inline_plugin_1.I18nInlinePlugin(this.pluginOptions, this.i18n).apply(compiler);
         }
         new rxjs_esm_resolution_1.RxjsEsmResolutionPlugin().apply(compiler);
-        new angular_rspack_plugin_1.AngularRspackPlugin(this.pluginOptions, this.i18n).apply(compiler);
+        if (this.sharedAngularPlugin) {
+            if (this.isPlatformServer) {
+                this.sharedAngularPlugin.applyToDependentCompiler(compiler);
+            }
+            else {
+                this.sharedAngularPlugin.apply(compiler);
+            }
+        }
+        else {
+            new angular_rspack_plugin_1.AngularRspackPlugin(this.pluginOptions, this.i18n).apply(compiler);
+        }
         if (!this.isPlatformServer && this.pluginOptions.index) {
             new index_html_plugin_1.IndexHtmlPlugin({
                 indexPath: this.pluginOptions.index.input,

package/dist/lib/plugins/prerender-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prerender-plugin.d.ts","sourceRoot":"","sources":["../../../src/lib/plugins/prerender-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,QAAQ,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAOhF,OAAO,EACL,KAAK,WAAW,EAEhB,oCAAoC,EACrC,MAAM,WAAW,CAAC;AAenB,qBAAa,eAAgB,YAAW,oBAAoB;;IAI1D,YACE,OAAO,EAAE,oCAAoC,EAC7C,WAAW,CAAC,EAAE,WAAW,EAI1B;IAED,KAAK,CAAC,QAAQ,EAAE,QAAQ,QAavB;CA2PF"}
+{"version":3,"file":"prerender-plugin.d.ts","sourceRoot":"","sources":["../../../src/lib/plugins/prerender-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,QAAQ,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAOhF,OAAO,EACL,KAAK,WAAW,EAEhB,oCAAoC,EACrC,MAAM,WAAW,CAAC;AAenB,qBAAa,eAAgB,YAAW,oBAAoB;;IAI1D,YACE,OAAO,EAAE,oCAAoC,EAC7C,WAAW,CAAC,EAAE,WAAW,EAI1B;IAED,KAAK,CAAC,QAAQ,EAAE,QAAQ,QAuBvB;CAqRF"}

package/dist/lib/plugins/prerender-plugin.js

@@ -1,5 +1,5 @@
 "use strict";
-var _PrerenderPlugin_instances, _PrerenderPlugin__options, _PrerenderPlugin_i18n, _PrerenderPlugin_prerenderAppShell, _PrerenderPlugin_prerenderSSGUniversal, _PrerenderPlugin_getRoutes, _PrerenderPlugin_normalizePrerenderOptions, _PrerenderPlugin_resolveZonePackage;
+var _PrerenderPlugin_instances, _PrerenderPlugin__options, _PrerenderPlugin_i18n, _PrerenderPlugin_writePrerenderedRoutesManifest, _PrerenderPlugin_prerenderAppShell, _PrerenderPlugin_prerenderSSGUniversal, _PrerenderPlugin_getRoutes, _PrerenderPlugin_normalizePrerenderOptions, _PrerenderPlugin_resolveZonePackage;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PrerenderPlugin = void 0;
 const tslib_1 = require("tslib");
@@ -30,18 +30,40 @@ class PrerenderPlugin {
     }
     apply(compiler) {
         compiler.hooks.afterEmit.tapAsync('Angular Rspack', async (compilation, callback) => {
+            const prerenderedRoutes = new Set();
             if (tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin__options, "f").appShell) {
                 await tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin_instances, "m", _PrerenderPlugin_prerenderAppShell).call(this, compilation);
+                prerenderedRoutes.add('/');
             }
             if (tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin__options, "f").prerender) {
-                await tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin_instances, "m", _PrerenderPlugin_prerenderSSGUniversal).call(this, compilation);
+                for (const route of await tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin_instances, "m", _PrerenderPlugin_prerenderSSGUniversal).call(this, compilation)) {
+                    // RoutesSet stores routes without the leading slash; the manifest
+                    // keys carry it, matching the esbuild application builder.
+                    prerenderedRoutes.add(`/${route}`);
+                }
             }
+            await tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin_instances, "m", _PrerenderPlugin_writePrerenderedRoutesManifest).call(this, compilation, prerenderedRoutes);
             callback();
         });
     }
 }
 exports.PrerenderPlugin = PrerenderPlugin;
-_PrerenderPlugin__options = new WeakMap(), _PrerenderPlugin_i18n = new WeakMap(), _PrerenderPlugin_instances = new WeakSet(), _PrerenderPlugin_prerenderAppShell = async function _PrerenderPlugin_prerenderAppShell(compilation) {
+_PrerenderPlugin__options = new WeakMap(), _PrerenderPlugin_i18n = new WeakMap(), _PrerenderPlugin_instances = new WeakSet(), _PrerenderPlugin_writePrerenderedRoutesManifest = 
+/**
+ * Overwrites the empty `prerendered-routes.json` emitted at the output root
+ * by the browser compiler with the routes that were prerendered.
+ */
+async function _PrerenderPlugin_writePrerenderedRoutesManifest(compilation, prerenderedRoutes) {
+    // fromEntries keeps a route literally named "__proto__" an own key.
+    const routes = Object.fromEntries([...prerenderedRoutes].sort().map((route) => [route, {}]));
+    try {
+        await (0, promises_1.writeFile)((0, path_1.join)(tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin__options, "f").outputPath.base, 'prerendered-routes.json'), JSON.stringify({ routes }, null, 2));
+    }
+    catch (error) {
+        (0, misc_helpers_1.assertIsError)(error);
+        (0, rspack_diagnostics_1.addError)(compilation, error.message);
+    }
+}, _PrerenderPlugin_prerenderAppShell = async function _PrerenderPlugin_prerenderAppShell(compilation) {
     // Users can specify a different base html file e.g. "src/home.html"
     const indexFile = (0, get_index_output_file_1.getIndexOutputFile)(tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin__options, "f").index);
     const worker = new worker_pool_1.WorkerPool({
@@ -167,6 +189,7 @@ _PrerenderPlugin__options = new WeakMap(), _PrerenderPlugin_i18n = new WeakMap()
     finally {
         void worker.destroy();
     }
+    return routes ?? [];
 }, _PrerenderPlugin_getRoutes = async function _PrerenderPlugin_getRoutes(indexFile, outputPath, serverBundlePath, workspaceRoot) {
     const { routes: extraRoutes = [], routesFile, discoverRoutes, } = tslib_1.__classPrivateFieldGet(this, _PrerenderPlugin_instances, "m", _PrerenderPlugin_normalizePrerenderOptions).call(this);
     const routes = new RoutesSet(extraRoutes);

package/dist/lib/utils/postcss-cli-resources.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postcss-cli-resources.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/postcss-cli-resources.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,KAAK,EAAe,MAAM,EAAE,MAAM,SAAS,CAAC;AA0BnD,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B,mEAAmE;IACnE,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,MAAM,CAAC;IAC3C,MAAM,EAAE,OAAO,cAAc,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IACtD,QAAQ,EAAE,OAAO,CAAC;CACnB;AAcD,eAAO,MAAM,OAAO,OAAO,CAAC;AAE5B,MAAM,CAAC,OAAO,WAAW,OAAO,CAAC,EAAE,0BAA0B,GAAG,MAAM,CA8KrE"}
+{"version":3,"file":"postcss-cli-resources.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/postcss-cli-resources.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,EAAe,MAAM,EAAE,MAAM,SAAS,CAAC;AA0BnD,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B,mEAAmE;IACnE,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,MAAM,CAAC;IAC3C,MAAM,EAAE,OAAO,cAAc,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IACtD,QAAQ,EAAE,OAAO,CAAC;CACnB;AAcD,eAAO,MAAM,OAAO,OAAO,CAAC;AAE5B,MAAM,CAAC,OAAO,WAAW,OAAO,CAAC,EAAE,0BAA0B,GAAG,MAAM,CAmLrE"}

package/dist/lib/utils/postcss-cli-resources.js

@@ -12,7 +12,6 @@ exports.default = default_1;
 const tslib_1 = require("tslib");
 const loader_utils_1 = require("loader-utils");
 const path = tslib_1.__importStar(require("node:path"));
-const node_url_1 = require("node:url");
 const misc_helpers_1 = require("./misc-helpers");
 function wrapUrl(url) {
     let wrappedUrl;
@@ -72,14 +71,19 @@ function default_1(options) {
         // Separate URL query/hash from the file path before resolving
         const [, filePath, urlSuffix] = inputUrl.match(/^([^?#]*)(.*)$/);
         const resolvedPath = path.resolve(context, filePath.replace(/\\/g, '/'));
-        const { pathname } = (0, node_url_1.pathToFileURL)(resolvedPath);
+        // Resolve a relative filesystem path, not a file:// URL pathname: on Windows the
+        // pathname is `/C:/...` (spaces as %20), which the resolver cannot find. Relative
+        // (not absolute) lets `resolve()`'s `./`-prefixed lookup succeed on the first try.
+        const resolveRequest = path
+            .relative(context, resolvedPath)
+            .replace(/\\/g, '/');
         let hash = '';
         let search = '';
         if (urlSuffix) {
             ({ hash, search } = new URL(`file:///dummy${urlSuffix}`));
         }
         const resolver = (file, base) => new Promise((resolve, reject) => {
-            loader.resolve(base, decodeURI(file), (err, result) => {
+            loader.resolve(base, file, (err, result) => {
                 if (err) {
                     reject(err);
                     return;
@@ -87,7 +91,7 @@ function default_1(options) {
                 resolve(result);
             });
         });
-        const result = await resolve(pathname, context, resolver);
+        const result = await resolve(resolveRequest, context, resolver);
         return new Promise((resolve, reject) => {
             loader.fs.readFile(result, (err, content) => {
                 if (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular-rspack",
-  "version": "23.1.0",
+  "version": "23.1.1",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -62,7 +62,6 @@
     "css-loader": "^7.1.2",
     "jsonc-parser": "^3.2.0",
     "less-loader": "^12.2.0",
-    "license-webpack-plugin": "^4.0.2",
     "loader-utils": "3.3.1",
     "open": "10.1.0",
     "ora": "^5.3.0",
@@ -78,8 +77,8 @@
     "tslib": "^2.3.0",
     "webpack-merge": "^6.0.1",
     "ws": "^8.18.0",
-    "@nx/angular-rspack-compiler": "23.1.0",
-    "@nx/devkit": "23.1.0"
+    "@nx/angular-rspack-compiler": "23.1.1",
+    "@nx/devkit": "23.1.1"
   },
   "devDependencies": {
     "jsonc-eslint-parser": "^2.4.0"
@@ -123,15 +122,10 @@
       },
       "test": {
         "dependsOn": [
+          "...",
           "build",
-          "^build-native",
           "angular-rspack-compiler:build"
-        ],
-        "options": {
-          "args": [
-            "--passWithNoTests"
-          ]
-        }
+        ]
       }
     }
   },

package/LICENSE

@@ -1,22 +0,0 @@
-(The MIT License)
-
-Copyright (c) 2017-2026 Narwhal Technologies Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.