@nrwl/angular 15.7.1 → 15.8.0-beta.1
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 -8
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js +14 -1
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -1
- package/src/builders/module-federation-dev-server/schema.d.ts +1 -0
- package/src/builders/module-federation-dev-server/schema.json +4 -0
- package/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.js +13 -1
- package/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.js.map +1 -1
- package/src/builders/module-federation-dev-ssr/schema.d.ts +1 -0
- package/src/builders/module-federation-dev-ssr/schema.json +4 -0
- package/src/builders/utilities/module-federation.d.ts +1 -1
- package/src/builders/utilities/module-federation.js +5 -6
- package/src/builders/utilities/module-federation.js.map +1 -1
- package/src/generators/application/angular-v14/lib/convert-to-standalone-app.js +6 -5
- package/src/generators/application/angular-v14/lib/convert-to-standalone-app.js.map +1 -1
- package/src/generators/application/angular-v14/lib/create-files.js.map +1 -1
- package/src/generators/application/angular-v14/lib/update-component-spec.js +5 -2
- package/src/generators/application/angular-v14/lib/update-component-spec.js.map +1 -1
- package/src/generators/application/angular-v14/lib/update-config-files.js +2 -2
- package/src/generators/application/angular-v14/lib/update-config-files.js.map +1 -1
- package/src/generators/application/angular-v14/lib/update-e2e-project.js +2 -2
- package/src/generators/application/angular-v14/lib/update-e2e-project.js.map +1 -1
- package/src/generators/application/application.d.ts +2 -2
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/lib/convert-to-standalone-app.js +6 -5
- package/src/generators/application/lib/convert-to-standalone-app.js.map +1 -1
- package/src/generators/application/lib/create-files.js +2 -2
- package/src/generators/application/lib/create-files.js.map +1 -1
- package/src/generators/application/lib/root-router-config.js +5 -2
- package/src/generators/application/lib/root-router-config.js.map +1 -1
- package/src/generators/application/lib/update-app-component-template.d.ts +1 -1
- package/src/generators/application/lib/update-app-component-template.js +18 -12
- package/src/generators/application/lib/update-app-component-template.js.map +1 -1
- package/src/generators/application/lib/update-component-spec.js +5 -2
- package/src/generators/application/lib/update-component-spec.js.map +1 -1
- package/src/generators/application/lib/update-config-files.js +2 -2
- package/src/generators/application/lib/update-config-files.js.map +1 -1
- package/src/generators/application/lib/update-e2e-project.js +2 -2
- package/src/generators/application/lib/update-e2e-project.js.map +1 -1
- package/src/generators/application/lib/update-nx-component-template.js +7 -4
- package/src/generators/application/lib/update-nx-component-template.js.map +1 -1
- package/src/generators/change-storybook-targets/change-storybook-targets.js +1 -1
- package/src/generators/change-storybook-targets/change-storybook-targets.js.map +1 -1
- package/src/generators/component/lib/entry-point.js +3 -3
- package/src/generators/component/lib/entry-point.js.map +1 -1
- package/src/generators/convert-to-with-mf/lib/check-name-matches.js +3 -3
- 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 +5 -5
- 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.d.ts +1 -1
- package/src/generators/convert-to-with-mf/lib/is-host-remote-config.js +8 -6
- 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.d.ts +1 -1
- package/src/generators/convert-to-with-mf/lib/parse-ast-webpack-config.js +2 -2
- package/src/generators/convert-to-with-mf/lib/parse-ast-webpack-config.js.map +1 -1
- package/src/generators/init/angular-v14/init.js +12 -4
- package/src/generators/init/angular-v14/init.js.map +1 -1
- package/src/generators/init/init.js +12 -4
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/karma-project/lib/generate-karma-project-files.js +3 -3
- package/src/generators/karma-project/lib/generate-karma-project-files.js.map +1 -1
- package/src/generators/library/lib/add-children.js +5 -2
- package/src/generators/library/lib/add-children.js.map +1 -1
- package/src/generators/library/lib/add-lazy-loaded-router-configuration.js +5 -2
- package/src/generators/library/lib/add-lazy-loaded-router-configuration.js.map +1 -1
- package/src/generators/library/lib/add-load-children.js +5 -2
- package/src/generators/library/lib/add-load-children.js.map +1 -1
- package/src/generators/library/lib/add-router-configuration.js +5 -2
- package/src/generators/library/lib/add-router-configuration.js.map +1 -1
- package/src/generators/library/lib/update-project.js +2 -2
- package/src/generators/library/lib/update-project.js.map +1 -1
- package/src/generators/library/lib/update-tsconfig.js +2 -17
- package/src/generators/library/lib/update-tsconfig.js.map +1 -1
- package/src/generators/library/library.d.ts +2 -2
- package/src/generators/library/library.js +5 -3
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library-secondary-entry-point/lib/add-path-mapping.js +2 -2
- package/src/generators/library-secondary-entry-point/lib/add-path-mapping.js.map +1 -1
- package/src/generators/ng-add/migrators/builders/angular-devkit-karma.migrator.js +2 -2
- package/src/generators/ng-add/migrators/builders/angular-devkit-karma.migrator.js.map +1 -1
- package/src/generators/ng-add/migrators/builders/angular-devkit-ng-packagr.migrator.js +2 -2
- package/src/generators/ng-add/migrators/builders/angular-devkit-ng-packagr.migrator.js.map +1 -1
- package/src/generators/ng-add/migrators/projects/app.migrator.js +2 -2
- package/src/generators/ng-add/migrators/projects/app.migrator.js.map +1 -1
- package/src/generators/ng-add/migrators/projects/e2e.migrator.js +21 -20
- package/src/generators/ng-add/migrators/projects/e2e.migrator.js.map +1 -1
- package/src/generators/ng-add/utilities/workspace.js +3 -3
- package/src/generators/ng-add/utilities/workspace.js.map +1 -1
- package/src/generators/setup-mf/lib/add-remote-to-host.js +5 -2
- package/src/generators/setup-mf/lib/add-remote-to-host.js.map +1 -1
- package/src/generators/setup-ssr/lib/update-app-module.js +3 -3
- package/src/generators/setup-ssr/lib/update-app-module.js.map +1 -1
- package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js +1 -1
- package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js.map +1 -1
- package/src/generators/utils/create-ts-config.d.ts +1 -1
- package/src/generators/utils/create-ts-config.js +4 -4
- package/src/generators/utils/create-ts-config.js.map +1 -1
- package/src/generators/utils/storybook-ast/module-info.js +3 -3
- package/src/generators/utils/storybook-ast/module-info.js.map +1 -1
- package/src/generators/web-worker/lib/update-tsconfig.js +2 -2
- package/src/generators/web-worker/lib/update-tsconfig.js.map +1 -1
- package/src/utils/nx-devkit/ast-utils.d.ts +1 -1
- package/src/utils/nx-devkit/ast-utils.js +78 -43
- package/src/utils/nx-devkit/ast-utils.js.map +1 -1
- package/src/utils/nx-devkit/route-utils.js +14 -10
- package/src/utils/nx-devkit/route-utils.js.map +1 -1
- package/src/utils/versions.d.ts +1 -1
- package/src/utils/versions.js +1 -1
|
@@ -1,14 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateComponentSpec = void 0;
|
|
4
|
-
const ts = require("typescript");
|
|
5
4
|
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
6
5
|
const ast_utils_2 = require("../../../utils/nx-devkit/ast-utils");
|
|
6
|
+
let tsModule;
|
|
7
7
|
function updateComponentSpec(host, options) {
|
|
8
|
+
if (!tsModule) {
|
|
9
|
+
tsModule = require('typescript');
|
|
10
|
+
}
|
|
8
11
|
if (options.skipTests !== true) {
|
|
9
12
|
const componentSpecPath = `${options.appProjectRoot}/src/app/app.component.spec.ts`;
|
|
10
13
|
const componentSpecSource = host.read(componentSpecPath, 'utf-8');
|
|
11
|
-
let componentSpecSourceFile =
|
|
14
|
+
let componentSpecSourceFile = tsModule.createSourceFile(componentSpecPath, componentSpecSource, tsModule.ScriptTarget.Latest, true);
|
|
12
15
|
host.write(componentSpecPath, componentSpecSource
|
|
13
16
|
.replace('.content span', 'h1')
|
|
14
17
|
.replace(`${options.name} app is running!`, `Welcome ${options.name}`));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-component-spec.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-component-spec.ts"],"names":[],"mappings":";;;
|
|
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;AAG5C,IAAI,QAAqC,CAAC;AAE1C,SAAgB,mBAAmB,CAAC,IAAU,EAAE,OAAyB;IACvE,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;KAClC;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,9 +4,9 @@ exports.updateConfigFiles = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const cli_config_utils_1 = require("@nrwl/workspace/src/utils/cli-config-utils");
|
|
7
|
+
const js_1 = require("@nrwl/js");
|
|
7
8
|
const test_runners_1 = require("../../../utils/test-runners");
|
|
8
9
|
const create_ts_config_1 = require("../../utils/create-ts-config");
|
|
9
|
-
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
10
10
|
function updateConfigFiles(host, options) {
|
|
11
11
|
updateTsConfigOptions(host, options);
|
|
12
12
|
updateAppAndE2EProjectConfigurations(host, options);
|
|
@@ -23,7 +23,7 @@ function updateTsConfigOptions(host, options) {
|
|
|
23
23
|
]),
|
|
24
24
|
] })));
|
|
25
25
|
// tsconfig.json
|
|
26
|
-
(0, create_ts_config_1.createTsConfig)(host, options.appProjectRoot, 'app', options, (0,
|
|
26
|
+
(0, create_ts_config_1.createTsConfig)(host, options.appProjectRoot, 'app', options, (0, js_1.getRelativePathToRootTsConfig)(host, options.appProjectRoot));
|
|
27
27
|
}
|
|
28
28
|
function updateAppAndE2EProjectConfigurations(host, options) {
|
|
29
29
|
let project = (0, devkit_1.readProjectConfiguration)(host, options.name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-config-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-config-files.ts"],"names":[],"mappings":";;;;AACA,yCAQsB;AACtB,iFAAoF;AACpF,8DAA4E;AAE5E,mEAA8D;
|
|
1
|
+
{"version":3,"file":"update-config-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-config-files.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateE2eProject = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const
|
|
5
|
+
const js_1 = require("@nrwl/js");
|
|
6
6
|
function updateE2eProject(tree, options) {
|
|
7
7
|
const spec = `${options.e2eProjectRoot}/src/app.e2e-spec.ts`;
|
|
8
8
|
const content = tree.read(spec, 'utf-8');
|
|
@@ -33,7 +33,7 @@ function updateE2eProject(tree, options) {
|
|
|
33
33
|
});
|
|
34
34
|
// update tsconfig
|
|
35
35
|
(0, devkit_1.updateJson)(tree, `${options.e2eProjectRoot}/tsconfig.json`, (json) => {
|
|
36
|
-
return Object.assign(Object.assign({}, json), { extends: (0,
|
|
36
|
+
return Object.assign(Object.assign({}, json), { extends: (0, js_1.getRelativePathToRootTsConfig)(tree, options.e2eProjectRoot) });
|
|
37
37
|
});
|
|
38
38
|
}
|
|
39
39
|
exports.updateE2eProject = updateE2eProject;
|
|
@@ -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;AACtB,
|
|
1
|
+
{"version":3,"file":"update-e2e-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-e2e-project.ts"],"names":[],"mappings":";;;AACA,yCAMsB;AACtB,iCAAyD;AAGzD,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,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,IAAA,kCAA6B,EAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,IACpE;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAtDD,4CAsDC"}
|
|
@@ -1,16 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateNxComponentTemplate = void 0;
|
|
4
|
-
const ts = require("typescript");
|
|
5
4
|
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
6
5
|
const ast_utils_2 = require("../../../utils/nx-devkit/ast-utils");
|
|
7
6
|
const nrwl_home_tpl_1 = require("./nrwl-home-tpl");
|
|
7
|
+
let tsModule;
|
|
8
8
|
function updateNxComponentTemplate(host, options) {
|
|
9
|
+
if (!tsModule) {
|
|
10
|
+
tsModule = require('typescript');
|
|
11
|
+
}
|
|
9
12
|
const componentPath = `${options.appProjectRoot}/src/app/nx-welcome.component.ts`;
|
|
10
13
|
const templateNodeValue = (0, ast_utils_2.getDecoratorPropertyValueNode)(host, componentPath, 'Component', 'template', '@angular/core');
|
|
11
|
-
(0, ast_utils_1.replaceNodeValue)(host,
|
|
14
|
+
(0, ast_utils_1.replaceNodeValue)(host, tsModule.createSourceFile(componentPath, host.read(componentPath, 'utf-8'), tsModule.ScriptTarget.Latest, true), componentPath, templateNodeValue, `\`\n${nrwl_home_tpl_1.nrwlHomeTemplate.template(options.name)}\n\``);
|
|
12
15
|
// Fixing extra comma issue `,,`
|
|
13
|
-
let sourceFile =
|
|
16
|
+
let sourceFile = tsModule.createSourceFile(componentPath, host.read(componentPath, 'utf-8'), tsModule.ScriptTarget.Latest, true);
|
|
14
17
|
const componentFile = host
|
|
15
18
|
.read(componentPath, 'utf-8')
|
|
16
19
|
.toString()
|
|
@@ -24,7 +27,7 @@ function updateNxComponentTemplate(host, options) {
|
|
|
24
27
|
},
|
|
25
28
|
});
|
|
26
29
|
// Add ESLint ignore to pass the lint step
|
|
27
|
-
sourceFile =
|
|
30
|
+
sourceFile = tsModule.createSourceFile(componentPath, host.read(componentPath, 'utf-8'), tsModule.ScriptTarget.Latest, true);
|
|
28
31
|
(0, ast_utils_1.addGlobal)(host, sourceFile, componentPath, '/* eslint-disable */');
|
|
29
32
|
}
|
|
30
33
|
exports.updateNxComponentTemplate = updateNxComponentTemplate;
|
|
@@ -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,
|
|
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;AAEnD,IAAI,QAAqC,CAAC;AAE1C,SAAgB,yBAAyB,CACvC,IAAU,EACV,OAAyB;IAEzB,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;KAClC;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"}
|
|
@@ -6,7 +6,7 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
6
6
|
const versions_1 = require("../../utils/versions");
|
|
7
7
|
function angularChangeStorybookTargestGenerator(tree, schema) {
|
|
8
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
|
-
|
|
9
|
+
(0, devkit_1.ensurePackage)(tree, '@nrwl/storybook', versions_1.nxVersion);
|
|
10
10
|
const { changeStorybookTargetsGenerator } = yield Promise.resolve().then(() => require('@nrwl/storybook'));
|
|
11
11
|
yield changeStorybookTargetsGenerator(tree);
|
|
12
12
|
if (!schema.skipFormat) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"change-storybook-targets.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/change-storybook-targets/change-storybook-targets.ts"],"names":[],"mappings":";;;;AACA,yCAA0D;AAC1D,mDAAiD;AAIjD,SAAsB,sCAAsC,CAC1D,IAAU,EACV,MAAc;;QAEd,
|
|
1
|
+
{"version":3,"file":"change-storybook-targets.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/change-storybook-targets/change-storybook-targets.ts"],"names":[],"mappings":";;;;AACA,yCAA0D;AAC1D,mDAAiD;AAIjD,SAAsB,sCAAsC,CAC1D,IAAU,EACV,MAAc;;QAEd,IAAA,sBAAa,EAAC,IAAI,EAAE,iBAAiB,EAAE,oBAAS,CAAC,CAAC;QAClD,MAAM,EAAE,+BAA+B,EAAE,GAAG,2CAAa,iBAAiB,EAAC,CAAC;QAC5E,MAAM,+BAA+B,CAAC,IAAI,CAAC,CAAC;QAE5C,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAXD,wFAWC;AAED,kBAAe,sCAAsC,CAAC"}
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.shouldExportInEntryPoint = void 0;
|
|
4
|
-
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
5
4
|
const path_1 = require("../../utils/path");
|
|
6
5
|
function shouldExportInEntryPoint(tree, entryPoint, modulePath) {
|
|
7
6
|
if (!modulePath) {
|
|
8
7
|
return false;
|
|
9
8
|
}
|
|
9
|
+
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
10
10
|
const moduleImportPath = (0, path_1.getRelativeImportToFile)(entryPoint, modulePath);
|
|
11
11
|
const entryPointContent = tree.read(entryPoint, 'utf-8');
|
|
12
|
-
const entryPointAst =
|
|
13
|
-
const moduleExport =
|
|
12
|
+
const entryPointAst = tsquery.ast(entryPointContent);
|
|
13
|
+
const moduleExport = tsquery(entryPointAst, `ExportDeclaration StringLiteral[value='${moduleImportPath}']`, { visitAllChildren: true })[0];
|
|
14
14
|
return Boolean(moduleExport);
|
|
15
15
|
}
|
|
16
16
|
exports.shouldExportInEntryPoint = shouldExportInEntryPoint;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entry-point.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/entry-point.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"entry-point.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/entry-point.ts"],"names":[],"mappings":";;;AAEA,2CAA2D;AAE3D,SAAgB,wBAAwB,CACtC,IAAU,EACV,UAAkB,EAClB,UAAkB;IAElB,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,KAAK,CAAC;KACd;IAED,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;AApBD,4DAoBC"}
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.checkOutputNameMatchesProjectName = void 0;
|
|
4
|
-
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
5
4
|
function checkOutputNameMatchesProjectName(ast, projectName) {
|
|
5
|
+
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
6
6
|
const OUTPUT_SELECTOR = 'PropertyAssignment:has(Identifier[name=output]) > ObjectLiteralExpression:has(PropertyAssignment:has(Identifier[name=uniqueName]))';
|
|
7
7
|
const UNIQUENAME_SELECTOR = 'ObjectLiteralExpression > PropertyAssignment:has(Identifier[name=uniqueName]) > StringLiteral';
|
|
8
|
-
const outputNodes =
|
|
8
|
+
const outputNodes = tsquery(ast, OUTPUT_SELECTOR, { visitAllChildren: true });
|
|
9
9
|
if (outputNodes.length === 0) {
|
|
10
10
|
// If the output isnt set in the config, then we can still set the project name correctly
|
|
11
11
|
return true;
|
|
12
12
|
}
|
|
13
|
-
const uniqueNameNodes =
|
|
13
|
+
const uniqueNameNodes = tsquery(outputNodes[0], UNIQUENAME_SELECTOR, {
|
|
14
14
|
visitAllChildren: true,
|
|
15
15
|
});
|
|
16
16
|
if (uniqueNameNodes.length === 0) {
|
|
@@ -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":";;;AAEA,SAAgB,iCAAiC,CAC/C,GAAe,EACf,WAAmB;IAEnB,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;AA1BD,8EA0BC"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.checkSharedNpmPackagesMatchExpected = void 0;
|
|
4
|
-
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
5
4
|
function checkSharedNpmPackagesMatchExpected(ast) {
|
|
5
|
+
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
6
6
|
const SHARE_HELPER_SELECTOR = 'PropertyAssignment:has(Identifier[name=shared]) > CallExpression:has(Identifier[name=share])';
|
|
7
7
|
const SHARED_PACKAGE_CONFIG_SELECTOR = 'ObjectLiteralExpression > PropertyAssignment > ObjectLiteralExpression';
|
|
8
|
-
const shareHelperNodes =
|
|
8
|
+
const shareHelperNodes = tsquery(ast, SHARE_HELPER_SELECTOR, {
|
|
9
9
|
visitAllChildren: true,
|
|
10
10
|
});
|
|
11
11
|
let sharedPackageConfigNodes;
|
|
@@ -13,18 +13,18 @@ function checkSharedNpmPackagesMatchExpected(ast) {
|
|
|
13
13
|
if (shareHelperNodes.length === 0) {
|
|
14
14
|
// if we arent sharing using share helper, check for standard object sharing syntax
|
|
15
15
|
const SHARED_OBJECT_SELECTOR = 'PropertyAssignment:has(Identifier[name=shared]) > ObjectLiteralExpression';
|
|
16
|
-
const sharedObjectNodes =
|
|
16
|
+
const sharedObjectNodes = tsquery(ast, SHARED_OBJECT_SELECTOR, {
|
|
17
17
|
visitAllChildren: true,
|
|
18
18
|
});
|
|
19
19
|
if (sharedObjectNodes.length === 0) {
|
|
20
20
|
// nothing is being shared, we're safe to continue
|
|
21
21
|
return true;
|
|
22
22
|
}
|
|
23
|
-
sharedPackageConfigNodes =
|
|
23
|
+
sharedPackageConfigNodes = tsquery(sharedObjectNodes[0], SHARED_PACKAGE_CONFIG_SELECTOR, { visitAllChildren: true });
|
|
24
24
|
settingsToMatch = [`singleton: true`, `strictVersion: true`];
|
|
25
25
|
}
|
|
26
26
|
else {
|
|
27
|
-
sharedPackageConfigNodes =
|
|
27
|
+
sharedPackageConfigNodes = tsquery(shareHelperNodes[0], SHARED_PACKAGE_CONFIG_SELECTOR, { visitAllChildren: true });
|
|
28
28
|
settingsToMatch = [
|
|
29
29
|
`singleton: true`,
|
|
30
30
|
`strictVersion: true`,
|
|
@@ -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":";;;AAEA,SAAgB,mCAAmC,CAAC,GAAe;IACjE,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;AAjED,kFAiEC"}
|
|
@@ -2,4 +2,4 @@ import type { SourceFile } from 'typescript';
|
|
|
2
2
|
export declare type IsHostRemoteConfigResult = 'host' | 'remote' | 'both' | false;
|
|
3
3
|
export declare function isHostRemoteConfig(ast: SourceFile): IsHostRemoteConfigResult;
|
|
4
4
|
export declare function getRemotesFromHost(ast: SourceFile): any[];
|
|
5
|
-
export declare function getExposedModulesFromRemote(ast: SourceFile):
|
|
5
|
+
export declare function getExposedModulesFromRemote(ast: SourceFile): any;
|
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getExposedModulesFromRemote = exports.getRemotesFromHost = exports.isHostRemoteConfig = void 0;
|
|
4
|
-
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
5
4
|
const REMOTES_EXPRESSION_SELECTOR = 'PropertyAssignment:has(Identifier[name=remotes]) > ObjectLiteralExpression';
|
|
6
5
|
const EXPOSES_EXPRESSION_SELECTOR = 'PropertyAssignment:has(Identifier[name=exposes]) > ObjectLiteralExpression';
|
|
7
6
|
const PROPERTY_SELECTOR = 'ObjectLiteralExpression > PropertyAssignment';
|
|
8
7
|
function isHostRemoteConfig(ast) {
|
|
9
8
|
let isHost = false;
|
|
10
9
|
let isRemote = false;
|
|
11
|
-
const
|
|
10
|
+
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
11
|
+
const remotesNodes = tsquery(ast, REMOTES_EXPRESSION_SELECTOR, {
|
|
12
12
|
visitAllChildren: true,
|
|
13
13
|
});
|
|
14
14
|
if (remotesNodes.length > 0) {
|
|
15
15
|
isHost = true;
|
|
16
16
|
}
|
|
17
|
-
const exposesNodes =
|
|
17
|
+
const exposesNodes = tsquery(ast, EXPOSES_EXPRESSION_SELECTOR, {
|
|
18
18
|
visitAllChildren: true,
|
|
19
19
|
});
|
|
20
20
|
if (exposesNodes.length > 0) {
|
|
@@ -25,13 +25,14 @@ function isHostRemoteConfig(ast) {
|
|
|
25
25
|
}
|
|
26
26
|
exports.isHostRemoteConfig = isHostRemoteConfig;
|
|
27
27
|
function getRemotesFromHost(ast) {
|
|
28
|
-
const
|
|
28
|
+
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
29
|
+
const remotesObjectNodes = tsquery(ast, REMOTES_EXPRESSION_SELECTOR, {
|
|
29
30
|
visitAllChildren: true,
|
|
30
31
|
});
|
|
31
32
|
if (remotesObjectNodes.length === 0) {
|
|
32
33
|
return [];
|
|
33
34
|
}
|
|
34
|
-
const remotesNodes =
|
|
35
|
+
const remotesNodes = tsquery(remotesObjectNodes[0], PROPERTY_SELECTOR, {
|
|
35
36
|
visitAllChildren: true,
|
|
36
37
|
});
|
|
37
38
|
if (remotesNodes.length === 0) {
|
|
@@ -51,7 +52,8 @@ function getRemotesFromHost(ast) {
|
|
|
51
52
|
}
|
|
52
53
|
exports.getRemotesFromHost = getRemotesFromHost;
|
|
53
54
|
function getExposedModulesFromRemote(ast) {
|
|
54
|
-
const
|
|
55
|
+
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
56
|
+
const exposesObjectNodes = tsquery(ast, EXPOSES_EXPRESSION_SELECTOR, {
|
|
55
57
|
visitAllChildren: true,
|
|
56
58
|
});
|
|
57
59
|
if (exposesObjectNodes.length === 0) {
|
|
@@ -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,2 +1,2 @@
|
|
|
1
1
|
import type { Tree } from '@nrwl/devkit';
|
|
2
|
-
export declare function parseASTOfWebpackConfig(tree: Tree, pathToWebpackConfig: string):
|
|
2
|
+
export declare function parseASTOfWebpackConfig(tree: Tree, pathToWebpackConfig: string): any;
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.parseASTOfWebpackConfig = void 0;
|
|
4
|
-
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
5
4
|
function parseASTOfWebpackConfig(tree, pathToWebpackConfig) {
|
|
6
5
|
if (!tree.exists(pathToWebpackConfig)) {
|
|
7
6
|
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.`);
|
|
8
7
|
}
|
|
8
|
+
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
9
9
|
const source = tree.read(pathToWebpackConfig, 'utf-8');
|
|
10
|
-
return
|
|
10
|
+
return tsquery.ast(source);
|
|
11
11
|
}
|
|
12
12
|
exports.parseASTOfWebpackConfig = parseASTOfWebpackConfig;
|
|
13
13
|
//# sourceMappingURL=parse-ast-webpack-config.js.map
|
|
@@ -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":";;;AAEA,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,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;AAbD,0DAaC"}
|
|
@@ -6,6 +6,7 @@ const cypress_1 = require("@nrwl/cypress");
|
|
|
6
6
|
const devkit_1 = require("@nrwl/devkit");
|
|
7
7
|
const jest_1 = require("@nrwl/jest");
|
|
8
8
|
const linter_1 = require("@nrwl/linter");
|
|
9
|
+
const js_1 = require("@nrwl/js");
|
|
9
10
|
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
10
11
|
const backward_compatible_versions_1 = require("../../../utils/backward-compatible-versions");
|
|
11
12
|
const test_runners_1 = require("../../../utils/test-runners");
|
|
@@ -15,6 +16,11 @@ function angularInitGenerator(host, rawOptions) {
|
|
|
15
16
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
16
17
|
const options = normalizeOptions(rawOptions);
|
|
17
18
|
setDefaults(host, options);
|
|
19
|
+
yield (0, js_1.initGenerator)(host, {
|
|
20
|
+
js: false,
|
|
21
|
+
skipFormat: true,
|
|
22
|
+
});
|
|
23
|
+
const tasks = [];
|
|
18
24
|
const peerDepsToInstall = [
|
|
19
25
|
'@angular-devkit/core',
|
|
20
26
|
'@angular-devkit/schematics',
|
|
@@ -29,16 +35,18 @@ function angularInitGenerator(host, rawOptions) {
|
|
|
29
35
|
(0, devkit_1.ensurePackage)(host, pkg, devkitVersion);
|
|
30
36
|
}
|
|
31
37
|
});
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
38
|
+
if (!options.skipPackageJson) {
|
|
39
|
+
tasks.push(updateDependencies(host));
|
|
40
|
+
}
|
|
35
41
|
const unitTestTask = yield addUnitTestRunner(host, options);
|
|
42
|
+
tasks.push(unitTestTask);
|
|
36
43
|
const e2eTask = addE2ETestRunner(host, options);
|
|
44
|
+
tasks.push(e2eTask);
|
|
37
45
|
addGitIgnoreEntry(host, '.angular');
|
|
38
46
|
if (!options.skipFormat) {
|
|
39
47
|
yield (0, devkit_1.formatFiles)(host);
|
|
40
48
|
}
|
|
41
|
-
return (0, run_tasks_in_serial_1.runTasksInSerial)(
|
|
49
|
+
return (0, run_tasks_in_serial_1.runTasksInSerial)(...tasks);
|
|
42
50
|
});
|
|
43
51
|
}
|
|
44
52
|
exports.angularInitGenerator = angularInitGenerator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/init/angular-v14/init.ts"],"names":[],"mappings":";;;;AAAA,2CAAqD;AACrD,yCAQsB;AACtB,qCAA+C;AAC/C,yCAAsC;AACtC,2FAAqF;AACrF,8FAAyF;AACzF,8DAA4E;AAC5E,6CAAmD;AACnD,6DAGmC;AAGnC,SAAsB,oBAAoB,CACxC,IAAU,EACV,UAAkB;;QAElB,MAAM,OAAO,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAC7C,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/init/angular-v14/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ const cypress_1 = require("@nrwl/cypress");
|
|
|
6
6
|
const devkit_1 = require("@nrwl/devkit");
|
|
7
7
|
const jest_1 = require("@nrwl/jest");
|
|
8
8
|
const linter_1 = require("@nrwl/linter");
|
|
9
|
+
const js_1 = require("@nrwl/js");
|
|
9
10
|
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
10
11
|
const path_1 = require("path");
|
|
11
12
|
const test_runners_1 = require("../../utils/test-runners");
|
|
@@ -36,16 +37,23 @@ function angularInitGenerator(tree, rawOptions) {
|
|
|
36
37
|
});
|
|
37
38
|
const options = normalizeOptions(rawOptions);
|
|
38
39
|
setDefaults(tree, options);
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
:
|
|
40
|
+
yield (0, js_1.initGenerator)(tree, {
|
|
41
|
+
js: false,
|
|
42
|
+
skipFormat: true,
|
|
43
|
+
});
|
|
44
|
+
const tasks = [];
|
|
45
|
+
if (!options.skipPackageJson) {
|
|
46
|
+
tasks.push(updateDependencies(tree));
|
|
47
|
+
}
|
|
42
48
|
const unitTestTask = yield addUnitTestRunner(tree, options);
|
|
49
|
+
tasks.push(unitTestTask);
|
|
43
50
|
const e2eTask = addE2ETestRunner(tree, options);
|
|
51
|
+
tasks.push(e2eTask);
|
|
44
52
|
addGitIgnoreEntry(tree, '.angular');
|
|
45
53
|
if (!options.skipFormat) {
|
|
46
54
|
yield (0, devkit_1.formatFiles)(tree);
|
|
47
55
|
}
|
|
48
|
-
return (0, run_tasks_in_serial_1.runTasksInSerial)(
|
|
56
|
+
return (0, run_tasks_in_serial_1.runTasksInSerial)(...tasks);
|
|
49
57
|
});
|
|
50
58
|
}
|
|
51
59
|
exports.angularInitGenerator = angularInitGenerator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,2CAAqD;AACrD,yCAQsB;AACtB,qCAA+C;AAC/C,yCAAsC;AACtC,2FAAqF;AACrF,+BAA4B;AAC5B,2DAAyE;AACzE,mDAa8B;AAC9B,0CAAgD;AAChD,0DAIgC;AAGhC,SAAsB,oBAAoB,CACxC,IAAU,EACV,UAAkB;;QAElB,MAAM,kBAAkB,GACtB,IAAA,+DAA+C,EAAC,IAAI,CAAC,CAAC;QACxD,IAAI,kBAAkB,EAAE;YACtB,IAAI,iBAAiB,GAAG,2CACtB,IAAA,WAAI,EAAC,SAAS,EAAE,kBAAkB,EAAE,MAAM,CAAC,EAC5C,CAAC;YACF,MAAM,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YAClD,OAAO;SACR;QAED,MAAM,iBAAiB,GAAG;YACxB,sBAAsB;YACtB,4BAA4B;YAC5B,qBAAqB;SACtB,CAAC;QACF,IAAI,aAAqB,CAAC;QAC1B,iBAAiB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;;YAChC,MAAM,cAAc,GAAG,IAAA,0CAA0B,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAE7D,IAAI,CAAC,cAAc,EAAE;gBACnB,aAAa,aAAb,aAAa,cAAb,aAAa,IAAb,aAAa,GACX,MAAA,IAAA,0CAA0B,EAAC,IAAI,EAAE,+BAA+B,CAAC,mCACjE,+BAAoB,EAAC;gBACvB,IAAA,sBAAa,EAAC,IAAI,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC;aACzC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAC7C,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.generateKarmaProjectFiles = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
6
5
|
const version_utils_1 = require("../../utils/version-utils");
|
|
7
6
|
const v14_test_file_1 = require("./v14-test-file");
|
|
8
7
|
function generateKarmaProjectFiles(tree, project) {
|
|
@@ -45,9 +44,10 @@ function isUsingConfigSetInBaseKarmaConfig(tree) {
|
|
|
45
44
|
if (!tree.exists('karma.conf.js')) {
|
|
46
45
|
return false;
|
|
47
46
|
}
|
|
47
|
+
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
48
48
|
const CONFIG_SET_SELECTOR = 'PropertyAccessExpression:has(Identifier[name=config], Identifier[name=set])';
|
|
49
|
-
const ast =
|
|
50
|
-
const nodes =
|
|
49
|
+
const ast = tsquery.ast(tree.read('karma.conf.js', 'utf-8'));
|
|
50
|
+
const nodes = tsquery(ast, CONFIG_SET_SELECTOR, { visitAllChildren: true });
|
|
51
51
|
return nodes.length > 0;
|
|
52
52
|
}
|
|
53
53
|
//# sourceMappingURL=generate-karma-project-files.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-karma-project-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/karma-project/lib/generate-karma-project-files.ts"],"names":[],"mappings":";;;AACA,yCAMsB;AACtB,
|
|
1
|
+
{"version":3,"file":"generate-karma-project-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/karma-project/lib/generate-karma-project-files.ts"],"names":[],"mappings":";;;AACA,yCAMsB;AACtB,6DAA2E;AAC3E,mDAA8C;AAE9C,SAAgB,yBAAyB,CAAC,IAAU,EAAE,OAAe;IACnE,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9D,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,EACrD,aAAa,CAAC,IAAI,EAClB;QACE,IAAI,EAAE,EAAE;QACR,WAAW,EAAE,aAAa,CAAC,IAAI;QAC/B,cAAc,EAAE,IAAA,uBAAc,EAAC,aAAa,CAAC,IAAI,CAAC;KACnD,CACF,CAAC;IAEF,IAAI,aAAa,CAAC,IAAI,KAAK,EAAE,IAAI,aAAa,CAAC,IAAI,KAAK,GAAG,EAAE;QAC3D,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,EAC3D,aAAa,CAAC,IAAI,EAClB;YACE,IAAI,EAAE,EAAE;YACR,WAAW,EAAE,OAAO;SACrB,CACF,CAAC;KACH;SAAM,IAAI,4BAA4B,CAAC,IAAI,CAAC,EAAE;QAC7C,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EACf,SAAS,EACT,IAAI,EACJ,OAAO,EACP,6BAA6B,CAC9B,EACD,aAAa,CAAC,IAAI,EAClB;YACE,IAAI,EAAE,EAAE;YACR,WAAW,EAAE,aAAa,CAAC,IAAI;YAC/B,cAAc,EAAE,IAAA,uBAAc,EAAC,aAAa,CAAC,IAAI,CAAC;YAClD,wBAAwB,EAAE,iCAAiC,CAAC,IAAI,CAAC;SAClE,CACF,CAAC;KACH;IAED,MAAM,uBAAuB,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;IACrE,IAAI,uBAAuB,CAAC,KAAK,KAAK,EAAE,EAAE;QACxC,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,aAAa,CAAC,UAAU,EAAE,SAAS,CAAC,EACtD,IAAA,2BAAW,EAAC,EAAE,SAAS,EAAE,aAAa,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC,CACpE,CAAC;KACH;AACH,CAAC;AAjDD,8DAiDC;AAED,SAAS,4BAA4B,CAAC,IAAU;IAC9C,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,KAAK,MAAM,CAAC,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE;QAClC,IAAI,OAAO,CAAC,IAAI,KAAK,GAAG,IAAI,OAAO,CAAC,IAAI,KAAK,EAAE,EAAE;YAC/C,OAAO,IAAI,CAAC;SACb;KACF;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,iCAAiC,CAAC,IAAU;IACnD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QACjC,OAAO,KAAK,CAAC;KACd;IACD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;IAEzD,MAAM,mBAAmB,GACvB,6EAA6E,CAAC;IAEhF,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC;IAC7D,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,EAAE,mBAAmB,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;IAE5E,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;AAC1B,CAAC"}
|
|
@@ -3,19 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.addChildren = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
6
|
-
const ts = require("typescript");
|
|
7
6
|
const ast_utils_2 = require("../../../utils/nx-devkit/ast-utils");
|
|
8
7
|
const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
|
|
8
|
+
let tsModule;
|
|
9
9
|
function addChildren(tree, options) {
|
|
10
10
|
if (!tree.exists(options.parent)) {
|
|
11
11
|
throw new Error(`Cannot find '${options.parent}'`);
|
|
12
12
|
}
|
|
13
|
+
if (!tsModule) {
|
|
14
|
+
tsModule = require('typescript');
|
|
15
|
+
}
|
|
13
16
|
const routeFileSource = tree.read(options.parent, 'utf-8');
|
|
14
17
|
const constName = options.standalone
|
|
15
18
|
? `${(0, devkit_1.names)(options.name).propertyName}Routes`
|
|
16
19
|
: `${(0, devkit_1.names)(options.fileName).propertyName}Routes`;
|
|
17
20
|
const importPath = options.importPath;
|
|
18
|
-
let sourceFile =
|
|
21
|
+
let sourceFile = tsModule.createSourceFile(options.parent, routeFileSource, tsModule.ScriptTarget.Latest, true);
|
|
19
22
|
if (!options.standalone) {
|
|
20
23
|
sourceFile = (0, ast_utils_2.addImportToModule)(tree, sourceFile, options.parent, options.moduleName);
|
|
21
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-children.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-children.ts"],"names":[],"mappings":";;;AAAA,yCAA2C;AAC3C,uEAAuE;AACvE,
|
|
1
|
+
{"version":3,"file":"add-children.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-children.ts"],"names":[],"mappings":";;;AAAA,yCAA2C;AAC3C,uEAAuE;AACvE,kEAAuE;AAEvE,sEAAgE;AAEhE,IAAI,QAAqC,CAAC;AAE1C,SAAgB,WAAW,CACzB,IAAU,EACV,OAA2C;IAE3C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QAChC,MAAM,IAAI,KAAK,CAAC,gBAAgB,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;KACpD;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;KAClC;IAED,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU;QAClC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,YAAY,QAAQ;QAC7C,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,YAAY,QAAQ,CAAC;IACpD,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IACtC,IAAI,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CACxC,OAAO,CAAC,MAAM,EACd,eAAe,EACf,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IAEF,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACvB,UAAU,GAAG,IAAA,6BAAiB,EAC5B,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,UAAU,CACnB,CAAC;KACH;IAED,UAAU,GAAG,IAAA,wBAAY,EACvB,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,UAAU,KAAK,SAAS,EAAE,EACtE,UAAU,CACX,CAAC;IAEF,MAAM,KAAK,GAAG,YACZ,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,QAC1B,gBAAgB,SAAS,IAAI,CAAC;IAE9B,IAAA,sBAAQ,EAAC,IAAI,EAAE,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AACtE,CAAC;AA7CD,kCA6CC"}
|
|
@@ -3,16 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.addLazyLoadedRouterConfiguration = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
6
|
-
const ts = require("typescript");
|
|
7
6
|
const ast_utils_2 = require("../../../utils/nx-devkit/ast-utils");
|
|
8
7
|
const path_1 = require("path");
|
|
8
|
+
let tsModule;
|
|
9
9
|
function addLazyLoadedRouterConfiguration(tree, options) {
|
|
10
|
+
if (!tsModule) {
|
|
11
|
+
tsModule = require('typescript');
|
|
12
|
+
}
|
|
10
13
|
const constName = `${(0, devkit_1.names)(options.fileName).propertyName}Routes`;
|
|
11
14
|
tree.write((0, devkit_1.joinPathFragments)((0, path_1.dirname)(options.modulePath), 'lib.routes.ts'), `import { Route } from '@angular/router';
|
|
12
15
|
|
|
13
16
|
export const ${constName}: Route[] = [/* {path: '', pathMatch: 'full', component: InsertYourComponentHere} */];`);
|
|
14
17
|
const routeFileSource = tree.read(options.modulePath, 'utf-8');
|
|
15
|
-
let sourceFile =
|
|
18
|
+
let sourceFile = tsModule.createSourceFile(options.modulePath, routeFileSource, tsModule.ScriptTarget.Latest, true);
|
|
16
19
|
sourceFile = (0, ast_utils_2.addImportToModule)(tree, sourceFile, options.modulePath, `
|
|
17
20
|
RouterModule.forChild(${constName}) `);
|
|
18
21
|
sourceFile = (0, ast_utils_1.insertImport)(tree, sourceFile, options.modulePath, 'RouterModule', '@angular/router');
|