@nrwl/angular 13.3.0-beta.4 → 13.3.0-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/fesm2015/nrwl-angular-testing.mjs +0 -1
- package/fesm2015/nrwl-angular.mjs +0 -1
- package/fesm2020/nrwl-angular-testing.mjs +0 -1
- package/fesm2020/nrwl-angular.mjs +0 -1
- package/ng-package.json +1 -1
- package/package.json +6 -6
- package/src/generators/application/application.js +14 -2
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/lib/index.d.ts +2 -2
- package/src/generators/application/lib/index.js +2 -2
- package/src/generators/application/lib/index.js.map +1 -1
- package/src/generators/application/lib/nrwl-home-tpl.d.ts +2 -3
- package/src/generators/application/lib/nrwl-home-tpl.js +790 -314
- package/src/generators/application/lib/nrwl-home-tpl.js.map +1 -1
- package/src/generators/application/lib/{update-component-template.d.ts → update-app-component-template.d.ts} +1 -1
- package/src/generators/application/lib/{update-component-template.js → update-app-component-template.js} +7 -7
- package/src/generators/application/lib/update-app-component-template.js.map +1 -0
- package/src/generators/application/lib/update-component-spec.js +8 -1
- package/src/generators/application/lib/update-component-spec.js.map +1 -1
- package/src/generators/application/lib/update-e2e-project.js +1 -1
- package/src/generators/application/lib/update-e2e-project.js.map +1 -1
- package/src/generators/application/lib/{update-component-styles.d.ts → update-nx-component-template.d.ts} +1 -1
- package/src/generators/application/lib/update-nx-component-template.js +31 -0
- package/src/generators/application/lib/update-nx-component-template.js.map +1 -0
- package/src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6.d.ts +1 -2
- package/src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6.js +1 -2
- package/src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6.js.map +1 -1
- package/src/utils/nx-devkit/ast-utils.d.ts +2 -0
- package/src/utils/nx-devkit/ast-utils.js +35 -1
- package/src/utils/nx-devkit/ast-utils.js.map +1 -1
- package/src/utils/versions.js +1 -1
- package/testing/ng-package.json +6 -0
- package/testing/package.json +3 -5
- package/src/generators/application/lib/update-component-styles.js +0 -26
- package/src/generators/application/lib/update-component-styles.js.map +0 -1
- package/src/generators/application/lib/update-component-template.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nrwl-home-tpl.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/nrwl-home-tpl.ts"],"names":[],"mappings":";;;AAAa,QAAA,gBAAgB,GAAG;IAC9B,
|
|
1
|
+
{"version":3,"file":"nrwl-home-tpl.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/nrwl-home-tpl.ts"],"names":[],"mappings":";;;AAAa,QAAA,gBAAgB,GAAG;IAC9B,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,MAAM,iBAAiB,MAAM,cAAc;IACxE,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBA6aD,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6WxB;CACF,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { Tree } from '@nrwl/devkit';
|
|
2
2
|
import type { NormalizedSchema } from './normalized-schema';
|
|
3
|
-
export declare function
|
|
3
|
+
export declare function updateAppComponentTemplate(host: Tree, options: NormalizedSchema): void;
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.updateAppComponentTemplate = void 0;
|
|
4
4
|
const ts = require("typescript");
|
|
5
5
|
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
6
6
|
const ast_utils_2 = require("../../../utils/nx-devkit/ast-utils");
|
|
7
7
|
const nrwl_home_tpl_1 = require("./nrwl-home-tpl");
|
|
8
|
-
function
|
|
8
|
+
function updateAppComponentTemplate(host, options) {
|
|
9
9
|
const content = options.routing
|
|
10
|
-
? `${nrwl_home_tpl_1.nrwlHomeTemplate.
|
|
11
|
-
: nrwl_home_tpl_1.nrwlHomeTemplate.
|
|
10
|
+
? `${nrwl_home_tpl_1.nrwlHomeTemplate.getSelector(options.prefix)}\n<router-outlet></router-outlet>`
|
|
11
|
+
: nrwl_home_tpl_1.nrwlHomeTemplate.getSelector(options.prefix);
|
|
12
12
|
if (!options.inlineTemplate) {
|
|
13
13
|
host.write(`${options.appProjectRoot}/src/app/app.component.html`, content);
|
|
14
14
|
return;
|
|
@@ -16,7 +16,7 @@ function updateComponentTemplate(host, options) {
|
|
|
16
16
|
// Inline component update
|
|
17
17
|
const componentPath = `${options.appProjectRoot}/src/app/app.component.ts`;
|
|
18
18
|
const templateNodeValue = (0, ast_utils_2.getDecoratorPropertyValueNode)(host, componentPath, 'Component', 'template', '@angular/core');
|
|
19
|
-
(0, ast_utils_1.replaceNodeValue)(host, ts.createSourceFile(componentPath, host.read(componentPath, 'utf-8'), ts.ScriptTarget.Latest, true), componentPath, templateNodeValue, `\`\n${nrwl_home_tpl_1.nrwlHomeTemplate.
|
|
19
|
+
(0, ast_utils_1.replaceNodeValue)(host, ts.createSourceFile(componentPath, host.read(componentPath, 'utf-8'), ts.ScriptTarget.Latest, true), componentPath, templateNodeValue, `\`\n${nrwl_home_tpl_1.nrwlHomeTemplate.getSelector(options.prefix)}\n\``);
|
|
20
20
|
}
|
|
21
|
-
exports.
|
|
22
|
-
//# sourceMappingURL=update-component-template.js.map
|
|
21
|
+
exports.updateAppComponentTemplate = updateAppComponentTemplate;
|
|
22
|
+
//# sourceMappingURL=update-app-component-template.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update-app-component-template.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-app-component-template.ts"],"names":[],"mappings":";;;AAGA,iCAAiC;AACjC,uEAA2E;AAC3E,kEAAmF;AAEnF,mDAAmD;AAEnD,SAAgB,0BAA0B,CACxC,IAAU,EACV,OAAyB;IAEzB,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO;QAC7B,CAAC,CAAC,GAAG,gCAAgB,CAAC,WAAW,CAC7B,OAAO,CAAC,MAAM,CACf,mCAAmC;QACtC,CAAC,CAAC,gCAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAEjD,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;QAC3B,IAAI,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,cAAc,6BAA6B,EAAE,OAAO,CAAC,CAAC;QAE5E,OAAO;KACR;IAED,0BAA0B;IAC1B,MAAM,aAAa,GAAG,GAAG,OAAO,CAAC,cAAc,2BAA2B,CAAC;IAC3E,MAAM,iBAAiB,GAAG,IAAA,yCAA6B,EACrD,IAAI,EACJ,aAAa,EACb,WAAW,EACX,UAAU,EACV,eAAe,CAChB,CAAC;IAEF,IAAA,4BAAgB,EACd,IAAI,EACJ,EAAE,CAAC,gBAAgB,CACjB,aAAa,EACb,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,EACjC,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,EACD,aAAa,EACb,iBAAiB,EACjB,OAAO,gCAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAC1D,CAAC;AACJ,CAAC;AAtCD,gEAsCC"}
|
|
@@ -11,7 +11,14 @@ function updateComponentSpec(host, options) {
|
|
|
11
11
|
let componentSpecSourceFile = ts.createSourceFile(componentSpecPath, componentSpecSource, ts.ScriptTarget.Latest, true);
|
|
12
12
|
host.write(componentSpecPath, componentSpecSource
|
|
13
13
|
.replace('.content span', 'h1')
|
|
14
|
-
.replace(`${options.name} app is running!`, `Welcome
|
|
14
|
+
.replace(`${options.name} app is running!`, `Welcome ${options.name}`));
|
|
15
|
+
// Adding NxWelcome component to app.component.spec
|
|
16
|
+
componentSpecSourceFile = (0, ast_utils_1.insertImport)(host, componentSpecSourceFile, componentSpecPath, 'NxWelcomeComponent', './nx-welcome.component');
|
|
17
|
+
componentSpecSourceFile = (0, ast_utils_2.replaceIntoToTestBed)(host, componentSpecSourceFile, componentSpecPath, `declarations: [AppComponent, NxWelcomeComponent]`, `
|
|
18
|
+
declarations: [
|
|
19
|
+
AppComponent
|
|
20
|
+
],
|
|
21
|
+
`);
|
|
15
22
|
if (options.routing) {
|
|
16
23
|
componentSpecSourceFile = (0, ast_utils_1.insertImport)(host, componentSpecSourceFile, componentSpecPath, 'RouterTestingModule', '@angular/router/testing');
|
|
17
24
|
componentSpecSourceFile = (0, ast_utils_2.addImportToTestBed)(host, componentSpecSourceFile, componentSpecPath, `RouterTestingModule`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-component-spec.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-component-spec.ts"],"names":[],"mappings":";;;AAGA,iCAAiC;AACjC,uEAAuE;AACvE,
|
|
1
|
+
{"version":3,"file":"update-component-spec.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-component-spec.ts"],"names":[],"mappings":";;;AAGA,iCAAiC;AACjC,uEAAuE;AACvE,kEAG4C;AAE5C,SAAgB,mBAAmB,CAAC,IAAU,EAAE,OAAyB;IACvE,IAAI,OAAO,CAAC,SAAS,KAAK,IAAI,EAAE;QAC9B,MAAM,iBAAiB,GAAG,GAAG,OAAO,CAAC,cAAc,gCAAgC,CAAC;QACpF,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;QAElE,IAAI,uBAAuB,GAAG,EAAE,CAAC,gBAAgB,CAC/C,iBAAiB,EACjB,mBAAmB,EACnB,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,KAAK,CACR,iBAAiB,EACjB,mBAAmB;aAChB,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC;aAC9B,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,kBAAkB,EAAE,WAAW,OAAO,CAAC,IAAI,EAAE,CAAC,CACzE,CAAC;QAEF,mDAAmD;QACnD,uBAAuB,GAAG,IAAA,wBAAY,EACpC,IAAI,EACJ,uBAAuB,EACvB,iBAAiB,EACjB,oBAAoB,EACpB,wBAAwB,CACzB,CAAC;QAEF,uBAAuB,GAAG,IAAA,gCAAoB,EAC5C,IAAI,EACJ,uBAAuB,EACvB,iBAAiB,EACjB,kDAAkD,EAClD;;;;KAID,CACA,CAAC;QAEF,IAAI,OAAO,CAAC,OAAO,EAAE;YACnB,uBAAuB,GAAG,IAAA,wBAAY,EACpC,IAAI,EACJ,uBAAuB,EACvB,iBAAiB,EACjB,qBAAqB,EACrB,yBAAyB,CAC1B,CAAC;YAEF,uBAAuB,GAAG,IAAA,8BAAkB,EAC1C,IAAI,EACJ,uBAAuB,EACvB,iBAAiB,EACjB,qBAAqB,CACtB,CAAC;SACH;KACF;AACH,CAAC;AAzDD,kDAyDC"}
|
|
@@ -5,7 +5,7 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
5
5
|
function updateE2eProject(tree, options) {
|
|
6
6
|
const spec = `${options.e2eProjectRoot}/src/app.e2e-spec.ts`;
|
|
7
7
|
const content = tree.read(spec, 'utf-8');
|
|
8
|
-
tree.write(spec, content.replace(`${options.name} app is running!`, `Welcome
|
|
8
|
+
tree.write(spec, content.replace(`${options.name} app is running!`, `Welcome ${options.name}`));
|
|
9
9
|
const page = `${options.e2eProjectRoot}/src/app.po.ts`;
|
|
10
10
|
const pageContent = tree.read(page, 'utf-8');
|
|
11
11
|
tree.write(page, pageContent.replace(`.content span`, `header h1`));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-e2e-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-e2e-project.ts"],"names":[],"mappings":";;;AACA,yCAMsB;AAGtB,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAyB;IACpE,MAAM,IAAI,GAAG,GAAG,OAAO,CAAC,cAAc,sBAAsB,CAAC;IAC7D,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACzC,IAAI,CAAC,KAAK,CACR,IAAI,EACJ,OAAO,CAAC,OAAO,CACb,GAAG,OAAO,CAAC,IAAI,kBAAkB,EACjC,
|
|
1
|
+
{"version":3,"file":"update-e2e-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-e2e-project.ts"],"names":[],"mappings":";;;AACA,yCAMsB;AAGtB,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAyB;IACpE,MAAM,IAAI,GAAG,GAAG,OAAO,CAAC,cAAc,sBAAsB,CAAC;IAC7D,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACzC,IAAI,CAAC,KAAK,CACR,IAAI,EACJ,OAAO,CAAC,OAAO,CACb,GAAG,OAAO,CAAC,IAAI,kBAAkB,EACjC,WAAW,OAAO,CAAC,IAAI,EAAE,CAC1B,CACF,CAAC;IAEF,MAAM,IAAI,GAAG,GAAG,OAAO,CAAC,cAAc,gBAAgB,CAAC;IACvD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7C,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC,CAAC;IAEpE,MAAM,IAAI,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAyB;QACpC,IAAI,EAAE,OAAO,CAAC,cAAc;QAC5B,WAAW,EAAE,aAAa;QAC1B,OAAO,EAAE;YACP,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG;SACtB;QACD,oBAAoB,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;QACpC,IAAI,EAAE,EAAE;KACT,CAAC;IACF,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,GAAG,GAAG,OAAO,CAAC,cAAc,qBAAqB,CAAC;IAC9F,uCAAuC;IACvC,IAAA,gCAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAE/D,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;IACxB,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAErD,sBAAsB;IACtB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,oBAAoB,CAAC,EAAE;QAC/D,IAAI,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,cAAc,oBAAoB,EAAE,IAAI,CAAC,CAAC;KACjE;IAED,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QACvE,uCACK,IAAI,KACP,OAAO,EAAE,iBAAiB,EAC1B,eAAe,kCACV,IAAI,CAAC,eAAe,KACvB,MAAM,EAAE,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,cAAc,CAAC,cAAc,OAEjE;IACJ,CAAC,CAAC,CAAC;IAEH,kBAAkB;IAClB,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE;QACnE,uCACK,IAAI,KACP,OAAO,EAAE,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,cAAc,CAAC,oBAAoB,IACtE;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAvDD,4CAuDC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { Tree } from '@nrwl/devkit';
|
|
2
2
|
import type { NormalizedSchema } from './normalized-schema';
|
|
3
|
-
export declare function
|
|
3
|
+
export declare function updateNxComponentTemplate(host: Tree, options: NormalizedSchema): void;
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.updateNxComponentTemplate = void 0;
|
|
4
|
+
const ts = require("typescript");
|
|
5
|
+
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
6
|
+
const ast_utils_2 = require("../../../utils/nx-devkit/ast-utils");
|
|
7
|
+
const nrwl_home_tpl_1 = require("./nrwl-home-tpl");
|
|
8
|
+
function updateNxComponentTemplate(host, options) {
|
|
9
|
+
const componentPath = `${options.appProjectRoot}/src/app/nx-welcome.component.ts`;
|
|
10
|
+
const templateNodeValue = (0, ast_utils_2.getDecoratorPropertyValueNode)(host, componentPath, 'Component', 'template', '@angular/core');
|
|
11
|
+
(0, ast_utils_1.replaceNodeValue)(host, ts.createSourceFile(componentPath, host.read(componentPath, 'utf-8'), ts.ScriptTarget.Latest, true), componentPath, templateNodeValue, `\`\n${nrwl_home_tpl_1.nrwlHomeTemplate.template(options.name)}\n\``);
|
|
12
|
+
// Fixing extra comma issue `,,`
|
|
13
|
+
let sourceFile = ts.createSourceFile(componentPath, host.read(componentPath, 'utf-8'), ts.ScriptTarget.Latest, true);
|
|
14
|
+
const componentFile = host
|
|
15
|
+
.read(componentPath, 'utf-8')
|
|
16
|
+
.toString()
|
|
17
|
+
.replace(/,,/gi, ',');
|
|
18
|
+
host.write(componentPath, componentFile);
|
|
19
|
+
sourceFile.update(componentFile, {
|
|
20
|
+
newLength: componentFile.length,
|
|
21
|
+
span: {
|
|
22
|
+
length: sourceFile.text.length,
|
|
23
|
+
start: 0,
|
|
24
|
+
},
|
|
25
|
+
});
|
|
26
|
+
// Add ESLint ignore to pass the lint step
|
|
27
|
+
sourceFile = ts.createSourceFile(componentPath, host.read(componentPath, 'utf-8'), ts.ScriptTarget.Latest, true);
|
|
28
|
+
(0, ast_utils_1.addGlobal)(host, sourceFile, componentPath, '/* eslint-disable */');
|
|
29
|
+
}
|
|
30
|
+
exports.updateNxComponentTemplate = updateNxComponentTemplate;
|
|
31
|
+
//# sourceMappingURL=update-nx-component-template.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update-nx-component-template.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-nx-component-template.ts"],"names":[],"mappings":";;;AAGA,iCAAiC;AACjC,uEAGiD;AACjD,kEAAmF;AACnF,mDAAmD;AAEnD,SAAgB,yBAAyB,CACvC,IAAU,EACV,OAAyB;IAEzB,MAAM,aAAa,GAAG,GAAG,OAAO,CAAC,cAAc,kCAAkC,CAAC;IAClF,MAAM,iBAAiB,GAAG,IAAA,yCAA6B,EACrD,IAAI,EACJ,aAAa,EACb,WAAW,EACX,UAAU,EACV,eAAe,CAChB,CAAC;IAEF,IAAA,4BAAgB,EACd,IAAI,EACJ,EAAE,CAAC,gBAAgB,CACjB,aAAa,EACb,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,EACjC,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,EACD,aAAa,EACb,iBAAiB,EACjB,OAAO,gCAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CACrD,CAAC;IAEF,gCAAgC;IAChC,IAAI,UAAU,GAAG,EAAE,CAAC,gBAAgB,CAClC,aAAa,EACb,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,EACjC,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IACF,MAAM,aAAa,GAAG,IAAI;SACvB,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC;SAC5B,QAAQ,EAAE;SACV,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACxB,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IACzC,UAAU,CAAC,MAAM,CAAC,aAAa,EAAE;QAC/B,SAAS,EAAE,aAAa,CAAC,MAAM;QAC/B,IAAI,EAAE;YACJ,MAAM,EAAE,UAAU,CAAC,IAAI,CAAC,MAAM;YAC9B,KAAK,EAAE,CAAC;SACT;KACF,CAAC,CAAC;IAEH,0CAA0C;IAC1C,UAAU,GAAG,EAAE,CAAC,gBAAgB,CAC9B,aAAa,EACb,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,EACjC,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IACF,IAAA,qBAAS,EAAC,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,sBAAsB,CAAC,CAAC;AACrE,CAAC;AAtDD,8DAsDC"}
|
package/src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6.d.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import type { GeneratorCallback, Tree } from '@nrwl/devkit';
|
|
2
|
-
import storybookConfigurationGenerator from '../storybook-configuration/storybook-configuration';
|
|
3
2
|
import type { StorybookMigrateDefault5to6Schema } from './schema';
|
|
4
3
|
export declare function storybookMigrateDefaults5To6Generator(tree: Tree, options: StorybookMigrateDefault5to6Schema): GeneratorCallback;
|
|
5
|
-
export default
|
|
4
|
+
export default storybookMigrateDefaults5To6Generator;
|
package/src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6.js
CHANGED
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.storybookMigrateDefaults5To6Generator = void 0;
|
|
4
4
|
const storybook_1 = require("@nrwl/storybook");
|
|
5
|
-
const storybook_configuration_1 = require("../storybook-configuration/storybook-configuration");
|
|
6
5
|
function storybookMigrateDefaults5To6Generator(tree, options) {
|
|
7
6
|
return (0, storybook_1.migrateDefaultsGenerator)(tree, {
|
|
8
7
|
name: options.name,
|
|
@@ -11,5 +10,5 @@ function storybookMigrateDefaults5To6Generator(tree, options) {
|
|
|
11
10
|
});
|
|
12
11
|
}
|
|
13
12
|
exports.storybookMigrateDefaults5To6Generator = storybookMigrateDefaults5To6Generator;
|
|
14
|
-
exports.default =
|
|
13
|
+
exports.default = storybookMigrateDefaults5To6Generator;
|
|
15
14
|
//# sourceMappingURL=storybook-migrate-defaults-5-to-6.js.map
|
package/src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storybook-migrate-defaults-5-to-6.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6.ts"],"names":[],"mappings":";;;AACA,+CAA2D;
|
|
1
|
+
{"version":3,"file":"storybook-migrate-defaults-5-to-6.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6.ts"],"names":[],"mappings":";;;AACA,+CAA2D;AAG3D,SAAgB,qCAAqC,CACnD,IAAU,EACV,OAA0C;IAE1C,OAAO,IAAA,oCAAwB,EAAC,IAAI,EAAE;QACpC,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,CAAC,CAAC;AACL,CAAC;AATD,sFASC;AAED,kBAAe,qCAAqC,CAAC"}
|
|
@@ -4,6 +4,8 @@ export declare function getDecoratorMetadata(source: ts.SourceFile, identifier:
|
|
|
4
4
|
export declare function removeFromNgModule(host: Tree, source: ts.SourceFile, modulePath: string, property: string): ts.SourceFile;
|
|
5
5
|
export declare function addImportToModule(host: Tree, source: ts.SourceFile, modulePath: string, symbolName: string): ts.SourceFile;
|
|
6
6
|
export declare function addImportToTestBed(host: Tree, source: ts.SourceFile, specPath: string, symbolName: string): ts.SourceFile;
|
|
7
|
+
export declare function addDeclarationsToTestBed(host: Tree, source: ts.SourceFile, specPath: string, symbolName: string[]): ts.SourceFile;
|
|
8
|
+
export declare function replaceIntoToTestBed(host: Tree, source: ts.SourceFile, specPath: string, newSymbol: string, previousSymbol: string): ts.SourceFile;
|
|
7
9
|
export declare function getBootstrapComponent(source: ts.SourceFile, moduleClassName: string): string;
|
|
8
10
|
export declare function addRoute(host: Tree, ngModulePath: string, source: ts.SourceFile, route: string): ts.SourceFile;
|
|
9
11
|
export declare function addProviderToModule(host: Tree, source: ts.SourceFile, modulePath: string, symbolName: string): ts.SourceFile;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getTsSourceFile = exports.getDecoratorPropertyValueNode = exports.readBootstrapInfo = exports.addEntryComponents = exports.addDeclarationToModule = exports.addProviderToModule = exports.addRoute = exports.getBootstrapComponent = exports.addImportToTestBed = exports.addImportToModule = exports.removeFromNgModule = exports.getDecoratorMetadata = void 0;
|
|
3
|
+
exports.getTsSourceFile = exports.getDecoratorPropertyValueNode = exports.readBootstrapInfo = exports.addEntryComponents = exports.addDeclarationToModule = exports.addProviderToModule = exports.addRoute = exports.getBootstrapComponent = exports.replaceIntoToTestBed = exports.addDeclarationsToTestBed = exports.addImportToTestBed = exports.addImportToModule = exports.removeFromNgModule = exports.getDecoratorMetadata = void 0;
|
|
4
4
|
const ts = require("typescript");
|
|
5
5
|
const find_nodes_1 = require("@nrwl/workspace/src/utilities/typescript/find-nodes");
|
|
6
6
|
const get_source_nodes_1 = require("@nrwl/workspace/src/utilities/typescript/get-source-nodes");
|
|
@@ -240,6 +240,40 @@ function addImportToTestBed(host, source, specPath, symbolName) {
|
|
|
240
240
|
return source;
|
|
241
241
|
}
|
|
242
242
|
exports.addImportToTestBed = addImportToTestBed;
|
|
243
|
+
function addDeclarationsToTestBed(host, source, specPath, symbolName) {
|
|
244
|
+
const allCalls = ((0, find_nodes_1.findNodes)(source, ts.SyntaxKind.CallExpression));
|
|
245
|
+
const configureTestingModuleObjectLiterals = allCalls
|
|
246
|
+
.filter((c) => c.expression.kind === ts.SyntaxKind.PropertyAccessExpression)
|
|
247
|
+
.filter((c) => c.expression.name.getText(source) === 'configureTestingModule')
|
|
248
|
+
.map((c) => c.arguments[0].kind === ts.SyntaxKind.ObjectLiteralExpression
|
|
249
|
+
? c.arguments[0]
|
|
250
|
+
: null);
|
|
251
|
+
if (configureTestingModuleObjectLiterals.length > 0) {
|
|
252
|
+
const startPosition = configureTestingModuleObjectLiterals[0]
|
|
253
|
+
.getFirstToken(source)
|
|
254
|
+
.getEnd();
|
|
255
|
+
return (0, ast_utils_1.insertChange)(host, source, specPath, startPosition, `declarations: [${symbolName.join(',')}], `);
|
|
256
|
+
}
|
|
257
|
+
return source;
|
|
258
|
+
}
|
|
259
|
+
exports.addDeclarationsToTestBed = addDeclarationsToTestBed;
|
|
260
|
+
function replaceIntoToTestBed(host, source, specPath, newSymbol, previousSymbol) {
|
|
261
|
+
const allCalls = ((0, find_nodes_1.findNodes)(source, ts.SyntaxKind.CallExpression));
|
|
262
|
+
const configureTestingModuleObjectLiterals = allCalls
|
|
263
|
+
.filter((c) => c.expression.kind === ts.SyntaxKind.PropertyAccessExpression)
|
|
264
|
+
.filter((c) => c.expression.name.getText(source) === 'configureTestingModule')
|
|
265
|
+
.map((c) => c.arguments[0].kind === ts.SyntaxKind.ObjectLiteralExpression
|
|
266
|
+
? c.arguments[0]
|
|
267
|
+
: null);
|
|
268
|
+
if (configureTestingModuleObjectLiterals.length > 0) {
|
|
269
|
+
const startPosition = configureTestingModuleObjectLiterals[0]
|
|
270
|
+
.getFirstToken(source)
|
|
271
|
+
.getEnd();
|
|
272
|
+
return (0, ast_utils_1.replaceChange)(host, source, specPath, startPosition, newSymbol, previousSymbol);
|
|
273
|
+
}
|
|
274
|
+
return source;
|
|
275
|
+
}
|
|
276
|
+
exports.replaceIntoToTestBed = replaceIntoToTestBed;
|
|
243
277
|
function getBootstrapComponent(source, moduleClassName) {
|
|
244
278
|
const bootstrap = getMatchingProperty(source, 'bootstrap', 'NgModule', '@angular/core');
|
|
245
279
|
if (!bootstrap) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/nx-devkit/ast-utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/nx-devkit/ast-utils.ts"],"names":[],"mappings":"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"}
|
package/src/utils/versions.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.angularArchitectsModuleFederationPluginVersion = exports.storybookVersion = exports.angularEslintVersion = exports.jestPresetAngularVersion = exports.rxjsVersion = exports.ngrxVersion = exports.angularJsVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '13.3.0-beta.
|
|
4
|
+
exports.nxVersion = '13.3.0-beta.6';
|
|
5
5
|
exports.angularVersion = '^13.0.0';
|
|
6
6
|
exports.angularDevkitVersion = '~13.0.0';
|
|
7
7
|
exports.angularJsVersion = '1.7.9';
|
package/testing/package.json
CHANGED
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
{
|
|
2
|
-
"name": "@nrwl/angular/testing",
|
|
3
|
-
"typings": "nrwl-angular-testing.d.ts",
|
|
4
|
-
"main": "../bundles/nrwl-nx-testing.umd.js",
|
|
5
2
|
"module": "../fesm2015/nrwl-angular-testing.mjs",
|
|
6
|
-
"es2015": "../esm2015/nrwl-nx-testing.js",
|
|
7
3
|
"es2020": "../fesm2020/nrwl-angular-testing.mjs",
|
|
8
4
|
"esm2020": "../esm2020/testing/nrwl-angular-testing.mjs",
|
|
9
5
|
"fesm2020": "../fesm2020/nrwl-angular-testing.mjs",
|
|
10
6
|
"fesm2015": "../fesm2015/nrwl-angular-testing.mjs",
|
|
11
|
-
"
|
|
7
|
+
"typings": "nrwl-angular-testing.d.ts",
|
|
8
|
+
"sideEffects": false,
|
|
9
|
+
"name": "@nrwl/angular/testing"
|
|
12
10
|
}
|
|
@@ -1,26 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.updateComponentStyles = void 0;
|
|
4
|
-
const ts = require("typescript");
|
|
5
|
-
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
6
|
-
const ast_utils_2 = require("../../../utils/nx-devkit/ast-utils");
|
|
7
|
-
const nrwl_home_tpl_1 = require("./nrwl-home-tpl");
|
|
8
|
-
function updateComponentStyles(host, options) {
|
|
9
|
-
const content = nrwl_home_tpl_1.nrwlHomeTemplate[options.style === 'sass' ? 'sass' : 'css'];
|
|
10
|
-
if (!options.inlineStyle) {
|
|
11
|
-
const filesMap = {
|
|
12
|
-
css: `${options.appProjectRoot}/src/app/app.component.css`,
|
|
13
|
-
sass: `${options.appProjectRoot}/src/app/app.component.sass`,
|
|
14
|
-
scss: `${options.appProjectRoot}/src/app/app.component.scss`,
|
|
15
|
-
less: `${options.appProjectRoot}/src/app/app.component.less`,
|
|
16
|
-
};
|
|
17
|
-
host.write(filesMap[options.style], content);
|
|
18
|
-
return;
|
|
19
|
-
}
|
|
20
|
-
// Inline component update
|
|
21
|
-
const componentPath = `${options.appProjectRoot}/src/app/app.component.ts`;
|
|
22
|
-
const templateNodeValue = (0, ast_utils_2.getDecoratorPropertyValueNode)(host, componentPath, 'Component', 'styles', '@angular/core');
|
|
23
|
-
(0, ast_utils_1.replaceNodeValue)(host, ts.createSourceFile(componentPath, host.read(componentPath, 'utf-8'), ts.ScriptTarget.Latest, true), componentPath, templateNodeValue, `[\`\n${content}\n\`],\n`);
|
|
24
|
-
}
|
|
25
|
-
exports.updateComponentStyles = updateComponentStyles;
|
|
26
|
-
//# sourceMappingURL=update-component-styles.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"update-component-styles.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-component-styles.ts"],"names":[],"mappings":";;;AAGA,iCAAiC;AACjC,uEAA2E;AAC3E,kEAAmF;AAEnF,mDAAmD;AAEnD,SAAgB,qBAAqB,CAAC,IAAU,EAAE,OAAyB;IACzE,MAAM,OAAO,GAAG,gCAAgB,CAAC,OAAO,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAE5E,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;QACxB,MAAM,QAAQ,GAAG;YACf,GAAG,EAAE,GAAG,OAAO,CAAC,cAAc,4BAA4B;YAC1D,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,6BAA6B;YAC5D,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,6BAA6B;YAC5D,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,6BAA6B;SAC7D,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;QAE7C,OAAO;KACR;IAED,0BAA0B;IAC1B,MAAM,aAAa,GAAG,GAAG,OAAO,CAAC,cAAc,2BAA2B,CAAC;IAC3E,MAAM,iBAAiB,GAAG,IAAA,yCAA6B,EACrD,IAAI,EACJ,aAAa,EACb,WAAW,EACX,QAAQ,EACR,eAAe,CAChB,CAAC;IAEF,IAAA,4BAAgB,EACd,IAAI,EACJ,EAAE,CAAC,gBAAgB,CACjB,aAAa,EACb,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,EACjC,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,EACD,aAAa,EACb,iBAAiB,EACjB,QAAQ,OAAO,UAAU,CAC1B,CAAC;AACJ,CAAC;AArCD,sDAqCC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"update-component-template.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-component-template.ts"],"names":[],"mappings":";;;AAGA,iCAAiC;AACjC,uEAA2E;AAC3E,kEAAmF;AAEnF,mDAAmD;AAEnD,SAAgB,uBAAuB,CAAC,IAAU,EAAE,OAAyB;IAC3E,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO;QAC7B,CAAC,CAAC,GAAG,gCAAgB,CAAC,IAAI,mCAAmC;QAC7D,CAAC,CAAC,gCAAgB,CAAC,IAAI,CAAC;IAE1B,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;QAC3B,IAAI,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,cAAc,6BAA6B,EAAE,OAAO,CAAC,CAAC;QAE5E,OAAO;KACR;IAED,0BAA0B;IAC1B,MAAM,aAAa,GAAG,GAAG,OAAO,CAAC,cAAc,2BAA2B,CAAC;IAC3E,MAAM,iBAAiB,GAAG,IAAA,yCAA6B,EACrD,IAAI,EACJ,aAAa,EACb,WAAW,EACX,UAAU,EACV,eAAe,CAChB,CAAC;IAEF,IAAA,4BAAgB,EACd,IAAI,EACJ,EAAE,CAAC,gBAAgB,CACjB,aAAa,EACb,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,EACjC,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,EACD,aAAa,EACb,iBAAiB,EACjB,OAAO,gCAAgB,CAAC,IAAI,MAAM,CACnC,CAAC;AACJ,CAAC;AAjCD,0DAiCC"}
|