@nrwl/angular 15.6.3 → 15.7.0-alpha.0

package/src/migrations/update-12-3-0/convert-webpack-browser-build-target-to-delegate-build.js

@@ -1,104 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nrwl/devkit");
-function convertWebpackBrowserBuildTargetToDelegateBuild(host) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(host);
-        for (const [projectName, project] of projects) {
-            const webpackBrowserTargets = Object.values(project.targets || {}).filter((target) => target.executor === '@nrwl/angular:webpack-browser');
-            for (const target of webpackBrowserTargets) {
-                const configurationOptions = getTargetConfigurationOptions(target);
-                const buildTargetName = yield getBuildTargetNameFromOptions(target.options, configurationOptions);
-                if (buildTargetName) {
-                    target.executor = '@nrwl/angular:delegate-build';
-                    updateTargetsOptions(project, target, buildTargetName);
-                    yield updateTargetsConfigurations(project, projectName, target, buildTargetName, configurationOptions);
-                }
-            }
-            (0, devkit_1.updateProjectConfiguration)(host, projectName, project);
-        }
-        yield (0, devkit_1.formatFiles)(host);
-    });
-}
-exports.default = convertWebpackBrowserBuildTargetToDelegateBuild;
-function cleanupBuildTargetProperties(options) {
-    delete options.tsConfig;
-    delete options.outputPath;
-}
-function extractConfigurationBuildTarget(project, target, configuration, buildTarget) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (buildTarget) {
-            const buildTargetObj = (0, devkit_1.parseTargetString)(buildTarget, yield (0, devkit_1.createProjectGraphAsync)());
-            return Object.assign(Object.assign({}, buildTargetObj), { configuration: (_a = buildTargetObj.configuration) !== null && _a !== void 0 ? _a : configuration });
-        }
-        return {
-            project: project,
-            target: target,
-            configuration: configuration,
-        };
-    });
-}
-function getBuildTargetNameFromOptions(baseOptions, configurationOptions) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const pg = yield (0, devkit_1.createProjectGraphAsync)();
-        if (baseOptions.buildTarget) {
-            return (0, devkit_1.parseTargetString)(baseOptions.buildTarget, pg).target;
-        }
-        for (const [, options] of configurationOptions) {
-            if (options.buildTarget) {
-                return (0, devkit_1.parseTargetString)(options.buildTarget, pg).target;
-            }
-        }
-    });
-}
-function getTargetConfigurationOptions(target) {
-    const targets = new Map();
-    if (target.configurations) {
-        for (const [name, options] of Object.entries(target.configurations)) {
-            if (options !== undefined) {
-                targets.set(name, options);
-            }
-        }
-    }
-    return targets;
-}
-function updateTargetsConfigurations(project, projectName, target, buildTargetName, configurationOptions) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        for (const [configurationName, options] of configurationOptions) {
-            const { buildTarget, tsConfig, outputPath } = options, delegateTargetOptions = tslib_1.__rest(options, ["buildTarget", "tsConfig", "outputPath"]);
-            const configurationBuildTarget = yield extractConfigurationBuildTarget(projectName, buildTargetName, configurationName, buildTarget);
-            if (!project.targets[buildTargetName].configurations) {
-                project.targets[buildTargetName].configurations = {};
-            }
-            // Update build target configuration options by overwriting them
-            const buildTargetConfigurations = project.targets[buildTargetName].configurations;
-            buildTargetConfigurations[configurationBuildTarget.configuration] = Object.assign(Object.assign({}, buildTargetConfigurations[configurationBuildTarget.configuration]), delegateTargetOptions);
-            // Delete options already present in the source target
-            cleanupBuildTargetProperties(buildTargetConfigurations[configurationBuildTarget.configuration]);
-            // Update source target configuration with buildTarget
-            target.configurations[configurationName] = {
-                buildTarget: (0, devkit_1.targetToTargetString)(configurationBuildTarget),
-                tsConfig,
-                outputPath,
-            };
-        }
-    });
-}
-function updateTargetsOptions(project, target, buildTargetName) {
-    if (target.options) {
-        const _a = target.options, { buildTarget, tsConfig, outputPath } = _a, delegateTargetOptions = tslib_1.__rest(_a, ["buildTarget", "tsConfig", "outputPath"]);
-        // Update build target options by overwriting them
-        project.targets[buildTargetName].options = Object.assign(Object.assign({}, project.targets[buildTargetName].options), delegateTargetOptions);
-        // Delete options already present in the source target
-        cleanupBuildTargetProperties(project.targets[buildTargetName].options);
-        // Update source target options to only contain what it needs
-        target.options = {
-            buildTarget,
-            tsConfig,
-            outputPath,
-        };
-    }
-}
-//# sourceMappingURL=convert-webpack-browser-build-target-to-delegate-build.js.map

