@nrwl/angular 13.8.1 → 13.8.4-beta.0

package/migrations.json

@@ -150,6 +150,12 @@
       "version": "13.8.1",
       "description": "Angular doesn't attach styles.js to index.html with type=module in dev mode, meaning an error is written to the console. Cypress falls over on this error. Add logic to Cypress e2e projects to ignore this error.",
       "factory": "./src/migrations/update-13-8-1/add-cypress-mfe-workaround"
+    },
+    "migrate-karma-config": {
+      "cli": "nx",
+      "version": "13.8.4",
+      "description": "Karma coverage is broken since Angular 13 upgarde and the karma config is severely out of date. Bring it up to date fixing the coverage issue.",
+      "factory": "./src/migrations/update-13-8-4/migrate-karma-conf"
     }
   },
   "packageJsonUpdates": {
@@ -1346,6 +1352,29 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "13.8.2": {
+      "version": "13.8.2-beta.0",
+      "packages": {
+        "jest-preset-angular": {
+          "version": "11.1.1",
+          "alwaysAddToPackageJson": false
+        }
+      }
+    },
+    "13.8.4": {
+      "version": "13.8.4-beta.0",
+      "packages": {
+        "karma": { "version": "~6.3.0", "alwaysAddToPackageJson": false },
+        "karma-jasmine-html-reporter": {
+          "version": "~1.7.0",
+          "alwaysAddToPackageJson": false
+        },
+        "jasmine-core": {
+          "version": "~3.10.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/angular",
-  "version": "13.8.1",
+  "version": "13.8.4-beta.0",
   "description": "Angular Plugin for Nx",
   "repository": {
     "type": "git",
@@ -56,11 +56,11 @@
   },
   "dependencies": {
     "@angular-devkit/schematics": "~13.2.0",
-    "@nrwl/cypress": "13.8.1",
-    "@nrwl/devkit": "13.8.1",
-    "@nrwl/jest": "13.8.1",
-    "@nrwl/linter": "13.8.1",
-    "@nrwl/storybook": "13.8.1",
+    "@nrwl/cypress": "13.8.4-beta.0",
+    "@nrwl/devkit": "13.8.4-beta.0",
+    "@nrwl/jest": "13.8.4-beta.0",
+    "@nrwl/linter": "13.8.4-beta.0",
+    "@nrwl/storybook": "13.8.4-beta.0",
     "@schematics/angular": "~13.2.0",
     "@phenomnomnominal/tsquery": "4.1.1",
     "ignore": "^5.0.4",

package/src/generators/karma/files/karma.conf.js__tmpl__

@@ -12,16 +12,25 @@ module.exports = () => {
       require('karma-jasmine'),
       require('karma-chrome-launcher'),
       require('karma-jasmine-html-reporter'),
-      require('karma-coverage-istanbul-reporter'),
+      require('karma-coverage'),
       require('@angular-devkit/build-angular/plugins/karma'),
     ],
     client: {
+      jasmine: {
+        // you can add configuration options for Jasmine here
+        // the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
+        // for example, you can disable the random execution with `random: false`
+        // or set a specific seed with `seed: 4321`
+      },
       clearContext: false, // leave Jasmine Spec Runner output visible in browser
     },
-    coverageIstanbulReporter: {
-      dir: join(__dirname, '../../coverage'),
-      reports: ['html', 'lcovonly'],
-      fixWebpackSourcePaths: true,
+    jasmineHtmlReporter: {
+      suppressAll: true, // removes the duplicated traces
+    },
+    coverageReporter: {
+      dir: join(__dirname, './coverage'),
+      subdir: '.',
+      reporters: [{ type: 'html' }, { type: 'text-summary' }],
     },
     reporters: ['progress', 'kjhtml'],
     port: 9876,

package/src/generators/karma/karma.js

@@ -10,12 +10,12 @@ function karmaGenerator(tree, options) {
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), '.', { tmpl: '' });
     return !options.skipPackageJson
         ? (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-            karma: '~5.0.0',
+            karma: '~6.3.0',
             'karma-chrome-launcher': '~3.1.0',
-            'karma-coverage-istanbul-reporter': '~3.0.2',
+            'karma-coverage': '~2.2.0',
             'karma-jasmine': '~4.0.0',
-            'karma-jasmine-html-reporter': '^1.5.0',
-            'jasmine-core': '~3.6.0',
+            'karma-jasmine-html-reporter': '~1.7.0',
+            'jasmine-core': '~3.10.0',
             'jasmine-spec-reporter': '~5.0.0',
             '@types/jasmine': '~3.5.0',
         })

package/src/generators/karma/karma.js.map

@@ -1 +1 @@
-{"version":3,"file":"karma.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/karma/karma.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AAGtB,SAAgB,cAAc,CAAC,IAAU,EAAE,OAAyB;IAClE,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACnD,IAAI,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE;QACxC,OAAO;KACR;IAED,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IAE9E,OAAO,CAAC,OAAO,CAAC,eAAe;QAC7B,CAAC,CAAC,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;YACE,KAAK,EAAE,QAAQ;YACf,uBAAuB,EAAE,QAAQ;YACjC,kCAAkC,EAAE,QAAQ;YAC5C,eAAe,EAAE,QAAQ;YACzB,6BAA6B,EAAE,QAAQ;YACvC,cAAc,EAAE,QAAQ;YACxB,uBAAuB,EAAE,QAAQ;YACjC,gBAAgB,EAAE,QAAQ;SAC3B,CACF;QACH,CAAC,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;AACf,CAAC;AAxBD,wCAwBC;AAED,kBAAe,cAAc,CAAC"}
+{"version":3,"file":"karma.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/karma/karma.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AAGtB,SAAgB,cAAc,CAAC,IAAU,EAAE,OAAyB;IAClE,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACnD,IAAI,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE;QACxC,OAAO;KACR;IAED,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IAE9E,OAAO,CAAC,OAAO,CAAC,eAAe;QAC7B,CAAC,CAAC,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;YACE,KAAK,EAAE,QAAQ;YACf,uBAAuB,EAAE,QAAQ;YACjC,gBAAgB,EAAE,QAAQ;YAC1B,eAAe,EAAE,QAAQ;YACzB,6BAA6B,EAAE,QAAQ;YACvC,cAAc,EAAE,SAAS;YACzB,uBAAuB,EAAE,QAAQ;YACjC,gBAAgB,EAAE,QAAQ;SAC3B,CACF;QACH,CAAC,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;AACf,CAAC;AAxBD,wCAwBC;AAED,kBAAe,cAAc,CAAC"}

package/src/generators/karma-project/files/karma.conf.js__tmpl__

@@ -8,8 +8,8 @@ module.exports = function(config) {
   const baseConfig = getBaseKarmaConfig();
   config.set({
     ...baseConfig,
-    coverageIstanbulReporter: {
-      ...baseConfig.coverageIstanbulReporter,
+    coverageReporter: {
+      ...baseConfig.coverageReporter,
       dir: join(__dirname, '<%= offsetFromRoot %>coverage/<%= projectRoot %>')
     }
   });

package/src/migrations/update-13-8-4/migrate-karma-conf.d.ts

@@ -0,0 +1,2 @@
+import type { Tree } from '@nrwl/devkit';
+export default function (tree: Tree): Promise<import("@nrwl/devkit").GeneratorCallback>;

package/src/migrations/update-13-8-4/migrate-karma-conf.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const executor_options_utils_1 = require("@nrwl/workspace/src/utilities/executor-options-utils");
+function default_1(tree) {
+    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        const executorName = '@angular-devkit/build-angular:karma';
+        (0, executor_options_utils_1.forEachExecutorOptions)(tree, executorName, ({ karmaConfig }, projectName) => {
+            const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+            const pathToKarma = (0, devkit_1.joinPathFragments)(project.root, karmaConfig);
+            if (!tree.exists(pathToKarma)) {
+                return;
+            }
+            const karmaContents = tree.read(pathToKarma, 'utf-8');
+            const updatedKarmaContents = karmaContents.replace(/coverageIstanbulReporter/g, 'coverageReporter');
+            tree.write(pathToKarma, updatedKarmaContents);
+        });
+        const pathToRootKarmaConf = 'karma.conf.js';
+        if (!tree.exists(pathToRootKarmaConf)) {
+            return;
+        }
+        const rootKarmaContents = tree.read(pathToRootKarmaConf, 'utf-8');
+        const updatedKarmaContents = rootKarmaContents
+            .replace(/coverageIstanbulReporter/g, 'coverageReporter')
+            .replace(/karma-coverage-istanbul-reporter/, 'karma-coverage')
+            .replace(/reports: \[(.+)\]/, `subdir: '.',\nreporters: [{ type: 'html' }, { type: 'text-summary' }]`)
+            .replace(/'\.\.\/\.\.\/coverage'/, `'./coverage'`)
+            .replace(/fixWebpackSourcePaths: true,/, '');
+        tree.write(pathToRootKarmaConf, updatedKarmaContents);
+        const installPackages = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+            'karma-coverage': '~2.2.0',
+        });
+        yield (0, devkit_1.formatFiles)(tree);
+        return installPackages;
+    });
+}
+exports.default = default_1;
+//# sourceMappingURL=migrate-karma-conf.js.map

package/src/migrations/update-13-8-4/migrate-karma-conf.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrate-karma-conf.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-13-8-4/migrate-karma-conf.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AACtB,iGAA8F;AAC9F,mBAA+B,IAAU;;QACvC,MAAM,YAAY,GAAG,qCAAqC,CAAC;QAE3D,IAAA,+CAAsB,EAAC,IAAI,EAAE,YAAY,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE,WAAW,EAAE,EAAE;YAC1E,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAE5D,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YACjE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;gBAC7B,OAAO;aACR;YAED,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;YACtD,MAAM,oBAAoB,GAAG,aAAa,CAAC,OAAO,CAChD,2BAA2B,EAC3B,kBAAkB,CACnB,CAAC;YAEF,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QAEH,MAAM,mBAAmB,GAAG,eAAe,CAAC;QAC5C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE;YACrC,OAAO;SACR;QAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;QAClE,MAAM,oBAAoB,GAAG,iBAAiB;aAC3C,OAAO,CAAC,2BAA2B,EAAE,kBAAkB,CAAC;aACxD,OAAO,CAAC,kCAAkC,EAAE,gBAAgB,CAAC;aAC7D,OAAO,CACN,mBAAmB,EACnB,uEAAuE,CACxE;aACA,OAAO,CAAC,wBAAwB,EAAE,cAAc,CAAC;aACjD,OAAO,CAAC,8BAA8B,EAAE,EAAE,CAAC,CAAC;QAE/C,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,CAAC;QAEtD,MAAM,eAAe,GAAG,IAAA,qCAA4B,EAClD,IAAI,EACJ,EAAE,EACF;YACE,gBAAgB,EAAE,QAAQ;SAC3B,CACF,CAAC;QAEF,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,eAAe,CAAC;IACzB,CAAC;CAAA;AAjDD,4BAiDC"}

package/src/utils/versions.d.ts

@@ -4,9 +4,9 @@ export declare const angularDevkitVersion = "~13.2.0";
 export declare const angularJsVersion = "1.7.9";
 export declare const ngrxVersion = "~13.0.0";
 export declare const rxjsVersion = "~7.4.0";
-export declare const jestPresetAngularVersion = "11.0.0";
+export declare const jestPresetAngularVersion = "11.1.1";
 export declare const angularEslintVersion = "~13.0.1";
-export declare const angularArchitectsModuleFederationPluginVersion = "^13.0.1";
+export declare const angularArchitectsModuleFederationPluginVersion = "^14.0.1";
 export declare const tailwindVersion = "^3.0.2";
 export declare const postcssVersion = "^8.4.5";
 export declare const autoprefixerVersion = "^10.4.0";

package/src/utils/versions.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.autoprefixerVersion = exports.postcssVersion = exports.tailwindVersion = exports.angularArchitectsModuleFederationPluginVersion = exports.angularEslintVersion = exports.jestPresetAngularVersion = exports.rxjsVersion = exports.ngrxVersion = exports.angularJsVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
-exports.nxVersion = '13.8.1';
+exports.nxVersion = '13.8.4-beta.0';
 exports.angularVersion = '~13.2.0';
 exports.angularDevkitVersion = '~13.2.0';
 exports.angularJsVersion = '1.7.9';
 exports.ngrxVersion = '~13.0.0';
 exports.rxjsVersion = '~7.4.0';
-exports.jestPresetAngularVersion = '11.0.0';
+exports.jestPresetAngularVersion = '11.1.1';
 exports.angularEslintVersion = '~13.0.1';
-exports.angularArchitectsModuleFederationPluginVersion = '^13.0.1';
+exports.angularArchitectsModuleFederationPluginVersion = '^14.0.1';
 exports.tailwindVersion = '^3.0.2';
 exports.postcssVersion = '^8.4.5';
 exports.autoprefixerVersion = '^10.4.0';