@nrwl/angular 14.7.5 → 14.7.6-beta.6
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/package.json +13 -10
- package/plugins/component-testing.js +7 -5
- package/plugins/component-testing.js.map +1 -1
- package/src/builders/webpack-server/webpack-server.impl.js +1 -1
- package/src/builders/webpack-server/webpack-server.impl.js.map +1 -1
- package/src/generators/application/lib/update-config-files.js +12 -1
- package/src/generators/application/lib/update-config-files.js.map +1 -1
- package/src/generators/component/lib/normalize-options.js +12 -3
- package/src/generators/component/lib/normalize-options.js.map +1 -1
- package/src/generators/component-test/schema.json +7 -9
- package/src/generators/cypress-component-configuration/schema.json +2 -3
- package/src/generators/library/lib/update-project.js +13 -2
- package/src/generators/library/lib/update-project.js.map +1 -1
- package/src/generators/setup-tailwind/files/v3/tailwind.config.js__tmpl__ +1 -0
- package/src/generators/utils/insert-ngmodule-import.js +30 -11
- package/src/generators/utils/insert-ngmodule-import.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
|
-
## [14.7.
|
|
6
|
+
## [14.7.6-beta.6](https://github.com/nrwl/nx/compare/14.7.5...14.7.6-beta.6) (2022-09-17)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/angular
|
package/package.json
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "14.7.
|
|
3
|
+
"version": "14.7.6-beta.6",
|
|
4
|
+
"private": false,
|
|
4
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.",
|
|
5
6
|
"repository": {
|
|
6
7
|
"type": "git",
|
|
@@ -66,16 +67,15 @@
|
|
|
66
67
|
},
|
|
67
68
|
"dependencies": {
|
|
68
69
|
"@angular-devkit/schematics": "~14.2.0",
|
|
69
|
-
"@nrwl/cypress": "14.7.
|
|
70
|
-
"@nrwl/devkit": "14.7.
|
|
71
|
-
"@nrwl/jest": "14.7.
|
|
72
|
-
"@nrwl/linter": "14.7.
|
|
73
|
-
"@nrwl/storybook": "14.7.
|
|
74
|
-
"@nrwl/
|
|
75
|
-
"@nrwl/workspace": "14.7.
|
|
70
|
+
"@nrwl/cypress": "14.7.6-beta.6",
|
|
71
|
+
"@nrwl/devkit": "14.7.6-beta.6",
|
|
72
|
+
"@nrwl/jest": "14.7.6-beta.6",
|
|
73
|
+
"@nrwl/linter": "14.7.6-beta.6",
|
|
74
|
+
"@nrwl/storybook": "14.7.6-beta.6",
|
|
75
|
+
"@nrwl/webpack": "14.7.6-beta.6",
|
|
76
|
+
"@nrwl/workspace": "14.7.6-beta.6",
|
|
76
77
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
77
78
|
"@schematics/angular": "~14.2.0",
|
|
78
|
-
"@typescript-eslint/type-utils": "^5.36.1",
|
|
79
79
|
"chalk": "4.1.0",
|
|
80
80
|
"chokidar": "^3.5.1",
|
|
81
81
|
"http-server": "^14.1.0",
|
|
@@ -90,6 +90,9 @@
|
|
|
90
90
|
"webpack": "^5.58.1",
|
|
91
91
|
"webpack-merge": "5.7.3"
|
|
92
92
|
},
|
|
93
|
+
"publishConfig": {
|
|
94
|
+
"access": "public"
|
|
95
|
+
},
|
|
93
96
|
"module": "fesm2015/nrwl-angular.mjs",
|
|
94
97
|
"es2020": "fesm2020/nrwl-angular.mjs",
|
|
95
98
|
"esm2020": "esm2020/nrwl-angular.mjs",
|
|
@@ -97,5 +100,5 @@
|
|
|
97
100
|
"fesm2015": "fesm2015/nrwl-angular.mjs",
|
|
98
101
|
"typings": "index.d.ts",
|
|
99
102
|
"sideEffects": false,
|
|
100
|
-
"gitHead": "
|
|
103
|
+
"gitHead": "08e7588d153cb8e8711a2998be7b665d2fa3940d"
|
|
101
104
|
}
|
|
@@ -99,8 +99,10 @@ function normalizeBuildTargetOptions(buildContext, ctContext, offset) {
|
|
|
99
99
|
buildOptions.index =
|
|
100
100
|
typeof buildOptions.index === 'string'
|
|
101
101
|
? (0, devkit_1.joinPathFragments)(offset, buildOptions.index)
|
|
102
|
-
: (buildOptions.index
|
|
103
|
-
|
|
102
|
+
: Object.assign(Object.assign({}, buildOptions.index), { input: (0, devkit_1.joinPathFragments)(offset, buildOptions.index.input) });
|
|
103
|
+
// cypress creates a tsconfig if one isn't preset
|
|
104
|
+
// that contains all the support required for angular and component tests
|
|
105
|
+
delete buildOptions.tsConfig;
|
|
104
106
|
buildOptions.fileReplacements = buildOptions.fileReplacements.map((fr) => {
|
|
105
107
|
fr.replace = (0, devkit_1.joinPathFragments)(offset, fr.replace);
|
|
106
108
|
fr.with = (0, devkit_1.joinPathFragments)(offset, fr.with);
|
|
@@ -113,17 +115,17 @@ function normalizeBuildTargetOptions(buildContext, ctContext, offset) {
|
|
|
113
115
|
buildOptions.assets = buildOptions.assets.map((asset) => {
|
|
114
116
|
return typeof asset === 'string'
|
|
115
117
|
? (0, devkit_1.joinPathFragments)(offset, asset)
|
|
116
|
-
: (asset
|
|
118
|
+
: Object.assign(Object.assign({}, asset), { input: (0, devkit_1.joinPathFragments)(offset, asset.input) });
|
|
117
119
|
});
|
|
118
120
|
buildOptions.styles = buildOptions.styles.map((style) => {
|
|
119
121
|
return typeof style === 'string'
|
|
120
122
|
? (0, devkit_1.joinPathFragments)(offset, style)
|
|
121
|
-
: (style
|
|
123
|
+
: Object.assign(Object.assign({}, style), { input: (0, devkit_1.joinPathFragments)(offset, style.input) });
|
|
122
124
|
});
|
|
123
125
|
buildOptions.scripts = buildOptions.scripts.map((script) => {
|
|
124
126
|
return typeof script === 'string'
|
|
125
127
|
? (0, devkit_1.joinPathFragments)(offset, script)
|
|
126
|
-
: (script
|
|
128
|
+
: Object.assign(Object.assign({}, script), { input: (0, devkit_1.joinPathFragments)(offset, script.input) });
|
|
127
129
|
});
|
|
128
130
|
}
|
|
129
131
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component-testing.js","sourceRoot":"","sources":["../../../../packages/angular/plugins/component-testing.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"component-testing.js","sourceRoot":"","sources":["../../../../packages/angular/plugins/component-testing.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const architect_1 = require("@angular-devkit/architect");
|
|
6
6
|
const build_angular_1 = require("@angular-devkit/build-angular");
|
|
7
7
|
const devkit_1 = require("@nrwl/devkit");
|
|
8
|
-
const webpack_nx_build_coordination_plugin_1 = require("@nrwl/
|
|
8
|
+
const webpack_nx_build_coordination_plugin_1 = require("@nrwl/webpack/src/plugins/webpack-nx-build-coordination-plugin");
|
|
9
9
|
const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
|
|
10
10
|
const project_graph_1 = require("nx/src/project-graph/project-graph");
|
|
11
11
|
const fs_1 = require("fs");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-server/webpack-server.impl.ts"],"names":[],"mappings":";;;;AAAA,yDAA0E;AAC1E,iEAGuC;AAEvC,yCAIsB;AACtB,
|
|
1
|
+
{"version":3,"file":"webpack-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-server/webpack-server.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,7 +44,18 @@ function updateAppAndE2EProjectConfigurations(host, options) {
|
|
|
44
44
|
project.targets.serve = Object.assign(Object.assign({}, project.targets.serve), { options: Object.assign(Object.assign({}, project.targets.serve.options), { port: options.port }) });
|
|
45
45
|
}
|
|
46
46
|
project.tags = options.parsedTags;
|
|
47
|
-
|
|
47
|
+
/**
|
|
48
|
+
* The "$schema" property on our configuration files is only added when the
|
|
49
|
+
* project configuration is added and not when updating it. It's done this
|
|
50
|
+
* way to avoid re-adding "$schema" when updating a project configuration
|
|
51
|
+
* and that property was intentionally removed by the devs.
|
|
52
|
+
*
|
|
53
|
+
* Since the project gets created by the Angular application schematic,
|
|
54
|
+
* the "$schema" property is not added, so we remove the project and add
|
|
55
|
+
* it back to workaround that.
|
|
56
|
+
*/
|
|
57
|
+
(0, devkit_1.removeProjectConfiguration)(host, options.name);
|
|
58
|
+
(0, devkit_1.addProjectConfiguration)(host, options.name, project, options.standaloneConfig);
|
|
48
59
|
if (options.unitTestRunner === test_runners_1.UnitTestRunner.None) {
|
|
49
60
|
host.delete(`${options.appProjectRoot}/src/app/app.component.spec.ts`);
|
|
50
61
|
host.delete(`${options.appProjectRoot}/tsconfig.spec.json`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-config-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-config-files.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"update-config-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-config-files.ts"],"names":[],"mappings":";;;;AACA,yCAOsB;AACtB,iFAAoF;AACpF,8DAA4E;AAG5E,SAAgB,iBAAiB,CAAC,IAAU,EAAE,OAAyB;IACrE,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACrC,oCAAoC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACtD,CAAC;AAHD,8CAGC;AAED,SAAS,qBAAqB,CAAC,IAAU,EAAE,OAAyB;IAClE,oBAAoB;IACpB,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iCACrE,IAAI,KACP,OAAO,EAAE,iBAAiB,EAC1B,eAAe,kCACV,IAAI,CAAC,eAAe,KACvB,MAAM,EAAE,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,cAAc,CAAC,cAAc,KAEjE,OAAO,EAAE;YACP,GAAG,IAAI,GAAG,CAAC;gBACT,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;gBACvB,gBAAgB;gBAChB,cAAc;gBACd,cAAc;aACf,CAAC;SACH,IACD,CAAC,CAAC;IAEJ,gBAAgB;IAChB,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iCACjE,IAAI,KACP,eAAe,kCAAO,IAAI,CAAC,eAAe,KAAE,MAAM,EAAE,QAAQ,OAC5D,CAAC,CAAC;AACN,CAAC;AAED,SAAS,oCAAoC,CAC3C,IAAU,EACV,OAAyB;IAEzB,iBAAiB;IACjB,IAAI,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAE3D,IAAI,OAAO,CAAC,qBAAqB,KAAK,OAAO,CAAC,cAAc,EAAE;QAC5D,OAAO,GAAG,IAAA,yCAAsB,EAC9B,OAAO,EACP,OAAO,CAAC,qBAAqB,EAC7B,OAAO,CAAC,cAAc,CACvB,CAAC;QACF,kFAAkF;QAClF,oBAAoB;QACpB,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,cAAc,CAAC;KACvC;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;IAE5B,2DAA2D;IAC3D,sBAAsB;IACtB,MAAM,KAAwB,OAAO,CAAC,OAAO,CAAC,KAAK,EAA7C,EAAE,QAAQ,OAAmC,EAA9B,IAAI,sBAAnB,YAAqB,CAAwB,CAAC;IACpD,OAAO,CAAC,OAAO,CAAC,KAAK,mBACnB,QAAQ,EACR,OAAO,EAAE,CAAC,sBAAsB,CAAC,IAC9B,IAAI,CACR,CAAC;IAEF,IAAI,OAAO,CAAC,UAAU,EAAE;QACtB,OAAO,OAAO,CAAC,UAAU,CAAC;KAC3B;IAED,IAAI,OAAO,CAAC,IAAI,EAAE;QAChB,OAAO,CAAC,OAAO,CAAC,KAAK,mCAChB,OAAO,CAAC,OAAO,CAAC,KAAK,KACxB,OAAO,kCACF,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,KAChC,IAAI,EAAE,OAAO,CAAC,IAAI,MAErB,CAAC;KACH;IAED,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC;IAElC;;;;;;;;;OASG;IACH,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,IAAA,gCAAuB,EACrB,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,OAAO,EACP,OAAO,CAAC,gBAAgB,CACzB,CAAC;IAEF,IAAI,OAAO,CAAC,cAAc,KAAK,6BAAc,CAAC,IAAI,EAAE;QAClD,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,gCAAgC,CAAC,CAAC;QACvE,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,qBAAqB,CAAC,CAAC;KAC7D;IAED,IAAI,OAAO,CAAC,aAAa,KAAK,4BAAa,CAAC,IAAI,EAAE;QAChD,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,IAAI,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;YACxC,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;SAC1D;KACF;IAED,mCAAmC;IACnC,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,gBAAgB,CAAC,CAAC;IACvD,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,cAAc,CAAC,CAAC;AACvD,CAAC"}
|
|
@@ -2,12 +2,21 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.normalizeOptions = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const project_graph_utils_1 = require("nx/src/utils/project-graph-utils");
|
|
6
|
+
function getProjectFromPath(path) {
|
|
7
|
+
try {
|
|
8
|
+
return (0, project_graph_utils_1.getProjectNameFromDirPath)(path);
|
|
9
|
+
}
|
|
10
|
+
catch (_a) {
|
|
11
|
+
return null;
|
|
12
|
+
}
|
|
13
|
+
}
|
|
5
14
|
function normalizeOptions(tree, options) {
|
|
6
|
-
var _a, _b;
|
|
7
|
-
const project = (_a = options.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readWorkspaceConfiguration)(tree).defaultProject;
|
|
15
|
+
var _a, _b, _c;
|
|
16
|
+
const project = (_b = (_a = options.project) !== null && _a !== void 0 ? _a : getProjectFromPath(options.path)) !== null && _b !== void 0 ? _b : (0, devkit_1.readWorkspaceConfiguration)(tree).defaultProject;
|
|
8
17
|
const { projectType, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);
|
|
9
18
|
const projectSourceRoot = sourceRoot !== null && sourceRoot !== void 0 ? sourceRoot : (0, devkit_1.joinPathFragments)(root, 'src');
|
|
10
|
-
const path = (
|
|
19
|
+
const path = (_c = options.path) !== null && _c !== void 0 ? _c : (0, devkit_1.joinPathFragments)(projectSourceRoot, projectType === 'application' ? 'app' : 'lib');
|
|
11
20
|
return Object.assign(Object.assign({}, options), { path,
|
|
12
21
|
project,
|
|
13
22
|
projectSourceRoot });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,yCAIsB;
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAEtB,0EAA6E;AAE7E,SAAS,kBAAkB,CAAC,IAAY;IACtC,IAAI;QACF,OAAO,IAAA,+CAAyB,EAAC,IAAI,CAAC,CAAC;KACxC;IAAC,WAAM;QACN,OAAO,IAAI,CAAC;KACb;AACH,CAAC;AAED,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,OAAO,GACX,MAAA,MAAA,OAAO,CAAC,OAAO,mCACf,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,mCAChC,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;IAClD,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAA,iCAAwB,EAChE,IAAI,EACJ,OAAO,CACR,CAAC;IACF,MAAM,iBAAiB,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAA,0BAAiB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACvE,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;IAEJ,uCACK,OAAO,KACV,IAAI;QACJ,OAAO;QACP,iBAAiB,IACjB;AACJ,CAAC;AA1BD,4CA0BC"}
|
|
@@ -14,17 +14,20 @@
|
|
|
14
14
|
"componentName": {
|
|
15
15
|
"type": "string",
|
|
16
16
|
"description": "Class name of the component to create a test for.",
|
|
17
|
-
"examples": ["MyFancyButtonComponent"]
|
|
17
|
+
"examples": ["MyFancyButtonComponent"],
|
|
18
|
+
"x-prompt": "What is the class name of the component to create a test for?"
|
|
18
19
|
},
|
|
19
20
|
"componentDir": {
|
|
20
21
|
"type": "string",
|
|
21
22
|
"description": "Relative path to the folder that contains the component from the project root.",
|
|
22
|
-
"
|
|
23
|
+
"examples": ["src/lib/my-fancy-button"],
|
|
24
|
+
"x-prompt": "What is the path to the component directory from the project root?"
|
|
23
25
|
},
|
|
24
26
|
"componentFileName": {
|
|
25
27
|
"type": "string",
|
|
26
28
|
"description": "File name that contains the component without the `.ts` extension.",
|
|
27
|
-
"examples": ["my-fancy-button.component"]
|
|
29
|
+
"examples": ["my-fancy-button.component"],
|
|
30
|
+
"x-prompt": "What is the file name that contains the component?"
|
|
28
31
|
},
|
|
29
32
|
"skipFormat": {
|
|
30
33
|
"description": "Skip formatting files.",
|
|
@@ -33,10 +36,5 @@
|
|
|
33
36
|
}
|
|
34
37
|
},
|
|
35
38
|
"additionalProperties": false,
|
|
36
|
-
"required": [
|
|
37
|
-
"projectPath",
|
|
38
|
-
"componentName",
|
|
39
|
-
"componentPath",
|
|
40
|
-
"componentFileName"
|
|
41
|
-
]
|
|
39
|
+
"required": ["project", "componentName", "componentDir", "componentFileName"]
|
|
42
40
|
}
|
|
@@ -9,14 +9,13 @@
|
|
|
9
9
|
"project": {
|
|
10
10
|
"type": "string",
|
|
11
11
|
"description": "The name of the project to add cypress component testing configuration to",
|
|
12
|
-
"
|
|
13
|
-
"$source": "projectName"
|
|
14
|
-
},
|
|
12
|
+
"x-dropdown": "projects",
|
|
15
13
|
"x-prompt": "What project should we add Cypress component testing to?"
|
|
16
14
|
},
|
|
17
15
|
"generateTests": {
|
|
18
16
|
"type": "boolean",
|
|
19
17
|
"description": "Generate default component tests for existing components in the project",
|
|
18
|
+
"x-prompt": "Automatically generate tests for components declared in this project?",
|
|
20
19
|
"default": false
|
|
21
20
|
},
|
|
22
21
|
"buildTarget": {
|
|
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.updateProject = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const cli_config_utils_1 = require("@nrwl/workspace/src/utils/cli-config-utils");
|
|
7
6
|
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
7
|
+
const cli_config_utils_1 = require("@nrwl/workspace/src/utils/cli-config-utils");
|
|
8
8
|
const path = require("path");
|
|
9
9
|
const update_ng_package_1 = require("./update-ng-package");
|
|
10
10
|
function updateProject(host, options) {
|
|
@@ -113,7 +113,18 @@ function fixProjectWorkspaceConfig(host, options) {
|
|
|
113
113
|
] }, rest);
|
|
114
114
|
}
|
|
115
115
|
delete project.targets.test;
|
|
116
|
-
|
|
116
|
+
/**
|
|
117
|
+
* The "$schema" property on our configuration files is only added when the
|
|
118
|
+
* project configuration is added and not when updating it. It's done this
|
|
119
|
+
* way to avoid re-adding "$schema" when updating a project configuration
|
|
120
|
+
* and that property was intentionally removed by the devs.
|
|
121
|
+
*
|
|
122
|
+
* Since the project gets created by the Angular application schematic,
|
|
123
|
+
* the "$schema" property is not added, so we remove the project and add
|
|
124
|
+
* it back to workaround that.
|
|
125
|
+
*/
|
|
126
|
+
(0, devkit_1.removeProjectConfiguration)(host, options.name);
|
|
127
|
+
(0, devkit_1.addProjectConfiguration)(host, options.name, project, options.standaloneConfig);
|
|
117
128
|
}
|
|
118
129
|
function updateProjectTsConfig(host, options) {
|
|
119
130
|
if (!host.exists(`${options.projectRoot}/tsconfig.lib.json`)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-project.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"update-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-project.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
const { createGlobPatternsForDependencies } = require('@nrwl/angular/tailwind');
|
|
2
2
|
const { join } = require('path');
|
|
3
3
|
|
|
4
|
+
/** @type {import('tailwindcss').Config} */
|
|
4
5
|
module.exports = {
|
|
5
6
|
content: [
|
|
6
7
|
join(__dirname, '<%= relativeSourceRoot %>/**/!(*.stories|*.spec).{ts,html}'),
|
|
@@ -3,12 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.insertNgModuleImport = exports.insertNgModuleProperty = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const typescript_1 = require("typescript");
|
|
6
|
-
/**
|
|
7
|
-
* Importing this helper from @typescript-eslint/type-utils to ensure
|
|
8
|
-
* compatibility with TS < 4.8 due to the API change in TS4.8.
|
|
9
|
-
* This helper allows for support of TS <= 4.8.
|
|
10
|
-
*/
|
|
11
|
-
const type_utils_1 = require("@typescript-eslint/type-utils");
|
|
12
6
|
function insertNgModuleProperty(tree, modulePath, name, property) {
|
|
13
7
|
const contents = tree.read(modulePath).toString('utf-8');
|
|
14
8
|
const sourceFile = (0, typescript_1.createSourceFile)(modulePath, contents, typescript_1.ScriptTarget.ESNext);
|
|
@@ -18,10 +12,28 @@ function insertNgModuleProperty(tree, modulePath, name, property) {
|
|
|
18
12
|
}
|
|
19
13
|
const ngModuleNamedImport = getNamedImport(coreImport, 'NgModule');
|
|
20
14
|
const ngModuleName = ngModuleNamedImport.name.escapedText;
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
15
|
+
/**
|
|
16
|
+
* Ensure backwards compatibility with TS < 4.8 due to the API change in TS4.8.
|
|
17
|
+
* The getDecorators util is only in TS 4.8, so we need the previous logic to handle TS < 4.8.
|
|
18
|
+
*
|
|
19
|
+
* TODO: clean this up using another util or when we don't need to support TS < 4.8 anymore.
|
|
20
|
+
*/
|
|
21
|
+
let ngModuleClassDeclaration;
|
|
22
|
+
let ngModuleDecorator;
|
|
23
|
+
try {
|
|
24
|
+
ngModuleClassDeclaration = findDecoratedClass(sourceFile, ngModuleName);
|
|
25
|
+
ngModuleDecorator = (0, typescript_1.getDecorators)(ngModuleClassDeclaration).find((decorator) => (0, typescript_1.isCallExpression)(decorator.expression) &&
|
|
26
|
+
(0, typescript_1.isIdentifier)(decorator.expression.expression) &&
|
|
27
|
+
decorator.expression.expression.escapedText === ngModuleName);
|
|
28
|
+
}
|
|
29
|
+
catch (_a) {
|
|
30
|
+
// Support for TS < 4.8
|
|
31
|
+
ngModuleClassDeclaration = findDecoratedClassLegacy(sourceFile, ngModuleName);
|
|
32
|
+
// @ts-ignore
|
|
33
|
+
ngModuleDecorator = ngModuleClassDeclaration.decorators.find((decorator) => (0, typescript_1.isCallExpression)(decorator.expression) &&
|
|
34
|
+
(0, typescript_1.isIdentifier)(decorator.expression.expression) &&
|
|
35
|
+
decorator.expression.expression.escapedText === ngModuleName);
|
|
36
|
+
}
|
|
25
37
|
const ngModuleCall = ngModuleDecorator.expression;
|
|
26
38
|
if (ngModuleCall.arguments.length < 1) {
|
|
27
39
|
const newContents = (0, devkit_1.applyChangesToString)(contents, [
|
|
@@ -104,7 +116,7 @@ function getNamedImport(coreImport, importName) {
|
|
|
104
116
|
function findDecoratedClass(sourceFile, ngModuleName) {
|
|
105
117
|
const classDeclarations = sourceFile.statements.filter(typescript_1.isClassDeclaration);
|
|
106
118
|
return classDeclarations.find((declaration) => {
|
|
107
|
-
const decorators = (0,
|
|
119
|
+
const decorators = (0, typescript_1.getDecorators)(declaration);
|
|
108
120
|
if (decorators) {
|
|
109
121
|
return decorators.some((decorator) => (0, typescript_1.isCallExpression)(decorator.expression) &&
|
|
110
122
|
(0, typescript_1.isIdentifier)(decorator.expression.expression) &&
|
|
@@ -113,6 +125,13 @@ function findDecoratedClass(sourceFile, ngModuleName) {
|
|
|
113
125
|
return undefined;
|
|
114
126
|
});
|
|
115
127
|
}
|
|
128
|
+
function findDecoratedClassLegacy(sourceFile, ngModuleName) {
|
|
129
|
+
const classDeclarations = sourceFile.statements.filter(typescript_1.isClassDeclaration);
|
|
130
|
+
return classDeclarations.find((declaration) => declaration.decorators &&
|
|
131
|
+
declaration.decorators.some((decorator) => (0, typescript_1.isCallExpression)(decorator.expression) &&
|
|
132
|
+
(0, typescript_1.isIdentifier)(decorator.expression.expression) &&
|
|
133
|
+
decorator.expression.expression.escapedText === ngModuleName));
|
|
134
|
+
}
|
|
116
135
|
function findPropertyAssignment(ngModuleOptions, propertyName) {
|
|
117
136
|
return ngModuleOptions.properties.find((property) => (0, typescript_1.isPropertyAssignment)(property) &&
|
|
118
137
|
(0, typescript_1.isIdentifier)(property.name) &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insert-ngmodule-import.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/insert-ngmodule-import.ts"],"names":[],"mappings":";;;AAAA,yCAAsE;AACtE,
|
|
1
|
+
{"version":3,"file":"insert-ngmodule-import.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/insert-ngmodule-import.ts"],"names":[],"mappings":"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"}
|