package/src/migrations/update-12-3-0/convert-webpack-browser-build-target-to-delegate-build.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"convert-webpack-browser-build-target-to-delegate-build.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-12-3-0/convert-webpack-browser-build-target-to-delegate-build.ts"],"names":[],"mappings":"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"}

package/src/migrations/update-12-3-0/update-angular-eslint-rules.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nrwl/devkit';
-export default function (tree: Tree): Promise<void>;

package/src/migrations/update-12-3-0/update-angular-eslint-rules.js

@@ -1,60 +0,0 @@
-"use strict";
-// This migration is mostly copied from https://github.com/angular-eslint/angular-eslint/blob/3c5a9d43264c9cbdd8fe8f2ebb19c613396386c2/packages/schematics/src/migrations/update-12-0-0/update-12-0-0.ts
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nrwl/devkit");
-const path_1 = require("path");
-function default_1(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, devkit_1.visitNotIgnoredFiles)(tree, '', (file) => {
-            if ((0, path_1.basename)(file) !== '.eslintrc.json') {
-                return;
-            }
-            (0, devkit_1.updateJson)(tree, file, (eslintJson) => {
-                migrateAngularEsLintRules(eslintJson);
-                return eslintJson;
-            });
-        });
-        yield (0, devkit_1.formatFiles)(tree);
-    });
-}
-exports.default = default_1;
-function migrateAngularEsLintRules({ overrides, rules }) {
-    var _a;
-    migrateToAccessibilityLabelHasAssociatedControlSchema(rules === null || rules === void 0 ? void 0 : rules['@angular-eslint/template/accessibility-label-for']);
-    migrateToAccessibilityLabelHasAssociatedControlName(rules);
-    addEqeqeqIfNeeded(rules);
-    for (const o of overrides !== null && overrides !== void 0 ? overrides : []) {
-        migrateToAccessibilityLabelHasAssociatedControlSchema((_a = o.rules) === null || _a === void 0 ? void 0 : _a['@angular-eslint/template/accessibility-label-for']);
-        migrateToAccessibilityLabelHasAssociatedControlName(o.rules);
-        addEqeqeqIfNeeded(o.rules);
-    }
-}
-function migrateToAccessibilityLabelHasAssociatedControlName(rules) {
-    if (!rules)
-        return;
-    const accessibilityLabelForRule = rules['@angular-eslint/template/accessibility-label-for'];
-    delete rules['@angular-eslint/template/accessibility-label-for'];
-    rules['@angular-eslint/template/accessibility-label-has-associated-control'] =
-        accessibilityLabelForRule;
-}
-function migrateToAccessibilityLabelHasAssociatedControlSchema(rule) {
-    if (!Array.isArray(rule) || rule.length !== 2)
-        return;
-    const [, currentSchema] = rule;
-    rule[1] = {
-        controlComponents: currentSchema.controlComponents,
-        labelComponents: currentSchema.labelComponents.map((selector) => {
-            return { inputs: currentSchema.labelAttributes, selector };
-        }),
-    };
-}
-function addEqeqeqIfNeeded(rules) {
-    if (!rules ||
-        !rules['@angular-eslint/template/no-negated-async'] ||
-        rules['@angular-eslint/template/eqeqeq']) {
-        return;
-    }
-    rules['@angular-eslint/template/eqeqeq'] = 'error';
-}
-//# sourceMappingURL=update-angular-eslint-rules.js.map

