From f7a61dc2f224dae46eee85b925bfc1d883a4b875 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Radula=C5=A1ki?= <radulle@gmail.com>
Date: Wed, 15 Jun 2022 15:00:57 +0200
Subject: [PATCH] fix(web): in webpack style-loader should be used when
 extract-css is false (#10192)

* fix(web): in webpack style-loader should be used when extract-css is false

* fix(web): remove unnecessary fallback

true value is already being read from schema
---
 docs/generated/packages/web.json                   | 2 +-
 packages/web/src/executors/webpack/schema.json     | 2 +-
 packages/web/src/executors/webpack/webpack.impl.ts | 2 ++
 packages/web/src/utils/web.config.ts               | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/generated/packages/web.json b/docs/generated/packages/web.json
index f13cfdc343e03..ade917e9b285e 100644
--- a/docs/generated/packages/web.json
+++ b/docs/generated/packages/web.json
@@ -430,7 +430,7 @@
           "extractCss": {
             "type": "boolean",
             "description": "Extract CSS into a `.css` file.",
-            "default": false
+            "default": true
           },
           "es2015Polyfills": {
             "description": "Conditional polyfills loaded in browsers which do not support `ES2015`.",
diff --git a/packages/web/src/executors/webpack/schema.json b/packages/web/src/executors/webpack/schema.json
index ed752415a6911..2448888732c7b 100644
--- a/packages/web/src/executors/webpack/schema.json
+++ b/packages/web/src/executors/webpack/schema.json
@@ -165,7 +165,7 @@
     "extractCss": {
       "type": "boolean",
       "description": "Extract CSS into a `.css` file.",
-      "default": false
+      "default": true
     },
     "es2015Polyfills": {
       "description": "Conditional polyfills loaded in browsers which do not support `ES2015`.",
diff --git a/packages/web/src/executors/webpack/webpack.impl.ts b/packages/web/src/executors/webpack/webpack.impl.ts
index 6465476bdac1f..50e455613c611 100644
--- a/packages/web/src/executors/webpack/webpack.impl.ts
+++ b/packages/web/src/executors/webpack/webpack.impl.ts
@@ -63,6 +63,8 @@ export interface WebWebpackExecutorOptions extends BuildBuilderOptions {
   generateIndexHtml?: boolean;
 
   postcssConfig?: string;
+
+  extractCss?: boolean;
 }
 
 async function getWebpackConfigs(
diff --git a/packages/web/src/utils/web.config.ts b/packages/web/src/utils/web.config.ts
index 898bda129a586..c11a184b580ea 100644
--- a/packages/web/src/utils/web.config.ts
+++ b/packages/web/src/utils/web.config.ts
@@ -72,7 +72,7 @@ export function getWebConfig(
       wco.root,
       wco.projectRoot,
       wco.buildOptions,
-      true,
+      options.extractCss,
       options.postcssConfig
     ),
     getCommonPartial(wco),