@nrwl/workspace 15.8.6 → 15.9.0-beta.1

package/src/utils/rules/update-karma-conf.js

@@ -1,36 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateKarmaConf = void 0;
-const ast_utils_1 = require("../ast-utils");
-const devkit_1 = require("@nrwl/devkit");
-/**
- * This returns a Rule which changes the default Angular CLI Generated karma.conf.js
- * @param options Object containing projectROot
- */
-function updateKarmaConf(options) {
-    return (host) => {
-        const project = (0, ast_utils_1.getProjectConfig)(host, options.projectName);
-        const projectRoot = project.root.replace(/\/$/, '');
-        const karmaPath = project.architect.test.options.karmaConfig;
-        (0, ast_utils_1.createOrUpdate)(host, karmaPath, `// Karma configuration file, see link for more information
-// https://karma-runner.github.io/1.0/config/configuration-file.html
-
-const { join } = require('path');
-const getBaseKarmaConfig = require('${(0, devkit_1.offsetFromRoot)(projectRoot)}karma.conf');
-
-module.exports = function(config) {
-  const baseConfig = getBaseKarmaConfig();
-  config.set({
-    ...baseConfig,
-    coverageIstanbulReporter: {
-      ...baseConfig.coverageIstanbulReporter,
-      dir: join(__dirname, '${(0, devkit_1.offsetFromRoot)(projectRoot)}coverage/${projectRoot}')
-    }
-  });
-};
-`);
-        return host;
-    };
-}
-exports.updateKarmaConf = updateKarmaConf;
-//# sourceMappingURL=update-karma-conf.js.map

package/src/utils/rules/update-karma-conf.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"update-karma-conf.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utils/rules/update-karma-conf.ts"],"names":[],"mappings":";;;AACA,4CAAgE;AAChE,yCAA8C;AAE9C;;;GAGG;AACH,SAAgB,eAAe,CAAC,OAAgC;IAC9D,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,MAAM,OAAO,GAAG,IAAA,4BAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QAC5D,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACpD,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;QAE7D,IAAA,0BAAc,EACZ,IAAI,EACJ,SAAS,EACT;;;;sCAIgC,IAAA,uBAAc,EAAC,WAAW,CAAC;;;;;;;;8BAQnC,IAAA,uBAAc,EACpC,WAAW,CACZ,YAAY,WAAW;;;;CAI7B,CACI,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AA/BD,0CA+BC"}

package/src/utils/update-packages-in-package-json.d.ts

@@ -1,3 +0,0 @@
-export declare function updatePackagesInPackageJson(migrationFilePath: string, versionName: string, options?: {
-    skipInstall: boolean;
-}): import("@angular-devkit/schematics").Rule;

package/src/utils/update-packages-in-package-json.js