package/src/migrations/update-12-3-0/update-angular-eslint-rules.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"update-angular-eslint-rules.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-12-3-0/update-angular-eslint-rules.ts"],"names":[],"mappings":";AAAA,wMAAwM;;;AAExM,yCAKsB;AACtB,+BAAgC;AAGhC,mBAA+B,IAAU;;QACvC,IAAA,6BAAoB,EAAC,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE;YACtC,IAAI,IAAA,eAAQ,EAAC,IAAI,CAAC,KAAK,gBAAgB,EAAE;gBACvC,OAAO;aACR;YAED,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAI,EAAE,CAAC,UAAyB,EAAE,EAAE;gBACnD,yBAAyB,CAAC,UAAU,CAAC,CAAC;gBACtC,OAAO,UAAU,CAAC;YACpB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAZD,4BAYC;AAED,SAAS,yBAAyB,CAAC,EAAE,SAAS,EAAE,KAAK,EAAiB;;IACpE,qDAAqD,CACnD,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAG,kDAAkD,CAAC,CAC5D,CAAC;IACF,mDAAmD,CAAC,KAAK,CAAC,CAAC;IAC3D,iBAAiB,CAAC,KAAK,CAAC,CAAC;IACzB,KAAK,MAAM,CAAC,IAAI,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,EAAE;QAC/B,qDAAqD,CACnD,MAAA,CAAC,CAAC,KAAK,0CAAG,kDAAkD,CAAC,CAC9D,CAAC;QACF,mDAAmD,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAC7D,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;KAC5B;AACH,CAAC;AAED,SAAS,mDAAmD,CAC1D,KAA8C;IAE9C,IAAI,CAAC,KAAK;QAAE,OAAO;IACnB,MAAM,yBAAyB,GAC7B,KAAK,CAAC,kDAAkD,CAAC,CAAC;IAC5D,OAAO,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACjE,KAAK,CAAC,qEAAqE,CAAC;QAC1E,yBAAyB,CAAC;AAC9B,CAAC;AAED,SAAS,qDAAqD,CAC5D,IAAkC;IAElC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IACtD,MAAM,CAAC,EAAE,aAAa,CAAC,GAAG,IAAI,CAAC;IAC/B,IAAI,CAAC,CAAC,CAAC,GAAG;QACR,iBAAiB,EAAE,aAAa,CAAC,iBAAiB;QAClD,eAAe,EAAE,aAAa,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,QAAgB,EAAE,EAAE;YACtE,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,eAAe,EAAE,QAAQ,EAAE,CAAC;QAC7D,CAAC,CAAC;KACH,CAAC;AACJ,CAAC;AACD,SAAS,iBAAiB,CAAC,KAA8C;IACvE,IACE,CAAC,KAAK;QACN,CAAC,KAAK,CAAC,2CAA2C,CAAC;QACnD,KAAK,CAAC,iCAAiC,CAAC,EACxC;QACA,OAAO;KACR;IAED,KAAK,CAAC,iCAAiC,CAAC,GAAG,OAAO,CAAC;AACrD,CAAC"}

package/src/migrations/update-12-3-0/update-storybook.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nrwl/devkit';
-export default function (tree: Tree): Promise<import("@nrwl/devkit").GeneratorCallback>;

package/src/migrations/update-12-3-0/update-storybook.js

