@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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-lazy-loaded-router-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-lazy-loaded-router-configuration.ts"],"names":[],"mappings":";;;AAAA,yCAA8D;AAC9D,uEAAuE;AACvE,
|
|
1
|
+
{"version":3,"file":"add-lazy-loaded-router-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-lazy-loaded-router-configuration.ts"],"names":[],"mappings":";;;AAAA,yCAA8D;AAC9D,uEAAuE;AACvE,kEAAuE;AAEvE,+BAA+B;AAE/B,IAAI,QAAqC,CAAC;AAE1C,SAAgB,gCAAgC,CAC9C,IAAU,EACV,OAA2C;IAE3C,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;KAClC;IACD,MAAM,SAAS,GAAG,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,YAAY,QAAQ,CAAC;IAClE,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,IAAA,cAAO,EAAC,OAAO,CAAC,UAAU,CAAC,EAAE,eAAe,CAAC,EAC/D;;eAEW,SAAS,wFAAwF,CAC7G,CAAC;IAEF,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAC/D,IAAI,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CACxC,OAAO,CAAC,UAAU,EAClB,eAAe,EACf,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IACF,UAAU,GAAG,IAAA,6BAAiB,EAC5B,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,UAAU,EAClB;4BACwB,SAAS,IAAI,CACtC,CAAC;IAEF,UAAU,GAAG,IAAA,wBAAY,EACvB,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,UAAU,EAClB,cAAc,EACd,iBAAiB,CAClB,CAAC;IACF,UAAU,GAAG,IAAA,wBAAY,EACvB,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,UAAU,EAClB,SAAS,EACT,cAAc,CACf,CAAC;IAEF,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAC3E,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC1D,IAAI,CAAC,KAAK,CACR,WAAW,EACX,GAAG,iBAAiB;oCACY,CACjC,CAAC;AACJ,CAAC;AApDD,4EAoDC"}
|
|
@@ -2,14 +2,17 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addLoadChildren = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const ts = require("typescript");
|
|
6
5
|
const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
|
|
6
|
+
let tsModule;
|
|
7
7
|
function addLoadChildren(tree, options) {
|
|
8
8
|
if (!tree.exists(options.parent)) {
|
|
9
9
|
throw new Error(`Cannot find '${options.parent}'`);
|
|
10
10
|
}
|
|
11
|
+
if (!tsModule) {
|
|
12
|
+
tsModule = require('typescript');
|
|
13
|
+
}
|
|
11
14
|
const moduleSource = tree.read(options.parent, 'utf-8');
|
|
12
|
-
const sourceFile =
|
|
15
|
+
const sourceFile = tsModule.createSourceFile(options.parent, moduleSource, tsModule.ScriptTarget.Latest, true);
|
|
13
16
|
const route = `{path: '${(0, devkit_1.names)(options.fileName).fileName}', loadChildren: () => import('${options.importPath}').then(m => m.${options.standalone
|
|
14
17
|
? `${(0, devkit_1.names)(options.name).propertyName}Routes`
|
|
15
18
|
: options.moduleName})}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-load-children.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-load-children.ts"],"names":[],"mappings":";;;AAAA,yCAA2C;
|
|
1
|
+
{"version":3,"file":"add-load-children.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-load-children.ts"],"names":[],"mappings":";;;AAAA,yCAA2C;AAE3C,sEAAgE;AAEhE,IAAI,QAAqC,CAAC;AAE1C,SAAgB,eAAe,CAC7B,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,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxD,MAAM,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CAC1C,OAAO,CAAC,MAAM,EACd,YAAY,EACZ,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IAEF,MAAM,KAAK,GAAG,WACZ,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,QAC1B,kCAAkC,OAAO,CAAC,UAAU,kBAClD,OAAO,CAAC,UAAU;QAChB,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,YAAY,QAAQ;QAC7C,CAAC,CAAC,OAAO,CAAC,UACd,IAAI,CAAC;IAEL,IAAA,sBAAQ,EAAC,IAAI,EAAE,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AACxC,CAAC;AA5BD,0CA4BC"}
|
|
@@ -3,13 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.addRouterConfiguration = 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 addRouterConfiguration(tree, options) {
|
|
10
|
+
if (!tsModule) {
|
|
11
|
+
tsModule = require('typescript');
|
|
12
|
+
}
|
|
10
13
|
const constName = `${(0, devkit_1.names)(options.fileName).propertyName}Routes`;
|
|
11
14
|
const moduleSource = tree.read(options.modulePath, 'utf-8');
|
|
12
|
-
let moduleSourceFile =
|
|
15
|
+
let moduleSourceFile = tsModule.createSourceFile(options.modulePath, moduleSource, tsModule.ScriptTarget.Latest, true);
|
|
13
16
|
moduleSourceFile = (0, ast_utils_2.addImportToModule)(tree, moduleSourceFile, options.modulePath, `RouterModule`);
|
|
14
17
|
moduleSourceFile = (0, ast_utils_1.insertImport)(tree, moduleSourceFile, options.modulePath, 'RouterModule, Route', '@angular/router');
|
|
15
18
|
moduleSourceFile = (0, ast_utils_1.insertImport)(tree, moduleSourceFile, options.modulePath, constName, './lib.routes');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-router-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-router-configuration.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,uEAAuE;AACvE,
|
|
1
|
+
{"version":3,"file":"add-router-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-router-configuration.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,uEAAuE;AACvE,kEAAuE;AAEvE,+BAA+B;AAE/B,IAAI,QAAqC,CAAC;AAE1C,SAAgB,sBAAsB,CACpC,IAAU,EACV,OAA2C;IAE3C,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;KAClC;IACD,MAAM,SAAS,GAAG,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,YAAY,QAAQ,CAAC;IAClE,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAC5D,IAAI,gBAAgB,GAAG,QAAQ,CAAC,gBAAgB,CAC9C,OAAO,CAAC,UAAU,EAClB,YAAY,EACZ,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IAEF,gBAAgB,GAAG,IAAA,6BAAiB,EAClC,IAAI,EACJ,gBAAgB,EAChB,OAAO,CAAC,UAAU,EAClB,cAAc,CACf,CAAC;IACF,gBAAgB,GAAG,IAAA,wBAAY,EAC7B,IAAI,EACJ,gBAAgB,EAChB,OAAO,CAAC,UAAU,EAClB,qBAAqB,EACrB,iBAAiB,CAClB,CAAC;IACF,gBAAgB,GAAG,IAAA,wBAAY,EAC7B,IAAI,EACJ,gBAAgB,EAChB,OAAO,CAAC,UAAU,EAClB,SAAS,EACT,cAAc,CACf,CAAC;IAEF,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,IAAA,cAAO,EAAC,OAAO,CAAC,UAAU,CAAC,EAAE,eAAe,CAAC,EAC/D;;eAEW,SAAS,iBAAiB,CACtC,CAAC;IAEF,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAC3E,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC1D,IAAI,CAAC,KAAK,CACR,WAAW,EACX,GAAG,iBAAiB;oCACY,CACjC,CAAC;AACJ,CAAC;AAnDD,wDAmDC"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.updateProject = 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 cli_config_utils_1 = require("@nrwl/workspace/src/utils/cli-config-utils");
|
|
8
8
|
const update_ng_package_1 = require("./update-ng-package");
|
|
9
9
|
const path_1 = require("path");
|
|
@@ -87,7 +87,7 @@ function updateFiles(host, options) {
|
|
|
87
87
|
`);
|
|
88
88
|
}
|
|
89
89
|
function createFiles(host, options) {
|
|
90
|
-
(0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/lib'), options.projectRoot, Object.assign(Object.assign({}, options), { rootTsConfigPath: (0,
|
|
90
|
+
(0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/lib'), options.projectRoot, Object.assign(Object.assign({}, options), { rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot), tpl: '' }));
|
|
91
91
|
}
|
|
92
92
|
function fixProjectWorkspaceConfig(host, options) {
|
|
93
93
|
let project = (0, devkit_1.readProjectConfiguration)(host, options.name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-project.ts"],"names":[],"mappings":";;;;AAAA,yCASsB;AACtB,
|
|
1
|
+
{"version":3,"file":"update-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-project.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,22 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateTsConfig = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const
|
|
5
|
+
const js_1 = require("@nrwl/js");
|
|
6
6
|
const create_ts_config_1 = require("../../utils/create-ts-config");
|
|
7
|
-
function updateRootConfig(host, options) {
|
|
8
|
-
(0, devkit_1.updateJson)(host, (0, typescript_1.getRootTsConfigPathInTree)(host), (json) => {
|
|
9
|
-
const c = json.compilerOptions;
|
|
10
|
-
c.paths = c.paths || {};
|
|
11
|
-
delete c.paths[options.name];
|
|
12
|
-
if (c.paths[options.importPath]) {
|
|
13
|
-
throw new Error(`You already have a library using the import path "${options.importPath}". Make sure to specify a unique one.`);
|
|
14
|
-
}
|
|
15
|
-
c.paths[options.importPath] = [
|
|
16
|
-
(0, devkit_1.joinPathFragments)(options.projectRoot, '/src/index.ts'),
|
|
17
|
-
];
|
|
18
|
-
return json;
|
|
19
|
-
});
|
|
20
|
-
}
|
|
21
7
|
function updateProjectConfig(host, options) {
|
|
22
8
|
(0, devkit_1.updateJson)(host, `${options.projectRoot}/tsconfig.lib.json`, (json) => {
|
|
23
9
|
json.include = ['src/**/*.ts'];
|
|
@@ -32,7 +18,7 @@ function updateProjectConfig(host, options) {
|
|
|
32
18
|
return json;
|
|
33
19
|
});
|
|
34
20
|
// tsconfig.json
|
|
35
|
-
(0, create_ts_config_1.createTsConfig)(host, options.projectRoot, 'lib', options, (0,
|
|
21
|
+
(0, create_ts_config_1.createTsConfig)(host, options.projectRoot, 'lib', options, (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot));
|
|
36
22
|
}
|
|
37
23
|
function updateProjectIvyConfig(host, options) {
|
|
38
24
|
if (options.buildable || options.publishable) {
|
|
@@ -45,7 +31,6 @@ function updateProjectIvyConfig(host, options) {
|
|
|
45
31
|
}
|
|
46
32
|
function updateTsConfig(host, options) {
|
|
47
33
|
(0, create_ts_config_1.extractTsConfigBase)(host);
|
|
48
|
-
updateRootConfig(host, options);
|
|
49
34
|
updateProjectConfig(host, options);
|
|
50
35
|
updateProjectIvyConfig(host, options);
|
|
51
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AACA,yCAA0C;AAC1C,iCAAyD;AAEzD,mEAGsC;AAEtC,SAAS,mBAAmB,CAC1B,IAAU,EACV,OAA2C;IAE3C,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QACpE,IAAI,CAAC,OAAO,GAAG,CAAC,aAAa,CAAC,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,IAAI,GAAG,CAAC;gBACT,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;gBACvB,gBAAgB;gBAChB,kBAAkB;gBAClB,kBAAkB;aACnB,CAAC;SACH,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,gBAAgB;IAChB,IAAA,iCAAc,EACZ,IAAI,EACJ,OAAO,CAAC,WAAW,EACnB,KAAK,EACL,OAAO,EACP,IAAA,kCAA6B,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CACzD,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAC7B,IAAU,EACV,OAA2C;IAE3C,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,WAAW,EAAE;QAC5C,OAAO,IAAA,mBAAU,EACf,IAAI,EACJ,GAAG,OAAO,CAAC,WAAW,yBAAyB,EAC/C,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,CAAC;gBAC5C,OAAO,CAAC,eAAe,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAC7D,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;KACH;AACH,CAAC;AAED,SAAgB,cAAc,CAC5B,IAAU,EACV,OAA2C;IAE3C,IAAA,sCAAmB,EAAC,IAAI,CAAC,CAAC;IAC1B,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACnC,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACxC,CAAC;AAPD,wCAOC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Tree } from '@nrwl/devkit';
|
|
1
|
+
import { GeneratorCallback, Tree } from '@nrwl/devkit';
|
|
2
2
|
import { Schema } from './schema';
|
|
3
|
-
export declare function libraryGenerator(tree: Tree, schema: Schema): Promise<
|
|
3
|
+
export declare function libraryGenerator(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
|
|
4
4
|
export default libraryGenerator;
|
|
@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const jest_1 = require("@nrwl/jest");
|
|
7
7
|
const linter_1 = require("@nrwl/linter");
|
|
8
|
+
const js_1 = require("@nrwl/js");
|
|
8
9
|
const semver_1 = require("semver");
|
|
9
10
|
const init_1 = require("../../generators/init/init");
|
|
10
11
|
const test_runners_1 = require("../../utils/test-runners");
|
|
@@ -19,7 +20,6 @@ const add_standalone_component_1 = require("./lib/add-standalone-component");
|
|
|
19
20
|
const enable_strict_type_checking_1 = require("./lib/enable-strict-type-checking");
|
|
20
21
|
const normalize_options_1 = require("./lib/normalize-options");
|
|
21
22
|
const update_lib_package_npm_scope_1 = require("./lib/update-lib-package-npm-scope");
|
|
22
|
-
const update_project_1 = require("./lib/update-project");
|
|
23
23
|
const update_tsconfig_1 = require("./lib/update-tsconfig");
|
|
24
24
|
function libraryGenerator(tree, schema) {
|
|
25
25
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -38,7 +38,7 @@ function libraryGenerator(tree, schema) {
|
|
|
38
38
|
throw new Error(`The "--standalone" option is not supported in Angular versions < 14.1.0.`);
|
|
39
39
|
}
|
|
40
40
|
const options = (0, normalize_options_1.normalizeOptions)(tree, schema);
|
|
41
|
-
const { libraryOptions
|
|
41
|
+
const { libraryOptions } = options;
|
|
42
42
|
yield (0, init_1.default)(tree, Object.assign(Object.assign({}, libraryOptions), { skipFormat: true, e2eTestRunner: test_runners_1.E2eTestRunner.None }));
|
|
43
43
|
const { wrapAngularDevkitSchematic } = require('@nrwl/devkit/ngcli-adapter');
|
|
44
44
|
const runAngularLibrarySchematic = wrapAngularDevkitSchematic('@schematics/angular', 'library');
|
|
@@ -53,7 +53,8 @@ function libraryGenerator(tree, schema) {
|
|
|
53
53
|
if (libraryOptions.ngCliSchematicLibRoot !== libraryOptions.projectRoot) {
|
|
54
54
|
(0, devkit_1.moveFilesToNewDirectory)(tree, libraryOptions.ngCliSchematicLibRoot, libraryOptions.projectRoot);
|
|
55
55
|
}
|
|
56
|
-
yield (
|
|
56
|
+
const { updateProject } = yield Promise.resolve().then(() => require('./lib/update-project'));
|
|
57
|
+
yield updateProject(tree, libraryOptions);
|
|
57
58
|
(0, update_tsconfig_1.updateTsConfig)(tree, libraryOptions);
|
|
58
59
|
yield addUnitTestRunner(tree, libraryOptions);
|
|
59
60
|
updateNpmScopeIfBuildableOrPublishable(tree, libraryOptions);
|
|
@@ -78,6 +79,7 @@ function libraryGenerator(tree, schema) {
|
|
|
78
79
|
});
|
|
79
80
|
(0, dependencies_1.addBuildableLibrariesPostCssDependencies)(tree);
|
|
80
81
|
}
|
|
82
|
+
(0, js_1.updateRootTsConfig)(tree, Object.assign(Object.assign({}, libraryOptions), { js: false }));
|
|
81
83
|
if (!libraryOptions.skipFormat) {
|
|
82
84
|
yield (0, devkit_1.formatFiles)(tree);
|
|
83
85
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addPathMapping = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const
|
|
5
|
+
const js_1 = require("@nrwl/js");
|
|
6
6
|
function addPathMapping(tree, options) {
|
|
7
|
-
(0, devkit_1.updateJson)(tree, (0,
|
|
7
|
+
(0, devkit_1.updateJson)(tree, (0, js_1.getRootTsConfigPathInTree)(tree), (json) => {
|
|
8
8
|
const c = json.compilerOptions;
|
|
9
9
|
c.paths = c.paths || {};
|
|
10
10
|
c.paths[options.secondaryEntryPoint] = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-path-mapping.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library-secondary-entry-point/lib/add-path-mapping.ts"],"names":[],"mappings":";;;AAAA,yCAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"add-path-mapping.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library-secondary-entry-point/lib/add-path-mapping.ts"],"names":[],"mappings":";;;AAAA,yCAAgD;AAChD,iCAAqD;AAGrD,SAAgB,cAAc,CAC5B,IAAU,EACV,OAAmC;IAEnC,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,8BAAyB,EAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;QACzD,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC/B,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACxB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,mBAAmB,CAAC,GAAG;YACrC,GAAG,OAAO,CAAC,cAAc,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,eAAe;SAC9D,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAbD,wCAaC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AngularDevkitKarmaMigrator = 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 builder_migrator_1 = require("./builder.migrator");
|
|
8
8
|
class AngularDevkitKarmaMigrator extends builder_migrator_1.BuilderMigrator {
|
|
@@ -71,7 +71,7 @@ class AngularDevkitKarmaMigrator extends builder_migrator_1.BuilderMigrator {
|
|
|
71
71
|
this.logger.warn(`The tsConfig file "${originalTsConfigPath}" specified in the "${targetName}" target could not be found. Skipping updating the tsConfig file.`);
|
|
72
72
|
return;
|
|
73
73
|
}
|
|
74
|
-
this.updateTsConfigFile(target.options.tsConfig, (0,
|
|
74
|
+
this.updateTsConfigFile(target.options.tsConfig, (0, js_1.getRootTsConfigPathInTree)(this.tree), (0, devkit_1.offsetFromRoot)(this.projectConfig.root));
|
|
75
75
|
}
|
|
76
76
|
}
|
|
77
77
|
exports.AngularDevkitKarmaMigrator = AngularDevkitKarmaMigrator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"angular-devkit-karma.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/builders/angular-devkit-karma.migrator.ts"],"names":[],"mappings":";;;AAKA,yCAIsB;AACtB,
|
|
1
|
+
{"version":3,"file":"angular-devkit-karma.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/builders/angular-devkit-karma.migrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -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":"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"}
|
|
@@ -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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"}
|
|
@@ -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.`);
|