@@ -1,56 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updatePackagesInPackageJson = void 0;
-const schematics_1 = require("@angular-devkit/schematics");
-const ast_utils_1 = require("./ast-utils");
-const fs_1 = require("fs");
-const version_utils_1 = require("./version-utils");
-const semver_1 = require("semver");
-const add_install_task_1 = require("./rules/add-install-task");
-function updatePackagesInPackageJson(migrationFilePath, versionName, options = { skipInstall: false }) {
-    const migrations = JSON.parse((0, fs_1.readFileSync)(migrationFilePath).toString());
-    const packageJsonUpdates = migrations.packageJsonUpdates[versionName];
-    // should never happen
-    if (!packageJsonUpdates) {
-        throw new Error(`Cannot find ${versionName} in migrations.json`);
-    }
-    const updatedPackages = packageJsonUpdates.packages;
-    let needsInstall = false;
-    return (0, schematics_1.chain)([
-        (0, ast_utils_1.updateJsonInTree)('package.json', (json) => {
-            Object.keys(updatedPackages).forEach((p) => {
-                /**
-                 * Check the updated version against semver
-                 */
-                const cleanUpdatedVersion = (0, version_utils_1.checkAndCleanWithSemver)(p, updatedPackages[p].version);
-                if (json.devDependencies && json.devDependencies[p]) {
-                    const cleanDevVersion = (0, version_utils_1.checkAndCleanWithSemver)(p, json.devDependencies[p]);
-                    if ((0, semver_1.lt)(cleanDevVersion, cleanUpdatedVersion)) {
-                        json.devDependencies[p] = updatedPackages[p].version;
-                        needsInstall = true;
-                    }
-                }
-                else if (json.dependencies && json.dependencies[p]) {
-                    const cleanVersion = (0, version_utils_1.checkAndCleanWithSemver)(p, json.dependencies[p]);
-                    if ((0, semver_1.lt)(cleanVersion, cleanUpdatedVersion)) {
-                        json.dependencies[p] = updatedPackages[p].version;
-                        needsInstall = true;
-                    }
-                }
-                else if (updatedPackages[p].alwaysAddToPackageJson) {
-                    const cleanVersion = (0, version_utils_1.checkAndCleanWithSemver)(p, json.dependencies[p]);
-                    if ((0, semver_1.lt)(cleanVersion, cleanUpdatedVersion)) {
-                        if (!json.dependencies)
-                            json.dependencies = {};
-                        json.dependencies[p] = updatedPackages[p].version;
-                        needsInstall = true;
-                    }
-                }
-            });
-            return json;
-        }),
-        needsInstall ? (0, add_install_task_1.addInstallTask)(options) : (0, schematics_1.noop)(),
-    ]);
-}
-exports.updatePackagesInPackageJson = updatePackagesInPackageJson;
-//# sourceMappingURL=update-packages-in-package-json.js.map

package/src/utils/update-packages-in-package-json.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"update-packages-in-package-json.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/update-packages-in-package-json.ts"],"names":[],"mappings":";;;AAAA,2DAAyD;AACzD,2CAA+C;AAC/C,2BAAkC;AAClC,mDAA0D;AAC1D,mCAA4B;AAC5B,+DAA0D;AAE1D,SAAgB,2BAA2B,CACzC,iBAAyB,EACzB,WAAmB,EACnB,UAAoC,EAAE,WAAW,EAAE,KAAK,EAAE;IAE1D,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,iBAAiB,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC1E,MAAM,kBAAkB,GAAG,UAAU,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAEtE,sBAAsB;IACtB,IAAI,CAAC,kBAAkB,EAAE;QACvB,MAAM,IAAI,KAAK,CAAC,eAAe,WAAW,qBAAqB,CAAC,CAAC;KAClE;IAED,MAAM,eAAe,GAAG,kBAAkB,CAAC,QAAQ,CAAC;IACpD,IAAI,YAAY,GAAG,KAAK,CAAC;IACzB,OAAO,IAAA,kBAAK,EAAC;QACX,IAAA,4BAAgB,EAAC,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;YACxC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACzC;;mBAEG;gBACH,MAAM,mBAAmB,GAAG,IAAA,uCAAuB,EACjD,CAAC,EACD,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO,CAC3B,CAAC;gBAEF,IAAI,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE;oBACnD,MAAM,eAAe,GAAG,IAAA,uCAAuB,EAC7C,CAAC,EACD,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CACxB,CAAC;oBAEF,IAAI,IAAA,WAAE,EAAC,eAAe,EAAE,mBAAmB,CAAC,EAAE;wBAC5C,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;wBACrD,YAAY,GAAG,IAAI,CAAC;qBACrB;iBACF;qBAAM,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE;oBACpD,MAAM,YAAY,GAAG,IAAA,uCAAuB,EAAC,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;oBAEtE,IAAI,IAAA,WAAE,EAAC,YAAY,EAAE,mBAAmB,CAAC,EAAE;wBACzC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;wBAClD,YAAY,GAAG,IAAI,CAAC;qBACrB;iBACF;qBAAM,IAAI,eAAe,CAAC,CAAC,CAAC,CAAC,sBAAsB,EAAE;oBACpD,MAAM,YAAY,GAAG,IAAA,uCAAuB,EAAC,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;oBAEtE,IAAI,IAAA,WAAE,EAAC,YAAY,EAAE,mBAAmB,CAAC,EAAE;wBACzC,IAAI,CAAC,IAAI,CAAC,YAAY;4BAAE,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;wBAC/C,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;wBAClD,YAAY,GAAG,IAAI,CAAC;qBACrB;iBACF;YACH,CAAC,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QACF,YAAY,CAAC,CAAC,CAAC,IAAA,iCAAc,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE;KAChD,CAAC,CAAC;AACL,CAAC;AAzDD,kEAyDC"}

