@nrwl/angular 15.7.0-alpha.2 → 15.7.0-beta.2

package/migrations.json

@@ -197,6 +197,12 @@
       "version": "15.5.0-beta.0",
       "description": "Update the @angular/cli package version to ~15.1.0.",
       "factory": "./src/migrations/update-15-5-0/update-angular-cli"
+    },
+    "install-required-packages": {
+      "cli": "nx",
+      "version": "15.7.0-beta.1",
+      "description": "Install the required angular-devkit packages as we do not directly depend on them anymore",
+      "factory": "./src/migrations/update-15-7-0/install-required-packages"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/angular",
-  "version": "15.7.0-alpha.2",
+  "version": "15.7.0-beta.2",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Cypress, Karma, and Protractor. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -63,15 +63,13 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@angular-devkit/schematics": "~15.1.0",
-    "@nrwl/cypress": "15.7.0-alpha.2",
-    "@nrwl/devkit": "15.7.0-alpha.2",
-    "@nrwl/jest": "15.7.0-alpha.2",
-    "@nrwl/linter": "15.7.0-alpha.2",
-    "@nrwl/webpack": "15.7.0-alpha.2",
-    "@nrwl/workspace": "15.7.0-alpha.2",
+    "@nrwl/cypress": "15.7.0-beta.2",
+    "@nrwl/devkit": "15.7.0-beta.2",
+    "@nrwl/jest": "15.7.0-beta.2",
+    "@nrwl/linter": "15.7.0-beta.2",
+    "@nrwl/webpack": "15.7.0-beta.2",
+    "@nrwl/workspace": "15.7.0-beta.2",
     "@phenomnomnominal/tsquery": "4.1.1",
-    "@schematics/angular": "~15.1.0",
     "chalk": "^4.1.0",
     "chokidar": "^3.5.1",
     "http-server": "^14.1.0",
@@ -86,7 +84,12 @@
     "webpack-merge": "5.7.3"
   },
   "peerDependencies": {
-    "@nguniversal/builders": "~15.1.0",
+    "@angular-devkit/architect": ">= 0.1400.0 < 0.1600.0",
+    "@angular-devkit/build-angular": ">= 14.0.0 < 16.0.0",
+    "@angular-devkit/core": ">= 14.0.0 < 16.0.0",
+    "@angular-devkit/schematics": ">= 14.0.0 < 16.0.0",
+    "@nguniversal/builders": ">= 14.0.0 < 16.0.0",
+    "@schematics/angular": ">= 14.0.0 < 16.0.0",
     "rxjs": "^6.5.3 || ^7.5.0"
   },
   "peerDependenciesMeta": {
@@ -104,5 +107,5 @@
   "fesm2015": "fesm2015/nrwl-angular.mjs",
   "typings": "index.d.ts",
   "sideEffects": false,
-  "gitHead": "20e163425f3dcc4d47bf7ebce8fb9d1c93c64843"
+  "gitHead": "104285b6929acc138531d6c7c8f5eba22c06ed92"
 }

package/src/builders/webpack-browser/schema.json

@@ -41,7 +41,7 @@
       "oneOf": [
         {
           "type": "array",
-          "description": "A list of polyfills to include in the build. Can be a full path for a file, relative to the current workspace or module specifier. Example: 'zone.js'.",
+          "description": "A list of polyfills to include in the build. Can be a full path for a file, relative to the current workspace or module specifier. Example: 'zone.js'. _Note: supported in Angular versions >= 15.0.0_.",
           "items": {
             "type": "string",
             "uniqueItems": true

package/src/builders/webpack-browser/webpack-browser.impl.js

@@ -5,9 +5,10 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const fs_1 = require("fs");
 const rxjs_1 = require("rxjs");
-const webpack_1 = require("../utilities/webpack");
-const buildable_libs_1 = require("../utilities/buildable-libs");
 const operators_1 = require("rxjs/operators");
+const angular_version_utils_1 = require("../../executors/utilities/angular-version-utils");
+const buildable_libs_1 = require("../utilities/buildable-libs");
+const webpack_1 = require("../utilities/webpack");
 function buildApp(options, context) {
     const { buildLibsFromSource, customWebpackConfig, indexFileTransformer } = options, delegateOptions = tslib_1.__rest(options, ["buildLibsFromSource", "customWebpackConfig", "indexFileTransformer"]);
     // If there is a path to an indexFileTransformer
@@ -41,8 +42,16 @@ function buildAppWithCustomWebpackConfiguration(options, context, pathToWebpackC
         }
         : {})))));
 }
