@nrwl/angular 15.8.0-beta.2 → 15.8.0-beta.3
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/package.json +9 -9
- package/src/generators/application/angular-v14/lib/convert-to-standalone-app.js +3 -0
- package/src/generators/application/angular-v14/lib/convert-to-standalone-app.js.map +1 -1
- package/src/generators/application/lib/convert-to-standalone-app.js +3 -0
- package/src/generators/application/lib/convert-to-standalone-app.js.map +1 -1
- package/src/generators/application/lib/root-router-config.js +2 -1
- package/src/generators/application/lib/root-router-config.js.map +1 -1
- package/src/generators/application/lib/update-app-component-template.js +2 -1
- package/src/generators/application/lib/update-app-component-template.js.map +1 -1
- package/src/generators/application/lib/update-component-spec.js +2 -1
- package/src/generators/application/lib/update-component-spec.js.map +1 -1
- package/src/generators/application/lib/update-nx-component-template.js +2 -1
- package/src/generators/application/lib/update-nx-component-template.js.map +1 -1
- package/src/generators/component/lib/entry-point.js +2 -0
- package/src/generators/component/lib/entry-point.js.map +1 -1
- package/src/generators/convert-to-with-mf/lib/check-name-matches.js +2 -0
- package/src/generators/convert-to-with-mf/lib/check-name-matches.js.map +1 -1
- package/src/generators/convert-to-with-mf/lib/check-shared-npm-packages.js +2 -0
- package/src/generators/convert-to-with-mf/lib/check-shared-npm-packages.js.map +1 -1
- package/src/generators/convert-to-with-mf/lib/is-host-remote-config.js +4 -0
- package/src/generators/convert-to-with-mf/lib/is-host-remote-config.js.map +1 -1
- package/src/generators/convert-to-with-mf/lib/parse-ast-webpack-config.js +2 -0
- package/src/generators/convert-to-with-mf/lib/parse-ast-webpack-config.js.map +1 -1
- package/src/generators/init/angular-v14/init.js +34 -23
- package/src/generators/init/angular-v14/init.js.map +1 -1
- package/src/generators/init/init.js +35 -24
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/karma-project/lib/generate-karma-project-files.js +2 -0
- package/src/generators/karma-project/lib/generate-karma-project-files.js.map +1 -1
- package/src/generators/library/lib/add-children.js +2 -1
- package/src/generators/library/lib/add-children.js.map +1 -1
- package/src/generators/library/lib/add-lazy-loaded-router-configuration.js +2 -1
- package/src/generators/library/lib/add-lazy-loaded-router-configuration.js.map +1 -1
- package/src/generators/library/lib/add-load-children.js +2 -1
- package/src/generators/library/lib/add-load-children.js.map +1 -1
- package/src/generators/library/lib/add-router-configuration.js +2 -1
- package/src/generators/library/lib/add-router-configuration.js.map +1 -1
- package/src/generators/ng-add/migrators/projects/e2e.migrator.js +3 -0
- package/src/generators/ng-add/migrators/projects/e2e.migrator.js.map +1 -1
- package/src/generators/setup-mf/lib/add-remote-to-host.js +2 -1
- package/src/generators/setup-mf/lib/add-remote-to-host.js.map +1 -1
- package/src/generators/setup-ssr/lib/update-app-module.js +2 -0
- package/src/generators/setup-ssr/lib/update-app-module.js.map +1 -1
- package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js +1 -2
- package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js.map +1 -1
- package/src/generators/utils/storybook-ast/module-info.js +2 -0
- package/src/generators/utils/storybook-ast/module-info.js.map +1 -1
- package/src/utils/nx-devkit/ast-utils.js +13 -11
- package/src/utils/nx-devkit/ast-utils.js.map +1 -1
- package/src/utils/nx-devkit/route-utils.js +4 -1
- package/src/utils/nx-devkit/route-utils.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "15.8.0-beta.
|
|
3
|
+
"version": "15.8.0-beta.3",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Cypress, Karma, and Protractor. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
|
|
6
6
|
"repository": {
|
|
@@ -63,13 +63,13 @@
|
|
|
63
63
|
"migrations": "./migrations.json"
|
|
64
64
|
},
|
|
65
65
|
"dependencies": {
|
|
66
|
-
"@nrwl/cypress": "15.8.0-beta.
|
|
67
|
-
"@nrwl/devkit": "15.8.0-beta.
|
|
68
|
-
"@nrwl/jest": "15.8.0-beta.
|
|
69
|
-
"@nrwl/js": "15.8.0-beta.
|
|
70
|
-
"@nrwl/linter": "15.8.0-beta.
|
|
71
|
-
"@nrwl/webpack": "15.8.0-beta.
|
|
72
|
-
"@nrwl/workspace": "15.8.0-beta.
|
|
66
|
+
"@nrwl/cypress": "15.8.0-beta.3",
|
|
67
|
+
"@nrwl/devkit": "15.8.0-beta.3",
|
|
68
|
+
"@nrwl/jest": "15.8.0-beta.3",
|
|
69
|
+
"@nrwl/js": "15.8.0-beta.3",
|
|
70
|
+
"@nrwl/linter": "15.8.0-beta.3",
|
|
71
|
+
"@nrwl/webpack": "15.8.0-beta.3",
|
|
72
|
+
"@nrwl/workspace": "15.8.0-beta.3",
|
|
73
73
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
74
74
|
"chalk": "^4.1.0",
|
|
75
75
|
"chokidar": "^3.5.1",
|
|
@@ -108,5 +108,5 @@
|
|
|
108
108
|
"fesm2015": "fesm2015/nrwl-angular.mjs",
|
|
109
109
|
"typings": "index.d.ts",
|
|
110
110
|
"sideEffects": false,
|
|
111
|
-
"gitHead": "
|
|
111
|
+
"gitHead": "cbf33c478661e0c4f4795f9986a2357b641cc497"
|
|
112
112
|
}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.convertToStandaloneApp = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
5
6
|
function convertToStandaloneApp(tree, options) {
|
|
6
7
|
const pathToAppModule = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/app/app.module.ts');
|
|
7
8
|
updateMainEntrypoint(options, tree, pathToAppModule);
|
|
@@ -15,6 +16,7 @@ exports.convertToStandaloneApp = convertToStandaloneApp;
|
|
|
15
16
|
function updateMainEntrypoint(options, tree, pathToAppModule) {
|
|
16
17
|
let routerModuleSetup;
|
|
17
18
|
if (options.routing) {
|
|
19
|
+
(0, ensure_typescript_1.ensureTypescript)();
|
|
18
20
|
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
19
21
|
const appModuleContents = tree.read(pathToAppModule, 'utf-8');
|
|
20
22
|
const ast = tsquery.ast(appModuleContents);
|
|
@@ -47,6 +49,7 @@ bootstrapApplication(AppComponent${routerModuleSetup
|
|
|
47
49
|
function updateAppComponent(tree, options) {
|
|
48
50
|
const pathToAppComponent = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/app/app.component.ts');
|
|
49
51
|
const appComponentContents = tree.read(pathToAppComponent, 'utf-8');
|
|
52
|
+
(0, ensure_typescript_1.ensureTypescript)();
|
|
50
53
|
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
51
54
|
const ast = tsquery.ast(appComponentContents);
|
|
52
55
|
const COMPONENT_DECORATOR_SELECTOR = 'Decorator > CallExpression:has(Identifier[name=Component]) ObjectLiteralExpression';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert-to-standalone-app.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/application/angular-v14/lib/convert-to-standalone-app.ts"],"names":[],"mappings":";;;AACA,yCAAiD;
|
|
1
|
+
{"version":3,"file":"convert-to-standalone-app.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/application/angular-v14/lib/convert-to-standalone-app.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.convertToStandaloneApp = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
5
6
|
function convertToStandaloneApp(tree, options) {
|
|
6
7
|
const pathToAppModule = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/app/app.module.ts');
|
|
7
8
|
updateMainEntrypoint(options, tree, pathToAppModule);
|
|
@@ -13,6 +14,7 @@ function convertToStandaloneApp(tree, options) {
|
|
|
13
14
|
}
|
|
14
15
|
exports.convertToStandaloneApp = convertToStandaloneApp;
|
|
15
16
|
function updateMainEntrypoint(options, tree, pathToAppModule) {
|
|
17
|
+
(0, ensure_typescript_1.ensureTypescript)();
|
|
16
18
|
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
17
19
|
let routerModuleSetup;
|
|
18
20
|
if (options.routing) {
|
|
@@ -41,6 +43,7 @@ bootstrapApplication(AppComponent${routerModuleSetup
|
|
|
41
43
|
}`
|
|
42
44
|
: ''}).catch((err) => console.error(err));`;
|
|
43
45
|
function updateAppComponent(tree, options) {
|
|
46
|
+
(0, ensure_typescript_1.ensureTypescript)();
|
|
44
47
|
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
45
48
|
const pathToAppComponent = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/app/app.component.ts');
|
|
46
49
|
const appComponentContents = tree.read(pathToAppComponent, 'utf-8');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert-to-standalone-app.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/convert-to-standalone-app.ts"],"names":[],"mappings":";;;AACA,yCAAiD;
|
|
1
|
+
{"version":3,"file":"convert-to-standalone-app.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/convert-to-standalone-app.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,12 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.addRouterRootConfiguration = void 0;
|
|
4
4
|
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
5
5
|
const ast_utils_2 = require("../../../utils/nx-devkit/ast-utils");
|
|
6
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
6
7
|
let tsModule;
|
|
7
8
|
function addRouterRootConfiguration(host, options) {
|
|
8
9
|
const modulePath = `${options.appProjectRoot}/src/app/app.module.ts`;
|
|
9
10
|
const moduleSource = host.read(modulePath, 'utf-8');
|
|
10
11
|
if (!tsModule) {
|
|
11
|
-
tsModule =
|
|
12
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
12
13
|
}
|
|
13
14
|
let sourceFile = tsModule.createSourceFile(modulePath, moduleSource, tsModule.ScriptTarget.Latest, true);
|
|
14
15
|
sourceFile = (0, ast_utils_1.insertImport)(host, sourceFile, modulePath, 'RouterModule', '@angular/router');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"root-router-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/root-router-config.ts"],"names":[],"mappings":";;;AAGA,uEAAuE;AACvE,kEAAuE;
|
|
1
|
+
{"version":3,"file":"root-router-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/root-router-config.ts"],"names":[],"mappings":";;;AAGA,uEAAuE;AACvE,kEAAuE;AACvE,uFAAmF;AAEnF,IAAI,QAAqC,CAAC;AAE1C,SAAgB,0BAA0B,CACxC,IAAU,EACV,OAAyB;IAEzB,MAAM,UAAU,GAAG,GAAG,OAAO,CAAC,cAAc,wBAAwB,CAAC;IACrE,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAEpD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IACD,IAAI,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CACxC,UAAU,EACV,YAAY,EACZ,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IAEF,UAAU,GAAG,IAAA,wBAAY,EACvB,IAAI,EACJ,UAAU,EACV,UAAU,EACV,cAAc,EACd,iBAAiB,CAClB,CAAC;IACF,UAAU,GAAG,IAAA,wBAAY,EACvB,IAAI,EACJ,UAAU,EACV,UAAU,EACV,WAAW,EACX,cAAc,CACf,CAAC;IACF,UAAU,GAAG,IAAA,6BAAiB,EAC5B,IAAI,EACJ,UAAU,EACV,UAAU,EACV,yEAAyE,CAC1E,CAAC;AACJ,CAAC;AArCD,gEAqCC"}
|
|
@@ -5,11 +5,12 @@ const tslib_1 = require("tslib");
|
|
|
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
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
8
9
|
let tsModule;
|
|
9
10
|
function updateAppComponentTemplate(host, options) {
|
|
10
11
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
12
|
if (!tsModule) {
|
|
12
|
-
tsModule =
|
|
13
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
13
14
|
}
|
|
14
15
|
const content = options.routing
|
|
15
16
|
? `${nrwl_home_tpl_1.nrwlHomeTemplate.getSelector(options.prefix)}\n<router-outlet></router-outlet>`
|
|
@@ -1 +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,uEAA2E;AAC3E,kEAAmF;AAEnF,mDAAmD;
|
|
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,uEAA2E;AAC3E,kEAAmF;AAEnF,mDAAmD;AACnD,uFAAmF;AAEnF,IAAI,QAAqC,CAAC;AAE1C,SAAsB,0BAA0B,CAC9C,IAAU,EACV,OAAyB;;QAEzB,IAAI,CAAC,QAAQ,EAAE;YACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;SAC/B;QAED,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO;YAC7B,CAAC,CAAC,GAAG,gCAAgB,CAAC,WAAW,CAC7B,OAAO,CAAC,MAAM,CACf,mCAAmC;YACtC,CAAC,CAAC,gCAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAEjD,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;YAC3B,IAAI,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,cAAc,6BAA6B,EAAE,OAAO,CAAC,CAAC;YAE5E,OAAO;SACR;QAED,0BAA0B;QAC1B,MAAM,aAAa,GAAG,GAAG,OAAO,CAAC,cAAc,2BAA2B,CAAC;QAC3E,MAAM,iBAAiB,GAAG,IAAA,yCAA6B,EACrD,IAAI,EACJ,aAAa,EACb,WAAW,EACX,UAAU,EACV,eAAe,CAChB,CAAC;QAEF,IAAA,4BAAgB,EACd,IAAI,EACJ,QAAQ,CAAC,gBAAgB,CACvB,aAAa,EACb,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,EACjC,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,EACD,aAAa,EACb,iBAAiB,EACjB,OAAO,gCAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAC1D,CAAC;IACJ,CAAC;CAAA;AA1CD,gEA0CC"}
|
|
@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.updateComponentSpec = void 0;
|
|
4
4
|
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
5
5
|
const ast_utils_2 = require("../../../utils/nx-devkit/ast-utils");
|
|
6
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
6
7
|
let tsModule;
|
|
7
8
|
function updateComponentSpec(host, options) {
|
|
8
9
|
if (!tsModule) {
|
|
9
|
-
tsModule =
|
|
10
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
10
11
|
}
|
|
11
12
|
if (options.skipTests !== true) {
|
|
12
13
|
const componentSpecPath = `${options.appProjectRoot}/src/app/app.component.spec.ts`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-component-spec.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-component-spec.ts"],"names":[],"mappings":";;;AACA,uEAAuE;AACvE,kEAG4C;
|
|
1
|
+
{"version":3,"file":"update-component-spec.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-component-spec.ts"],"names":[],"mappings":";;;AACA,uEAAuE;AACvE,kEAG4C;AAE5C,uFAAmF;AAEnF,IAAI,QAAqC,CAAC;AAE1C,SAAgB,mBAAmB,CAAC,IAAU,EAAE,OAAyB;IACvE,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,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,QAAQ,CAAC,gBAAgB,CACrD,iBAAiB,EACjB,mBAAmB,EACnB,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,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;AA7DD,kDA6DC"}
|
|
@@ -4,10 +4,11 @@ exports.updateNxComponentTemplate = void 0;
|
|
|
4
4
|
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
5
5
|
const ast_utils_2 = require("../../../utils/nx-devkit/ast-utils");
|
|
6
6
|
const nrwl_home_tpl_1 = require("./nrwl-home-tpl");
|
|
7
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
7
8
|
let tsModule;
|
|
8
9
|
function updateNxComponentTemplate(host, options) {
|
|
9
10
|
if (!tsModule) {
|
|
10
|
-
tsModule =
|
|
11
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
11
12
|
}
|
|
12
13
|
const componentPath = `${options.appProjectRoot}/src/app/nx-welcome.component.ts`;
|
|
13
14
|
const templateNodeValue = (0, ast_utils_2.getDecoratorPropertyValueNode)(host, componentPath, 'Component', 'template', '@angular/core');
|
|
@@ -1 +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,uEAGiD;AACjD,kEAAmF;AACnF,mDAAmD;
|
|
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,uEAGiD;AACjD,kEAAmF;AACnF,mDAAmD;AACnD,uFAAmF;AAEnF,IAAI,QAAqC,CAAC;AAE1C,SAAgB,yBAAyB,CACvC,IAAU,EACV,OAAyB;IAEzB,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,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,QAAQ,CAAC,gBAAgB,CACvB,aAAa,EACb,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,EACjC,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,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,QAAQ,CAAC,gBAAgB,CACxC,aAAa,EACb,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,EACjC,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,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,QAAQ,CAAC,gBAAgB,CACpC,aAAa,EACb,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,EACjC,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IACF,IAAA,qBAAS,EAAC,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,sBAAsB,CAAC,CAAC;AACrE,CAAC;AA1DD,8DA0DC"}
|
|
@@ -2,10 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.shouldExportInEntryPoint = void 0;
|
|
4
4
|
const path_1 = require("../../utils/path");
|
|
5
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
5
6
|
function shouldExportInEntryPoint(tree, entryPoint, modulePath) {
|
|
6
7
|
if (!modulePath) {
|
|
7
8
|
return false;
|
|
8
9
|
}
|
|
10
|
+
(0, ensure_typescript_1.ensureTypescript)();
|
|
9
11
|
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
10
12
|
const moduleImportPath = (0, path_1.getRelativeImportToFile)(entryPoint, modulePath);
|
|
11
13
|
const entryPointContent = tree.read(entryPoint, 'utf-8');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entry-point.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/entry-point.ts"],"names":[],"mappings":";;;AAEA,2CAA2D;
|
|
1
|
+
{"version":3,"file":"entry-point.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/entry-point.ts"],"names":[],"mappings":";;;AAEA,2CAA2D;AAC3D,uFAAmF;AAEnF,SAAgB,wBAAwB,CACtC,IAAU,EACV,UAAkB,EAClB,UAAkB;IAElB,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,KAAK,CAAC;KACd;IAED,IAAA,oCAAgB,GAAE,CAAC;IACnB,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;IACzD,MAAM,gBAAgB,GAAG,IAAA,8BAAuB,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IACzE,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACzD,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACrD,MAAM,YAAY,GAAG,OAAO,CAC1B,aAAa,EACb,0CAA0C,gBAAgB,IAAI,EAC9D,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAC3B,CAAC,CAAC,CAAkB,CAAC;IAEtB,OAAO,OAAO,CAAC,YAAY,CAAC,CAAC;AAC/B,CAAC;AArBD,4DAqBC"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.checkOutputNameMatchesProjectName = void 0;
|
|
4
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
4
5
|
function checkOutputNameMatchesProjectName(ast, projectName) {
|
|
6
|
+
(0, ensure_typescript_1.ensureTypescript)();
|
|
5
7
|
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
6
8
|
const OUTPUT_SELECTOR = 'PropertyAssignment:has(Identifier[name=output]) > ObjectLiteralExpression:has(PropertyAssignment:has(Identifier[name=uniqueName]))';
|
|
7
9
|
const UNIQUENAME_SELECTOR = 'ObjectLiteralExpression > PropertyAssignment:has(Identifier[name=uniqueName]) > StringLiteral';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check-name-matches.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/check-name-matches.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"check-name-matches.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/check-name-matches.ts"],"names":[],"mappings":";;;AACA,uFAAmF;AAEnF,SAAgB,iCAAiC,CAC/C,GAAe,EACf,WAAmB;IAEnB,IAAA,oCAAgB,GAAE,CAAC;IACnB,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;IACzD,MAAM,eAAe,GACnB,oIAAoI,CAAC;IACvI,MAAM,mBAAmB,GACvB,+FAA+F,CAAC;IAElG,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,eAAe,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9E,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;QAC5B,yFAAyF;QACzF,OAAO,IAAI,CAAC;KACb;IAED,MAAM,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE;QACnE,gBAAgB,EAAE,IAAI;KACvB,CAAC,CAAC;IACH,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE;QAChC,4FAA4F;QAC5F,OAAO,IAAI,CAAC;KACb;IACD,MAAM,UAAU,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAElE,OAAO,UAAU,KAAK,WAAW,CAAC;AACpC,CAAC;AA3BD,8EA2BC"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.checkSharedNpmPackagesMatchExpected = void 0;
|
|
4
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
4
5
|
function checkSharedNpmPackagesMatchExpected(ast) {
|
|
6
|
+
(0, ensure_typescript_1.ensureTypescript)();
|
|
5
7
|
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
6
8
|
const SHARE_HELPER_SELECTOR = 'PropertyAssignment:has(Identifier[name=shared]) > CallExpression:has(Identifier[name=share])';
|
|
7
9
|
const SHARED_PACKAGE_CONFIG_SELECTOR = 'ObjectLiteralExpression > PropertyAssignment > ObjectLiteralExpression';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check-shared-npm-packages.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/check-shared-npm-packages.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"check-shared-npm-packages.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/check-shared-npm-packages.ts"],"names":[],"mappings":";;;AACA,uFAAmF;AAEnF,SAAgB,mCAAmC,CAAC,GAAe;IACjE,IAAA,oCAAgB,GAAE,CAAC;IACnB,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;IACzD,MAAM,qBAAqB,GACzB,8FAA8F,CAAC;IACjG,MAAM,8BAA8B,GAClC,wEAAwE,CAAC;IAE3E,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,EAAE,qBAAqB,EAAE;QAC3D,gBAAgB,EAAE,IAAI;KACvB,CAAC,CAAC;IAEH,IAAI,wBAAgC,CAAC;IACrC,IAAI,eAAe,GAAa,EAAE,CAAC;IACnC,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;QACjC,mFAAmF;QACnF,MAAM,sBAAsB,GAC1B,2EAA2E,CAAC;QAC9E,MAAM,iBAAiB,GAAG,OAAO,CAAC,GAAG,EAAE,sBAAsB,EAAE;YAC7D,gBAAgB,EAAE,IAAI;SACvB,CAAC,CAAC;QAEH,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE;YAClC,kDAAkD;YAClD,OAAO,IAAI,CAAC;SACb;QAED,wBAAwB,GAAG,OAAO,CAChC,iBAAiB,CAAC,CAAC,CAAC,EACpB,8BAA8B,EAC9B,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAC3B,CAAC;QAEF,eAAe,GAAG,CAAC,iBAAiB,EAAE,qBAAqB,CAAC,CAAC;KAC9D;SAAM;QACL,wBAAwB,GAAG,OAAO,CAChC,gBAAgB,CAAC,CAAC,CAAC,EACnB,8BAA8B,EAC9B,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAC3B,CAAC;QAEF,eAAe,GAAG;YAChB,iBAAiB;YACjB,qBAAqB;YACrB,yBAAyB;SAC1B,CAAC;KACH;IAED,IAAI,wBAAwB,CAAC,MAAM,KAAK,CAAC,EAAE;QACzC,4EAA4E;QAC5E,OAAO,IAAI,CAAC;KACb;IAED,IAAI,aAAa,GAAG,IAAI,CAAC;IACzB,KAAK,MAAM,UAAU,IAAI,wBAAwB,EAAE;QACjD,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;QACxC,aAAa,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,CAChD,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAC7B,CAAC;QAEF,IAAI,CAAC,aAAa,EAAE;YAClB,MAAM;SACP;KACF;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAlED,kFAkEC"}
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getExposedModulesFromRemote = exports.getRemotesFromHost = exports.isHostRemoteConfig = void 0;
|
|
4
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
4
5
|
const REMOTES_EXPRESSION_SELECTOR = 'PropertyAssignment:has(Identifier[name=remotes]) > ObjectLiteralExpression';
|
|
5
6
|
const EXPOSES_EXPRESSION_SELECTOR = 'PropertyAssignment:has(Identifier[name=exposes]) > ObjectLiteralExpression';
|
|
6
7
|
const PROPERTY_SELECTOR = 'ObjectLiteralExpression > PropertyAssignment';
|
|
7
8
|
function isHostRemoteConfig(ast) {
|
|
8
9
|
let isHost = false;
|
|
9
10
|
let isRemote = false;
|
|
11
|
+
(0, ensure_typescript_1.ensureTypescript)();
|
|
10
12
|
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
11
13
|
const remotesNodes = tsquery(ast, REMOTES_EXPRESSION_SELECTOR, {
|
|
12
14
|
visitAllChildren: true,
|
|
@@ -25,6 +27,7 @@ function isHostRemoteConfig(ast) {
|
|
|
25
27
|
}
|
|
26
28
|
exports.isHostRemoteConfig = isHostRemoteConfig;
|
|
27
29
|
function getRemotesFromHost(ast) {
|
|
30
|
+
(0, ensure_typescript_1.ensureTypescript)();
|
|
28
31
|
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
29
32
|
const remotesObjectNodes = tsquery(ast, REMOTES_EXPRESSION_SELECTOR, {
|
|
30
33
|
visitAllChildren: true,
|
|
@@ -52,6 +55,7 @@ function getRemotesFromHost(ast) {
|
|
|
52
55
|
}
|
|
53
56
|
exports.getRemotesFromHost = getRemotesFromHost;
|
|
54
57
|
function getExposedModulesFromRemote(ast) {
|
|
58
|
+
(0, ensure_typescript_1.ensureTypescript)();
|
|
55
59
|
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
56
60
|
const exposesObjectNodes = tsquery(ast, EXPOSES_EXPRESSION_SELECTOR, {
|
|
57
61
|
visitAllChildren: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"is-host-remote-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/is-host-remote-config.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"is-host-remote-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/is-host-remote-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.parseASTOfWebpackConfig = void 0;
|
|
4
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
4
5
|
function parseASTOfWebpackConfig(tree, pathToWebpackConfig) {
|
|
5
6
|
if (!tree.exists(pathToWebpackConfig)) {
|
|
6
7
|
throw new Error(`Cannot migrate webpack config at \`${pathToWebpackConfig}\` as it does not exist. Please ensure this file exists and that the path to the file is correct.`);
|
|
7
8
|
}
|
|
9
|
+
(0, ensure_typescript_1.ensureTypescript)();
|
|
8
10
|
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
9
11
|
const source = tree.read(pathToWebpackConfig, 'utf-8');
|
|
10
12
|
return tsquery.ast(source);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-ast-webpack-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/parse-ast-webpack-config.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"parse-ast-webpack-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/parse-ast-webpack-config.ts"],"names":[],"mappings":";;;AACA,uFAAmF;AAEnF,SAAgB,uBAAuB,CACrC,IAAU,EACV,mBAA2B;IAE3B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE;QACrC,MAAM,IAAI,KAAK,CACb,sCAAsC,mBAAmB,mGAAmG,CAC7J,CAAC;KACH;IACD,IAAA,oCAAgB,GAAE,CAAC;IACnB,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;IAEzD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;IACvD,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AAC7B,CAAC;AAdD,0DAcC"}
|
|
@@ -16,7 +16,6 @@ function angularInitGenerator(host, rawOptions) {
|
|
|
16
16
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
17
17
|
const options = normalizeOptions(rawOptions);
|
|
18
18
|
setDefaults(host, options);
|
|
19
|
-
yield (0, js_1.initGenerator)(host, Object.assign(Object.assign({}, options), { tsConfigName: options.rootProject ? 'tsconfig.json' : 'tsconfig.base.json', js: false, skipFormat: true }));
|
|
20
19
|
const tasks = [];
|
|
21
20
|
const peerDepsToInstall = [
|
|
22
21
|
'@angular-devkit/core',
|
|
@@ -29,15 +28,25 @@ function angularInitGenerator(host, rawOptions) {
|
|
|
29
28
|
const packageVersion = (0, version_utils_1.getInstalledPackageVersion)(host, pkg);
|
|
30
29
|
if (!packageVersion) {
|
|
31
30
|
devkitVersion !== null && devkitVersion !== void 0 ? devkitVersion : (devkitVersion = (_a = (0, version_utils_1.getInstalledPackageVersion)(host, '@angular-devkit/build-angular')) !== null && _a !== void 0 ? _a : backward_compatible_versions_1.backwardCompatibleVersions.angularV14.angularDevkitVersion);
|
|
32
|
-
|
|
31
|
+
try {
|
|
32
|
+
(0, devkit_1.ensurePackage)(pkg, devkitVersion);
|
|
33
|
+
}
|
|
34
|
+
catch (_b) {
|
|
35
|
+
// @schematics/angular cannot be required so this fails but this will still allow wrapping the schematic later on
|
|
36
|
+
}
|
|
37
|
+
if (!options.skipPackageJson) {
|
|
38
|
+
tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, {}, { [pkg]: devkitVersion }));
|
|
39
|
+
}
|
|
33
40
|
}
|
|
34
41
|
});
|
|
42
|
+
const jsTask = yield (0, js_1.initGenerator)(host, Object.assign(Object.assign({}, options), { js: false, tsConfigName: options.rootProject ? 'tsconfig.json' : 'tsconfig.base.json', skipFormat: true }));
|
|
43
|
+
tasks.push(jsTask);
|
|
35
44
|
if (!options.skipPackageJson) {
|
|
36
45
|
tasks.push(updateDependencies(host));
|
|
37
46
|
}
|
|
38
47
|
const unitTestTask = yield addUnitTestRunner(host, options);
|
|
39
48
|
tasks.push(unitTestTask);
|
|
40
|
-
const e2eTask = addE2ETestRunner(host, options);
|
|
49
|
+
const e2eTask = yield addE2ETestRunner(host, options);
|
|
41
50
|
tasks.push(e2eTask);
|
|
42
51
|
addGitIgnoreEntry(host, '.angular');
|
|
43
52
|
if (!options.skipFormat) {
|
|
@@ -113,26 +122,28 @@ function addUnitTestRunner(tree, options) {
|
|
|
113
122
|
});
|
|
114
123
|
}
|
|
115
124
|
function addE2ETestRunner(tree, options) {
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
.
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
125
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
126
|
+
switch (options.e2eTestRunner) {
|
|
127
|
+
case test_runners_1.E2eTestRunner.Protractor:
|
|
128
|
+
return !options.skipPackageJson
|
|
129
|
+
? (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {}, {
|
|
130
|
+
protractor: backward_compatible_versions_1.backwardCompatibleVersions.angularV14.protractorVersion,
|
|
131
|
+
'jasmine-core': backward_compatible_versions_1.backwardCompatibleVersions.angularV14.jasmineCoreVersion,
|
|
132
|
+
'jasmine-spec-reporter': backward_compatible_versions_1.backwardCompatibleVersions.angularV14
|
|
133
|
+
.jasmineSpecReporterVersion,
|
|
134
|
+
'ts-node': backward_compatible_versions_1.backwardCompatibleVersions.angularV14.tsNodeVersion,
|
|
135
|
+
'@types/jasmine': backward_compatible_versions_1.backwardCompatibleVersions.angularV14.typesJasmineVersion,
|
|
136
|
+
'@types/jasminewd2': backward_compatible_versions_1.backwardCompatibleVersions.angularV14.typesJasminewd2Version,
|
|
137
|
+
})
|
|
138
|
+
: () => { };
|
|
139
|
+
case test_runners_1.E2eTestRunner.Cypress:
|
|
140
|
+
return yield (0, cypress_1.cypressInitGenerator)(tree, {
|
|
141
|
+
skipPackageJson: options.skipPackageJson,
|
|
142
|
+
});
|
|
143
|
+
default:
|
|
144
|
+
return () => { };
|
|
145
|
+
}
|
|
146
|
+
});
|
|
136
147
|
}
|
|
137
148
|
function addGitIgnoreEntry(host, entry) {
|
|
138
149
|
if (host.exists('.gitignore')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/init/angular-v14/init.ts"],"names":[],"mappings":";;;;AAAA,2CAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/init/angular-v14/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,8 @@ function angularInitGenerator(tree, rawOptions) {
|
|
|
22
22
|
yield previousGenerator.default(tree, rawOptions);
|
|
23
23
|
return;
|
|
24
24
|
}
|
|
25
|
+
const tasks = [];
|
|
26
|
+
const options = normalizeOptions(rawOptions);
|
|
25
27
|
const peerDepsToInstall = [
|
|
26
28
|
'@angular-devkit/core',
|
|
27
29
|
'@angular-devkit/schematics',
|
|
@@ -33,19 +35,26 @@ function angularInitGenerator(tree, rawOptions) {
|
|
|
33
35
|
const packageVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, pkg);
|
|
34
36
|
if (!packageVersion) {
|
|
35
37
|
devkitVersion !== null && devkitVersion !== void 0 ? devkitVersion : (devkitVersion = (_a = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular')) !== null && _a !== void 0 ? _a : versions_1.angularDevkitVersion);
|
|
36
|
-
|
|
38
|
+
try {
|
|
39
|
+
(0, devkit_1.ensurePackage)(pkg, devkitVersion);
|
|
40
|
+
}
|
|
41
|
+
catch (_b) {
|
|
42
|
+
// @schematics/angular cannot be required so this fails but this will still allow wrapping the schematic later on
|
|
43
|
+
}
|
|
44
|
+
if (!options.skipPackageJson) {
|
|
45
|
+
tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, { [pkg]: devkitVersion }));
|
|
46
|
+
}
|
|
37
47
|
}
|
|
38
48
|
});
|
|
39
|
-
const options = normalizeOptions(rawOptions);
|
|
40
49
|
setDefaults(tree, options);
|
|
41
|
-
yield (0, js_1.initGenerator)(tree, Object.assign(Object.assign({}, options), { tsConfigName: options.rootProject ? 'tsconfig.json' : 'tsconfig.base.json', js: false, skipFormat: true }));
|
|
42
|
-
|
|
50
|
+
const jsTask = yield (0, js_1.initGenerator)(tree, Object.assign(Object.assign({}, options), { tsConfigName: options.rootProject ? 'tsconfig.json' : 'tsconfig.base.json', js: false, skipFormat: true }));
|
|
51
|
+
tasks.push(jsTask);
|
|
43
52
|
if (!options.skipPackageJson) {
|
|
44
53
|
tasks.push(updateDependencies(tree));
|
|
45
54
|
}
|
|
46
55
|
const unitTestTask = yield addUnitTestRunner(tree, options);
|
|
47
56
|
tasks.push(unitTestTask);
|
|
48
|
-
const e2eTask = addE2ETestRunner(tree, options);
|
|
57
|
+
const e2eTask = yield addE2ETestRunner(tree, options);
|
|
49
58
|
tasks.push(e2eTask);
|
|
50
59
|
addGitIgnoreEntry(tree, '.angular');
|
|
51
60
|
if (!options.skipFormat) {
|
|
@@ -121,25 +130,27 @@ function addUnitTestRunner(tree, options) {
|
|
|
121
130
|
});
|
|
122
131
|
}
|
|
123
132
|
function addE2ETestRunner(tree, options) {
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
133
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
134
|
+
switch (options.e2eTestRunner) {
|
|
135
|
+
case test_runners_1.E2eTestRunner.Protractor:
|
|
136
|
+
return !options.skipPackageJson
|
|
137
|
+
? (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {}, {
|
|
138
|
+
protractor: versions_1.protractorVersion,
|
|
139
|
+
'jasmine-core': versions_1.jasmineCoreVersion,
|
|
140
|
+
'jasmine-spec-reporter': versions_1.jasmineSpecReporterVersion,
|
|
141
|
+
'ts-node': versions_1.tsNodeVersion,
|
|
142
|
+
'@types/jasmine': versions_1.typesJasmineVersion,
|
|
143
|
+
'@types/jasminewd2': versions_1.typesJasminewd2Version,
|
|
144
|
+
})
|
|
145
|
+
: () => { };
|
|
146
|
+
case test_runners_1.E2eTestRunner.Cypress:
|
|
147
|
+
return (0, cypress_1.cypressInitGenerator)(tree, {
|
|
148
|
+
skipPackageJson: options.skipPackageJson,
|
|
149
|
+
});
|
|
150
|
+
default:
|
|
151
|
+
return () => { };
|
|
152
|
+
}
|
|
153
|
+
});
|
|
143
154
|
}
|
|
144
155
|
function addGitIgnoreEntry(host, entry) {
|
|
145
156
|
if (host.exists('.gitignore')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,2CAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ exports.generateKarmaProjectFiles = void 0;
|
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const version_utils_1 = require("../../utils/version-utils");
|
|
6
6
|
const v14_test_file_1 = require("./v14-test-file");
|
|
7
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
7
8
|
function generateKarmaProjectFiles(tree, project) {
|
|
8
9
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
|
|
9
10
|
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'common'), projectConfig.root, {
|
|
@@ -44,6 +45,7 @@ function isUsingConfigSetInBaseKarmaConfig(tree) {
|
|
|
44
45
|
if (!tree.exists('karma.conf.js')) {
|
|
45
46
|
return false;
|
|
46
47
|
}
|
|
48
|
+
(0, ensure_typescript_1.ensureTypescript)();
|
|
47
49
|
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
48
50
|
const CONFIG_SET_SELECTOR = 'PropertyAccessExpression:has(Identifier[name=config], Identifier[name=set])';
|
|
49
51
|
const ast = tsquery.ast(tree.read('karma.conf.js', 'utf-8'));
|