package/src/utils/update-task.d.ts

@@ -1,2 +0,0 @@
-import type { Rule, TaskId } from '@angular-devkit/schematics';
-export declare function addUpdateTask(pkg: string, to: string, dependencies?: TaskId[]): Rule;

package/src/utils/update-task.js

@@ -1,83 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addUpdateTask = void 0;
-const Observable_1 = require("rxjs/internal/Observable");
-const child_process_1 = require("child_process");
-const path_1 = require("path");
-const ast_utils_1 = require("./ast-utils");
-let taskRegistered = false;
-function addUpdateTask(pkg, to, dependencies = []) {
-    return (host, context) => {
-        // Workflow should always be there during ng update but not during tests.
-        if (!context.engine.workflow) {
-            return;
-        }
-        const packageJson = (0, ast_utils_1.readJsonInTree)(host, 'package.json');
-        if (!packageJson.dependencies[pkg] && !packageJson.devDependencies[pkg]) {
-            return;
-        }
-        if (!taskRegistered) {
-            const engineHost = context.engine.workflow._engineHost;
-            engineHost.registerTaskExecutor(createRunUpdateTask());
-            taskRegistered = true;
-        }
-        context.engine._taskSchedulers.forEach((scheduler) => {
-            if (scheduler._queue.peek() &&
-                scheduler._queue.peek().configuration.name === 'RunUpdate' &&
-                scheduler._queue.peek().configuration.options.package === pkg) {
-                scheduler._queue.pop();
-            }
-        });
-        context.addTask(new RunUpdateTask(pkg, to), dependencies);
-    };
-}
-exports.addUpdateTask = addUpdateTask;
-class RunUpdateTask {
-    constructor(_pkg, _to) {
-        this._pkg = _pkg;
-        this._to = _to;
-    }
-    toConfiguration() {
-        return {
-            name: 'RunUpdate',
-            options: {
-                package: this._pkg,
-                to: this._to,
-            },
-        };
-    }
-}
-function createRunUpdateTask() {
-    return {
-        name: 'RunUpdate',
-        create: () => {
-            return Promise.resolve((options, context) => {
-                context.logger.info(`Updating ${options.package} to ${options.to}`);
-                const forkOptions = {
-                    stdio: [process.stdin, process.stdout, process.stderr, 'ipc'],
-                    shell: true,
-                };
-                const ng = (0, path_1.join)('./node_modules', '@angular/cli', 'bin/ng');
-                const args = [
-                    'update',
-                    `${options.package}@${options.to}`,
-                    '--force',
-                    '--allow-dirty',
-                ].filter((e) => !!e);
-                return new Observable_1.Observable((obs) => {
-                    (0, child_process_1.fork)(ng, args, forkOptions).on('close', (code) => {
-                        if (code === 0) {
-                            obs.next();
-                            obs.complete();
-                        }
-                        else {
-                            const message = `${options.package} migration failed, see above.`;
-                            obs.error(new Error(message));
-                        }
-                    });
-                });
-            });
-        },
-    };
-}
-//# sourceMappingURL=update-task.js.map

package/src/utils/update-task.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"update-task.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/update-task.ts"],"names":[],"mappings":"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"}