+function validateOptions(options) {
+    const { major, version } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
+    if (major < 15 && Array.isArray(options.polyfills)) {
+        throw new Error((0, devkit_1.stripIndents) `The array syntax for the "polyfills" option is supported from Angular >= 15.0.0. You are currently using ${version}.
+    You can resolve this error by removing the "polyfills" option, setting it to a string value or migrating to Angular 15.0.0.`);
+    }
+}
 function executeWebpackBrowserBuilder(options, context) {
     var _a;
+    validateOptions(options);
     (_a = options.buildLibsFromSource) !== null && _a !== void 0 ? _a : (options.buildLibsFromSource = true);
     if (!options.buildLibsFromSource) {
         const { tsConfigPath } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(options.tsConfig, context);

package/src/builders/webpack-browser/webpack-browser.impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"webpack-browser.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-browser/webpack-browser.impl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webpack-browser.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-browser/webpack-browser.impl.ts"],"names":[],"mappings":"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"}

package/src/migrations/update-15-7-0/install-required-packages.d.ts

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

package/src/migrations/update-15-7-0/install-required-packages.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const version_utils_1 = require("../../generators/utils/version-utils");
+const version_utils_2 = require("../../utils/version-utils");
+function default_1(tree) {
+    var _a, _b;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const packagesToInstall = [
+            '@angular-devkit/core',
+            '@angular-devkit/schematics',
+            '@schematics/angular',
+        ];
+        const pkgJson = (0, devkit_1.readJson)(tree, 'package.json');
+        const angularMajorVersion = (0, version_utils_1.getInstalledAngularMajorVersion)(tree);
+        const angularDevkitVersion = (0, version_utils_2.getPkgVersionForAngularMajorVersion)('angularDevkitVersion', angularMajorVersion);
+        const angularCliVersion = (_b = (_a = pkgJson.devDependencies['@angular/cli']) !== null && _a !== void 0 ? _a : pkgJson.dependencies['@angular/cli']) !== null && _b !== void 0 ? _b : angularDevkitVersion;
+        const filteredPackages = packagesToInstall
+            .filter((pkg) => !pkgJson.devDependencies[pkg] && !pkgJson.dependencies[pkg])
+            .reduce((allPkgs, pkg) => (Object.assign(Object.assign({}, allPkgs), { [pkg]: angularCliVersion })), {});
+        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, Object.assign({}, filteredPackages));
+    });
+}
+exports.default = default_1;
+//# sourceMappingURL=install-required-packages.js.map

package/src/migrations/update-15-7-0/install-required-packages.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"install-required-packages.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-15-7-0/install-required-packages.ts"],"names":[],"mappings":";;;AACA,yCAAsE;AACtE,wEAAuF;AACvF,6DAAgF;AAEhF,mBAA+B,IAAU;;;QACvC,MAAM,iBAAiB,GAAG;YACxB,sBAAsB;YACtB,4BAA4B;YAC5B,qBAAqB;SACtB,CAAC;QACF,MAAM,OAAO,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAE/C,MAAM,mBAAmB,GAAG,IAAA,+CAA+B,EAAC,IAAI,CAAC,CAAC;QAClE,MAAM,oBAAoB,GAAG,IAAA,mDAAmC,EAC9D,sBAAsB,EACtB,mBAAmB,CACpB,CAAC;QAEF,MAAM,iBAAiB,GACrB,MAAA,MAAA,OAAO,CAAC,eAAe,CAAC,cAAc,CAAC,mCACvC,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,mCACpC,oBAAoB,CAAC;QAEvB,MAAM,gBAAgB,GAA2B,iBAAiB;aAC/D,MAAM,CACL,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CACrE;aACA,MAAM,CAAC,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,CAAC,iCAAM,OAAO,KAAE,CAAC,GAAG,CAAC,EAAE,iBAAiB,IAAG,EAAE,EAAE,CAAC,CAAC;QAE5E,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,oBAAO,gBAAgB,EAAG,CAAC;;CACjE;AA1BD,4BA0BC"}