@angular-devkit/build-angular 18.0.0-next.1 → 18.0.0-next.2

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "18.0.0-next.1",
+  "version": "18.0.0-next.2",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular-devkit/architect": "0.1800.0-next.1",
-    "@angular-devkit/build-webpack": "0.1800.0-next.1",
-    "@angular-devkit/core": "18.0.0-next.1",
+    "@angular-devkit/architect": "0.1800.0-next.2",
+    "@angular-devkit/build-webpack": "0.1800.0-next.2",
+    "@angular-devkit/core": "18.0.0-next.2",
     "@babel/core": "7.24.3",
     "@babel/generator": "7.24.1",
     "@babel/helper-annotate-as-pure": "7.22.5",
@@ -20,7 +20,7 @@
     "@babel/preset-env": "7.24.3",
     "@babel/runtime": "7.24.1",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "18.0.0-next.1",
+    "@ngtools/webpack": "18.0.0-next.2",
     "@vitejs/plugin-basic-ssl": "1.1.0",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.19",
@@ -34,7 +34,7 @@
     "fast-glob": "3.3.2",
     "https-proxy-agent": "7.0.4",
     "http-proxy-middleware": "2.0.6",
-    "inquirer": "9.2.16",
+    "inquirer": "9.2.17",
     "jsonc-parser": "3.2.1",
     "karma-source-map-support": "1.4.0",
     "less": "4.2.0",
@@ -47,7 +47,7 @@
     "open": "8.4.2",
     "ora": "5.4.1",
     "parse5-html-rewriting-stream": "7.0.0",
-    "picomatch": "4.0.1",
+    "picomatch": "4.0.2",
     "piscina": "4.4.0",
     "postcss": "8.4.38",
     "postcss-loader": "8.1.1",
@@ -58,14 +58,14 @@
     "semver": "7.6.0",
     "source-map-loader": "5.0.0",
     "source-map-support": "0.5.21",
-    "terser": "5.29.2",
+    "terser": "5.30.2",
     "tree-kill": "1.2.2",
     "tslib": "2.6.2",
-    "undici": "6.10.1",
-    "vite": "5.2.6",
+    "undici": "6.11.1",
+    "vite": "5.2.7",
     "watchpack": "2.4.1",
     "webpack": "5.91.0",
-    "webpack-dev-middleware": "7.1.1",
+    "webpack-dev-middleware": "7.2.1",
     "webpack-dev-server": "5.0.4",
     "webpack-merge": "5.10.0",
     "webpack-subresource-integrity": "5.1.0"

package/src/builders/application/options.js

@@ -21,7 +21,6 @@ const environment_options_1 = require("../../utils/environment-options");
 const i18n_options_1 = require("../../utils/i18n-options");
 const normalize_cache_1 = require("../../utils/normalize-cache");
 const postcss_configuration_1 = require("../../utils/postcss-configuration");
-const tailwind_1 = require("../../utils/tailwind");
 const schema_1 = require("./schema");
 /**
  * Normalize the user provided options by creating full paths for all path based options
@@ -108,11 +107,13 @@ async function normalizeOptions(context, projectName, options, extensions) {
             loaderExtensions[extension] = value;
         }
     }
-    const postcssConfiguration = await (0, postcss_configuration_1.loadPostcssConfiguration)(workspaceRoot, projectRoot);
+    // A configuration file can exist in the project or workspace root
+    const searchDirectories = await (0, postcss_configuration_1.generateSearchDirectories)([projectRoot, workspaceRoot]);
+    const postcssConfiguration = await (0, postcss_configuration_1.loadPostcssConfiguration)(searchDirectories);
     // Skip tailwind configuration if postcss is customized
     const tailwindConfiguration = postcssConfiguration
         ? undefined
-        : await getTailwindConfig(workspaceRoot, projectRoot, context);
+        : await getTailwindConfig(searchDirectories, workspaceRoot, context);
     const globalStyles = normalizeGlobalEntries(options.styles, 'styles');
     const globalScripts = normalizeGlobalEntries(options.scripts, 'scripts');
     let indexHtmlOptions;
@@ -230,13 +231,13 @@ async function normalizeOptions(context, projectName, options, extensions) {
     };
 }
 exports.normalizeOptions = normalizeOptions;
-async function getTailwindConfig(workspaceRoot, projectRoot, context) {
-    const tailwindConfigurationPath = await (0, tailwind_1.findTailwindConfigurationFile)(workspaceRoot, projectRoot);
+async function getTailwindConfig(searchDirectories, workspaceRoot, context) {
+    const tailwindConfigurationPath = (0, postcss_configuration_1.findTailwindConfiguration)(searchDirectories);
     if (!tailwindConfigurationPath) {
         return undefined;
     }
-    // Create a node resolver at the project root as a directory
-    const resolver = (0, node_module_1.createRequire)(projectRoot + '/');
+    // Create a node resolver from the configuration file
+    const resolver = (0, node_module_1.createRequire)(tailwindConfigurationPath);
     try {
         return {
             file: tailwindConfigurationPath,

package/src/builders/ssr-dev-server/index.js

@@ -156,7 +156,7 @@ exports.log = log;
 function startNodeServer(serverOutput, port, logger, inspectMode = false) {
     const outputPath = serverOutput.outputPath;
     const path = (0, path_1.join)(outputPath, 'main.js');
-    const env = { ...process.env, SSR_PORT: '' + port, PORT: '' + port };
+    const env = { ...process.env, PORT: '' + port };
     const args = ['--enable-source-maps', `"${path}"`];
     if (inspectMode) {
         args.unshift('--inspect-brk');

package/src/utils/normalize-cache.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeCacheOptions = void 0;
 const node_path_1 = require("node:path");
 /** Version placeholder is replaced during the build process with actual package version */
-const VERSION = '18.0.0-next.1';
+const VERSION = '18.0.0-next.2';
 function hasCacheMetadata(value) {
     return (!!value &&
         typeof value === 'object' &&

package/src/utils/postcss-configuration.d.ts

@@ -8,4 +8,10 @@
 export interface PostcssConfiguration {
     plugins: [name: string, options?: object | string][];
 }
-export declare function loadPostcssConfiguration(workspaceRoot: string, projectRoot: string): Promise<PostcssConfiguration | undefined>;
+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>;

package/src/utils/postcss-configuration.js

@@ -7,16 +7,23 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadPostcssConfiguration = void 0;
+exports.loadPostcssConfiguration = exports.findTailwindConfiguration = exports.generateSearchDirectories = void 0;
 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)),
     }))));
 }
+exports.generateSearchDirectories = generateSearchDirectories;
 function findFile(searchDirectories, potentialFiles) {
     for (const { root, files } of searchDirectories) {
         for (const potential of potentialFiles) {
@@ -27,14 +34,16 @@ function findFile(searchDirectories, potentialFiles) {
     }
     return undefined;
 }
+function findTailwindConfiguration(searchDirectories) {
+    return findFile(searchDirectories, tailwindConfigFiles);
+}
+exports.findTailwindConfiguration = findTailwindConfiguration;
 async function readPostcssConfiguration(configurationFile) {
     const data = await (0, promises_1.readFile)(configurationFile, 'utf-8');
     const config = JSON.parse(data);
     return config;
 }
-async function loadPostcssConfiguration(workspaceRoot, projectRoot) {
-    // A configuration file can exist in the project or workspace root
-    const searchDirectories = await generateSearchDirectories([projectRoot, workspaceRoot]);
+async function loadPostcssConfiguration(searchDirectories) {
     const configPath = findFile(searchDirectories, postcssConfigurationFiles);
     if (!configPath) {
         return undefined;