@nrwl/angular 15.7.0-beta.5 → 15.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/migrations.json +7 -2
- package/package.json +8 -8
- package/src/builders/webpack-dev-server/webpack-dev-server.impl.js +1 -1
- package/src/builders/webpack-dev-server/webpack-dev-server.impl.js.map +1 -1
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.js +2 -2
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js +2 -2
- package/src/generators/application/angular-v14/lib/normalize-options.js +1 -1
- package/src/generators/application/angular-v14/lib/normalize-options.js.map +1 -1
- package/src/generators/application/lib/normalize-options.js +3 -4
- package/src/generators/application/lib/normalize-options.js.map +1 -1
package/migrations.json
CHANGED
|
@@ -1489,6 +1489,9 @@
|
|
|
1489
1489
|
},
|
|
1490
1490
|
"14.5.3": {
|
|
1491
1491
|
"version": "14.5.3-beta.0",
|
|
1492
|
+
"requires": {
|
|
1493
|
+
"@angular/core": "14.1.0"
|
|
1494
|
+
},
|
|
1492
1495
|
"packages": {
|
|
1493
1496
|
"@angular-devkit/architect": {
|
|
1494
1497
|
"version": "~0.1401.1",
|
|
@@ -1639,7 +1642,8 @@
|
|
|
1639
1642
|
"version": "15.2.0-beta.0",
|
|
1640
1643
|
"x-prompt": "Do you want to update the Angular version to v15?",
|
|
1641
1644
|
"requires": {
|
|
1642
|
-
"@angular/core": "^14.
|
|
1645
|
+
"@angular/core": "^14.2.0",
|
|
1646
|
+
"typescript": ">=4.8.2 <5.0"
|
|
1643
1647
|
},
|
|
1644
1648
|
"packages": {
|
|
1645
1649
|
"@angular-devkit/architect": {
|
|
@@ -1771,7 +1775,8 @@
|
|
|
1771
1775
|
"version": "15.5.0-beta.0",
|
|
1772
1776
|
"x-prompt": "Do you want to update the Angular version to v15.1?",
|
|
1773
1777
|
"requires": {
|
|
1774
|
-
"@angular/core": ">=15.0.0 <15.1.0"
|
|
1778
|
+
"@angular/core": ">=15.0.0 <15.1.0",
|
|
1779
|
+
"typescript": ">=4.8.2 <5.0"
|
|
1775
1780
|
},
|
|
1776
1781
|
"packages": {
|
|
1777
1782
|
"@angular-devkit/architect": {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "15.7.0
|
|
3
|
+
"version": "15.7.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"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.",
|
|
6
6
|
"repository": {
|
|
@@ -63,12 +63,12 @@
|
|
|
63
63
|
"migrations": "./migrations.json"
|
|
64
64
|
},
|
|
65
65
|
"dependencies": {
|
|
66
|
-
"@nrwl/cypress": "15.7.0
|
|
67
|
-
"@nrwl/devkit": "15.7.0
|
|
68
|
-
"@nrwl/jest": "15.7.0
|
|
69
|
-
"@nrwl/linter": "15.7.0
|
|
70
|
-
"@nrwl/webpack": "15.7.0
|
|
71
|
-
"@nrwl/workspace": "15.7.0
|
|
66
|
+
"@nrwl/cypress": "15.7.0",
|
|
67
|
+
"@nrwl/devkit": "15.7.0",
|
|
68
|
+
"@nrwl/jest": "15.7.0",
|
|
69
|
+
"@nrwl/linter": "15.7.0",
|
|
70
|
+
"@nrwl/webpack": "15.7.0",
|
|
71
|
+
"@nrwl/workspace": "15.7.0",
|
|
72
72
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
73
73
|
"chalk": "^4.1.0",
|
|
74
74
|
"chokidar": "^3.5.1",
|
|
@@ -106,5 +106,5 @@
|
|
|
106
106
|
"fesm2015": "fesm2015/nrwl-angular.mjs",
|
|
107
107
|
"typings": "index.d.ts",
|
|
108
108
|
"sideEffects": false,
|
|
109
|
-
"gitHead": "
|
|
109
|
+
"gitHead": "385934c2a236d905c8c5dd71d93320b8bed9a126"
|
|
110
110
|
}
|
|
@@ -24,7 +24,7 @@ function executeWebpackDevServerBuilder(rawOptions, context) {
|
|
|
24
24
|
? buildTarget.configurations[parsedBrowserTarget.configuration]
|
|
25
25
|
: buildTarget.defaultConfiguration
|
|
26
26
|
? buildTarget.configurations[buildTarget.defaultConfiguration]
|
|
27
|
-
:
|
|
27
|
+
: buildTarget.options;
|
|
28
28
|
const buildLibsFromSource = (_c = (_b = (_a = options.buildLibsFromSource) !== null && _a !== void 0 ? _a : buildTargetConfiguration === null || buildTargetConfiguration === void 0 ? void 0 : buildTargetConfiguration.buildLibsFromSource) !== null && _b !== void 0 ? _b : buildTarget.options.buildLibsFromSource) !== null && _c !== void 0 ? _c : true;
|
|
29
29
|
const customWebpackConfig = (_d = buildTargetConfiguration === null || buildTargetConfiguration === void 0 ? void 0 : buildTargetConfiguration.customWebpackConfig) !== null && _d !== void 0 ? _d : buildTarget.options.customWebpackConfig;
|
|
30
30
|
let pathToWebpackConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-dev-server/webpack-dev-server.impl.ts"],"names":[],"mappings":";;;;AAAA,yCAIsB;AACtB,yHAAkH;AAElH,sEAAoF;AACpF,2BAAgC;AAChC,8DAA8D;AAC9D,kDAG8B;AAC9B,+BAAyC;AAEzC,gEAAgF;AAChF,+BAA4B;AAC5B,8CAA2C;AAC3C,wDAA8D;AAE9D,SAAgB,8BAA8B,CAC5C,UAAkB,EAClB,OAA2D;;IAE3D,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,IAAA,gCAAmB,GAAE,CAAC;IAErD,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,UAAU,CAAC,CAAC;IAE7C,MAAM,mBAAmB,GAAG,IAAA,0BAAiB,EAC3C,OAAO,CAAC,aAAa,EACrB,IAAA,+BAAsB,GAAE,CACzB,CAAC;IACF,MAAM,iCAAiC,GAAG,IAAA,8CAA8B,EACtE,mBAAmB,CAAC,OAAO,CAC5B,CAAC;IAEF,MAAM,WAAW,GACf,iCAAiC,CAAC,OAAO,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAExE,MAAM,wBAAwB,GAAG,mBAAmB,CAAC,aAAa;QAChE,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC,mBAAmB,CAAC,aAAa,CAAC;QAC/D,CAAC,CAAC,WAAW,CAAC,oBAAoB;YAClC,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC,WAAW,CAAC,oBAAoB,CAAC;YAC9D,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"webpack-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-dev-server/webpack-dev-server.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,7 +49,7 @@ class StylesheetProcessor {
|
|
|
49
49
|
// We change the default query to browsers that Angular support.
|
|
50
50
|
// https://angular.io/guide/browser-support
|
|
51
51
|
browserslist.defaults = [
|
|
52
|
-
'last
|
|
52
|
+
'last 2 Chrome version',
|
|
53
53
|
'last 1 Firefox version',
|
|
54
54
|
'last 2 Edge major versions',
|
|
55
55
|
'last 2 Safari major versions',
|
|
@@ -233,7 +233,7 @@ function transformSupportedBrowsersToTargets(supportedBrowsers) {
|
|
|
233
233
|
transformed.push('edge12');
|
|
234
234
|
}
|
|
235
235
|
else if (esBuildSupportedBrowsers.has(browserName)) {
|
|
236
|
-
if (browserName === 'safari' && version === '
|
|
236
|
+
if (browserName === 'safari' && version === 'tp') {
|
|
237
237
|
// esbuild only supports numeric versions so `TP` is converted to a high number (999) since
|
|
238
238
|
// a Technology Preview (TP) of Safari is assumed to support all currently known features.
|
|
239
239
|
version = '999';
|
|
@@ -42,7 +42,7 @@ class StylesheetProcessor {
|
|
|
42
42
|
// We change the default query to browsers that Angular support.
|
|
43
43
|
// https://angular.io/guide/browser-support
|
|
44
44
|
browserslist.defaults = [
|
|
45
|
-
'last
|
|
45
|
+
'last 2 Chrome version',
|
|
46
46
|
'last 1 Firefox version',
|
|
47
47
|
'last 2 Edge major versions',
|
|
48
48
|
'last 2 Safari major versions',
|
|
@@ -226,7 +226,7 @@ function transformSupportedBrowsersToTargets(supportedBrowsers) {
|
|
|
226
226
|
transformed.push('edge12');
|
|
227
227
|
}
|
|
228
228
|
else if (esBuildSupportedBrowsers.has(browserName)) {
|
|
229
|
-
if (browserName === 'safari' && version === '
|
|
229
|
+
if (browserName === 'safari' && version === 'tp') {
|
|
230
230
|
// esbuild only supports numeric versions so `TP` is converted to a high number (999) since
|
|
231
231
|
// a Technology Preview (TP) of Safari is assumed to support all currently known features.
|
|
232
232
|
version = '999';
|
|
@@ -29,7 +29,7 @@ function normalizeOptions(host, options) {
|
|
|
29
29
|
const ngCliSchematicAppRoot = appProjectName;
|
|
30
30
|
const ngCliSchematicE2ERoot = `${appProjectName}/e2e`;
|
|
31
31
|
// Set defaults and then overwrite with user options
|
|
32
|
-
return Object.assign(Object.assign({ style: 'css', routing: false, inlineStyle: false, inlineTemplate: false, skipTests:
|
|
32
|
+
return Object.assign(Object.assign({ style: 'css', routing: false, inlineStyle: false, inlineTemplate: false, skipTests: options.unitTestRunner === test_runners_1.UnitTestRunner.None, skipFormat: false, unitTestRunner: test_runners_1.UnitTestRunner.Jest, e2eTestRunner: test_runners_1.E2eTestRunner.Cypress, linter: linter_1.Linter.EsLint, strict: true }, options), { prefix, name: appProjectName, appProjectRoot,
|
|
33
33
|
e2eProjectRoot,
|
|
34
34
|
e2eProjectName,
|
|
35
35
|
parsedTags,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/application/angular-v14/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/application/angular-v14/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AAGtB,iEAA+E;AAC/E,yCAAsC;AACtC,oDAIgC;AAEhC,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAwB;;IAExB,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAsB,EAClE,OAAO,CAAC,SAAS,CAClB,CAAC;IACF,MAAM,YAAY,GAAG,IAAA,4BAAkB,EAAC,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IACxE,MAAM,cAAc,GAAG,IAAA,8BAAoB,EAAC,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAC5E,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW;QACxC,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,MAAM,CAAC;IAE1C,MAAM,EACJ,OAAO,EAAE,cAAc,EACvB,QAAQ,EACR,mBAAmB,GACpB,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAC7B,MAAM,OAAO,GAAG,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,cAAc,CAAC;IAClD,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW;QACxC,CAAC,CAAC,GAAG;QACL,CAAC,CAAC,IAAA,0BAAiB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAC7C,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW;QACxC,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,IAAA,0BAAiB,EAAC,OAAO,EAAE,GAAG,YAAY,MAAM,CAAC,CAAC;IAEtD,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,MAAM,GAAG,IAAA,yBAAe,EAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAEzD,OAAO,CAAC,gBAAgB,GAAG,MAAA,OAAO,CAAC,gBAAgB,mCAAI,mBAAmB,CAAC;IAE3E,MAAM,qBAAqB,GAAG,cAAc,CAAC;IAC7C,MAAM,qBAAqB,GAAG,GAAG,cAAc,MAAM,CAAC;IAEtD,oDAAoD;IACpD,qCACE,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,KAAK,EACd,WAAW,EAAE,KAAK,EAClB,cAAc,EAAE,KAAK,EACrB,SAAS,EAAE,OAAO,CAAC,cAAc,KAAK,6BAAc,CAAC,IAAI,EACzD,UAAU,EAAE,KAAK,EACjB,cAAc,EAAE,6BAAc,CAAC,IAAI,EACnC,aAAa,EAAE,4BAAa,CAAC,OAAO,EACpC,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,MAAM,EAAE,IAAI,IACT,OAAO,KACV,MAAM,EACN,IAAI,EAAE,cAAc,EACpB,cAAc;QACd,cAAc;QACd,cAAc;QACd,UAAU;QACV,qBAAqB;QACrB,qBAAqB,IACrB;AACJ,CAAC;AA3DD,4CA2DC"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.normalizeOptions = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const devkit_2 = require("@nrwl/devkit");
|
|
6
5
|
const test_runners_1 = require("../../../utils/test-runners");
|
|
7
6
|
const linter_1 = require("@nrwl/linter");
|
|
8
7
|
const project_1 = require("../../utils/project");
|
|
@@ -13,8 +12,8 @@ function normalizeOptions(host, options) {
|
|
|
13
12
|
const appProjectName = (0, project_1.normalizeProjectName)(options.name, projectDirectory);
|
|
14
13
|
const e2eProjectName = options.rootProject
|
|
15
14
|
? 'e2e'
|
|
16
|
-
: `${(0,
|
|
17
|
-
const { appsDir: defaultAppsDir, npmScope, standaloneAsDefault, } = (0,
|
|
15
|
+
: `${(0, devkit_1.names)(options.name).fileName}-e2e`;
|
|
16
|
+
const { appsDir: defaultAppsDir, npmScope, standaloneAsDefault, } = (0, devkit_1.getWorkspaceLayout)(host);
|
|
18
17
|
const appsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : defaultAppsDir;
|
|
19
18
|
const appProjectRoot = options.rootProject
|
|
20
19
|
? '.'
|
|
@@ -30,7 +29,7 @@ function normalizeOptions(host, options) {
|
|
|
30
29
|
const ngCliSchematicAppRoot = appProjectName;
|
|
31
30
|
const ngCliSchematicE2ERoot = `${appProjectName}/e2e`;
|
|
32
31
|
// Set defaults and then overwrite with user options
|
|
33
|
-
return Object.assign(Object.assign({ style: 'css', routing: false, inlineStyle: false, inlineTemplate: false, skipTests:
|
|
32
|
+
return Object.assign(Object.assign({ style: 'css', routing: false, inlineStyle: false, inlineTemplate: false, skipTests: options.unitTestRunner === test_runners_1.UnitTestRunner.None, skipFormat: false, unitTestRunner: test_runners_1.UnitTestRunner.Jest, e2eTestRunner: test_runners_1.E2eTestRunner.Cypress, linter: linter_1.Linter.EsLint, strict: true }, options), { prefix, name: appProjectName, appProjectRoot,
|
|
34
33
|
e2eProjectRoot,
|
|
35
34
|
e2eProjectName,
|
|
36
35
|
parsedTags,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AAGtB,8DAA4E;AAC5E,yCAAsC;AACtC,iDAI6B;AAE7B,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAwB;;IAExB,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAsB,EAClE,OAAO,CAAC,SAAS,CAClB,CAAC;IACF,MAAM,YAAY,GAAG,IAAA,4BAAkB,EAAC,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IACxE,MAAM,cAAc,GAAG,IAAA,8BAAoB,EAAC,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAC5E,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW;QACxC,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,MAAM,CAAC;IAE1C,MAAM,EACJ,OAAO,EAAE,cAAc,EACvB,QAAQ,EACR,mBAAmB,GACpB,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAC7B,MAAM,OAAO,GAAG,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,cAAc,CAAC;IAClD,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW;QACxC,CAAC,CAAC,GAAG;QACL,CAAC,CAAC,IAAA,0BAAiB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAC7C,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW;QACxC,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,IAAA,0BAAiB,EAAC,OAAO,EAAE,GAAG,YAAY,MAAM,CAAC,CAAC;IAEtD,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,MAAM,GAAG,IAAA,yBAAe,EAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAEzD,OAAO,CAAC,gBAAgB,GAAG,MAAA,OAAO,CAAC,gBAAgB,mCAAI,mBAAmB,CAAC;IAE3E,MAAM,qBAAqB,GAAG,cAAc,CAAC;IAC7C,MAAM,qBAAqB,GAAG,GAAG,cAAc,MAAM,CAAC;IAEtD,oDAAoD;IACpD,qCACE,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,KAAK,EACd,WAAW,EAAE,KAAK,EAClB,cAAc,EAAE,KAAK,EACrB,SAAS,EAAE,OAAO,CAAC,cAAc,KAAK,6BAAc,CAAC,IAAI,EACzD,UAAU,EAAE,KAAK,EACjB,cAAc,EAAE,6BAAc,CAAC,IAAI,EACnC,aAAa,EAAE,4BAAa,CAAC,OAAO,EACpC,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,MAAM,EAAE,IAAI,IACT,OAAO,KACV,MAAM,EACN,IAAI,EAAE,cAAc,EACpB,cAAc;QACd,cAAc;QACd,cAAc;QACd,UAAU;QACV,qBAAqB;QACrB,qBAAqB,IACrB;AACJ,CAAC;AA3DD,4CA2DC"}
|