@angular-devkit/build-angular 14.0.0-rc.2 → 14.0.1

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "14.0.0-rc.2",
+  "version": "14.0.1",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.2.0",
-    "@angular-devkit/architect": "0.1400.0-rc.2",
-    "@angular-devkit/build-webpack": "0.1400.0-rc.2",
-    "@angular-devkit/core": "14.0.0-rc.2",
+    "@angular-devkit/architect": "0.1400.1",
+    "@angular-devkit/build-webpack": "0.1400.1",
+    "@angular-devkit/core": "14.0.1",
     "@babel/core": "7.17.10",
     "@babel/generator": "7.17.10",
     "@babel/helper-annotate-as-pure": "7.16.7",
@@ -20,7 +20,7 @@
     "@babel/runtime": "7.17.9",
     "@babel/template": "7.16.7",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "14.0.0-rc.2",
+    "@ngtools/webpack": "14.0.1",
     "ansi-colors": "4.1.1",
     "babel-loader": "8.2.5",
     "babel-plugin-istanbul": "6.1.1",
@@ -73,11 +73,11 @@
     "esbuild": "0.14.38"
   },
   "peerDependencies": {
-    "@angular/compiler-cli": "^14.0.0 || ^14.0.0-rc",
-    "@angular/localize": "^14.0.0 || ^14.0.0-rc",
-    "@angular/service-worker": "^14.0.0 || ^14.0.0-rc",
+    "@angular/compiler-cli": "^14.0.0",
+    "@angular/localize": "^14.0.0",
+    "@angular/service-worker": "^14.0.0",
     "karma": "^6.3.0",
-    "ng-packagr": "^14.0.0 || ^14.0.0-next",
+    "ng-packagr": "^14.0.0",
     "protractor": "^7.0.0",
     "tailwindcss": "^2.0.0 || ^3.0.0",
     "typescript": ">=4.6.2 <4.8"

package/src/builders/browser-esbuild/compiler-plugin.js

@@ -119,7 +119,7 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
             // Once TypeScript provides support for retaining dynamic imports this workaround can be dropped.
             const compilerCli = await (0, load_esm_1.loadEsmModule)('@angular/compiler-cli');
             // Temporary deep import for transformer support
-            const { createAotTransformers, mergeTransformers, } = require('@ngtools/webpack/src/ivy/transformation');
+            const { mergeTransformers, replaceBootstrap, } = require('@ngtools/webpack/src/ivy/transformation');
             // Setup defines based on the values provided by the Angular compiler-cli
             (_a = (_b = build.initialOptions).define) !== null && _a !== void 0 ? _a : (_b.define = {});
             for (const [key, value] of Object.entries(compilerCli.GLOBAL_DEFS_FOR_TERSER_WITH_AOT)) {
@@ -226,7 +226,9 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                         ((_b = result.warnings) !== null && _b !== void 0 ? _b : (result.warnings = [])).push(message);
                     }
                 }
-                fileEmitter = createFileEmitter(builder, mergeTransformers(angularCompiler.prepareEmit().transformers, createAotTransformers(builder, {})), () => []);
+                fileEmitter = createFileEmitter(builder, mergeTransformers(angularCompiler.prepareEmit().transformers, {
+                    before: [replaceBootstrap(() => builder.getProgram().getTypeChecker())],
+                }), () => []);
                 return result;
             });
             build.onLoad({ filter: compilerOptions.allowJs ? /\.[cm]?[jt]sx?$/ : /\.[cm]?tsx?$/ }, async (args) => {

package/src/builders/browser-esbuild/index.js

@@ -224,7 +224,7 @@ async function bundleCode(workspaceRoot, entryPoints, outputNames, options, opti
         assetNames: outputNames.media,
         target: 'es2020',
         mainFields: ['es2020', 'browser', 'module', 'main'],
-        conditions: ['es2020', 'module'],
+        conditions: ['es2020', 'es2015', 'module'],
         resolveExtensions: ['.ts', '.tsx', '.mjs', '.js'],
         logLevel: options.verbose ? 'debug' : 'silent',
         metafile: true,

package/src/webpack/configs/common.js

@@ -47,6 +47,7 @@ const named_chunks_plugin_1 = require("../plugins/named-chunks-plugin");
 const progress_plugin_1 = require("../plugins/progress-plugin");
 const transfer_size_plugin_1 = require("../plugins/transfer-size-plugin");
 const typescript_2 = require("../plugins/typescript");
+const watch_files_logs_plugin_1 = require("../plugins/watch-files-logs-plugin");
 const helpers_1 = require("../utils/helpers");
 // eslint-disable-next-line max-lines-per-function
 async function getCommonConfig(wco) {
@@ -143,6 +144,9 @@ async function getCommonConfig(wco) {
             append: hiddenSourceMap ? false : undefined,
         }));
     }
+    if (verbose) {
+        extraPlugins.push(new watch_files_logs_plugin_1.WatchFilesLogsPlugin());
+    }
     if (buildOptions.statsJson) {
         extraPlugins.push(new plugins_1.JsonStatsPlugin(path.resolve(root, buildOptions.outputPath, 'stats.json')));
     }

package/src/webpack/configs/dev-server.js

@@ -270,7 +270,7 @@ function getWebSocketSettings(options, servePath) {
             client: undefined,
         };
     }
