@nx/angular 16.8.0-beta.3 → 16.8.0-beta.5

package/src/generators/utils/testing.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStorybookTestWorkspaceForLib = exports.generateTestLibrary = exports.generateTestRemoteApplication = exports.generateTestHostApplication = exports.generateTestApplication = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const testing_1 = require("@nx/devkit/testing");
 const linter_1 = require("@nx/linter");
@@ -12,57 +11,55 @@ const component_1 = require("../component/component");
 const host_1 = require("../host/host");
 const library_1 = require("../library/library");
 const remote_1 = require("../remote/remote");
-function generateTestApplication(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        addAngularPluginPeerDeps(tree);
-        tree.write('.gitignore', '');
-        yield (0, application_1.applicationGenerator)(tree, options);
+async function generateTestApplication(tree, options) {
+    addAngularPluginPeerDeps(tree);
+    tree.write('.gitignore', '');
+    await (0, application_1.applicationGenerator)(tree, {
+        projectNameAndRootFormat: 'as-provided',
+        ...options,
     });
 }
 exports.generateTestApplication = generateTestApplication;
-function generateTestHostApplication(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        addAngularPluginPeerDeps(tree);
-        tree.write('.gitignore', '');
-        yield (0, host_1.host)(tree, options);
-    });
+async function generateTestHostApplication(tree, options) {
+    addAngularPluginPeerDeps(tree);
+    tree.write('.gitignore', '');
+    await (0, host_1.host)(tree, { projectNameAndRootFormat: 'as-provided', ...options });
 }
 exports.generateTestHostApplication = generateTestHostApplication;
-function generateTestRemoteApplication(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        addAngularPluginPeerDeps(tree);
-        tree.write('.gitignore', '');
-        yield (0, remote_1.remote)(tree, options);
-    });
+async function generateTestRemoteApplication(tree, options) {
+    addAngularPluginPeerDeps(tree);
+    tree.write('.gitignore', '');
+    await (0, remote_1.remote)(tree, { projectNameAndRootFormat: 'as-provided', ...options });
 }
 exports.generateTestRemoteApplication = generateTestRemoteApplication;
