@nrwl/angular 15.4.0-beta.1 → 15.4.0-beta.2
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/CHANGELOG.md +1 -1
- package/fesm2015/nrwl-angular-mf.mjs +1 -0
- package/fesm2015/nrwl-angular-testing.mjs +1 -0
- package/fesm2015/nrwl-angular.mjs +1 -0
- package/fesm2020/nrwl-angular-mf.mjs +1 -0
- package/fesm2020/nrwl-angular-testing.mjs +1 -0
- package/fesm2020/nrwl-angular.mjs +1 -0
- package/package.json +8 -8
- package/src/generators/component/angular-v14/lib/normalize-options.js +12 -1
- package/src/generators/component/angular-v14/lib/normalize-options.js.map +1 -1
- package/src/generators/component/lib/normalize-options.js +12 -1
- package/src/generators/component/lib/normalize-options.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
-
# [15.4.0-beta.
|
|
6
|
+
# [15.4.0-beta.2](https://github.com/nrwl/nx/compare/15.3.3...15.4.0-beta.2) (2022-12-19)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/angular
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "15.4.0-beta.
|
|
3
|
+
"version": "15.4.0-beta.2",
|
|
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": {
|
|
@@ -68,12 +68,12 @@
|
|
|
68
68
|
"dependencies": {
|
|
69
69
|
"@angular-devkit/schematics": "~15.0.1",
|
|
70
70
|
"@nguniversal/builders": "~15.0.0",
|
|
71
|
-
"@nrwl/cypress": "15.4.0-beta.
|
|
72
|
-
"@nrwl/devkit": "15.4.0-beta.
|
|
73
|
-
"@nrwl/jest": "15.4.0-beta.
|
|
74
|
-
"@nrwl/linter": "15.4.0-beta.
|
|
75
|
-
"@nrwl/webpack": "15.4.0-beta.
|
|
76
|
-
"@nrwl/workspace": "15.4.0-beta.
|
|
71
|
+
"@nrwl/cypress": "15.4.0-beta.2",
|
|
72
|
+
"@nrwl/devkit": "15.4.0-beta.2",
|
|
73
|
+
"@nrwl/jest": "15.4.0-beta.2",
|
|
74
|
+
"@nrwl/linter": "15.4.0-beta.2",
|
|
75
|
+
"@nrwl/webpack": "15.4.0-beta.2",
|
|
76
|
+
"@nrwl/workspace": "15.4.0-beta.2",
|
|
77
77
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
78
78
|
"@schematics/angular": "~15.0.1",
|
|
79
79
|
"chalk": "4.1.0",
|
|
@@ -99,5 +99,5 @@
|
|
|
99
99
|
"fesm2015": "fesm2015/nrwl-angular.mjs",
|
|
100
100
|
"typings": "index.d.ts",
|
|
101
101
|
"sideEffects": false,
|
|
102
|
-
"gitHead": "
|
|
102
|
+
"gitHead": "4e54b1a545497836fe4d7ee7807508c158d4a88c"
|
|
103
103
|
}
|
|
@@ -8,13 +8,24 @@ function findProjectFromOptions(options) {
|
|
|
8
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
9
|
const projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
|
|
10
10
|
const projectRootMappings = (0, find_project_for_path_1.createProjectRootMappings)(projectGraph.nodes);
|
|
11
|
-
|
|
11
|
+
// path can be undefined when running on the root of the workspace, we default to the root
|
|
12
|
+
// to handle standalone layouts
|
|
13
|
+
return (0, find_project_for_path_1.findProjectForPath)(options.path || '', projectRootMappings);
|
|
12
14
|
});
|
|
13
15
|
}
|
|
14
16
|
function normalizeOptions(tree, options) {
|
|
15
17
|
var _a, _b, _c;
|
|
16
18
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
17
19
|
const project = (_b = (_a = options.project) !== null && _a !== void 0 ? _a : (yield findProjectFromOptions(options))) !== null && _b !== void 0 ? _b : (0, devkit_1.readWorkspaceConfiguration)(tree).defaultProject;
|
|
20
|
+
if (!project) {
|
|
21
|
+
// path is hidden, so if not provided we don't suggest setting it
|
|
22
|
+
if (!options.path) {
|
|
23
|
+
throw new Error('No "project" was specified and "defaultProject" is not set in the workspace configuration. Please provide the "project" option and try again.');
|
|
24
|
+
}
|
|
25
|
+
// path was provided, so it's wrong and we should mention it
|
|
26
|
+
throw new Error('The provided "path" is wrong and no "project" was specified and "defaultProject" is not set in the workspace configuration. ' +
|
|
27
|
+
'Please provide a correct "path" or provide the "project" option instead and try again.');
|
|
28
|
+
}
|
|
18
29
|
const { projectType, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);
|
|
19
30
|
const projectSourceRoot = sourceRoot !== null && sourceRoot !== void 0 ? sourceRoot : (0, devkit_1.joinPathFragments)(root, 'src');
|
|
20
31
|
const path = (_c = options.path) !== null && _c !== void 0 ? _c : (0, devkit_1.joinPathFragments)(projectSourceRoot, projectType === 'application' ? 'app' : 'lib');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/component/angular-v14/lib/normalize-options.ts"],"names":[],"mappings":";;;;AACA,
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/component/angular-v14/lib/normalize-options.ts"],"names":[],"mappings":";;;;AACA,yCAKsB;AAEtB,4FAG0D;AAE1D,SAAe,sBAAsB,CAAC,OAAe;;QACnD,MAAM,YAAY,GAAG,MAAM,IAAA,gCAAuB,GAAE,CAAC;QACrD,MAAM,mBAAmB,GAAG,IAAA,iDAAyB,EAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAE1E,0FAA0F;QAC1F,+BAA+B;QAC/B,OAAO,IAAA,0CAAkB,EAAC,OAAO,CAAC,IAAI,IAAI,EAAE,EAAE,mBAAmB,CAAC,CAAC;IACrE,CAAC;CAAA;AAED,SAAsB,gBAAgB,CACpC,IAAU,EACV,OAAe;;;QAEf,MAAM,OAAO,GACX,MAAA,MAAA,OAAO,CAAC,OAAO,mCACf,CAAC,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC,mCACvC,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;QAElD,IAAI,CAAC,OAAO,EAAE;YACZ,iEAAiE;YACjE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;gBACjB,MAAM,IAAI,KAAK,CACb,+IAA+I,CAChJ,CAAC;aACH;YAED,4DAA4D;YAC5D,MAAM,IAAI,KAAK,CACb,8HAA8H;gBAC5H,wFAAwF,CAC3F,CAAC;SACH;QAED,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAA,iCAAwB,EAChE,IAAI,EACJ,OAAO,CACR,CAAC;QACF,MAAM,iBAAiB,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAA,0BAAiB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACvE,MAAM,IAAI,GACR,MAAA,OAAO,CAAC,IAAI,mCACZ,IAAA,0BAAiB,EACf,iBAAiB,EACjB,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAC9C,CAAC;QAEJ,uCACK,OAAO,KACV,IAAI;YACJ,OAAO;YACP,iBAAiB,IACjB;;CACH;AA1CD,4CA0CC"}
|
|
@@ -8,13 +8,24 @@ function findProjectFromOptions(options) {
|
|
|
8
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
9
|
const projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
|
|
10
10
|
const projectRootMappings = (0, find_project_for_path_1.createProjectRootMappings)(projectGraph.nodes);
|
|
11
|
-
|
|
11
|
+
// path can be undefined when running on the root of the workspace, we default to the root
|
|
12
|
+
// to handle standalone layouts
|
|
13
|
+
return (0, find_project_for_path_1.findProjectForPath)(options.path || '', projectRootMappings);
|
|
12
14
|
});
|
|
13
15
|
}
|
|
14
16
|
function normalizeOptions(tree, options) {
|
|
15
17
|
var _a, _b, _c;
|
|
16
18
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
17
19
|
const project = (_b = (_a = options.project) !== null && _a !== void 0 ? _a : (yield findProjectFromOptions(options))) !== null && _b !== void 0 ? _b : (0, devkit_1.readWorkspaceConfiguration)(tree).defaultProject;
|
|
20
|
+
if (!project) {
|
|
21
|
+
// path is hidden, so if not provided we don't suggest setting it
|
|
22
|
+
if (!options.path) {
|
|
23
|
+
throw new Error('No "project" was specified and "defaultProject" is not set in the workspace configuration. Please provide the "project" option and try again.');
|
|
24
|
+
}
|
|
25
|
+
// path was provided, so it's wrong and we should mention it
|
|
26
|
+
throw new Error('The provided "path" is wrong and no "project" was specified and "defaultProject" is not set in the workspace configuration. ' +
|
|
27
|
+
'Please provide a correct "path" or provide the "project" option instead and try again.');
|
|
28
|
+
}
|
|
18
29
|
const { projectType, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);
|
|
19
30
|
const projectSourceRoot = sourceRoot !== null && sourceRoot !== void 0 ? sourceRoot : (0, devkit_1.joinPathFragments)(root, 'src');
|
|
20
31
|
const path = (_c = options.path) !== null && _c !== void 0 ? _c : (0, devkit_1.joinPathFragments)(projectSourceRoot, projectType === 'application' ? 'app' : 'lib');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/normalize-options.ts"],"names":[],"mappings":";;;;AACA,
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/normalize-options.ts"],"names":[],"mappings":";;;;AACA,yCAKsB;AAEtB,4FAG0D;AAE1D,SAAe,sBAAsB,CAAC,OAAe;;QACnD,MAAM,YAAY,GAAG,MAAM,IAAA,gCAAuB,GAAE,CAAC;QACrD,MAAM,mBAAmB,GAAG,IAAA,iDAAyB,EAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAE1E,0FAA0F;QAC1F,+BAA+B;QAC/B,OAAO,IAAA,0CAAkB,EAAC,OAAO,CAAC,IAAI,IAAI,EAAE,EAAE,mBAAmB,CAAC,CAAC;IACrE,CAAC;CAAA;AAED,SAAsB,gBAAgB,CACpC,IAAU,EACV,OAAe;;;QAEf,MAAM,OAAO,GACX,MAAA,MAAA,OAAO,CAAC,OAAO,mCACf,CAAC,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC,mCACvC,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;QAElD,IAAI,CAAC,OAAO,EAAE;YACZ,iEAAiE;YACjE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;gBACjB,MAAM,IAAI,KAAK,CACb,+IAA+I,CAChJ,CAAC;aACH;YAED,4DAA4D;YAC5D,MAAM,IAAI,KAAK,CACb,8HAA8H;gBAC5H,wFAAwF,CAC3F,CAAC;SACH;QAED,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAA,iCAAwB,EAChE,IAAI,EACJ,OAAO,CACR,CAAC;QACF,MAAM,iBAAiB,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAA,0BAAiB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACvE,MAAM,IAAI,GACR,MAAA,OAAO,CAAC,IAAI,mCACZ,IAAA,0BAAiB,EACf,iBAAiB,EACjB,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAC9C,CAAC;QAEJ,uCACK,OAAO,KACV,IAAI;YACJ,OAAO;YACP,iBAAiB,IACjB;;CACH;AA1CD,4CA0CC"}
|