@nrwl/angular 13.2.0-rc.3 → 13.2.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/migrations.json +38 -1
- package/package.json +7 -6
- package/src/executors/package/ng-packagr-adjustments/ng-package/package.di.js.map +1 -1
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.d.ts +4 -0
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js +43 -14
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js.map +1 -1
- package/src/executors/package/ng-packagr-adjustments/utilities/tailwindcss.d.ts +7 -1
- package/src/executors/package/ng-packagr-adjustments/utilities/tailwindcss.js +19 -7
- package/src/executors/package/ng-packagr-adjustments/utilities/tailwindcss.js.map +1 -1
- package/src/generators/component-story/component-story.js +1 -1
- package/src/generators/component-story/component-story.js.map +1 -1
- package/src/generators/karma-project/files/tsconfig.spec.json +1 -1
- package/src/generators/library-secondary-entry-point/files/ng-package.json__tmpl__ +5 -0
- package/src/migrations/update-13-2-0/update-angular-jest-config.js +3 -2
- package/src/migrations/update-13-2-0/update-angular-jest-config.js.map +1 -1
- package/src/migrations/update-13-2-0/update-libraries.js +14 -14
- package/src/migrations/update-13-2-0/update-libraries.js.map +1 -1
- package/src/utils/versions.d.ts +2 -2
- package/src/utils/versions.js +3 -3
- package/src/utils/versions.js.map +1 -1
- package/src/generators/library-secondary-entry-point/files/package.json__tmpl__ +0 -7
package/migrations.json
CHANGED
|
@@ -1052,7 +1052,7 @@
|
|
|
1052
1052
|
"alwaysAddToPackageJson": false
|
|
1053
1053
|
},
|
|
1054
1054
|
"jest-preset-angular": {
|
|
1055
|
-
"version": "11.0.0
|
|
1055
|
+
"version": "11.0.0",
|
|
1056
1056
|
"alwaysAddToPackageJson": false
|
|
1057
1057
|
},
|
|
1058
1058
|
"@storybook/manager-webpack5": {
|
|
@@ -1074,6 +1074,43 @@
|
|
|
1074
1074
|
"@storybook/addon-essentials": {
|
|
1075
1075
|
"version": "6.4.0-rc.3",
|
|
1076
1076
|
"alwaysAddToPackageJson": false
|
|
1077
|
+
},
|
|
1078
|
+
"@ngrx/store": {
|
|
1079
|
+
"version": "~13.0.0",
|
|
1080
|
+
"alwaysAddToPackageJson": false
|
|
1081
|
+
},
|
|
1082
|
+
"@ngrx/effects": {
|
|
1083
|
+
"version": "~13.0.0",
|
|
1084
|
+
"alwaysAddToPackageJson": false
|
|
1085
|
+
},
|
|
1086
|
+
"@ngrx/entity": {
|
|
1087
|
+
"version": "~13.0.0",
|
|
1088
|
+
"alwaysAddToPackageJson": false
|
|
1089
|
+
},
|
|
1090
|
+
"@ngrx/router-store": {
|
|
1091
|
+
"version": "~13.0.0",
|
|
1092
|
+
"alwaysAddToPackageJson": false
|
|
1093
|
+
},
|
|
1094
|
+
"@ngrx/schematics": {
|
|
1095
|
+
"version": "~13.0.0",
|
|
1096
|
+
"alwaysAddToPackageJson": false
|
|
1097
|
+
},
|
|
1098
|
+
"@ngrx/store-devtools": {
|
|
1099
|
+
"version": "~13.0.0",
|
|
1100
|
+
"alwaysAddToPackageJson": false
|
|
1101
|
+
},
|
|
1102
|
+
"@ngrx/component-store": {
|
|
1103
|
+
"version": "~13.0.0",
|
|
1104
|
+
"alwaysAddToPackageJson": false
|
|
1105
|
+
}
|
|
1106
|
+
}
|
|
1107
|
+
},
|
|
1108
|
+
"13.2.1": {
|
|
1109
|
+
"version": "13.2.1-beta.0",
|
|
1110
|
+
"packages": {
|
|
1111
|
+
"@angular/localize": {
|
|
1112
|
+
"version": "^13.0.0",
|
|
1113
|
+
"alwaysAddToPackageJson": false
|
|
1077
1114
|
}
|
|
1078
1115
|
}
|
|
1079
1116
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "13.2.
|
|
3
|
+
"version": "13.2.2",
|
|
4
4
|
"description": "Angular Plugin for Nx",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -23,6 +23,7 @@
|
|
|
23
23
|
"es2015": "esm2015/nrwl-angular.js",
|
|
24
24
|
"exports": {
|
|
25
25
|
"./generators": "./generators.js",
|
|
26
|
+
"./tailwind": "./tailwind.js",
|
|
26
27
|
"./src/generators/utils": "./src/generators/utils/index.js",
|
|
27
28
|
"./package.json": {
|
|
28
29
|
"default": "./package.json"
|
|
@@ -58,11 +59,11 @@
|
|
|
58
59
|
},
|
|
59
60
|
"dependencies": {
|
|
60
61
|
"@angular-devkit/schematics": "~13.0.0",
|
|
61
|
-
"@nrwl/cypress": "13.2.
|
|
62
|
-
"@nrwl/devkit": "13.2.
|
|
63
|
-
"@nrwl/jest": "13.2.
|
|
64
|
-
"@nrwl/linter": "13.2.
|
|
65
|
-
"@nrwl/storybook": "13.2.
|
|
62
|
+
"@nrwl/cypress": "13.2.2",
|
|
63
|
+
"@nrwl/devkit": "13.2.2",
|
|
64
|
+
"@nrwl/jest": "13.2.2",
|
|
65
|
+
"@nrwl/linter": "13.2.2",
|
|
66
|
+
"@nrwl/storybook": "13.2.2",
|
|
66
67
|
"@schematics/angular": "~13.0.0",
|
|
67
68
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
68
69
|
"ignore": "^5.0.4",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package.di.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/ng-package/package.di.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+CAAwD;AAExD,oEAG2C;AAC3C,iGAGkE;AAClE,
|
|
1
|
+
{"version":3,"file":"package.di.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/ng-package/package.di.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+CAAwD;AAExD,oEAG2C;AAC3C,iGAGkE;AAClE,6FAGgE;AAChE,qEAG8C;AAC9C,mFAAsF;AACtF,0DAA0D;AAC1D,iEAA8E;AAEjE,QAAA,0BAA0B,GAAG,IAAI,6BAAc,CAC1D,wBAAwB,CACzB,CAAC;AAEW,QAAA,oBAAoB,GAAsB,IAAA,+BAAgB,EAAC;IACtE,OAAO,EAAE,kCAA0B;IACnC,UAAU,EAAE,2CAAuB;IACnC,IAAI,EAAE;QACJ,0BAAa;QACb,0BAAa;QACb,uCAAoB;QACpB,0CAAqB;QACrB,+CAA8B;KAC/B;CACF,CAAC,CAAC;AAEU,QAAA,oBAAoB,GAAe;IAC9C,4BAAoB;IACpB,qCAAwB;IACxB,2CAAwB;IACxB,8CAAyB;CAC1B,CAAC"}
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Changes made:
|
|
5
5
|
* - Added the filePath parameter to the cache key.
|
|
6
|
+
* - Refactored caching to take into account TailwindCSS processing.
|
|
6
7
|
* - Added PostCSS plugins needed to support TailwindCSS.
|
|
7
8
|
* - Added watch mode parameter.
|
|
8
9
|
*/
|
|
@@ -31,11 +32,14 @@ export declare class StylesheetProcessor {
|
|
|
31
32
|
private targets;
|
|
32
33
|
private postCssProcessor;
|
|
33
34
|
private esbuild;
|
|
35
|
+
private tailwindSetup;
|
|
34
36
|
constructor(basePath: string, cssUrl?: CssUrl, styleIncludePaths?: string[], cacheDirectory?: string | false, watch?: boolean);
|
|
35
37
|
process({ filePath, content, }: {
|
|
36
38
|
filePath: string;
|
|
37
39
|
content: string;
|
|
38
40
|
}): Promise<string>;
|
|
41
|
+
private getCachedResult;
|
|
42
|
+
private containsTailwindDirectives;
|
|
39
43
|
private createPostCssPlugins;
|
|
40
44
|
private renderCss;
|
|
41
45
|
}
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
*
|
|
5
5
|
* Changes made:
|
|
6
6
|
* - Added the filePath parameter to the cache key.
|
|
7
|
+
* - Refactored caching to take into account TailwindCSS processing.
|
|
7
8
|
* - Added PostCSS plugins needed to support TailwindCSS.
|
|
8
9
|
* - Added watch mode parameter.
|
|
9
10
|
*/
|
|
@@ -55,15 +56,17 @@ class StylesheetProcessor {
|
|
|
55
56
|
];
|
|
56
57
|
this.browserslistData = browserslist(undefined, { path: this.basePath });
|
|
57
58
|
this.targets = transformSupportedBrowsersToTargets(this.browserslistData);
|
|
59
|
+
this.tailwindSetup = (0, tailwindcss_1.getTailwindSetup)(this.basePath);
|
|
58
60
|
this.postCssProcessor = this.createPostCssPlugins();
|
|
59
61
|
}
|
|
60
62
|
process({ filePath, content, }) {
|
|
61
63
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
62
64
|
let key;
|
|
63
|
-
if (
|
|
65
|
+
if (this.cacheDirectory &&
|
|
66
|
+
!content.includes('@import') &&
|
|
64
67
|
!content.includes('@use') &&
|
|
65
|
-
this.
|
|
66
|
-
// No transitive deps, we can cache more aggressively.
|
|
68
|
+
!this.containsTailwindDirectives(content)) {
|
|
69
|
+
// No transitive deps and no Tailwind directives, we can cache more aggressively.
|
|
67
70
|
key = yield (0, cache_1.generateKey)(content, ...this.browserslistData, filePath);
|
|
68
71
|
const result = yield (0, cache_1.readCacheEntry)(this.cacheDirectory, key);
|
|
69
72
|
if (result) {
|
|
@@ -73,16 +76,18 @@ class StylesheetProcessor {
|
|
|
73
76
|
}
|
|
74
77
|
// Render pre-processor language (sass, styl, less)
|
|
75
78
|
const renderedCss = yield this.renderCss(filePath, content);
|
|
76
|
-
|
|
77
|
-
// Example a change in a mixin or SCSS variable.
|
|
78
|
-
if (!key) {
|
|
79
|
-
key = yield (0, cache_1.generateKey)(renderedCss, ...this.browserslistData, filePath);
|
|
80
|
-
}
|
|
79
|
+
let containsTailwindDirectives = false;
|
|
81
80
|
if (this.cacheDirectory) {
|
|
82
|
-
|
|
83
|
-
if (
|
|
84
|
-
|
|
85
|
-
|
|
81
|
+
containsTailwindDirectives = this.containsTailwindDirectives(renderedCss);
|
|
82
|
+
if (!containsTailwindDirectives) {
|
|
83
|
+
// No Tailwind directives to process by PostCSS, we can return cached results
|
|
84
|
+
if (!key) {
|
|
85
|
+
key = yield (0, cache_1.generateKey)(renderedCss, ...this.browserslistData, filePath);
|
|
86
|
+
}
|
|
87
|
+
const cachedResult = yield this.getCachedResult(key);
|
|
88
|
+
if (cachedResult) {
|
|
89
|
+
return cachedResult;
|
|
90
|
+
}
|
|
86
91
|
}
|
|
87
92
|
}
|
|
88
93
|
// Render postcss (autoprefixing and friends)
|
|
@@ -90,6 +95,15 @@ class StylesheetProcessor {
|
|
|
90
95
|
from: filePath,
|
|
91
96
|
to: filePath.replace((0, path_1.extname)(filePath), '.css'),
|
|
92
97
|
});
|
|
98
|
+
if (this.cacheDirectory && containsTailwindDirectives) {
|
|
99
|
+
// We had Tailwind directives to process by PostCSS, only now
|
|
100
|
+
// is safe to return cached results
|
|
101
|
+
key = yield (0, cache_1.generateKey)(result.css, ...this.browserslistData, filePath);
|
|
102
|
+
const cachedResult = yield this.getCachedResult(key);
|
|
103
|
+
if (cachedResult) {
|
|
104
|
+
return cachedResult;
|
|
105
|
+
}
|
|
106
|
+
}
|
|
93
107
|
const warnings = result.warnings().map((w) => w.toString());
|
|
94
108
|
const { code, warnings: esBuildWarnings } = yield this.esbuild.transform(result.css, {
|
|
95
109
|
loader: 'css',
|
|
@@ -112,12 +126,27 @@ class StylesheetProcessor {
|
|
|
112
126
|
return code;
|
|
113
127
|
});
|
|
114
128
|
}
|
|
129
|
+
getCachedResult(key) {
|
|
130
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
131
|
+
const cachedResult = yield (0, cache_1.readCacheEntry)(this.cacheDirectory, key);
|
|
132
|
+
if (cachedResult) {
|
|
133
|
+
cachedResult.warnings.forEach((msg) => log.warn(msg));
|
|
134
|
+
return cachedResult.css;
|
|
135
|
+
}
|
|
136
|
+
return undefined;
|
|
137
|
+
});
|
|
138
|
+
}
|
|
139
|
+
containsTailwindDirectives(content) {
|
|
140
|
+
return (this.tailwindSetup && tailwindcss_1.tailwindDirectives.some((d) => content.includes(d)));
|
|
141
|
+
}
|
|
115
142
|
createPostCssPlugins() {
|
|
116
143
|
const postCssPlugins = [];
|
|
117
144
|
if (this.cssUrl !== CssUrl.none) {
|
|
118
145
|
postCssPlugins.push(postcssUrl({ url: this.cssUrl }));
|
|
119
146
|
}
|
|
120
|
-
|
|
147
|
+
if (this.tailwindSetup) {
|
|
148
|
+
postCssPlugins.push(...(0, tailwindcss_1.getTailwindPostCssPlugins)(this.tailwindSetup, this.styleIncludePaths, this.watch));
|
|
149
|
+
}
|
|
121
150
|
postCssPlugins.push(postcssPresetEnv({
|
|
122
151
|
browsers: this.browserslistData,
|
|
123
152
|
autoprefixer: true,
|
|
@@ -215,7 +244,7 @@ function customSassImporter(url, prev) {
|
|
|
215
244
|
if (url[0] !== '~') {
|
|
216
245
|
return undefined;
|
|
217
246
|
}
|
|
218
|
-
const result = resolveImport(url.
|
|
247
|
+
const result = resolveImport(url.substring(1), prev);
|
|
219
248
|
if (!result) {
|
|
220
249
|
return undefined;
|
|
221
250
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stylesheet-processor.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.ts"],"names":[],"mappings":";AAAA
|
|
1
|
+
{"version":3,"file":"stylesheet-processor.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1,7 @@
|
|
|
1
|
-
export
|
|
1
|
+
export interface TailwindSetup {
|
|
2
|
+
tailwindConfigPath: string;
|
|
3
|
+
tailwindPackagePath: string;
|
|
4
|
+
}
|
|
5
|
+
export declare const tailwindDirectives: string[];
|
|
6
|
+
export declare function getTailwindSetup(basePath: string): TailwindSetup | undefined;
|
|
7
|
+
export declare function getTailwindPostCssPlugins({ tailwindConfigPath, tailwindPackagePath }: TailwindSetup, includePaths?: string[], watch?: boolean): any[];
|
|
@@ -1,12 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.getTailwindPostCssPlugins = exports.getTailwindSetup = exports.tailwindDirectives = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const app_root_1 = require("@nrwl/tao/src/utils/app-root");
|
|
6
6
|
const fs_1 = require("fs");
|
|
7
7
|
const path_1 = require("path");
|
|
8
8
|
const postcssImport = require("postcss-import");
|
|
9
|
-
|
|
9
|
+
exports.tailwindDirectives = [
|
|
10
|
+
'@tailwind',
|
|
11
|
+
'@apply',
|
|
12
|
+
'@layer',
|
|
13
|
+
'@variants',
|
|
14
|
+
'@responsive',
|
|
15
|
+
'@screen',
|
|
16
|
+
];
|
|
17
|
+
function getTailwindSetup(basePath) {
|
|
10
18
|
// Try to find TailwindCSS configuration file in the project or workspace root.
|
|
11
19
|
const tailwindConfigFile = 'tailwind.config.js';
|
|
12
20
|
let tailwindConfigPath;
|
|
@@ -19,7 +27,7 @@ function getTailwindPostCssPluginsIfPresent(basePath, includePaths, watch) {
|
|
|
19
27
|
}
|
|
20
28
|
// Only load Tailwind CSS plugin if configuration file was found.
|
|
21
29
|
if (!tailwindConfigPath) {
|
|
22
|
-
return
|
|
30
|
+
return undefined;
|
|
23
31
|
}
|
|
24
32
|
let tailwindPackagePath;
|
|
25
33
|
try {
|
|
@@ -30,21 +38,25 @@ function getTailwindPostCssPluginsIfPresent(basePath, includePaths, watch) {
|
|
|
30
38
|
devkit_1.logger.warn(`Tailwind CSS configuration file found (${relativeTailwindConfigPath})` +
|
|
31
39
|
` but the 'tailwindcss' package is not installed.` +
|
|
32
40
|
` To enable Tailwind CSS, please install the 'tailwindcss' package.`);
|
|
33
|
-
return
|
|
41
|
+
return undefined;
|
|
34
42
|
}
|
|
35
43
|
if (!tailwindPackagePath) {
|
|
36
|
-
return
|
|
44
|
+
return undefined;
|
|
37
45
|
}
|
|
46
|
+
return { tailwindConfigPath, tailwindPackagePath };
|
|
47
|
+
}
|
|
48
|
+
exports.getTailwindSetup = getTailwindSetup;
|
|
49
|
+
function getTailwindPostCssPlugins({ tailwindConfigPath, tailwindPackagePath }, includePaths, watch) {
|
|
38
50
|
if (process.env['TAILWIND_MODE'] === undefined) {
|
|
39
51
|
process.env['TAILWIND_MODE'] = watch ? 'watch' : 'build';
|
|
40
52
|
}
|
|
41
53
|
return [
|
|
42
54
|
postcssImport({
|
|
43
55
|
addModulesDirectories: includePaths !== null && includePaths !== void 0 ? includePaths : [],
|
|
44
|
-
resolve: (url) => (url.startsWith('~') ? url.
|
|
56
|
+
resolve: (url) => (url.startsWith('~') ? url.substring(1) : url),
|
|
45
57
|
}),
|
|
46
58
|
require(tailwindPackagePath)({ config: tailwindConfigPath }),
|
|
47
59
|
];
|
|
48
60
|
}
|
|
49
|
-
exports.
|
|
61
|
+
exports.getTailwindPostCssPlugins = getTailwindPostCssPlugins;
|
|
50
62
|
//# sourceMappingURL=tailwindcss.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tailwindcss.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/utilities/tailwindcss.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AACtC,2DAA2D;AAC3D,2BAAgC;AAChC,+BAAsC;AACtC,gDAAgD;
|
|
1
|
+
{"version":3,"file":"tailwindcss.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/utilities/tailwindcss.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AACtC,2DAA2D;AAC3D,2BAAgC;AAChC,+BAAsC;AACtC,gDAAgD;AAOnC,QAAA,kBAAkB,GAAG;IAChC,WAAW;IACX,QAAQ;IACR,QAAQ;IACR,WAAW;IACX,aAAa;IACb,SAAS;CACV,CAAC;AAEF,SAAgB,gBAAgB,CAAC,QAAgB;IAC/C,+EAA+E;IAC/E,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;IAChD,IAAI,kBAAsC,CAAC;IAC3C,KAAK,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,sBAAW,CAAC,EAAE;QAC1C,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;QAChD,IAAI,IAAA,eAAU,EAAC,QAAQ,CAAC,EAAE;YACxB,kBAAkB,GAAG,QAAQ,CAAC;YAC9B,MAAM;SACP;KACF;IAED,iEAAiE;IACjE,IAAI,CAAC,kBAAkB,EAAE;QACvB,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,mBAAuC,CAAC;IAC5C,IAAI;QACF,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;KACtD;IAAC,WAAM;QACN,MAAM,0BAA0B,GAAG,IAAA,eAAQ,EACzC,sBAAW,EACX,kBAAkB,CACnB,CAAC;QACF,eAAM,CAAC,IAAI,CACT,0CAA0C,0BAA0B,GAAG;YACrE,kDAAkD;YAClD,oEAAoE,CACvE,CAAC;QAEF,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,CAAC,mBAAmB,EAAE;QACxB,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,CAAC;AACrD,CAAC;AAvCD,4CAuCC;AAED,SAAgB,yBAAyB,CACvC,EAAE,kBAAkB,EAAE,mBAAmB,EAAiB,EAC1D,YAAuB,EACvB,KAAe;IAEf,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,SAAS,EAAE;QAC9C,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;KAC1D;IAED,OAAO;QACL,aAAa,CAAC;YACZ,qBAAqB,EAAE,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE;YACzC,OAAO,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;SACzE,CAAC;QACF,OAAO,CAAC,mBAAmB,CAAC,CAAC,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC;KAC7D,CAAC;AACJ,CAAC;AAhBD,8DAgBC"}
|
|
@@ -16,7 +16,7 @@ function componentStoryGenerator(tree, options) {
|
|
|
16
16
|
(0, devkit_1.generateFiles)(tree, templatesDir, destinationDir, {
|
|
17
17
|
componentFileName: componentFileName,
|
|
18
18
|
componentName: componentName,
|
|
19
|
-
props,
|
|
19
|
+
props: props.filter((p) => typeof p.defaultValue !== 'undefined'),
|
|
20
20
|
tmpl: '',
|
|
21
21
|
});
|
|
22
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component-story.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component-story/component-story.ts"],"names":[],"mappings":";;;AACA,yCAAgE;AAChE,kDAAuD;AACvD,yEAAmE;AAGnE,SAAgB,uBAAuB,CACrC,IAAU,EACV,OAAuC;IAEvC,MAAM,EAAE,iBAAiB,EAAE,aAAa,EAAE,aAAa,EAAE,WAAW,EAAE,GACpE,OAAO,CAAC;IAEV,MAAM,YAAY,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,WAAW,EAAE,aAAa,CAAC,CAAC;IACrE,MAAM,SAAS,GAAG,IAAA,0BAAiB,EACjC,cAAc,EACd,GAAG,iBAAiB,aAAa,CAClC,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAC1B,OAAO;KACR;IAED,MAAM,KAAK,GAAG,IAAA,6BAAiB,EAC7B,IAAI,EACJ,IAAA,0BAAiB,EAAC,cAAc,EAAE,GAAG,iBAAiB,KAAK,CAAC,EAC5D,4CAAmB,CACpB,CAAC;IAEF,IAAA,sBAAa,EAAC,IAAI,EAAE,YAAY,EAAE,cAAc,EAAE;QAChD,iBAAiB,EAAE,iBAAiB;QACpC,aAAa,EAAE,aAAa;QAC5B,KAAK;
|
|
1
|
+
{"version":3,"file":"component-story.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component-story/component-story.ts"],"names":[],"mappings":";;;AACA,yCAAgE;AAChE,kDAAuD;AACvD,yEAAmE;AAGnE,SAAgB,uBAAuB,CACrC,IAAU,EACV,OAAuC;IAEvC,MAAM,EAAE,iBAAiB,EAAE,aAAa,EAAE,aAAa,EAAE,WAAW,EAAE,GACpE,OAAO,CAAC;IAEV,MAAM,YAAY,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,WAAW,EAAE,aAAa,CAAC,CAAC;IACrE,MAAM,SAAS,GAAG,IAAA,0BAAiB,EACjC,cAAc,EACd,GAAG,iBAAiB,aAAa,CAClC,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAC1B,OAAO;KACR;IAED,MAAM,KAAK,GAAG,IAAA,6BAAiB,EAC7B,IAAI,EACJ,IAAA,0BAAiB,EAAC,cAAc,EAAE,GAAG,iBAAiB,KAAK,CAAC,EAC5D,4CAAmB,CACpB,CAAC;IAEF,IAAA,sBAAa,EAAC,IAAI,EAAE,YAAY,EAAE,cAAc,EAAE;QAChD,iBAAiB,EAAE,iBAAiB;QACpC,aAAa,EAAE,aAAa;QAC5B,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,YAAY,KAAK,WAAW,CAAC;QACjE,IAAI,EAAE,EAAE;KACT,CAAC,CAAC;AACL,CAAC;AA9BD,0DA8BC;AAED,kBAAe,uBAAuB,CAAC"}
|
|
@@ -5,12 +5,13 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
7
7
|
function default_1(tree) {
|
|
8
|
+
var _a, _b;
|
|
8
9
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
9
10
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
10
11
|
const angularProjects = {};
|
|
11
12
|
for (const [projectName, project] of projects.entries()) {
|
|
12
|
-
if (project.targets.test &&
|
|
13
|
-
project.targets.test.executor === '@nrwl/jest:jest') {
|
|
13
|
+
if (((_a = project.targets) === null || _a === void 0 ? void 0 : _a.test) &&
|
|
14
|
+
((_b = project.targets) === null || _b === void 0 ? void 0 : _b.test.executor) === '@nrwl/jest:jest') {
|
|
14
15
|
const jestConfigPath = project.targets.test.options && project.targets.test.options.jestConfig;
|
|
15
16
|
if (!jestConfigPath || !tree.exists(jestConfigPath)) {
|
|
16
17
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-angular-jest-config.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-13-2-0/update-angular-jest-config.ts"],"names":[],"mappings":";;;;AAEA,yCAAwD;AACxD,uDAAoD;AAIpD,mBAA+B,IAAU
|
|
1
|
+
{"version":3,"file":"update-angular-jest-config.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-13-2-0/update-angular-jest-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const executor_options_utils_1 = require("@nrwl/workspace/src/utilities/executor-options-utils");
|
|
5
6
|
function default_1(tree) {
|
|
6
7
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
7
8
|
const LIBRARY_EXECUTORS = [
|
|
@@ -11,21 +12,20 @@ function default_1(tree) {
|
|
|
11
12
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
12
13
|
const tsConfigFilesToUpdate = new Set();
|
|
13
14
|
const ngPackageFilesToUpdate = new Set();
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
}
|
|
22
|
-
const ngPackageFilePath = (0, devkit_1.joinPathFragments)(project.root, 'ng-package.json');
|
|
23
|
-
if (tree.exists(ngPackageFilePath)) {
|
|
24
|
-
ngPackageFilesToUpdate.add(ngPackageFilePath);
|
|
25
|
-
}
|
|
15
|
+
LIBRARY_EXECUTORS.forEach((executor) => {
|
|
16
|
+
(0, executor_options_utils_1.forEachExecutorOptions)(tree, executor, (opts, projectName) => {
|
|
17
|
+
const project = projects.get(projectName);
|
|
18
|
+
// UPDATE THE TSCONFIG JSON
|
|
19
|
+
const tsConfigPath = (0, devkit_1.joinPathFragments)(project.root, 'tsconfig.lib.prod.json');
|
|
20
|
+
if (tree.exists(tsConfigPath)) {
|
|
21
|
+
tsConfigFilesToUpdate.add(tsConfigPath);
|
|
26
22
|
}
|
|
27
|
-
|
|
28
|
-
|
|
23
|
+
const ngPackageFilePath = (0, devkit_1.joinPathFragments)(project.root, 'ng-package.json');
|
|
24
|
+
if (tree.exists(ngPackageFilePath)) {
|
|
25
|
+
ngPackageFilesToUpdate.add(ngPackageFilePath);
|
|
26
|
+
}
|
|
27
|
+
});
|
|
28
|
+
});
|
|
29
29
|
for (const tsConfigPath of tsConfigFilesToUpdate) {
|
|
30
30
|
(0, devkit_1.updateJson)(tree, tsConfigPath, (json) => {
|
|
31
31
|
if (json.angularCompilerOptions &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-libraries.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-13-2-0/update-libraries.ts"],"names":[],"mappings":";;;AACA,yCAA0E;
|
|
1
|
+
{"version":3,"file":"update-libraries.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-13-2-0/update-libraries.ts"],"names":[],"mappings":";;;AACA,yCAA0E;AAC1E,iGAA8F;AAE9F,mBAA+B,IAAU;;QACvC,MAAM,iBAAiB,GAAG;YACxB,+BAA+B;YAC/B,uBAAuB;SACxB,CAAC;QACF,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAAU,CAAC;QAChD,MAAM,sBAAsB,GAAG,IAAI,GAAG,EAAU,CAAC;QACjD,iBAAiB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YACrC,IAAA,+CAAsB,EAAC,IAAI,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE;gBAC3D,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;gBAC1C,2BAA2B;gBAC3B,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,OAAO,CAAC,IAAI,EACZ,wBAAwB,CACzB,CAAC;gBACF,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;oBAC7B,qBAAqB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;iBACzC;gBAED,MAAM,iBAAiB,GAAG,IAAA,0BAAiB,EACzC,OAAO,CAAC,IAAI,EACZ,iBAAiB,CAClB,CAAC;gBACF,IAAI,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE;oBAClC,sBAAsB,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;iBAC/C;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,KAAK,MAAM,YAAY,IAAI,qBAAqB,EAAE;YAChD,IAAA,mBAAU,EAAC,IAAI,EAAE,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE;gBACtC,IACE,IAAI,CAAC,sBAAsB;oBAC3B,WAAW,IAAI,IAAI,CAAC,sBAAsB,EAC1C;oBACA,IAAI,CAAC,sBAAsB,CAAC,SAAS,GAAG,SAAS,CAAC;iBACnD;gBAED,IACE,IAAI,CAAC,sBAAsB;oBAC3B,CAAC,CAAC,iBAAiB,IAAI,IAAI,CAAC,sBAAsB,CAAC,EACnD;oBACA,IAAI,CAAC,sBAAsB,CAAC,eAAe,GAAG,SAAS,CAAC;iBACzD;gBAED,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;SACJ;QAED,KAAK,MAAM,aAAa,IAAI,sBAAsB,EAAE;YAClD,IAAA,mBAAU,EAAC,IAAI,EAAE,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;gBACvC,IAAI,IAAI,CAAC,GAAG,IAAI,cAAc,IAAI,IAAI,CAAC,GAAG,EAAE;oBAC1C,IAAI,CAAC,GAAG,CAAC,YAAY,GAAG,SAAS,CAAC;iBACnC;gBACD,IAAI,IAAI,CAAC,GAAG,IAAI,OAAO,IAAI,IAAI,CAAC,GAAG,EAAE;oBACnC,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,SAAS,CAAC;iBAC5B;gBACD,IAAI,IAAI,CAAC,GAAG,IAAI,OAAO,IAAI,IAAI,CAAC,GAAG,EAAE;oBACnC,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,SAAS,CAAC;iBAC5B;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;CAAA;AAjED,4BAiEC"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -2,8 +2,8 @@ export declare const nxVersion = "*";
|
|
|
2
2
|
export declare const angularVersion = "^13.0.0";
|
|
3
3
|
export declare const angularDevkitVersion = "~13.0.0";
|
|
4
4
|
export declare const angularJsVersion = "1.7.9";
|
|
5
|
-
export declare const ngrxVersion = "~
|
|
5
|
+
export declare const ngrxVersion = "~13.0.0";
|
|
6
6
|
export declare const rxjsVersion = "~7.4.0";
|
|
7
|
-
export declare const jestPresetAngularVersion = "11.0.0
|
|
7
|
+
export declare const jestPresetAngularVersion = "11.0.0";
|
|
8
8
|
export declare const angularEslintVersion = "~12.6.0";
|
|
9
9
|
export declare const storybookVersion = "~6.4.0-rc.3";
|
package/src/utils/versions.js
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.storybookVersion = exports.angularEslintVersion = exports.jestPresetAngularVersion = exports.rxjsVersion = exports.ngrxVersion = exports.angularJsVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '13.2.
|
|
4
|
+
exports.nxVersion = '13.2.2';
|
|
5
5
|
exports.angularVersion = '^13.0.0';
|
|
6
6
|
exports.angularDevkitVersion = '~13.0.0';
|
|
7
7
|
exports.angularJsVersion = '1.7.9';
|
|
8
|
-
exports.ngrxVersion = '~
|
|
8
|
+
exports.ngrxVersion = '~13.0.0';
|
|
9
9
|
exports.rxjsVersion = '~7.4.0';
|
|
10
|
-
exports.jestPresetAngularVersion = '11.0.0
|
|
10
|
+
exports.jestPresetAngularVersion = '11.0.0';
|
|
11
11
|
exports.angularEslintVersion = '~12.6.0';
|
|
12
12
|
exports.storybookVersion = '~6.4.0-rc.3';
|
|
13
13
|
//# sourceMappingURL=versions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,GAAG,CAAC;AAChB,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAC3B,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,wBAAwB,GAAG,
|
|
1
|
+
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,GAAG,CAAC;AAChB,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAC3B,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,wBAAwB,GAAG,QAAQ,CAAC;AACpC,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,gBAAgB,GAAG,aAAa,CAAC"}
|