@@ -1,64 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nrwl/devkit");
-const semver_1 = require("semver");
-const path_1 = require("path");
-const executor_options_utils_1 = require("@nrwl/workspace/src/utilities/executor-options-utils");
-function default_1(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        let storybookVersion;
-        try {
-            storybookVersion = require('@storybook/core/package.json').version;
-        }
-        catch (_a) { }
-        if (!storybookVersion) {
-            return;
-        }
-        if ((0, semver_1.lt)(storybookVersion, '6.2.0')) {
-            devkit_1.logger.error((0, devkit_1.stripIndents) `NX Could not migrate to Angular 12
-      Angular 12 uses Webpack 5.
-      This workspace uses Storybook ${storybookVersion} which does not support Webpack 5.
-      Storybook 6.2+ is required to support Webpack 5.
-      See our documentation on migrating to Storybook 6:
-      https://nx.dev/storybook/overview-angular#upgrading-to-storybook-6-using-the-nx-migration-generator
-    `);
-            throw new Error('Could not migrate to Angular 12');
-        }
-        let updated;
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/storybook:storybook', (options) => {
-            var _a, _b;
-            if (options['uiFramework'] !== '@storybook/angular') {
-                return;
-            }
-            const configFolder = (_a = options === null || options === void 0 ? void 0 : options['config']) === null || _a === void 0 ? void 0 : _a.configFolder;
-            if (!configFolder) {
-                return;
-            }
-            const configPath = (0, path_1.join)(configFolder, 'main.js');
-            if (!tree.exists(configPath)) {
-                devkit_1.logger.warn(`Could not migrate ${configPath} to use webpack 5. The config.core.builder should be set to "webpack5". See https://gist.github.com/shilman/8856ea1786dcd247139b47b270912324#upgrade`);
-                return;
-            }
-            updated = true;
-            const originalContents = tree.read(configPath).toString();
-            const configureWebpack5 = `module.exports.core = { ...module.exports.core, builder: 'webpack5' };`;
-            try {
-                const config = require((0, path_1.join)(tree.root, configPath));
-                if (((_b = config === null || config === void 0 ? void 0 : config.core) === null || _b === void 0 ? void 0 : _b.builder) !== 'webpack5') {
-                    tree.write(configPath, originalContents + '\n' + configureWebpack5);
-                }
-            }
-            catch (_c) { }
-        });
-        const installTask = updated
-            ? (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-                '@storybook/builder-webpack5': storybookVersion,
-            })
-            : () => { };
-        yield (0, devkit_1.formatFiles)(tree);
-        return installTask;
-    });
-}
-exports.default = default_1;
-//# sourceMappingURL=update-storybook.js.map

package/src/migrations/update-12-3-0/update-storybook.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"update-storybook.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-12-3-0/update-storybook.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,mCAA4B;AAC5B,+BAA4B;AAC5B,iGAA8F;AAE9F,mBAA+B,IAAU;;QACvC,IAAI,gBAAgB,CAAC;QAErB,IAAI;YACF,gBAAgB,GAAG,OAAO,CAAC,8BAA8B,CAAC,CAAC,OAAO,CAAC;SACpE;QAAC,WAAM,GAAE;QAEV,IAAI,CAAC,gBAAgB,EAAE;YACrB,OAAO;SACR;QAED,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,OAAO,CAAC,EAAE;YACjC,eAAM,CAAC,KAAK,CAAC,IAAA,qBAAY,EAAA;;sCAES,gBAAgB;;;;KAIjD,CAAC,CAAC;YACH,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;SACpD;QAED,IAAI,OAAO,CAAC;QACZ,IAAA,+CAAsB,EAAC,IAAI,EAAE,2BAA2B,EAAE,CAAC,OAAO,EAAE,EAAE;;YACpE,IAAI,OAAO,CAAC,aAAa,CAAC,KAAK,oBAAoB,EAAE;gBACnD,OAAO;aACR;YAED,MAAM,YAAY,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,QAAQ,CAAC,0CAAE,YAAY,CAAC;YAEvD,IAAI,CAAC,YAAY,EAAE;gBACjB,OAAO;aACR;YAED,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC,YAAY,EAAE,SAAS,CAAC,CAAC;YAEjD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;gBAC5B,eAAM,CAAC,IAAI,CACT,qBAAqB,UAAU,sJAAsJ,CACtL,CAAC;gBACF,OAAO;aACR;YAED,OAAO,GAAG,IAAI,CAAC;YACf,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC;YAC1D,MAAM,iBAAiB,GAAG,wEAAwE,CAAC;YACnG,IAAI;gBACF,MAAM,MAAM,GAAG,OAAO,CAAC,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;gBACpD,IAAI,CAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,0CAAE,OAAO,MAAK,UAAU,EAAE;oBACxC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,gBAAgB,GAAG,IAAI,GAAG,iBAAiB,CAAC,CAAC;iBACrE;aACF;YAAC,WAAM,GAAE;QACZ,CAAC,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,OAAO;YACzB,CAAC,CAAC,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;gBACE,6BAA6B,EAAE,gBAAgB;aAChD,CACF;YACH,CAAC,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;QACb,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,WAAW,CAAC;IACrB,CAAC;CAAA;AAlED,4BAkEC"}

