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

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "14.0.0-rc.2",
+  "version": "14.0.0-rc.3",
   "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.0-rc.3",
+    "@angular-devkit/build-webpack": "0.1400.0-rc.3",
+    "@angular-devkit/core": "14.0.0-rc.3",
     "@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.0-rc.3",
     "ansi-colors": "4.1.1",
     "babel-loader": "8.2.5",
     "babel-plugin-istanbul": "6.1.1",

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/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;
+}