@nx/angular-rspack 20.8.2 → 20.9.0

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

@@ -0,0 +1,158 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.postcss = void 0;
+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 url = tslib_1.__importStar(require("node:url"));
+const misc_helpers_1 = require("./misc-helpers");
+function wrapUrl(url) {
+    let wrappedUrl;
+    const hasSingleQuotes = url.indexOf("'") >= 0;
+    if (hasSingleQuotes) {
+        wrappedUrl = `"${url}"`;
+    }
+    else {
+        wrappedUrl = `'${url}'`;
+    }
+    return `url(${wrappedUrl})`;
+}
+async function resolve(file, base, resolver) {
+    try {
+        return await resolver('./' + file, base);
+    }
+    catch {
+        return resolver(file, base);
+    }
+}
+exports.postcss = true;
+function default_1(options) {
+    if (!options) {
+        throw new Error('No options were specified to "postcss-cli-resources".');
+    }
+    const { deployUrl = '', resourcesOutputPath = '', filename, loader, emitFile, extracted, } = options;
+    const process = async (inputUrl, context, resourceCache) => {
+        // If root-relative, absolute or protocol relative url, leave as is
+        if (/^((?:\w+:)?\/\/|data:|chrome:|#)/.test(inputUrl)) {
+            return inputUrl;
+        }
+        if (/^\//.test(inputUrl)) {
+            return inputUrl;
+        }
+        // If starts with a caret, remove and return remainder
+        // this supports bypassing asset processing
+        if (inputUrl.startsWith('^')) {
+            return inputUrl.slice(1);
+        }
+        const cacheKey = path.resolve(context, inputUrl);
+        const cachedUrl = resourceCache.get(cacheKey);
+        if (cachedUrl) {
+            return cachedUrl;
+        }
+        if (inputUrl.startsWith('~')) {
+            inputUrl = inputUrl.slice(1);
+        }
+        const { pathname, hash, search } = url.parse(inputUrl.replace(/\\/g, '/'));
+        const resolver = (file, base) => new Promise((resolve, reject) => {
+            loader.resolve(base, decodeURI(file), (err, result) => {
+                if (err) {
+                    reject(err);
+                    return;
+                }
+                resolve(result);
+            });
+        });
+        const result = await resolve(pathname, context, resolver);
+        return new Promise((resolve, reject) => {
+            loader.fs.readFile(result, (err, content) => {
+                if (err) {
+                    reject(err);
+                    return;
+                }
+                let outputPath = (0, loader_utils_1.interpolateName)(
+                // TODO: Revisit. Previously due to lack of type safety, this object
+                // was fine, but in practice it doesn't match the type of the loader context.
+                { resourcePath: result }, filename(result), {
+                    content,
+                    context: loader.context || loader.rootContext,
+                }).replace(/\\|\//g, '-');
+                if (resourcesOutputPath) {
+                    outputPath = path.posix.join(resourcesOutputPath, outputPath);
+                }
+                loader.addDependency(result);
+                if (emitFile) {
+                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                    loader.emitFile(outputPath, content, undefined, {
+                        sourceFilename: result,
+                    });
+                }
+                let outputUrl = outputPath.replace(/\\/g, '/');
+                if (hash || search) {
+                    outputUrl = url.format({ pathname: outputUrl, hash, search });
+                }
+                if (deployUrl && !extracted) {
+                    outputUrl = url.resolve(deployUrl, outputUrl);
+                }
+                resourceCache.set(cacheKey, outputUrl);
+                resolve(outputUrl);
+            });
+        });
+    };
+    const resourceCache = new Map();
+    const processed = Symbol('postcss-cli-resources');
+    return {
+        postcssPlugin: 'postcss-cli-resources',
+        async Declaration(decl) {
+            if (!decl.value.includes('url') || processed in decl) {
+                return;
+            }
+            const value = decl.value;
+            const urlRegex = /url(?:\(\s*(['"]?))(.*?)(?:\1\s*\))/g;
+            const segments = [];
+            let match;
+            let lastIndex = 0;
+            let modified = false;
+            // We want to load it relative to the file that imports
+            const inputFile = decl.source && decl.source.input.file;
+            const context = (inputFile && path.dirname(inputFile)) || loader.context;
+            while ((match = urlRegex.exec(value))) {
+                const originalUrl = match[2];
+                let processedUrl;
+                try {
+                    processedUrl = await process(originalUrl, context ?? '', resourceCache);
+                }
+                catch (err) {
+                    (0, misc_helpers_1.assertIsError)(err);
+                    loader.emitError(decl.error(err.message, { word: originalUrl }));
+                    continue;
+                }
+                if (lastIndex < match.index) {
+                    segments.push(value.slice(lastIndex, match.index));
+                }
+                if (!processedUrl || originalUrl === processedUrl) {
+                    segments.push(match[0]);
+                }
+                else {
+                    segments.push(wrapUrl(processedUrl));
+                    modified = true;
+                }
+                lastIndex = match.index + match[0].length;
+            }
+            if (lastIndex < value.length) {
+                segments.push(value.slice(lastIndex));
+            }
+            if (modified) {
+                decl.value = segments.join('');
+            }
+            decl[processed] = true;
+        },
+    };
+}

package/dist/lib/utils/postcss-configuration.d.ts

@@ -0,0 +1,18 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+export interface PostcssConfiguration {
+    plugins: [name: string, options?: object | string][];
+}
+export interface SearchDirectory {
+    root: string;
+    files: Set<string>;
+}
+export declare function generateSearchDirectories(roots: string[]): Promise<SearchDirectory[]>;
+export declare function findTailwindConfiguration(searchDirectories: SearchDirectory[]): string | undefined;
+export declare function loadPostcssConfiguration(searchDirectories: SearchDirectory[]): Promise<PostcssConfiguration | undefined>;
+//# sourceMappingURL=postcss-configuration.d.ts.map

package/dist/lib/utils/postcss-configuration.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"postcss-configuration.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/postcss-configuration.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;CACtD;AAmBD,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACpB;AAED,wBAAsB,yBAAyB,CAC7C,KAAK,EAAE,MAAM,EAAE,GACd,OAAO,CAAC,eAAe,EAAE,CAAC,CAW5B;AAiBD,wBAAgB,yBAAyB,CACvC,iBAAiB,EAAE,eAAe,EAAE,GACnC,MAAM,GAAG,SAAS,CAEpB;AAWD,wBAAsB,wBAAwB,CAC5C,iBAAiB,EAAE,eAAe,EAAE,GACnC,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,CAkD3C"}

package/dist/lib/utils/postcss-configuration.js

@@ -0,0 +1,89 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateSearchDirectories = generateSearchDirectories;
+exports.findTailwindConfiguration = findTailwindConfiguration;
+exports.loadPostcssConfiguration = loadPostcssConfiguration;
+const promises_1 = require("node:fs/promises");
+const node_path_1 = require("node:path");
+const postcssConfigurationFiles = [
+    'postcss.config.json',
+    '.postcssrc.json',
+];
+const tailwindConfigFiles = [
+    'tailwind.config.js',
+    'tailwind.config.cjs',
+    'tailwind.config.mjs',
+    'tailwind.config.ts',
+];
+async function generateSearchDirectories(roots) {
+    return await Promise.all(roots.map((root) => (0, promises_1.readdir)(root, { withFileTypes: true }).then((entries) => ({
+        root,
+        files: new Set(entries.filter((entry) => entry.isFile()).map((entry) => entry.name)),
+    }))));
+}
+function findFile(searchDirectories, potentialFiles) {
+    for (const { root, files } of searchDirectories) {
+        for (const potential of potentialFiles) {
+            if (files.has(potential)) {
+                return (0, node_path_1.join)(root, potential);
+            }
+        }
+    }
+    return undefined;
+}
+function findTailwindConfiguration(searchDirectories) {
+    return findFile(searchDirectories, tailwindConfigFiles);
+}
+async function readPostcssConfiguration(configurationFile) {
+    const data = await (0, promises_1.readFile)(configurationFile, 'utf-8');
+    const config = JSON.parse(data);
+    return config;
+}
+async function loadPostcssConfiguration(searchDirectories) {
+    const configPath = findFile(searchDirectories, postcssConfigurationFiles);
+    if (!configPath) {
+        return undefined;
+    }
+    const raw = await readPostcssConfiguration(configPath);
+    // If no plugins are defined, consider it equivalent to no configuration
+    if (!raw.plugins || typeof raw.plugins !== 'object') {
+        return undefined;
+    }
+    // Normalize plugin array form
+    if (Array.isArray(raw.plugins)) {
+        if (raw.plugins.length < 1) {
+            return undefined;
+        }
+        const config = { plugins: [] };
+        for (const element of raw.plugins) {
+            if (typeof element === 'string') {
+                config.plugins.push([element]);
+            }
+            else {
+                config.plugins.push(element);
+            }
+        }
+        return config;
+    }
+    // Normalize plugin object map form
+    const entries = Object.entries(raw.plugins);
+    if (entries.length < 1) {
+        return undefined;
+    }
+    const config = { plugins: [] };
+    for (const [name, options] of entries) {
+        if (!options ||
+            (typeof options !== 'object' && typeof options !== 'string')) {
+            continue;
+        }
+        config.plugins.push([name, options]);
+    }
+    return config;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular-rspack",
-  "version": "20.8.2",
+  "version": "20.9.0",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -38,6 +38,10 @@
       "types": "./dist/lib/plugins/loaders/angular-transform.loader.d.ts",
       "default": "./dist/lib/plugins/loaders/angular-transform.loader.js"
     },
+    "./loaders/platform-server-exports-loader": {
+      "types": "./dist/lib/plugins/loaders/platform-server-exports.loader.d.ts",
+      "default": "./dist/lib/plugins/loaders/platform-server-exports.loader.js"
+    },
     "./ssr": {
       "types": "./dist/lib/ssr/server.d.ts",
       "default": "./dist/lib/ssr/server.js"
@@ -46,7 +50,7 @@
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
     "@babel/core": "7.26.10",
-    "@nx/devkit": "21.0.0-beta.8",
+    "@nx/devkit": "21.0.0",
     "autoprefixer": "10.4.21",
     "deepmerge": "^4.3.1",
     "express": "4.21.1",
@@ -54,7 +58,9 @@
     "jsonc-parser": "^3.3.1",
     "less-loader": "^12.2.0",
     "license-webpack-plugin": "^4.0.2",
+    "loader-utils": "3.3.1",
     "parse5-html-rewriting-stream": "7.0.0",
+    "piscina": "4.9.2",
     "postcss": "8.5.3",
     "postcss-loader": "8.1.1",
     "resolve-url-loader": "^5.0.0",
@@ -64,7 +70,7 @@
     "tslib": "^2.3.0",
     "webpack-merge": "^6.0.1",
     "ws": "^8.18.0",
-    "@nx/angular-rspack-compiler": "20.8.2"
+    "@nx/angular-rspack-compiler": "20.9.0"
   },
   "devDependencies": {
     "@code-pushup/models": "^0.63.0",
@@ -76,9 +82,11 @@
     "@angular/common": ">=19.0.0 <20.0.0",
     "@angular/build": ">=19.0.0 <20.0.0",
     "@angular/localize": ">=19.0.0 <20.0.0",
+    "@angular/platform-server": ">=19.0.0 <20.0.0",
+    "zone.js": ">=0.14.0 <0.16.0",
     "@angular/ssr": ">=19.0.0 <20.0.0",
-    "@rspack/core": ">=1.0.5 <2.0.0",
-    "tailwindcss": "^2.0.0 || ^3.0.0"
+    "@rspack/core": ">=1.3.5 <2.0.0",
+    "tailwindcss": "^2.0.0 || ^3.0.0 || ^4.0.0"
   },
   "peerDependenciesMeta": {
     "tailwindcss": {
@@ -86,6 +94,12 @@
     },
     "@angular/localize": {
       "optional": true
+    },
+    "@angular/platform-server": {
+      "optional": true
+    },
+    "zone.js": {
+      "optional": true
     }
   },
   "nx": {

package/dist/lib/config/dev-server-config-utils.d.ts

@@ -1,4 +0,0 @@
-import type { DevServer } from '@rspack/core';
-export declare function getAllowedHostsConfig(allowedHosts: string[] | boolean | undefined, disableHostCheck: boolean | undefined): "all" | string[] | undefined;
-export declare function getProxyConfig(root: string, proxyConfig: string | undefined): Promise<DevServer['proxy'] | undefined>;
-//# sourceMappingURL=dev-server-config-utils.d.ts.map

package/dist/lib/config/dev-server-config-utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"dev-server-config-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/config/dev-server-config-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAO9C,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EAAE,GAAG,OAAO,GAAG,SAAS,EAC5C,gBAAgB,EAAE,OAAO,GAAG,SAAS,gCAUtC;AAED,wBAAsB,cAAc,CAClC,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,GAAG,SAAS,GAC9B,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC,CA2EzC"}

package/dist/lib/config/dev-server-config-utils.js

@@ -1,107 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAllowedHostsConfig = getAllowedHostsConfig;
-exports.getProxyConfig = getProxyConfig;
-const tslib_1 = require("tslib");
-const node_assert_1 = tslib_1.__importDefault(require("node:assert"));
-const node_fs_1 = require("node:fs");
-const node_path_1 = require("node:path");
-const node_url_1 = require("node:url");
-const misc_helpers_1 = require("../utils/misc-helpers");
-function getAllowedHostsConfig(allowedHosts, disableHostCheck) {
-    if (disableHostCheck || allowedHosts === true) {
-        return 'all';
-    }
-    if (Array.isArray(allowedHosts) && allowedHosts.length > 0) {
-        return allowedHosts;
-    }
-    return undefined;
-}
-async function getProxyConfig(root, proxyConfig) {
-    if (!proxyConfig) {
-        return undefined;
-    }
-    const proxyPath = (0, node_path_1.resolve)(root, proxyConfig);
-    if (!(0, node_fs_1.existsSync)(proxyPath)) {
-        throw new Error(`Proxy configuration file ${proxyPath} does not exist.`);
-    }
-    let proxyConfiguration;
-    switch ((0, node_path_1.extname)(proxyPath)) {
-        case '.json': {
-            const content = await node_fs_1.promises.readFile(proxyPath, 'utf-8');
-            const { parse, printParseErrorCode } = await Promise.resolve().then(() => tslib_1.__importStar(require('jsonc-parser')));
-            const parseErrors = [];
-            proxyConfiguration = parse(content, parseErrors, {
-                allowTrailingComma: true,
-            });
-            if (parseErrors.length > 0) {
-                let errorMessage = `Proxy configuration file ${proxyPath} contains parse errors:`;
-                for (const parseError of parseErrors) {
-                    const { line, column } = getJsonErrorLineColumn(parseError.offset, content);
-                    errorMessage += `\n[${line}, ${column}] ${printParseErrorCode(parseError.error)}`;
-                }
-                throw new Error(errorMessage);
-            }
-            break;
-        }
-        case '.mjs':
-            // Load the ESM configuration file using the TypeScript dynamic import workaround.
-            // Once TypeScript provides support for keeping the dynamic import this workaround can be
-            // changed to a direct dynamic import.
-            proxyConfiguration = (await (0, misc_helpers_1.loadEsmModule)((0, node_url_1.pathToFileURL)(proxyPath))).default;
-            break;
-        case '.cjs':
-            proxyConfiguration = require(proxyPath);
-            break;
-        default:
-            // The file could be either CommonJS or ESM.
-            // CommonJS is tried first then ESM if loading fails.
-            try {
-                proxyConfiguration = require(proxyPath);
-            }
-            catch (e) {
-                assertIsError(e);
-                if (e.code !== 'ERR_REQUIRE_ESM') {
-                    throw e;
-                }
-                // Load the ESM configuration file using the TypeScript dynamic import workaround.
-                // Once TypeScript provides support for keeping the dynamic import this workaround can be
-                // changed to a direct dynamic import.
-                proxyConfiguration = (await (0, misc_helpers_1.loadEsmModule)((0, node_url_1.pathToFileURL)(proxyPath))).default;
-            }
-    }
-    return normalizeProxyConfiguration(proxyConfiguration);
-}
-function getJsonErrorLineColumn(offset, content) {
-    if (offset === 0) {
-        return { line: 1, column: 1 };
-    }
-    let line = 0;
-    let position = 0;
-    while (true) {
-        ++line;
-        const nextNewline = content.indexOf('\n', position);
-        if (nextNewline === -1 || nextNewline > offset) {
-            break;
-        }
-        position = nextNewline + 1;
-    }
-    return { line, column: offset - position + 1 };
-}
-function normalizeProxyConfiguration(proxy) {
-    return Array.isArray(proxy)
-        ? proxy
-        : Object.entries(proxy).map(([context, value]) => ({
-            context: [context],
-            ...value,
-        }));
-}
-function assertIsError(value) {
-    const isError = value instanceof Error ||
-        // The following is needing to identify errors coming from RxJs.
-        (typeof value === 'object' &&
-            value &&
-            'name' in value &&
-            'message' in value);
-    (0, node_assert_1.default)(isError, 'catch clause variable is not an Error instance');
-}

package/dist/lib/config/entry-points.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"entry-points.d.ts","sourceRoot":"","sources":["../../../src/lib/config/entry-points.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAE7C,wBAAgB,cAAc,CAC5B,YAAY,EAAE,WAAW,EAAE,EAC3B,aAAa,EAAE,WAAW,EAAE,EAC5B,YAAY,CAAC,EAAE,OAAO,GACrB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE,CAerC;AAED,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,MAAM,EAAE,EACnB,GAAG,EAAE,OAAO,GACX;IAAE,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,CAW1B;AAED,wBAAgB,eAAe,CAC7B,OAAO,EAAE,WAAW,EAAE,EACtB,IAAI,EAAE,MAAM,EACZ,WAAW,CAAC,EAAE,MAAM;YAEmB,MAAM,EAAE;GAahD"}

package/dist/lib/config/helpers.d.ts

@@ -1,14 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.dev/license
- */
-import { OutputHashing, HashFormat } from '../models';
-/**
- * Delete an output directory, but error out if it's the root of the project.
- */
-export declare function deleteOutputDir(root: string, outputPath: string, emptyOnlyDirectories?: string[]): Promise<void>;
-export declare function getOutputHashFormat(outputHashing?: OutputHashing, length?: number): HashFormat;
-//# sourceMappingURL=helpers.d.ts.map

package/dist/lib/config/helpers.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/lib/config/helpers.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAItD;;GAEG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,oBAAoB,CAAC,EAAE,MAAM,EAAE,GAC9B,OAAO,CAAC,IAAI,CAAC,CAqCf;AAED,wBAAgB,mBAAmB,CACjC,aAAa,GAAE,aAAsB,EACrC,MAAM,SAAI,GACT,UAAU,CAkCZ"}

package/dist/lib/config/style-config-utils.d.ts

@@ -1,22 +0,0 @@
-import { type RuleSetUseItem } from '@rspack/core';
-import type { NormalizedAngularRspackPluginOptions } from '../models';
-/**
- * Returns an array of style loaders for sass and less. Both loader´s are always returned
- *
- * @param stylePreprocessorOptions
- * @param sourceMap
- */
-export declare function getStyleLoaders(buildOptions: NormalizedAngularRspackPluginOptions): Promise<{
-    test: RegExp;
-    rules: ({
-        oneOf: {
-            use: RuleSetUseItem[];
-            resourceQuery: RegExp;
-        }[];
-        use?: undefined;
-    } | {
-        use: RuleSetUseItem[];
-        oneOf?: undefined;
-    })[];
-}[]>;
-//# sourceMappingURL=style-config-utils.d.ts.map

package/dist/lib/config/style-config-utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"style-config-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/config/style-config-utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAA0B,KAAK,cAAc,EAAE,MAAM,cAAc,CAAC;AAE3E,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,WAAW,CAAC;AAGtE;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,YAAY,EAAE,oCAAoC;;;;;;;;;;;;KAsNnD"}