package/src/migrations/update-12-3-0/update-webpack-browser-config.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nrwl/devkit';
-export default function updateAngularConfig(host: Tree): Promise<void>;

package/src/migrations/update-12-3-0/update-webpack-browser-config.js

@@ -1,67 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nrwl/devkit");
-const optionsToUpdate = [
-    ['aot', false, true],
-    ['vendorChunk', true, false],
-    ['extractLicenses', false, true],
-    ['buildOptimizer', false, true],
-    ['sourceMap', true, false],
-    ['optimization', false, true],
-    ['namedChunks', true, false],
-];
-function updateAngularConfig(host) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(host);
-        for (const [name, project] of projects) {
-            for (const target of Object.values(project.targets || {})) {
-                if (target.executor === '@nrwl/angular:webpack-browser') {
-                    updateOptions(target, optionsToUpdate);
-                    for (const options of allTargetOptions(target)) {
-                        delete options.experimentalRollupPass;
-                        delete options.lazyModules;
-                        delete options.forkTypeChecker;
-                    }
-                }
-            }
-            (0, devkit_1.updateProjectConfiguration)(host, name, project);
-        }
-        yield (0, devkit_1.formatFiles)(host);
-    });
-}
-exports.default = updateAngularConfig;
-function* allTargetOptions(target) {
-    if (target.options) {
-        yield target.options;
-    }
-    if (!target.configurations) {
-        return;
-    }
-    for (const [, options] of Object.entries(target.configurations)) {
-        if (options !== undefined) {
-            yield options;
-        }
-    }
-}
-function updateOptions(target, options) {
-    if (!target.options) {
-        target.options = {};
-    }
-    const configurationOptions = target.configurations && Object.values(target.configurations);
-    for (const [optionName, oldDefault, newDefault] of options) {
-        let value = target.options[optionName];
-        if (value === newDefault) {
-            // Value is same as new default
-            delete target.options[optionName];
-        }
-        else if (value === undefined) {
-            // Value is not defined, hence the default in the executor was used.
-            target.options[optionName] = oldDefault;
-            value = oldDefault;
-        }
-        // Remove overrides in configurations which are no longer needed.
-        configurationOptions === null || configurationOptions === void 0 ? void 0 : configurationOptions.filter((o) => o && o[optionName] === value).forEach((o) => o && delete o[optionName]);
-    }
-}
-//# sourceMappingURL=update-webpack-browser-config.js.map

