@nrwl/angular 15.8.0-beta.0 → 15.8.0-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/generators.d.ts +0 -1
- package/generators.js +0 -1
- package/generators.js.map +1 -1
- package/generators.json +0 -11
- package/mf/mf.d.ts +1 -1
- package/mf/mf.js +2 -1
- package/mf/mf.js.map +1 -1
- package/ng-package.json +2 -1
- package/package.json +10 -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/builders/webpack-browser/webpack-browser.impl.d.ts +1 -1
- package/src/executors/utilities/angular-version-utils.d.ts +1 -1
- package/src/generators/add-linting/add-linting.js +2 -1
- package/src/generators/add-linting/add-linting.js.map +1 -1
- package/src/generators/add-linting/angular-v14/lib/create-eslint-configuration.d.ts +1 -1
- package/src/generators/add-linting/lib/create-eslint-configuration.d.ts +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 +12 -1
- 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/application/schema.json +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 +2 -2
- 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/host/host.js +2 -1
- package/src/generators/host/host.js.map +1 -1
- package/src/generators/init/angular-v14/init.js +10 -4
- package/src/generators/init/angular-v14/init.js.map +1 -1
- package/src/generators/init/angular-v14/schema.d.ts +1 -0
- package/src/generators/init/init.js +12 -5
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/init/schema.d.ts +1 -0
- package/src/generators/karma/karma.js +2 -1
- package/src/generators/karma/karma.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/builders/builder-migrator-class.type.d.ts +1 -1
- package/src/generators/ng-add/migrators/projects/app.migrator.d.ts +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.d.ts +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/migrators/projects/project.migrator.js +3 -3
- package/src/generators/ng-add/migrators/projects/project.migrator.js.map +1 -1
- package/src/generators/ng-add/utilities/file-change-recorder.js +5 -5
- package/src/generators/ng-add/utilities/file-change-recorder.js.map +1 -1
- package/src/generators/ng-add/utilities/types.d.ts +8 -8
- package/src/generators/ng-add/utilities/workspace.js +3 -3
- package/src/generators/ng-add/utilities/workspace.js.map +1 -1
- package/src/generators/ngrx/lib/normalize-options.d.ts +1 -1
- package/src/generators/remote/remote.js +2 -2
- package/src/generators/remote/remote.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/export-scam.d.ts +1 -1
- package/src/generators/utils/file-info.d.ts +2 -2
- package/src/generators/utils/insert-ngmodule-import.d.ts +1 -1
- package/src/generators/utils/storybook-ast/entry-point.d.ts +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/utils/storybook-ast/storybook-inputs.d.ts +1 -1
- package/src/generators/utils/types.d.ts +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/runtime/nx/data-persistence.d.ts +4 -4
- package/src/utils/backward-compatible-versions.d.ts +3 -3
- package/src/utils/nx-devkit/ast-utils.d.ts +2 -2
- 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
- package/src/generators/change-storybook-targets/change-storybook-targets.d.ts +0 -4
- package/src/generators/change-storybook-targets/change-storybook-targets.js +0 -19
- package/src/generators/change-storybook-targets/change-storybook-targets.js.map +0 -1
- package/src/generators/change-storybook-targets/compat.d.ts +0 -2
- package/src/generators/change-storybook-targets/compat.js +0 -6
- package/src/generators/change-storybook-targets/compat.js.map +0 -1
- package/src/generators/change-storybook-targets/schema.d.ts +0 -3
- package/src/generators/change-storybook-targets/schema.json +0 -19
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AngularDevkitNgPackagrMigrator = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const
|
|
5
|
+
const js_1 = require("@nrwl/js");
|
|
6
6
|
const path_1 = require("path");
|
|
7
7
|
const dependencies_1 = require("../../../utils/dependencies");
|
|
8
8
|
const builder_migrator_1 = require("./builder.migrator");
|
|
@@ -81,7 +81,7 @@ class AngularDevkitNgPackagrMigrator extends builder_migrator_1.BuilderMigrator
|
|
|
81
81
|
this.logger.warn(`The tsConfig file "${originalTsConfigPath}" specified in the "${targetName}" target could not be found. Skipping updating the tsConfig file.`);
|
|
82
82
|
return;
|
|
83
83
|
}
|
|
84
|
-
const rootTsConfigFile = (0,
|
|
84
|
+
const rootTsConfigFile = (0, js_1.getRootTsConfigPathInTree)(this.tree);
|
|
85
85
|
const projectOffsetFromRoot = (0, devkit_1.offsetFromRoot)(this.projectConfig.root);
|
|
86
86
|
this.updateTsConfigFile(tsConfigPath, rootTsConfigFile, projectOffsetFromRoot);
|
|
87
87
|
(0, devkit_1.updateJson)(this.tree, tsConfigPath, (json) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"angular-devkit-ng-packagr.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/builders/angular-devkit-ng-packagr.migrator.ts"],"names":[],"mappings":";;;AAKA,yCAKsB;AACtB,
|
|
1
|
+
{"version":3,"file":"angular-devkit-ng-packagr.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/builders/angular-devkit-ng-packagr.migrator.ts"],"names":[],"mappings":";;;AAKA,yCAKsB;AACtB,iCAAqD;AACrD,+BAAgC;AAChC,8DAAuF;AAEvF,yDAAqD;AAErD,MAAa,8BAA+B,SAAQ,kCAAe;IACjE,YACE,IAAU,EACV,OAA6B,EAC7B,aAAmC,EACnC,MAAc;QAEd,KAAK,CACH,IAAI,EACJ,0CAA0C,EAC1C,SAAS,EACT,OAAO,EACP,aAAa,EACb,MAAM,CACP,CAAC;IACJ,CAAC;IAEQ,OAAO;QACd,IAAI,IAAI,CAAC,aAAa,EAAE;YACtB,OAAO;SACR;QAED,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;YACtB,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,6DAA6D,IAAI,CAAC,WAAW,wCAAwC;gBACnH,4CAA4C,CAC/C,CAAC;YACF,OAAO;SACR;QAED,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE;YACzC,IAAI,CAAC,yBAAyB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAC7C,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACvC,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACnC,IAAI,CAAC,yBAAyB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;YACvC,IAAA,uDAAwC,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACrD;IACH,CAAC;IAEO,yBAAyB,CAC/B,UAAkB,EAClB,MAA2B;QAE3B,MAAM,CAAC,QAAQ,GAAG,uBAAuB,CAAC;QAE1C,IACE,CAAC,MAAM,CAAC,OAAO;YACf,CAAC,CAAC,MAAM,CAAC,cAAc,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,EACtE;YACA,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,eAAe,UAAU,gGAAgG,CAC1H,CAAC;YACF,OAAO;SACR;QAED,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;;YACzC,IAAI,MAAA,MAAM,CAAC,OAAO,0CAAG,MAAM,CAAC,EAAE;gBAC5B,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,IAAA,0BAAiB,EACxC,IAAI,CAAC,OAAO,CAAC,OAAO,EACpB,IAAA,eAAQ,EAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CACjC,CAAC;aACH;YAED,KAAK,MAAM,aAAa,IAAI,MAAM,CAAC,MAAM,CAAC,MAAA,MAAM,CAAC,cAAc,mCAAI,EAAE,CAAC,EAAE;gBACtE,aAAa,CAAC,MAAM,CAAC;oBACnB,aAAa,CAAC,MAAM,CAAC;wBACrB,IAAA,0BAAiB,EACf,IAAI,CAAC,OAAO,CAAC,OAAO,EACpB,IAAA,eAAQ,EAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAChC,CAAC;aACL;QACH,CAAC,CAAC,CAAC;QAEH,IAAA,mCAA0B,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,oBAClD,IAAI,CAAC,aAAa,EACrB,CAAC;IACL,CAAC;IAEO,mBAAmB,CACzB,UAAkB,EAClB,MAA2B;;QAE3B,IAAI,CAAC,CAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,OAAO,CAAA,EAAE;YAC5B,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,QAAQ,UAAU,4HAA4H,CAC/I,CAAC;YACF,OAAO;SACR;aAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACpD,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,gCAAgC,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,OAAO,uBAAuB,UAAU,IAAI;gBACjI,2EAA2E,CAC9E,CAAC;YACF,OAAO;SACR;QAED,IAAA,mBAAU,EAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,aAAa,EAAE,EAAE;YAC9D,MAAM,MAAM,GAAG,IAAA,uBAAc,EAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACpD,aAAa,CAAC,OAAO;gBACnB,aAAa,CAAC,OAAO;oBACrB,GAAG,MAAM,gDAAgD,CAAC;YAC5D,aAAa,CAAC,IAAI,GAAG,GAAG,MAAM,QAAQ,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YAE1D,OAAO,aAAa,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,eAAe,CACrB,UAAkB,EAClB,MAA2B;;QAE3B,MAAM,YAAY,GAChB,MAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,QAAQ,mCAAI,MAAA,MAAA,MAAM,CAAC,cAAc,0CAAE,WAAW,0CAAE,QAAQ,CAAC;QAC3E,IAAI,CAAC,YAAY,EAAE;YACjB,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,QAAQ,UAAU,+FAA+F,CAClH,CAAC;YACF,OAAO;SACR;aAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;YAC1C,MAAM,oBAAoB,GAAG,CAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,QAAQ;gBACnD,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,QAAQ;gBACjE,CAAC,CAAC,MAAA,MAAA,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,cAAc,0CACzD,WAAW,0CAAE,QAAQ,CAAC;YAC9B,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,sBAAsB,oBAAoB,uBAAuB,UAAU,mEAAmE,CAC/I,CAAC;YACF,OAAO;SACR;QAED,MAAM,gBAAgB,GAAG,IAAA,8BAAyB,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9D,MAAM,qBAAqB,GAAG,IAAA,uBAAc,EAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACtE,IAAI,CAAC,kBAAkB,CACrB,YAAY,EACZ,gBAAgB,EAChB,qBAAqB,CACtB,CAAC;QAEF,IAAA,mBAAU,EAAC,IAAI,CAAC,IAAI,EAAE,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE;;YAC3C,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,MAAM,CAAA,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,KAAK,0CAAE,MAAM,CAAA,EAAE;gBAChD,IAAI,CAAC,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC;aAC5B;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAhJD,wEAgJC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { ProjectConfiguration, Tree } from '@nrwl/devkit';
|
|
2
2
|
import type { Logger, ProjectMigrationInfo } from '../../utilities';
|
|
3
3
|
import type { BuilderMigrator } from './builder.migrator';
|
|
4
|
-
export
|
|
4
|
+
export type BuilderMigratorClassType = {
|
|
5
5
|
new (tree: Tree, project: ProjectMigrationInfo, projectConfig: ProjectConfiguration, logger: Logger): BuilderMigrator;
|
|
6
6
|
};
|
|
@@ -2,7 +2,7 @@ import type { Tree } from '@nrwl/devkit';
|
|
|
2
2
|
import type { GeneratorOptions } from '../../schema';
|
|
3
3
|
import type { Logger, MigrationProjectConfiguration, ValidationResult } from '../../utilities';
|
|
4
4
|
import { ProjectMigrator } from './project.migrator';
|
|
5
|
-
|
|
5
|
+
type SupportedTargets = 'build' | 'e2e' | 'i18n' | 'prerender' | 'serve' | 'server' | 'serveSsr';
|
|
6
6
|
export declare class AppMigrator extends ProjectMigrator<SupportedTargets> {
|
|
7
7
|
private e2eMigrator;
|
|
8
8
|
constructor(tree: Tree, options: GeneratorOptions, project: MigrationProjectConfiguration, logger?: Logger);
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.AppMigrator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const
|
|
6
|
+
const js_1 = require("@nrwl/js");
|
|
7
7
|
const path_1 = require("path");
|
|
8
8
|
const utilities_1 = require("../../utilities");
|
|
9
9
|
const builders_1 = require("../builders");
|
|
@@ -120,7 +120,7 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
120
120
|
(0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig));
|
|
121
121
|
}
|
|
122
122
|
updateTsConfigs() {
|
|
123
|
-
const rootTsConfigFile = (0,
|
|
123
|
+
const rootTsConfigFile = (0, js_1.getRootTsConfigPathInTree)(this.tree);
|
|
124
124
|
const projectOffsetFromRoot = (0, devkit_1.offsetFromRoot)(this.projectConfig.root);
|
|
125
125
|
this.updateTsConfigFileUsedByBuildTarget(rootTsConfigFile, projectOffsetFromRoot);
|
|
126
126
|
this.updateTsConfigFileUsedByServerTarget(projectOffsetFromRoot);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/projects/app.migrator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"app.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/projects/app.migrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import type { Tree } from '@nrwl/devkit';
|
|
|
2
2
|
import type { GeneratorOptions } from '../../schema';
|
|
3
3
|
import type { Logger, MigrationProjectConfiguration, ValidationResult } from '../../utilities';
|
|
4
4
|
import { ProjectMigrator } from './project.migrator';
|
|
5
|
-
|
|
5
|
+
type SupportedTargets = 'e2e';
|
|
6
6
|
export declare class E2eMigrator extends ProjectMigrator<SupportedTargets> {
|
|
7
7
|
private lintTargetName;
|
|
8
8
|
private appConfig;
|
|
@@ -8,10 +8,9 @@ const cypress_version_1 = require("@nrwl/cypress/src/utils/cypress-version");
|
|
|
8
8
|
const devkit_1 = require("@nrwl/devkit");
|
|
9
9
|
const linter_1 = require("@nrwl/linter");
|
|
10
10
|
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
11
|
-
const
|
|
12
|
-
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
11
|
+
const js_1 = require("@nrwl/js");
|
|
13
12
|
const path_1 = require("path");
|
|
14
|
-
const
|
|
13
|
+
const typescript_1 = require("typescript");
|
|
15
14
|
const utilities_1 = require("../../utilities");
|
|
16
15
|
const project_migrator_1 = require("./project.migrator");
|
|
17
16
|
const supportedTargets = {
|
|
@@ -70,7 +69,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
70
69
|
}
|
|
71
70
|
const rootOffset = (0, devkit_1.offsetFromRoot)(this.project.newRoot);
|
|
72
71
|
(0, devkit_1.updateJson)(this.tree, tsConfig, (json) => {
|
|
73
|
-
json.extends = `${rootOffset}${(0,
|
|
72
|
+
json.extends = `${rootOffset}${(0, js_1.getRootTsConfigPathInTree)(this.tree)}`;
|
|
74
73
|
json.compilerOptions = Object.assign(Object.assign({}, json.compilerOptions), { outDir: `${rootOffset}dist/out-tsc` });
|
|
75
74
|
return json;
|
|
76
75
|
});
|
|
@@ -350,11 +349,12 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
350
349
|
: undefined;
|
|
351
350
|
}
|
|
352
351
|
updateCypress10ConfigFile(configFilePath) {
|
|
352
|
+
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
353
353
|
this.cypressPreset = (0, cypress_preset_1.nxE2EPreset)(configFilePath);
|
|
354
354
|
const fileContent = this.tree.read(configFilePath, 'utf-8');
|
|
355
|
-
let sourceFile =
|
|
355
|
+
let sourceFile = tsquery.ast(fileContent);
|
|
356
356
|
const recorder = new utilities_1.FileChangeRecorder(this.tree, configFilePath);
|
|
357
|
-
const defineConfigExpression =
|
|
357
|
+
const defineConfigExpression = tsquery.query(sourceFile, 'CallExpression:has(Identifier[name=defineConfig]) > ObjectLiteralExpression')[0];
|
|
358
358
|
if (!defineConfigExpression) {
|
|
359
359
|
this.logger.warn(`Could not find a "defineConfig" expression in "${configFilePath}". Skipping updating the Cypress configuration.`);
|
|
360
360
|
return;
|
|
@@ -363,15 +363,15 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
363
363
|
let componentNode;
|
|
364
364
|
const globalConfig = {};
|
|
365
365
|
defineConfigExpression.forEachChild((node) => {
|
|
366
|
-
if ((0,
|
|
366
|
+
if ((0, typescript_1.isPropertyAssignment)(node) && node.name.getText() === 'component') {
|
|
367
367
|
componentNode = node;
|
|
368
368
|
return;
|
|
369
369
|
}
|
|
370
|
-
if ((0,
|
|
370
|
+
if ((0, typescript_1.isPropertyAssignment)(node) && node.name.getText() === 'e2e') {
|
|
371
371
|
e2eNode = node;
|
|
372
372
|
return;
|
|
373
373
|
}
|
|
374
|
-
if ((0,
|
|
374
|
+
if ((0, typescript_1.isPropertyAssignment)(node)) {
|
|
375
375
|
this.updateCypressConfigNodeValue(recorder, node, globalConfig);
|
|
376
376
|
}
|
|
377
377
|
});
|
|
@@ -383,20 +383,21 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
383
383
|
if (!componentNode) {
|
|
384
384
|
return;
|
|
385
385
|
}
|
|
386
|
-
if (!(0,
|
|
386
|
+
if (!(0, typescript_1.isObjectLiteralExpression)(componentNode.initializer)) {
|
|
387
387
|
this.logger.warn('The automatic migration only supports having an object literal in the "component" option of the Cypress configuration. ' +
|
|
388
388
|
`The configuration won't be updated. Please make sure to update any paths you may have in the "component" option ` +
|
|
389
389
|
'manually to point to the new location.');
|
|
390
390
|
return;
|
|
391
391
|
}
|
|
392
392
|
componentNode.initializer.properties.forEach((node) => {
|
|
393
|
-
if ((0,
|
|
393
|
+
if ((0, typescript_1.isPropertyAssignment)(node)) {
|
|
394
394
|
this.updateCypressConfigNodeValue(recorder, node);
|
|
395
395
|
}
|
|
396
396
|
});
|
|
397
397
|
}
|
|
398
398
|
updateCypressE2EConfig(configFilePath, defineConfigNode, e2eNode, recorder, _a) {
|
|
399
399
|
var globalConfig = tslib_1.__rest(_a, []);
|
|
400
|
+
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
400
401
|
const e2eConfig = {};
|
|
401
402
|
const presetSpreadAssignment = `...nxE2EPreset(__dirname),`;
|
|
402
403
|
if (!e2eNode) {
|
|
@@ -412,7 +413,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
412
413
|
recorder.insertRight(defineConfigNode.getStart() + 1, e2eAssignment);
|
|
413
414
|
}
|
|
414
415
|
else {
|
|
415
|
-
if (!(0,
|
|
416
|
+
if (!(0, typescript_1.isObjectLiteralExpression)(e2eNode.initializer)) {
|
|
416
417
|
this.logger.warn('The automatic migration only supports having an object literal in the "e2e" option of the Cypress configuration. ' +
|
|
417
418
|
`The configuration won't be updated. Please make sure to update any paths you might have in the "e2e" option ` +
|
|
418
419
|
'manually to point to the new location.');
|
|
@@ -420,7 +421,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
420
421
|
}
|
|
421
422
|
recorder.insertRight(e2eNode.initializer.getStart() + 1, presetSpreadAssignment);
|
|
422
423
|
e2eNode.initializer.properties.forEach((node) => {
|
|
423
|
-
if (!(0,
|
|
424
|
+
if (!(0, typescript_1.isPropertyAssignment)(node)) {
|
|
424
425
|
return;
|
|
425
426
|
}
|
|
426
427
|
let change = { type: 'ignore' };
|
|
@@ -474,7 +475,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
474
475
|
}
|
|
475
476
|
// apply changes so we can apply AST transformations
|
|
476
477
|
recorder.applyChanges();
|
|
477
|
-
const sourceFile =
|
|
478
|
+
const sourceFile = tsquery.ast(recorder.content);
|
|
478
479
|
(0, ast_utils_1.insertImport)(this.tree, sourceFile, configFilePath, 'nxE2EPreset', '@nrwl/cypress/plugins/cypress-preset');
|
|
479
480
|
// update recorder with the new content from the file
|
|
480
481
|
recorder.setContentToFileContent();
|
|
@@ -499,7 +500,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
499
500
|
}
|
|
500
501
|
}
|
|
501
502
|
isValidPathLikePropertyWithStringLiteralValue(node, properties) {
|
|
502
|
-
if (!(0,
|
|
503
|
+
if (!(0, typescript_1.isPropertyAssignment)(node)) {
|
|
503
504
|
// TODO(leo): handle more scenarios (spread assignments, etc)
|
|
504
505
|
return false;
|
|
505
506
|
}
|
|
@@ -507,13 +508,13 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
507
508
|
if (!property) {
|
|
508
509
|
return false;
|
|
509
510
|
}
|
|
510
|
-
if (node.initializer.kind ===
|
|
511
|
-
node.initializer.kind ===
|
|
512
|
-
node.initializer.kind ===
|
|
511
|
+
if (node.initializer.kind === typescript_1.SyntaxKind.UndefinedKeyword ||
|
|
512
|
+
node.initializer.kind === typescript_1.SyntaxKind.NullKeyword ||
|
|
513
|
+
node.initializer.kind === typescript_1.SyntaxKind.FalseKeyword) {
|
|
513
514
|
return false;
|
|
514
515
|
}
|
|
515
|
-
if (!(0,
|
|
516
|
-
if ((0,
|
|
516
|
+
if (!(0, typescript_1.isStringLiteralLike)(node.initializer)) {
|
|
517
|
+
if ((0, typescript_1.isTemplateExpression)(node.initializer)) {
|
|
517
518
|
this.logger.warn(`The "${node.name.getText()}" in the Cypress configuration file is set to a template expression ("${node.initializer.getText()}"). ` +
|
|
518
519
|
`This is not supported by the automatic migration and its value won't be automatically migrated. ` +
|
|
519
520
|
`Please make sure to update its value to match the new location if needed.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"e2e.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/projects/e2e.migrator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"e2e.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/projects/e2e.migrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,9 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
5
5
|
const utilities_1 = require("../../utilities");
|
|
6
6
|
const migrator_1 = require("../migrator");
|
|
7
7
|
class ProjectMigrator extends migrator_1.Migrator {
|
|
8
|
+
get projectName() {
|
|
9
|
+
return this.project.name;
|
|
10
|
+
}
|
|
8
11
|
constructor(tree, options, targets, project, rootDir, logger,
|
|
9
12
|
// TODO(leo): this will replace `targets` and become required once the full
|
|
10
13
|
// refactor is done.
|
|
@@ -29,9 +32,6 @@ class ProjectMigrator extends migrator_1.Migrator {
|
|
|
29
32
|
this.collectTargetNames();
|
|
30
33
|
this.createBuilderMigrators(supportedBuilderMigrators);
|
|
31
34
|
}
|
|
32
|
-
get projectName() {
|
|
33
|
-
return this.project.name;
|
|
34
|
-
}
|
|
35
35
|
getWorkspaceRootFileTypesInfo() {
|
|
36
36
|
var _a;
|
|
37
37
|
const workspaceRootFileTypesInfo = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/projects/project.migrator.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAStB,+CAIyB;AAEzB,0CAAuC;AAEvC,MAAa,eAEX,SAAQ,mBAAQ;
|
|
1
|
+
{"version":3,"file":"project.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/projects/project.migrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,17 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.FileChangeRecorder = void 0;
|
|
4
4
|
const magic_string_1 = require("magic-string");
|
|
5
5
|
class FileChangeRecorder {
|
|
6
|
-
constructor(tree, filePath) {
|
|
7
|
-
this.tree = tree;
|
|
8
|
-
this.filePath = filePath;
|
|
9
|
-
this.setContentToFileContent();
|
|
10
|
-
}
|
|
11
6
|
get content() {
|
|
12
7
|
return this.mutableContent.toString();
|
|
13
8
|
}
|
|
14
9
|
get originalContent() {
|
|
15
10
|
return this.mutableContent.original;
|
|
16
11
|
}
|
|
12
|
+
constructor(tree, filePath) {
|
|
13
|
+
this.tree = tree;
|
|
14
|
+
this.filePath = filePath;
|
|
15
|
+
this.setContentToFileContent();
|
|
16
|
+
}
|
|
17
17
|
applyChanges() {
|
|
18
18
|
this.tree.write(this.filePath, this.mutableContent.toString());
|
|
19
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-change-recorder.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/file-change-recorder.ts"],"names":[],"mappings":";;;AACA,+CAAuC;AAGvC,MAAa,kBAAkB;
|
|
1
|
+
{"version":3,"file":"file-change-recorder.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/file-change-recorder.ts"],"names":[],"mappings":";;;AACA,+CAAuC;AAGvC,MAAa,kBAAkB;IAG7B,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;IACxC,CAAC;IACD,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC;IACtC,CAAC;IAED,YAA6B,IAAU,EAAmB,QAAgB;QAA7C,SAAI,GAAJ,IAAI,CAAM;QAAmB,aAAQ,GAAR,QAAQ,CAAQ;QACxE,IAAI,CAAC,uBAAuB,EAAE,CAAC;IACjC,CAAC;IAED,YAAY;QACV,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;IACjE,CAAC;IAED,UAAU,CAAC,KAAa,EAAE,OAAe;QACvC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAED,WAAW,CAAC,KAAa,EAAE,OAAe;QACxC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;IAED,MAAM,CAAC,KAAa,EAAE,MAAc;QAClC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,CAAC,IAAU,EAAE,OAAe;QACjC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;IACzE,CAAC;IAED,uBAAuB;QACrB,IAAI,CAAC,cAAc,GAAG,IAAI,sBAAW,CACnC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CACvC,CAAC;IACJ,CAAC;CACF;AAvCD,gDAuCC"}
|
|
@@ -1,22 +1,22 @@
|
|
|
1
1
|
import type { ProjectConfiguration } from '@nrwl/devkit';
|
|
2
|
-
export
|
|
2
|
+
export type MigrationProjectConfiguration = {
|
|
3
3
|
config: ProjectConfiguration;
|
|
4
4
|
name: string;
|
|
5
5
|
};
|
|
6
|
-
export
|
|
6
|
+
export type WorkspaceProjects = {
|
|
7
7
|
apps: MigrationProjectConfiguration[];
|
|
8
8
|
libs: MigrationProjectConfiguration[];
|
|
9
9
|
};
|
|
10
|
-
export
|
|
10
|
+
export type ProjectMigrationInfo = {
|
|
11
11
|
name: string;
|
|
12
12
|
oldRoot: string;
|
|
13
13
|
oldSourceRoot: string;
|
|
14
14
|
newRoot: string;
|
|
15
15
|
newSourceRoot: string;
|
|
16
16
|
};
|
|
17
|
-
export
|
|
18
|
-
export
|
|
19
|
-
export
|
|
17
|
+
export type WorkspaceRootFileType = 'karma' | 'eslint';
|
|
18
|
+
export type WorkspaceRootFileTypesInfo = Record<WorkspaceRootFileType, boolean>;
|
|
19
|
+
export type ValidationError = {
|
|
20
20
|
message?: string;
|
|
21
21
|
messageGroup?: {
|
|
22
22
|
title: string;
|
|
@@ -24,8 +24,8 @@ export declare type ValidationError = {
|
|
|
24
24
|
};
|
|
25
25
|
hint?: string;
|
|
26
26
|
};
|
|
27
|
-
export
|
|
28
|
-
export
|
|
27
|
+
export type ValidationResult = ValidationError[] | null;
|
|
28
|
+
export type Target = {
|
|
29
29
|
builders: string[];
|
|
30
30
|
acceptMultipleDefinitions?: boolean;
|
|
31
31
|
};
|
|
@@ -7,7 +7,7 @@ const linter_1 = require("@nrwl/linter");
|
|
|
7
7
|
const generate_workspace_files_1 = require("@nrwl/workspace/src/generators/new/generate-workspace-files");
|
|
8
8
|
const default_base_1 = require("@nrwl/workspace/src/utilities/default-base");
|
|
9
9
|
const prettier_1 = require("@nrwl/workspace/src/utilities/prettier");
|
|
10
|
-
const
|
|
10
|
+
const js_1 = require("@nrwl/js");
|
|
11
11
|
const versions_1 = require("@nrwl/workspace/src/utils/versions");
|
|
12
12
|
const angular_json_1 = require("nx/src/adapter/angular-json");
|
|
13
13
|
const versions_2 = require("../../../utils/versions");
|
|
@@ -114,7 +114,7 @@ exports.updateWorkspaceConfigDefaults = updateWorkspaceConfigDefaults;
|
|
|
114
114
|
function updateRootTsConfig(tree) {
|
|
115
115
|
var _a, _b;
|
|
116
116
|
var _c;
|
|
117
|
-
const tsconfig = (0, devkit_1.readJson)(tree, (0,
|
|
117
|
+
const tsconfig = (0, devkit_1.readJson)(tree, (0, js_1.getRootTsConfigPathInTree)(tree));
|
|
118
118
|
(_a = (_c = tsconfig.compilerOptions).paths) !== null && _a !== void 0 ? _a : (_c.paths = {});
|
|
119
119
|
tsconfig.compilerOptions.baseUrl = '.';
|
|
120
120
|
tsconfig.compilerOptions.rootDir = '.';
|
|
@@ -225,7 +225,7 @@ function createWorkspaceFiles(tree) {
|
|
|
225
225
|
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/root'), '.', {
|
|
226
226
|
tmpl: '',
|
|
227
227
|
dot: '.',
|
|
228
|
-
rootTsConfigPath: (0,
|
|
228
|
+
rootTsConfigPath: (0, js_1.getRootTsConfigPathInTree)(tree),
|
|
229
229
|
});
|
|
230
230
|
});
|
|
231
231
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/workspace.ts"],"names":[],"mappings":";;;;AACA,yCASsB;AACtB,yCAAyD;AACzD,0GAA2G;AAC3G,6EAA+E;AAC/E,qEAA2F;AAC3F,
|
|
1
|
+
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/workspace.ts"],"names":[],"mappings":";;;;AACA,yCASsB;AACtB,yCAAyD;AACzD,0GAA2G;AAC3G,6EAA+E;AAC/E,qEAA2F;AAC3F,iCAAqD;AACrD,iEAAqE;AACrE,8DAA0D;AAC1D,sDAA0E;AAK1E,SAAgB,iBAAiB,CAAC,IAAU;IAC1C,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;QAChC,MAAM,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;KAC5D;IACD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;QAChC,MAAM,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;KAC5D;IAED,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;QAClB,OAAO;KACR;IAED,MAAM,IAAI,KAAK,CAAC;;MAEZ,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAC7B,CAAC;AAhBD,8CAgBC;AAED,SAAgB,YAAY,CAC1B,IAAU,EACV,OAAyB,EACzB,cAAkC;;IAElC,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAE7B,MAAM,OAAO,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAC;IAEhD,IAAA,kBAAS,EAAsB,IAAI,EAAE,SAAS,kCACzC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KACjC,QAAQ,EAAE;YACR,WAAW,EAAE,MAAA,OAAO,CAAC,WAAW,mCAAI,IAAA,gCAAiB,GAAE;SACxD,EACD,kBAAkB,EAAE;YAClB,OAAO,EAAE;gBACP,MAAM,EAAE,0BAA0B;gBAClC,OAAO,EAAE;oBACP,mBAAmB,EAAE;wBACnB,OAAO;wBACP,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;wBACjC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;wBACjC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;qBAChC,CAAC,MAAM,CAAC,OAAO,CAAC;iBAClB;aACF;SACF,EACD,WAAW,EAAE;YACX,aAAa,EAAE,EAAE;YACjB,OAAO,EAAE,CAAC,oBAAoB,EAAE,eAAe,CAAC;YAChD,UAAU,EAAE;gBACV,SAAS;gBACT,GAAG,CAAC,OAAO,CAAC,IAAI;oBACd,CAAC,CAAC;wBACE,mCAAmC;wBACnC,gCAAgC;wBAChC,8BAA8B;qBAC/B;oBACH,CAAC,CAAC,EAAE,CAAC;gBACP,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAC,SAAS;aAC3D,CAAC,MAAM,CAAC,OAAO,CAAC;SAClB,EACD,cAAc,EAAE;YACd,KAAK,EAAE;gBACL,SAAS,EAAE,CAAC,QAAQ,CAAC;gBACrB,MAAM,EAAE,CAAC,YAAY,EAAE,aAAa,CAAC;aACtC;YACD,IAAI,EAAE,OAAO,CAAC,IAAI;gBAChB,CAAC,CAAC;oBACE,MAAM,EAAE,CAAC,SAAS,EAAE,aAAa,EAAE,+BAA+B,CAAC;iBACpE;gBACH,CAAC,CAAC,SAAS;YACb,IAAI,EAAE,OAAO,CAAC,IAAI;gBAChB,CAAC,CAAC;oBACE,MAAM,EAAE,CAAC,SAAS,EAAE,gCAAgC,CAAC;iBACtD;gBACH,CAAC,CAAC,SAAS;YACb,GAAG,EAAE,OAAO,CAAC,GAAG;gBACd,CAAC,CAAC;oBACE,MAAM,EAAE,CAAC,SAAS,EAAE,aAAa,CAAC;iBACnC;gBACH,CAAC,CAAC,SAAS;SACd,EACD,cAAc,IACd,CAAC;AACL,CAAC;AAjED,oCAiEC;AAED,SAAS,yBAAyB,CAAC,IAAU;;IAK3C,MAAM,OAAO,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IACzD,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAEnC,KAAK,MAAM,CAAC,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE;QAClC,IAAI,CAAC,OAAO,CAAC,GAAG,KAAI,MAAA,OAAO,CAAC,OAAO,0CAAE,GAAG,CAAA,EAAE;YACxC,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC;SACpB;QACD,IAAI,CAAC,OAAO,CAAC,IAAI,KAAI,MAAA,OAAO,CAAC,OAAO,0CAAE,IAAI,CAAA,EAAE;YAC1C,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;SACrB;QACD,IAAI,CAAC,OAAO,CAAC,IAAI,KAAI,MAAA,OAAO,CAAC,OAAO,0CAAE,IAAI,CAAA,EAAE;YAC1C,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;SACrB;QAED,IAAI,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,EAAE;YAC/C,OAAO,OAAO,CAAC;SAChB;KACF;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAgB,6BAA6B,CAAC,IAAU;IACtD,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAChC,OAAQ,MAAc,CAAC,cAAc,CAAC;IACtC,IAAI,MAAM,CAAC,GAAG,EAAE;QACd,OAAQ,MAAc,CAAC,iBAAiB,CAAC;KAC1C;IACD,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAPD,sEAOC;AAED,SAAgB,kBAAkB,CAAC,IAAU;;;IAC3C,MAAM,QAAQ,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,IAAA,8BAAyB,EAAC,IAAI,CAAC,CAAC,CAAC;IACjE,YAAA,QAAQ,CAAC,eAAe,EAAC,KAAK,uCAAL,KAAK,GAAK,EAAE,EAAC;IACtC,QAAQ,CAAC,eAAe,CAAC,OAAO,GAAG,GAAG,CAAC;IACvC,QAAQ,CAAC,eAAe,CAAC,OAAO,GAAG,GAAG,CAAC;IACvC,QAAQ,CAAC,OAAO,GAAG,KAAK,CAAC,IAAI,CAC3B,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,MAAA,QAAQ,CAAC,OAAO,mCAAI,EAAE,CAAC,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC,CAC9D,CAAC;IACF,IAAA,kBAAS,EAAC,IAAI,EAAE,oBAAoB,EAAE,QAAQ,CAAC,CAAC;IAEhD,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QAChC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;KAC9B;AACH,CAAC;AAbD,gDAaC;AAED,SAAgB,iBAAiB,CAAC,IAAU;IAC1C,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,WAAW,EAAE,EAAE;;QAC/C,WAAW,CAAC,OAAO,GAAG,MAAA,WAAW,CAAC,OAAO,mCAAI,EAAE,CAAC;QAChD,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAClD,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC;iBACtD,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC;iBACtB,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QAEH,WAAW,CAAC,eAAe,GAAG,MAAA,WAAW,CAAC,eAAe,mCAAI,EAAE,CAAC;QAChE,WAAW,CAAC,YAAY,GAAG,MAAA,WAAW,CAAC,YAAY,mCAAI,EAAE,CAAC;QAC1D,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,cAAc,CAAC,EAAE;YAChD,WAAW,CAAC,eAAe,CAAC,cAAc,CAAC,GAAG,+BAAoB,CAAC;SACpE;QACD,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,iBAAiB,CAAC,EAAE;YACnD,WAAW,CAAC,eAAe,CAAC,iBAAiB,CAAC,GAAG,oBAAS,CAAC;SAC5D;QACD,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE;YACtC,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,oBAAS,CAAC;SAC/C;QACD,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,UAAU,CAAC,EAAE;YAC5C,WAAW,CAAC,eAAe,CAAC,UAAU,CAAC,GAAG,0BAAe,CAAC;SAC3D;QAED,OAAO,WAAW,CAAC;IACrB,CAAC,CAAC,CAAC;AACL,CAAC;AA1BD,8CA0BC;AAED,SAAgB,sBAAsB,CACpC,IAAU,EACV,oBAAqC,EACrC,cAAuB;;IAEvB,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE;QACjC;;;;;WAKG;QACH,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;KAC/B;IAED,IAAA,0BAAiB,EAAC,IAAI,EAAE,EAAE,MAAM,EAAE,eAAM,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC;IAEnE,IAAI,CAAC,oBAAoB,EAAE;QACzB,8EAA8E;QAC9E,OAAO;KACR;IAED,oBAAoB,CAAC,cAAc,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/C,oBAAoB,CAAC,OAAO,GAAG,KAAK,CAAC,IAAI,CACvC,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,MAAA,oBAAoB,CAAC,OAAO,mCAAI,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC,CAC/D,CAAC;IACF,MAAA,oBAAoB,CAAC,SAAS,0CAAE,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;;QACnD,IAAI,CAAC,CAAA,MAAA,QAAQ,CAAC,aAAa,0CAAE,OAAO,CAAA,EAAE;YACpC,OAAO;SACR;QAED,OAAO,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC;IACxC,CAAC,CAAC,CAAC;IACH,kDAAkD;IAClD,oBAAoB,CAAC,SAAS,GAAG;QAC/B,GAAG,CAAC,MAAA,oBAAoB,CAAC,SAAS,mCAAI,EAAE,CAAC;QACzC;YACE,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC;YACzC,KAAK,EAAE;gBACL,oCAAoC,EAAE;oBACpC,OAAO;oBACP;wBACE,6BAA6B,EAAE,IAAI;wBACnC,KAAK,EAAE,EAAE;wBACT,cAAc,EAAE;4BACd,EAAE,SAAS,EAAE,GAAG,EAAE,wBAAwB,EAAE,CAAC,GAAG,CAAC,EAAE;yBACpD;qBACF;iBACF;aACF;SACF;KACF,CAAC;IAEF,IAAA,kBAAS,EAAC,IAAI,EAAE,gBAAgB,EAAE,oBAAoB,CAAC,CAAC;AAC1D,CAAC;AAtDD,wDAsDC;AAED,SAAgB,qBAAqB,CAAC,IAAU;IAC9C,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;;QACxC,IAAI,MAAA,IAAI,CAAC,eAAe,0CAAG,yBAAyB,CAAC,EAAE;YACrD,OAAO,IAAI,CAAC,eAAe,CAAC,yBAAyB,CAAC,CAAC;SACxD;QACD,IAAI,MAAA,IAAI,CAAC,YAAY,0CAAG,yBAAyB,CAAC,EAAE;YAClD,OAAO,IAAI,CAAC,YAAY,CAAC,yBAAyB,CAAC,CAAC;SACrD;QACD,IAAI,MAAA,IAAI,CAAC,eAAe,0CAAG,4BAA4B,CAAC,EAAE;YACxD,OAAO,IAAI,CAAC,eAAe,CAAC,4BAA4B,CAAC,CAAC;SAC3D;QACD,IAAI,MAAA,IAAI,CAAC,YAAY,0CAAG,4BAA4B,CAAC,EAAE;YACrD,OAAO,IAAI,CAAC,YAAY,CAAC,4BAA4B,CAAC,CAAC;SACxD;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAjBD,sDAiBC;AAED,SAAsB,oBAAoB,CAAC,IAAU;;QACnD,iCAAiC,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAEjC,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,eAAe,CAAC,EAAE,GAAG,EAAE;YACtE,IAAI,EAAE,EAAE;YACR,GAAG,EAAE,GAAG;YACR,gBAAgB,EAAE,IAAA,8BAAyB,EAAC,IAAI,CAAC;SAClD,CAAC,CAAC;IACL,CAAC;CAAA;AATD,oDASC;AAED,SAAgB,qBAAqB,CAAC,IAAU;IAC9C,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,qBAAqB,CAAC,EACnD,GAAG,EACH;QACE,IAAI,EAAE,EAAE;KACT,CACF,CAAC;AACJ,CAAC;AATD,sDASC;AAED,SAAgB,6BAA6B,CAC3C,IAAU,EACV,SAA4B;IAE5B,MAAM,0BAA0B,GAA+B;QAC7D,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,KAAK;KACb,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE;QACjC,0BAA0B,CAAC,MAAM,GAAG,IAAI,CAAC;KAC1C;IACD,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QAChC,0BAA0B,CAAC,KAAK,GAAG,IAAI,CAAC;KACzC;IAED,IAAI,0BAA0B,CAAC,MAAM,IAAI,0BAA0B,CAAC,KAAK,EAAE;QACzE,OAAO,0BAA0B,CAAC;KACnC;IAED,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;QAChC,MAAM,WAAW,GAAG,QAAQ,CAAC,6BAA6B,EAAE,CAAC;QAC7D,0BAA0B,CAAC,MAAM;YAC/B,0BAA0B,CAAC,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC;QAC1D,0BAA0B,CAAC,KAAK;YAC9B,0BAA0B,CAAC,KAAK,IAAI,WAAW,CAAC,KAAK,CAAC;QAExD,IAAI,0BAA0B,CAAC,MAAM,IAAI,0BAA0B,CAAC,KAAK,EAAE;YACzE,OAAO,0BAA0B,CAAC;SACnC;KACF;IAED,OAAO,0BAA0B,CAAC;AACpC,CAAC;AAjCD,sEAiCC;AAED,SAAgB,iCAAiC,CAAC,IAAU;IAC1D,MAAM,eAAe,GAAG;QACtB,sBAAsB;QACtB,qBAAqB;QACrB,wBAAwB;QACxB,wBAAwB;KACzB,CAAC;IACF,IAAI,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,EAAE;QAC1C,IAAA,mBAAU,EACR,IAAI,EACJ,yBAAyB,EACzB,CAAC,IAAoC,EAAE,EAAE;YACvC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC;YAClD,eAAe,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;gBACpC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;oBAC7C,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;iBACtC;YACH,CAAC,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;KACH;SAAM;QACL,IAAA,kBAAS,EAAC,IAAI,EAAE,yBAAyB,EAAE;YACzC,eAAe;SAChB,CAAC,CAAC;KACJ;AACH,CAAC;AA3BD,8EA2BC;AAED,SAAsB,oBAAoB,CAAC,IAAU;;QACnD,MAAM,sBAAsB,GAAG,MAAM,IAAA,4CAAiC,GAAE,CAAC;QACzE,IAAI,CAAC,sBAAsB,EAAE;YAC3B,IAAA,kBAAS,EAAC,IAAI,EAAE,aAAa,EAAE,uDAA4B,CAAC,CAAC;SAC9D;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE;YACnC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,mBAAmB,CAAC,EACjD,GAAG,EACH,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CACvB,CAAC;SACH;IACH,CAAC;CAAA;AAdD,oDAcC;AAED,SAAgB,iBAAiB,CAAC,IAAU;IAC1C,MAAM,QAAQ,GAAG,IAAA,0BAAW,EAAC,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC;IACtE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE;QACjC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;KAC7B;AACH,CAAC;AALD,8CAKC;AAED,SAAgB,6BAA6B,CAAC,IAAU;IACtD,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QACpE,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;KAC9B;IACD,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QACpE,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;KAC9B;AACH,CAAC;AAPD,sEAOC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { NgRxGeneratorOptions } from '../schema';
|
|
2
|
-
export
|
|
2
|
+
export type NormalizedNgRxGeneratorOptions = NgRxGeneratorOptions & {
|
|
3
3
|
parentDirectory: string;
|
|
4
4
|
};
|
|
5
5
|
export declare function normalizeOptions(options: NgRxGeneratorOptions): NormalizedNgRxGeneratorOptions;
|
|
@@ -12,7 +12,7 @@ const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-i
|
|
|
12
12
|
const version_utils_1 = require("../utils/version-utils");
|
|
13
13
|
const semver_1 = require("semver");
|
|
14
14
|
function remote(tree, options) {
|
|
15
|
-
var _a;
|
|
15
|
+
var _a, _b;
|
|
16
16
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
17
17
|
const installedAngularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
|
|
18
18
|
if ((0, semver_1.lt)(installedAngularVersionInfo.version, '14.1.0') && options.standalone) {
|
|
@@ -25,7 +25,7 @@ function remote(tree, options) {
|
|
|
25
25
|
}
|
|
26
26
|
const appName = (0, project_1.normalizeProjectName)(options.name, options.directory);
|
|
27
27
|
const port = (_a = options.port) !== null && _a !== void 0 ? _a : (0, lib_1.findNextAvailablePort)(tree);
|
|
28
|
-
const appInstallTask = yield (0, application_1.default)(tree, Object.assign(Object.assign({}, options), { routing: true, port }));
|
|
28
|
+
const appInstallTask = yield (0, application_1.default)(tree, Object.assign(Object.assign({}, options), { standalone: (_b = options.standalone) !== null && _b !== void 0 ? _b : false, routing: true, port }));
|
|
29
29
|
const skipE2E = !options.e2eTestRunner || options.e2eTestRunner === test_runners_1.E2eTestRunner.None;
|
|
30
30
|
yield (0, setup_mf_1.setupMf)(tree, {
|
|
31
31
|
appName,
|