@angular-devkit/build-angular 14.0.0-next.8 → 14.0.0-rc.1

package/src/webpack/configs/styles.d.ts

@@ -6,5 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { Configuration } from 'webpack';
+import { StyleElement } from '../../builders/browser/schema';
 import { WebpackConfigOptions } from '../../utils/build-options';
+export declare function resolveGlobalStyles(styleEntrypoints: StyleElement[], root: string, preserveSymlinks: boolean): {
+    entryPoints: Record<string, string[]>;
+    noInjectNames: string[];
+    paths: string[];
+};
 export declare function getStylesConfig(wco: WebpackConfigOptions): Configuration;

package/src/webpack/configs/styles.js

@@ -33,7 +33,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStylesConfig = void 0;
+exports.getStylesConfig = exports.resolveGlobalStyles = void 0;
 const fs = __importStar(require("fs"));
 const mini_css_extract_plugin_1 = __importDefault(require("mini-css-extract-plugin"));
 const path = __importStar(require("path"));
@@ -75,6 +75,7 @@ function resolveGlobalStyles(styleEntrypoints, root, preserveSymlinks) {
     }
     return { entryPoints, noInjectNames, paths };
 }
+exports.resolveGlobalStyles = resolveGlobalStyles;
 // eslint-disable-next-line max-lines-per-function
 function getStylesConfig(wco) {
     var _a, _b, _c;

package/src/webpack/plugins/karma/karma.js

@@ -34,7 +34,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = __importStar(require("path"));
-const glob = __importStar(require("glob"));
 const webpack_1 = __importDefault(require("webpack"));
 const webpack_dev_middleware_1 = __importDefault(require("webpack-dev-middleware"));
 const stats_1 = require("../../utils/stats");
@@ -46,27 +45,6 @@ let isBlocked = false;
 let webpackMiddleware;
 let successCb;
 let failureCb;
-// Add files to the Karma files array.
-function addKarmaFiles(files, newFiles, prepend = false) {
-    const defaults = {
-        included: true,
-        served: true,
-        watched: true,
-    };
-    const processedFiles = newFiles
-        // Remove globs that do not match any files, otherwise Karma will show a warning for these.
-        .filter((file) => glob.sync(file.pattern, { nodir: true }).length != 0)
-        // Fill in pattern properties with defaults.
-        .map((file) => ({ ...defaults, ...file }));
-    // It's important to not replace the array, because
-    // karma already has a reference to the existing array.
-    if (prepend) {
-        files.unshift(...processedFiles);
-    }
-    else {
-        files.push(...processedFiles);
-    }
-}
 const init = (config, emitter) => {
     if (!config.buildWebpack) {
         throw new Error(`The '@angular-devkit/build-angular/plugins/karma' karma plugin is meant to` +
@@ -84,10 +62,12 @@ const init = (config, emitter) => {
         // frameworks cannot be added dynamically.
         const smsPath = path.dirname(require.resolve('source-map-support'));
         const ksmsPath = path.dirname(require.resolve('karma-source-map-support'));
-        addKarmaFiles(config.files, [
-            { pattern: path.join(smsPath, 'browser-source-map-support.js'), watched: false },
-            { pattern: path.join(ksmsPath, 'client.js'), watched: false },
-        ], true);
+        config.files.unshift({
+            pattern: path.join(smsPath, 'browser-source-map-support.js'),
+            included: true,
+            served: true,
+            watched: false,
+        }, { pattern: path.join(ksmsPath, 'client.js'), included: true, served: true, watched: false });
     }
     config.reporters.unshift('@angular-devkit/build-angular--event-reporter');
     // When using code-coverage, auto-add karma-coverage.
@@ -162,7 +142,7 @@ const init = (config, emitter) => {
     webpackMiddleware = (0, webpack_dev_middleware_1.default)(compiler, webpackMiddlewareConfig);
     emitter.on('exit', (done) => {
         webpackMiddleware.close();
-        done();
+        compiler.close(() => done());
     });
     function unblock() {
         isBlocked = false;