package/src/migrations/update-12-3-0/update-webpack-browser-config.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"update-webpack-browser-config.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-12-3-0/update-webpack-browser-config.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AAUtB,MAAM,eAAe,GAAwB;IAC3C,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC;IACpB,CAAC,aAAa,EAAE,IAAI,EAAE,KAAK,CAAC;IAC5B,CAAC,iBAAiB,EAAE,KAAK,EAAE,IAAI,CAAC;IAChC,CAAC,gBAAgB,EAAE,KAAK,EAAE,IAAI,CAAC;IAC/B,CAAC,WAAW,EAAE,IAAI,EAAE,KAAK,CAAC;IAC1B,CAAC,cAAc,EAAE,KAAK,EAAE,IAAI,CAAC;IAC7B,CAAC,aAAa,EAAE,IAAI,EAAE,KAAK,CAAC;CAC7B,CAAC;AAEF,SAA8B,mBAAmB,CAAC,IAAU;;QAC1D,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE;YACtC,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE;gBACzD,IAAI,MAAM,CAAC,QAAQ,KAAK,+BAA+B,EAAE;oBACvD,aAAa,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;oBAEvC,KAAK,MAAM,OAAO,IAAI,gBAAgB,CAAC,MAAM,CAAC,EAAE;wBAC9C,OAAO,OAAO,CAAC,sBAAsB,CAAC;wBACtC,OAAO,OAAO,CAAC,WAAW,CAAC;wBAC3B,OAAO,OAAO,CAAC,eAAe,CAAC;qBAChC;iBACF;aACF;YAED,IAAA,mCAA0B,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;SACjD;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AApBD,sCAoBC;AAED,QAAQ,CAAC,CAAC,gBAAgB,CAAC,MAA2B;IACpD,IAAI,MAAM,CAAC,OAAO,EAAE;QAClB,MAAM,MAAM,CAAC,OAAO,CAAC;KACtB;IAED,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE;QAC1B,OAAO;KACR;IAED,KAAK,MAAM,CAAC,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;QAC/D,IAAI,OAAO,KAAK,SAAS,EAAE;YACzB,MAAM,OAAO,CAAC;SACf;KACF;AACH,CAAC;AAED,SAAS,aAAa,CACpB,MAA2B,EAC3B,OAA+B;IAE/B,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;QACnB,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC;KACrB;IAED,MAAM,oBAAoB,GACxB,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAEhE,KAAK,MAAM,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,IAAI,OAAO,EAAE;QAC1D,IAAI,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACvC,IAAI,KAAK,KAAK,UAAU,EAAE;YACxB,+BAA+B;YAC/B,OAAO,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;SACnC;aAAM,IAAI,KAAK,KAAK,SAAS,EAAE;YAC9B,oEAAoE;YACpE,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC;YACxC,KAAK,GAAG,UAAU,CAAC;SACpB;QAED,iEAAiE;QACjE,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAChB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,KAAK,KAAK,EAC3C,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;KAC9C;AACH,CAAC"}

package/src/migrations/update-12-9-0/update-invalid-import-paths.d.ts

@@ -1,10 +0,0 @@
-import type { ProjectConfiguration, Tree } from '@nrwl/devkit';
-declare type AffectedLib = ProjectConfiguration;
-declare type InvalidLibs = {
-    buildableLibs: AffectedLib[];
-    publishableLibs: AffectedLib[];
-};
-export default function (tree: Tree): Promise<void>;
-export declare function findBuildableAndPublishableLibs(tree: Tree): InvalidLibs;
-export declare function findInvalidLibs(tree: Tree, libs: InvalidLibs, tsconfigPath: string): InvalidLibs;
-export {};

package/src/migrations/update-12-9-0/update-invalid-import-paths.js