-    const webSocketPath = path_1.posix.join(servePath, 'ws');
+    const webSocketPath = path_1.posix.join(servePath, 'ng-cli-ws');
     return {
         webSocketServer: {
             options: {

package/src/webpack/configs/styles.js

@@ -110,19 +110,10 @@ function getStylesConfig(wco) {
     const assetNameTemplate = (0, helpers_1.assetNameTemplateFactory)(hashFormat);
     const extraPostcssPlugins = [];
     // Attempt to setup Tailwind CSS
-    // A configuration file can exist in the project or workspace root
-    const tailwindConfigFile = 'tailwind.config.js';
-    let tailwindConfigPath;
-    for (const basePath of [wco.projectRoot, wco.root]) {
-        const fullPath = path.join(basePath, tailwindConfigFile);
-        if (fs.existsSync(fullPath)) {
-            tailwindConfigPath = fullPath;
-            break;
-        }
-    }
     // Only load Tailwind CSS plugin if configuration file was found.
     // This acts as a guard to ensure the project actually wants to use Tailwind CSS.
     // The package may be unknowningly present due to a third-party transitive package dependency.
+    const tailwindConfigPath = getTailwindConfigPath(wco);
     if (tailwindConfigPath) {
         let tailwindPackagePath;
         try {
@@ -374,3 +365,19 @@ function getStylesConfig(wco) {
     };
 }
 exports.getStylesConfig = getStylesConfig;
+function getTailwindConfigPath({ projectRoot, root }) {
+    // A configuration file can exist in the project or workspace root
+    // The list of valid config files can be found:
+    // https://github.com/tailwindlabs/tailwindcss/blob/8845d112fb62d79815b50b3bae80c317450b8b92/src/util/resolveConfigPath.js#L46-L52
+    const tailwindConfigFiles = ['tailwind.config.js', 'tailwind.config.cjs'];
+    for (const basePath of [projectRoot, root]) {
+        for (const configFile of tailwindConfigFiles) {
+            // Irrespective of the name project level configuration should always take precedence.
+            const fullPath = path.join(basePath, configFile);
+            if (fs.existsSync(fullPath)) {
+                return fullPath;
+            }
+        }
+    }
+    return undefined;
+}

package/src/webpack/plugins/watch-files-logs-plugin.d.ts

@@ -0,0 +1,11 @@
+/**
+ * @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.io/license
+ */
+import type { Compiler } from 'webpack';
+export declare class WatchFilesLogsPlugin {
+    apply(compiler: Compiler): void;
+}

package/src/webpack/plugins/watch-files-logs-plugin.js

@@ -0,0 +1,27 @@
+"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.io/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WatchFilesLogsPlugin = void 0;
+const PLUGIN_NAME = 'angular.watch-files-logs-plugin';
+class WatchFilesLogsPlugin {
+    apply(compiler) {
+        compiler.hooks.watchRun.tap(PLUGIN_NAME, ({ modifiedFiles, removedFiles }) => {
+            compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
+                const logger = compilation.getLogger(PLUGIN_NAME);
+                if (modifiedFiles === null || modifiedFiles === void 0 ? void 0 : modifiedFiles.size) {
+                    logger.log(`Modified files:\n${[...modifiedFiles].join('\n')}\n`);
+                }
+                if (removedFiles === null || removedFiles === void 0 ? void 0 : removedFiles.size) {
+                    logger.log(`Removed files:\n${[...removedFiles].join('\n')}\n`);
+                }
+            });
+        });
+    }
+}
+exports.WatchFilesLogsPlugin = WatchFilesLogsPlugin;