-function generateTestLibrary(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        addAngularPluginPeerDeps(tree);
-        tree.write('.gitignore', '');
-        yield (0, library_1.libraryGenerator)(tree, options);
+async function generateTestLibrary(tree, options) {
+    addAngularPluginPeerDeps(tree);
+    tree.write('.gitignore', '');
+    await (0, library_1.libraryGenerator)(tree, {
+        projectNameAndRootFormat: 'as-provided',
+        ...options,
     });
 }
 exports.generateTestLibrary = generateTestLibrary;
-function createStorybookTestWorkspaceForLib(libName) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        let tree = (0, testing_1.createTreeWithEmptyWorkspace)({ layout: 'apps-libs' });
-        addAngularPluginPeerDeps(tree);
-        tree.write('.gitignore', '');
-        yield (0, library_1.libraryGenerator)(tree, {
-            name: libName,
-            buildable: false,
-            linter: linter_1.Linter.EsLint,
-            publishable: false,
-            simpleName: false,
-            skipFormat: false,
-            unitTestRunner: test_runners_1.UnitTestRunner.Jest,
-        });
-        yield (0, component_1.componentGenerator)(tree, {
-            name: 'test-button',
-            project: libName,
-        });
-        tree.write(`libs/${libName}/src/lib/test-button/test-button.component.ts`, `import { Component, Input } from '@angular/core';
+async function createStorybookTestWorkspaceForLib(libName) {
+    let tree = (0, testing_1.createTreeWithEmptyWorkspace)({ layout: 'apps-libs' });
+    addAngularPluginPeerDeps(tree);
+    tree.write('.gitignore', '');
+    await (0, library_1.libraryGenerator)(tree, {
+        name: libName,
+        buildable: false,
+        linter: linter_1.Linter.EsLint,
+        publishable: false,
+        simpleName: false,
+        skipFormat: false,
+        unitTestRunner: test_runners_1.UnitTestRunner.Jest,
+        projectNameAndRootFormat: 'as-provided',
+    });
+    await (0, component_1.componentGenerator)(tree, {
+        name: 'test-button',
+        project: libName,
+    });
+    tree.write(`${libName}/src/lib/test-button/test-button.component.ts`, `import { Component, Input } from '@angular/core';
 
 export type ButtonStyle = 'default' | 'primary' | 'accent';
 
@@ -77,23 +74,23 @@ export class TestButtonComponent {
   @Input() age?: number;
   @Input() isOn = false;
 }`);
-        tree.write(`libs/${libName}/src/lib/test-button/test-button.component.html`, `<button [attr.type]="type" [ngClass]="style"></button>`);
-        const modulePath = `libs/${libName}/src/lib/${libName}.module.ts`;
-        tree.write(modulePath, `import * as ButtonExports from './test-button/test-button.component';
+    tree.write(`${libName}/src/lib/test-button/test-button.component.html`, `<button [attr.type]="type" [ngClass]="style"></button>`);
+    const modulePath = `${libName}/src/lib/${libName}.module.ts`;
+    tree.write(modulePath, `import * as ButtonExports from './test-button/test-button.component';
     ${tree.read(modulePath)}`);
-        // create a module with component that gets exported in a barrel file
-        generateModule(tree, {
-            name: 'barrel',
-            project: libName,
-        });
-        yield (0, component_1.componentGenerator)(tree, {
-            name: 'barrel-button',
-            project: libName,
-            path: `libs/${libName}/src/lib/barrel`,
-            module: 'barrel',
-        });
-        tree.write(`libs/${libName}/src/lib/barrel/barrel-button/index.ts`, `export * from './barrel-button.component';`);
-        tree.write(`libs/${libName}/src/lib/barrel/barrel.module.ts`, `import { NgModule } from '@angular/core';
+    // create a module with component that gets exported in a barrel file
+    generateModule(tree, {
+        name: 'barrel',
+        project: libName,
+    });
+    await (0, component_1.componentGenerator)(tree, {
+        name: 'barrel-button',
+        project: libName,
+        path: `${libName}/src/lib/barrel`,
+        module: 'barrel',
+    });
+    tree.write(`${libName}/src/lib/barrel/barrel-button/index.ts`, `export * from './barrel-button.component';`);
+    tree.write(`${libName}/src/lib/barrel/barrel.module.ts`, `import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { BarrelButtonComponent } from './barrel-button';
 
@@ -102,24 +99,24 @@ import { BarrelButtonComponent } from './barrel-button';
   declarations: [BarrelButtonComponent],
 })
 export class BarrelModule {}`);
-        // create a module with components that get Angular exported and declared by variable
-        generateModule(tree, {
-            name: 'variable-declare',
-            project: libName,
-        });
-        yield (0, component_1.componentGenerator)(tree, {
-            name: 'variable-declare-button',
-            project: libName,
-            path: `libs/${libName}/src/lib/variable-declare`,
-            module: 'variable-declare',
-        });
-        yield (0, component_1.componentGenerator)(tree, {
-            name: 'variable-declare-view',
-            project: libName,
-            path: `libs/${libName}/src/lib/variable-declare`,
-            module: 'variable-declare',
-        });
-        tree.write(`libs/${libName}/src/lib/variable-declare/variable-declare.module.ts`, `import { NgModule } from '@angular/core';
+    // create a module with components that get Angular exported and declared by variable
+    generateModule(tree, {
+        name: 'variable-declare',
+        project: libName,
+    });
+    await (0, component_1.componentGenerator)(tree, {
+        name: 'variable-declare-button',
+        project: libName,
+        path: `${libName}/src/lib/variable-declare`,
+        module: 'variable-declare',
+    });
+    await (0, component_1.componentGenerator)(tree, {
+        name: 'variable-declare-view',
+        project: libName,
+        path: `${libName}/src/lib/variable-declare`,
+        module: 'variable-declare',
+    });
+    tree.write(`${libName}/src/lib/variable-declare/variable-declare.module.ts`, `import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { VariableDeclareButtonComponent } from './variable-declare-button/variable-declare-button.component';
 import { VariableDeclareViewComponent } from './variable-declare-view/variable-declare-view.component';
@@ -135,30 +132,30 @@ const COMPONENTS = [
   exports: COMPONENTS
 })
 export class VariableDeclareModule {}`);
-        // create a module with components that get Angular exported and declared by variable
-        generateModule(tree, {
-            name: 'variable-spread-declare',
-            project: libName,
-        });
-        yield (0, component_1.componentGenerator)(tree, {
-            name: 'variable-spread-declare-button',
-            project: libName,
-            path: `libs/${libName}/src/lib/variable-spread-declare`,
-            module: 'variable-spread-declare',
-        });
-        yield (0, component_1.componentGenerator)(tree, {
-            name: 'variable-spread-declare-view',
-            project: libName,
-            path: `libs/${libName}/src/lib/variable-spread-declare`,
-            module: 'variable-spread-declare',
-        });
-        yield (0, component_1.componentGenerator)(tree, {
-            name: 'variable-spread-declare-anotherview',
-            project: libName,
-            path: `libs/${libName}/src/lib/variable-spread-declare`,
-            module: 'variable-spread-declare',
-        });
-        tree.write(`libs/${libName}/src/lib/variable-spread-declare/variable-spread-declare.module.ts`, `import { NgModule } from '@angular/core';
+    // create a module with components that get Angular exported and declared by variable
+    generateModule(tree, {
+        name: 'variable-spread-declare',
+        project: libName,
+    });
+    await (0, component_1.componentGenerator)(tree, {
+        name: 'variable-spread-declare-button',
+        project: libName,
+        path: `${libName}/src/lib/variable-spread-declare`,
+        module: 'variable-spread-declare',
+    });
+    await (0, component_1.componentGenerator)(tree, {
+        name: 'variable-spread-declare-view',
+        project: libName,
+        path: `${libName}/src/lib/variable-spread-declare`,
+        module: 'variable-spread-declare',
+    });
+    await (0, component_1.componentGenerator)(tree, {
+        name: 'variable-spread-declare-anotherview',
+        project: libName,
+        path: `${libName}/src/lib/variable-spread-declare`,
+        module: 'variable-spread-declare',
+    });
+    tree.write(`${libName}/src/lib/variable-spread-declare/variable-spread-declare.module.ts`, `import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { VariableSpreadDeclareButtonComponent } from './variable-spread-declare-button/variable-spread-declare-button.component';
 import { VariableSpreadDeclareViewComponent } from './variable-spread-declare-view/variable-spread-declare-view.component';
@@ -174,24 +171,24 @@ const COMPONENTS = [
   declarations: [...COMPONENTS, VariableSpreadDeclareAnotherviewComponent],
 })
 export class VariableSpreadDeclareModule {}`);
-        // create a module where declared components are pulled from a static member of the module
-        generateModule(tree, {
-            name: 'static-member-declarations',
-            project: libName,
-        });
-        yield (0, component_1.componentGenerator)(tree, {
-            name: 'cmp1',
-            project: libName,
-            path: `libs/${libName}/src/lib/static-member-declarations`,
-            module: 'static-member-declarations',
-        });
-        yield (0, component_1.componentGenerator)(tree, {
-            name: 'cmp2',
-            project: libName,
-            path: `libs/${libName}/src/lib/static-member-declarations`,
-            module: 'static-member-declarations',
-        });
-        tree.write(`libs/${libName}/src/lib/static-member-declarations/static-member-declarations.module.ts`, `import { NgModule } from '@angular/core';
+    // create a module where declared components are pulled from a static member of the module
+    generateModule(tree, {
+        name: 'static-member-declarations',
+        project: libName,
+    });
+    await (0, component_1.componentGenerator)(tree, {
+        name: 'cmp1',
+        project: libName,
+        path: `${libName}/src/lib/static-member-declarations`,
+        module: 'static-member-declarations',
+    });
+    await (0, component_1.componentGenerator)(tree, {
+        name: 'cmp2',
+        project: libName,
+        path: `${libName}/src/lib/static-member-declarations`,
+        module: 'static-member-declarations',
+    });
+    tree.write(`${libName}/src/lib/static-member-declarations/static-member-declarations.module.ts`, `import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { Cmp1Component } from './cmp1/cmp1.component';
 import { Cmp2Component } from './cmp2/cmp2.component';
@@ -204,34 +201,40 @@ import { Cmp2Component } from './cmp2/cmp2.component';
 export class StaticMemberDeclarationsModule {
   static readonly COMPONENTS = [Cmp1Component, Cmp2Component];
 }`);
-        // create another button in a nested subpath
-        generateModule(tree, {
-            name: 'nested',
-            project: libName,
-            path: `libs/${libName}/src/lib`,
-        });
-        yield (0, component_1.componentGenerator)(tree, {
-            name: 'nested-button',
-            project: libName,
-            module: 'nested',
-            path: `libs/${libName}/src/lib/nested`,
-        });
-        yield (0, component_1.componentGenerator)(tree, {
-            name: 'test-other',
-            project: libName,
-        });
-        return tree;
+    // create another button in a nested subpath
+    generateModule(tree, {
+        name: 'nested',
+        project: libName,
+        path: `${libName}/src/lib`,
+    });
+    await (0, component_1.componentGenerator)(tree, {
+        name: 'nested-button',
+        project: libName,
+        module: 'nested',
+        path: `${libName}/src/lib/nested`,
+    });
+    await (0, component_1.componentGenerator)(tree, {
+        name: 'test-other',
+        project: libName,
     });
+    return tree;
 }
 exports.createStorybookTestWorkspaceForLib = createStorybookTestWorkspaceForLib;
 function addAngularPluginPeerDeps(tree) {
-    (0, devkit_1.updateJson)(tree, 'package.json', (json) => (Object.assign(Object.assign({}, json), { devDependencies: Object.assign(Object.assign({}, json.devDependencies), { '@angular-devkit/core': versions_1.angularDevkitVersion, '@angular-devkit/schematics': versions_1.angularDevkitVersion, '@schematics/angular': versions_1.angularDevkitVersion }) })));
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => ({
+        ...json,
+        devDependencies: {
+            ...json.devDependencies,
+            '@angular-devkit/core': versions_1.angularDevkitVersion,
+            '@angular-devkit/schematics': versions_1.angularDevkitVersion,
+            '@schematics/angular': versions_1.angularDevkitVersion,
+        },
+    }));
 }
 function generateModule(tree, options) {
-    var _a;
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     if (options.path === undefined) {
-        const sourceRoot = (_a = project.sourceRoot) !== null && _a !== void 0 ? _a : `${project.root}/src`;
+        const sourceRoot = project.sourceRoot ?? `${project.root}/src`;
         const projectDirName = project.projectType === 'application' ? 'app' : 'lib';
         options.path = `${sourceRoot}/${projectDirName}`;
     }

package/src/generators/utils/validations.js

@@ -16,7 +16,7 @@ function validateStandaloneOption(tree, standalone, angularVersion) {
     if (!standalone) {
         return;
     }
-    const installedAngularVersion = angularVersion !== null && angularVersion !== void 0 ? angularVersion : (0, version_utils_1.getInstalledAngularVersionInfo)(tree).version;
+    const installedAngularVersion = angularVersion ?? (0, version_utils_1.getInstalledAngularVersionInfo)(tree).version;
     if ((0, semver_1.lt)(installedAngularVersion, '14.1.0')) {
         throw new Error((0, devkit_1.stripIndents) `The "standalone" option is only supported in Angular >= 14.1.0. You are currently using "${installedAngularVersion}".
     You can resolve this error by removing the "standalone" option or by migrating to Angular 14.1.0.`);

package/src/generators/utils/version-utils.js

@@ -7,15 +7,14 @@ const latestVersions = require("../../utils/versions");
 const versions_1 = require("../../utils/versions");
 const backward_compatible_versions_1 = require("../../utils/backward-compatible-versions");
 function getInstalledAngularVersion(tree) {
-    var _a, _b;
     const pkgJson = (0, devkit_1.readJson)(tree, 'package.json');
     const installedAngularVersion = pkgJson.dependencies && pkgJson.dependencies['@angular/core'];
     if (!installedAngularVersion ||
         installedAngularVersion === 'latest' ||
         installedAngularVersion === 'next') {
-        return (_a = (0, semver_1.clean)(versions_1.angularVersion)) !== null && _a !== void 0 ? _a : (0, semver_1.coerce)(versions_1.angularVersion).version;
+        return (0, semver_1.clean)(versions_1.angularVersion) ?? (0, semver_1.coerce)(versions_1.angularVersion).version;
     }
-    return ((_b = (0, semver_1.clean)(installedAngularVersion)) !== null && _b !== void 0 ? _b : (0, semver_1.coerce)(installedAngularVersion).version);
+    return ((0, semver_1.clean)(installedAngularVersion) ?? (0, semver_1.coerce)(installedAngularVersion).version);
 }
 exports.getInstalledAngularVersion = getInstalledAngularVersion;
 function getInstalledAngularMajorVersion(tree) {
@@ -31,9 +30,8 @@ function getInstalledAngularVersionInfo(tree) {
 }
 exports.getInstalledAngularVersionInfo = getInstalledAngularVersionInfo;
 function getInstalledPackageVersion(tree, pkgName) {
-    var _a;
     const { dependencies, devDependencies } = (0, devkit_1.readJson)(tree, 'package.json');
-    const version = (_a = dependencies === null || dependencies === void 0 ? void 0 : dependencies[pkgName]) !== null && _a !== void 0 ? _a : devDependencies === null || devDependencies === void 0 ? void 0 : devDependencies[pkgName];
+    const version = dependencies?.[pkgName] ?? devDependencies?.[pkgName];
     return version;
 }
 exports.getInstalledPackageVersion = getInstalledPackageVersion;
@@ -46,8 +44,8 @@ function addDependenciesToPackageJsonIfDontExist(tree, dependencies, devDependen
     const packageJson = (0, devkit_1.readJson)(tree, packageJsonPath);
     function filterExisting(deps) {
         return Object.keys(deps)
-            .filter((d) => { var _a, _b; return !((_a = packageJson.dependencies) === null || _a === void 0 ? void 0 : _a[d]) && !((_b = packageJson.devDependencies) === null || _b === void 0 ? void 0 : _b[d]); })
-            .reduce((acc, d) => (Object.assign(Object.assign({}, acc), { [d]: deps[d] })), {});
+            .filter((d) => !packageJson.dependencies?.[d] && !packageJson.devDependencies?.[d])
+            .reduce((acc, d) => ({ ...acc, [d]: deps[d] }), {});
     }
     const depsToAdd = filterExisting(dependencies);
     const devDepsToAdd = filterExisting(devDependencies);

package/src/generators/web-worker/lib/normalize-options.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const devkit_1 = require("@nx/devkit");
 function normalizeOptions(tree, options) {
-    var _a, _b;
     if (!(0, devkit_1.getProjects)(tree).has(options.project)) {
         throw new Error(`Project '${options.project}' does not exist!`);
     }
@@ -11,12 +10,16 @@ function normalizeOptions(tree, options) {
     if (projectType !== 'application') {
         throw new Error(`Web Worker can only be added to an application. Project '${options.project}' is a library.`);
     }
-    const path = ((_a = options.path) !== null && _a !== void 0 ? _a : sourceRoot)
+    const path = options.path ?? sourceRoot
         ? (0, devkit_1.joinPathFragments)(sourceRoot, 'app')
         : (0, devkit_1.joinPathFragments)(root, 'src', 'app');
     if (!tree.exists(path)) {
         throw new Error(`Path '${options.path}' does not exist!`);
     }
-    return Object.assign(Object.assign({}, options), { path, snippet: (_b = options.snippet) !== null && _b !== void 0 ? _b : true });
+    return {
+        ...options,
+        path,
+        snippet: options.snippet ?? true,
+    };
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/web-worker/web-worker.js

@@ -1,37 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webWorkerGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const lib_1 = require("./lib");
 const js_1 = require("@nx/js");
-function webWorkerGenerator(tree, rawOptions) {
-    var _a, _b;
-    var _c, _d;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
-        const workerNames = (0, devkit_1.names)(options.name);
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-        const substitutions = {
-            rootOffset: (0, devkit_1.offsetFromRoot)(projectConfig.root),
-            rootTsConfig: (0, js_1.getRelativePathToRootTsConfig)(tree, projectConfig.root),
-            name: workerNames.fileName,
-            tpl: '',
-        };
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, './files/worker'), options.path, substitutions);
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, './files/config'), projectConfig.root, substitutions);
-        if (options.snippet) {
-            (0, lib_1.addSnippet)(tree, workerNames.fileName, options.path);
-        }
-        (_a = (_c = projectConfig.targets['build'].options).webWorkerTsConfig) !== null && _a !== void 0 ? _a : (_c.webWorkerTsConfig = (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.worker.json'));
-        if (projectConfig.targets['test']) {
-            (_b = (_d = projectConfig.targets['test'].options).webWorkerTsConfig) !== null && _b !== void 0 ? _b : (_d.webWorkerTsConfig = (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.worker.json'));
-        }
-        (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-    });
+async function webWorkerGenerator(tree, rawOptions) {
+    const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
+    const workerNames = (0, devkit_1.names)(options.name);
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    const substitutions = {
+        rootOffset: (0, devkit_1.offsetFromRoot)(projectConfig.root),
+        rootTsConfig: (0, js_1.getRelativePathToRootTsConfig)(tree, projectConfig.root),
+        name: workerNames.fileName,
+        tpl: '',
+    };
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, './files/worker'), options.path, substitutions);
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, './files/config'), projectConfig.root, substitutions);
+    if (options.snippet) {
+        (0, lib_1.addSnippet)(tree, workerNames.fileName, options.path);
+    }
+    projectConfig.targets['build'].options.webWorkerTsConfig ??=
+        (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.worker.json');
+    if (projectConfig.targets['test']) {
+        projectConfig.targets['test'].options.webWorkerTsConfig ??=
+            (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.worker.json');
+    }
+    (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
 }
 exports.webWorkerGenerator = webWorkerGenerator;
 exports.default = webWorkerGenerator;

package/src/migrations/update-14-2-0/remove-show-circular-dependencies-option.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const executors = [
@@ -8,19 +7,17 @@ const executors = [
     '@angular-devkit/build-angular:server',
     '@nrwl/angular:webpack-browser',
 ];
-function default_1(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        executors.forEach((executor) => {
-            (0, executor_options_utils_1.forEachExecutorOptions)(tree, executor, (_options, projectName, targetName, configurationName) => {
-                const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-                const config = configurationName
-                    ? projectConfiguration.targets[targetName].configurations[configurationName]
-                    : projectConfiguration.targets[targetName].options;
-                delete config.showCircularDependencies;
-                (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
-            });
+async function default_1(tree) {
+    executors.forEach((executor) => {
+        (0, executor_options_utils_1.forEachExecutorOptions)(tree, executor, (_options, projectName, targetName, configurationName) => {
+            const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+            const config = configurationName
+                ? projectConfiguration.targets[targetName].configurations[configurationName]
+                : projectConfiguration.targets[targetName].options;
+            delete config.showCircularDependencies;
+            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
         });
-        yield (0, devkit_1.formatFiles)(tree);
     });
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = default_1;

package/src/migrations/update-14-2-0/update-angular-cli.js

@@ -1,26 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const angularCliVersion = '~14.0.0';
-function default_1(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        let shouldFormat = false;
-        (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
-            var _a, _b;
-            if ((_a = json.devDependencies) === null || _a === void 0 ? void 0 : _a['@angular/cli']) {
-                json.devDependencies['@angular/cli'] = angularCliVersion;
-                shouldFormat = true;
-            }
-            else if ((_b = json.dependencies) === null || _b === void 0 ? void 0 : _b['@angular/cli']) {
-                json.dependencies['@angular/cli'] = angularCliVersion;
-                shouldFormat = true;
-            }
-            return json;
-        });
-        if (shouldFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
+async function default_1(tree) {
+    let shouldFormat = false;
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        if (json.devDependencies?.['@angular/cli']) {
+            json.devDependencies['@angular/cli'] = angularCliVersion;
+            shouldFormat = true;
         }
+        else if (json.dependencies?.['@angular/cli']) {
+            json.dependencies['@angular/cli'] = angularCliVersion;
+            shouldFormat = true;
+        }
+        return json;
     });
+    if (shouldFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
 }
 exports.default = default_1;

package/src/migrations/update-14-2-0/update-libraries-secondary-entrypoints.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const libraryExecutors = [
@@ -8,31 +7,28 @@ const libraryExecutors = [
     '@nrwl/angular:ng-packagr-lite',
     '@nrwl/angular:package',
 ];
-function default_1(tree) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(tree);
-        for (const [, project] of projects) {
-            if (!Object.values((_a = project.targets) !== null && _a !== void 0 ? _a : {}).some((target) => libraryExecutors.includes(target.executor))) {
-                continue;
-            }
-            (0, devkit_1.visitNotIgnoredFiles)(tree, project.root, (filePath) => {
-                if ((0, path_1.basename)(filePath) !== 'package.json' ||
-                    (0, devkit_1.normalizePath)(filePath) ===
-                        (0, devkit_1.joinPathFragments)(project.root, 'package.json')) {
-                    return;
-                }
-                const json = (0, devkit_1.readJson)(tree, filePath);
-                if (json.ngPackage) {
-                    // Migrate ng-packagr config to an ng-packagr config file.
-                    const configFilePath = (0, devkit_1.joinPathFragments)((0, path_1.dirname)(filePath), 'ng-package.json');
-                    (0, devkit_1.writeJson)(tree, configFilePath, json.ngPackage);
-                }
-                // Delete package.json as it is no longer needed in APF 14.
-                tree.delete(filePath);
-            });
+async function default_1(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const [, project] of projects) {
+        if (!Object.values(project.targets ?? {}).some((target) => libraryExecutors.includes(target.executor))) {
+            continue;
         }
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+        (0, devkit_1.visitNotIgnoredFiles)(tree, project.root, (filePath) => {
+            if ((0, path_1.basename)(filePath) !== 'package.json' ||
+                (0, devkit_1.normalizePath)(filePath) ===
+                    (0, devkit_1.joinPathFragments)(project.root, 'package.json')) {
+                return;
+            }
+            const json = (0, devkit_1.readJson)(tree, filePath);
+            if (json.ngPackage) {
+                // Migrate ng-packagr config to an ng-packagr config file.
+                const configFilePath = (0, devkit_1.joinPathFragments)((0, path_1.dirname)(filePath), 'ng-package.json');
+                (0, devkit_1.writeJson)(tree, configFilePath, json.ngPackage);
+            }
+            // Delete package.json as it is no longer needed in APF 14.
+            tree.delete(filePath);
+        });
+    }
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = default_1;