@@ -1,94 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.findInvalidLibs = exports.findBuildableAndPublishableLibs = void 0;
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nrwl/devkit");
-function default_1(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const tsconfigPath = getBaseTsConfigPath(tree);
-        if (!tree.exists(tsconfigPath)) {
-            devkit_1.logger.error('Could not find `tsconfig.base.json` or `tsconfig.json` at the root of the workspace. Skipping this migration...');
-            return;
-        }
-        const possibleAffectedLibs = findBuildableAndPublishableLibs(tree);
-        const invalidLibs = findInvalidLibs(tree, possibleAffectedLibs, tsconfigPath);
-        fixLibs(tree, invalidLibs, tsconfigPath);
-        yield (0, devkit_1.formatFiles)(tree);
-    });
-}
-exports.default = default_1;
-function findBuildableAndPublishableLibs(tree) {
-    const projects = (0, devkit_1.getProjects)(tree);
-    const buildableLibs = [];
-    const publishableLibs = [];
-    for (const [name, project] of projects) {
-        for (const target of Object.values(project.targets || {})) {
-            if (target.executor === '@nrwl/angular:package') {
-                publishableLibs.push(project);
-            }
-            else if (target.executor === '@nrwl/angular:ng-packagr-lite') {
-                buildableLibs.push(project);
-            }
-        }
-    }
-    return { buildableLibs, publishableLibs };
-}
-exports.findBuildableAndPublishableLibs = findBuildableAndPublishableLibs;
-function findInvalidLibs(tree, libs, tsconfigPath) {
-    const { compilerOptions } = (0, devkit_1.readJson)(tree, tsconfigPath);
-    const { paths: tsConfigPaths } = compilerOptions;
-    const invalidBuildableLibs = libs.buildableLibs.filter((lib) => checkInvalidLib(tree, lib, tsConfigPaths));
-    const invalidPublishableLibs = libs.publishableLibs.filter((lib) => checkInvalidLib(tree, lib, tsConfigPaths));
-    return {
-        buildableLibs: invalidBuildableLibs,
-        publishableLibs: invalidPublishableLibs,
-    };
-}
-exports.findInvalidLibs = findInvalidLibs;
-function checkInvalidLib(tree, lib, tsConfigPaths) {
-    const { name } = (0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(lib.root, 'package.json'));
-    return !tsConfigPaths[name];
-}
-function fixLibs(tree, { buildableLibs, publishableLibs }, tsconfigFilePath) {
-    const { compilerOptions } = (0, devkit_1.readJson)(tree, tsconfigFilePath);
-    const { paths: tsConfigPaths } = compilerOptions;
-    buildableLibs.map((lib) => fixBuildableLib(tree, lib, tsConfigPaths));
-    publishableLibs.map((lib) => fixPublishableLib(tree, lib, tsConfigPaths, tsconfigFilePath));
-}
-function fixBuildableLib(tree, lib, tsConfigPaths) {
-    const srcRoot = (0, devkit_1.joinPathFragments)(lib.sourceRoot, 'index.ts');
-    for (const [validPackageName, tsLibSrcRoot] of Object.entries(tsConfigPaths)) {
-        if (tsLibSrcRoot[0] === srcRoot) {
-            (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(lib.root, 'package.json'), (pkgJson) => {
-                pkgJson.name = validPackageName;
-                return pkgJson;
-            });
-            break;
-        }
-    }
-}
-function fixPublishableLib(tree, lib, tsConfigPaths, tsconfigFilePath) {
-    const srcRoot = (0, devkit_1.joinPathFragments)(lib.sourceRoot, 'index.ts');
-    const { name: pkgName } = (0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(lib.root, 'package.json'));
-    const pkgNameParts = pkgName.split('/');
-    if (Array.isArray(pkgNameParts) && pkgNameParts.length > 2) {
-        devkit_1.logger.warn(`Your publishable package ${pkgName} is an invalid NPM Package name. Please ensure it only contains one '/'.`);
-        devkit_1.logger.warn(`The affected package.json is at '${(0, devkit_1.joinPathFragments)(lib.root, 'package.json')}'`);
-    }
-    for (const [invalidPathKey, tsLibSrcRoot] of Object.entries(tsConfigPaths)) {
-        if (tsLibSrcRoot[0] === srcRoot) {
-            (0, devkit_1.updateJson)(tree, tsconfigFilePath, (tsconfig) => {
-                tsconfig.compilerOptions.paths[invalidPathKey] = undefined;
-                tsconfig.compilerOptions.paths[pkgName] = tsLibSrcRoot;
-                return tsconfig;
-            });
-            break;
-        }
-    }
-}
-function getBaseTsConfigPath(tree) {
-    return tree.exists('tsconfig.base.json')
-        ? 'tsconfig.base.json'
-        : 'tsconfig.json';
-}
-//# sourceMappingURL=update-invalid-import-paths.js.map

package/src/migrations/update-12-9-0/update-invalid-import-paths.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"update-invalid-import-paths.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-12-9-0/update-invalid-import-paths.ts"],"names":[],"mappings":"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"}