@nrwl/workspace 14.8.8 → 14.9.0-beta.1

package/src/utils/ast-utils.js

@@ -1,549 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.applyWithSkipExisting = exports.renameDirSyncInTree = exports.renameSyncInTree = exports.replaceNodeValue = exports.insertImport = exports.createOrUpdate = exports.getProjectConfig = exports.updatePackageJsonDependencies = exports.addDepsToPackageJson = exports.readWorkspace = exports.updateNxJsonInTree = exports.appsDir = exports.libsDir = exports.readNxJsonInTree = exports.updateWorkspaceInTree = exports.updateJsonInTree = exports.allFilesInDirInHost = exports.getFileDataInHost = exports.readJsonInTree = exports.insert = exports.addGlobal = exports.getImport = exports.addIncludeToTsConfig = exports.offset = exports.findClass = exports.addMethod = exports.addParameterToConstructor = exports.ReplaceChange = exports.RemoveChange = exports.InsertChange = exports.NoopChange = exports.getSourceNodes = exports.findNodes = exports.sortObjectByKeys = void 0;
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT- style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-const schematics_1 = require("@angular-devkit/schematics");
-const ts = require("typescript");
-const devkit_1 = require("@nrwl/devkit");
-const cli_config_utils_1 = require("./cli-config-utils");
-const core_1 = require("@angular-devkit/core");
-const add_install_task_1 = require("./rules/add-install-task");
-const find_nodes_1 = require("../utilities/typescript/find-nodes");
-const get_source_nodes_1 = require("../utilities/typescript/get-source-nodes");
-function nodesByPosition(first, second) {
-    return first.getStart() - second.getStart();
-}
-function insertAfterLastOccurrence(nodes, toInsert, file, fallbackPos, syntaxKind) {
-    // sort() has a side effect, so make a copy so that we won't overwrite the parent's object.
-    let lastItem = [...nodes].sort(nodesByPosition).pop();
-    if (!lastItem) {
-        throw new Error();
-    }
-    if (syntaxKind) {
-        lastItem = (0, find_nodes_1.findNodes)(lastItem, syntaxKind).sort(nodesByPosition).pop();
-    }
-    if (!lastItem && fallbackPos == undefined) {
-        throw new Error(`tried to insert ${toInsert} as first occurrence with no fallback position`);
-    }
-    const lastItemPosition = lastItem ? lastItem.getEnd() : fallbackPos;
-    return new InsertChange(file, lastItemPosition, toInsert);
-}
-function sortObjectByKeys(obj) {
-    return Object.keys(obj)
-        .sort()
-        .reduce((result, key) => {
-        return Object.assign(Object.assign({}, result), { [key]: obj[key] });
-    }, {});
-}
-exports.sortObjectByKeys = sortObjectByKeys;
-var find_nodes_2 = require("../utilities/typescript/find-nodes");
-Object.defineProperty(exports, "findNodes", { enumerable: true, get: function () { return find_nodes_2.findNodes; } });
-var get_source_nodes_2 = require("../utilities/typescript/get-source-nodes");
-Object.defineProperty(exports, "getSourceNodes", { enumerable: true, get: function () { return get_source_nodes_2.getSourceNodes; } });
-class NoopChange {
-    constructor() {
-        this.type = 'noop';
-        this.description = 'No operation.';
-        this.order = Infinity;
-        this.path = null;
-    }
-    apply() {
-        return Promise.resolve();
-    }
-}
-exports.NoopChange = NoopChange;
-class InsertChange {
-    constructor(path, pos, toAdd) {
-        this.path = path;
-        this.pos = pos;
-        this.toAdd = toAdd;
-        this.type = 'insert';
-        if (pos < 0) {
-            throw new Error('Negative positions are invalid');
-        }
-        this.description = `Inserted ${toAdd} into position ${pos} of ${path}`;
-        this.order = pos;
-    }
-    apply(host) {
-        return host.read(this.path).then((content) => {
-            const prefix = content.substring(0, this.pos);
-            const suffix = content.substring(this.pos);
-            return host.write(this.path, `${prefix}${this.toAdd}${suffix}`);
-        });
-    }
-}
-exports.InsertChange = InsertChange;
-class RemoveChange {
-    constructor(path, pos, toRemove) {
-        this.path = path;
-        this.pos = pos;
-        this.toRemove = toRemove;
-        this.type = 'remove';
-        if (pos < 0) {
-            throw new Error('Negative positions are invalid');
-        }
-        this.description = `Removed ${toRemove} into position ${pos} of ${path}`;
-        this.order = pos;
-    }
-    apply(host) {
-        return host.read(this.path).then((content) => {
-            const prefix = content.substring(0, this.pos);
-            const suffix = content.substring(this.pos + this.toRemove.length);
-            return host.write(this.path, `${prefix}${suffix}`);
-        });
-    }
-}
-exports.RemoveChange = RemoveChange;
-class ReplaceChange {
-    constructor(path, pos, oldText, newText) {
-        this.path = path;
-        this.pos = pos;
-        this.oldText = oldText;
-        this.newText = newText;
-        this.type = 'replace';
-        if (pos < 0) {
-            throw new Error('Negative positions are invalid');
-        }
-        this.description = `Replaced ${oldText} into position ${pos} of ${path} with ${newText}`;
-        this.order = pos;
-    }
-    apply(host) {
-        return host.read(this.path).then((content) => {
-            const prefix = content.substring(0, this.pos);
-            const suffix = content.substring(this.pos + this.oldText.length);
-            const text = content.substring(this.pos, this.pos + this.oldText.length);
-            if (text !== this.oldText) {
-                return Promise.reject(new Error(`Invalid replace: "${text}" != "${this.oldText}".`));
-            }
-            return host.write(this.path, `${prefix}${this.newText}${suffix}`);
-        });
-    }
-}
-exports.ReplaceChange = ReplaceChange;
-function addParameterToConstructor(source, modulePath, opts) {
-    const clazz = findClass(source, opts.className);
-    const constructor = clazz.members.filter((m) => m.kind === ts.SyntaxKind.Constructor)[0];
-    if (constructor) {
-        throw new Error('Should be tested');
-    }
-    else {
-        const methodHeader = `constructor(${opts.param})`;
-        return addMethod(source, modulePath, {
-            className: opts.className,
-            methodHeader,
-            body: null,
-        });
-    }
-}
-exports.addParameterToConstructor = addParameterToConstructor;
-function addMethod(source, modulePath, opts) {
-    const clazz = findClass(source, opts.className);
-    const body = opts.body
-        ? `
-${opts.methodHeader} {
-${offset(opts.body, 1, false)}
-}
-`
-        : `
-${opts.methodHeader} {}
-`;
-    return [new InsertChange(modulePath, clazz.end - 1, offset(body, 1, true))];
-}
-exports.addMethod = addMethod;
-function findClass(source, className, silent = false) {
-    const nodes = (0, get_source_nodes_1.getSourceNodes)(source);
-    const clazz = (nodes.filter((n) => n.kind === ts.SyntaxKind.ClassDeclaration &&
-        n.name.text === className)[0]);
-    if (!clazz && !silent) {
-        throw new Error(`Cannot find class '${className}'`);
-    }
-    return clazz;
-}
-exports.findClass = findClass;
-function offset(text, numberOfTabs, wrap) {
-    const lines = text
-        .trim()
-        .split('\n')
-        .map((line) => {
-        let tabs = '';
-        for (let c = 0; c < numberOfTabs; ++c) {
-            tabs += '  ';
-        }
-        return `${tabs}${line}`;
-    })
-        .join('\n');
-    return wrap ? `\n${lines}\n` : lines;
-}
-exports.offset = offset;
-function addIncludeToTsConfig(tsConfigPath, source, include) {
-    const includeKeywordPos = source.text.indexOf('"include":');
-    if (includeKeywordPos > -1) {
-        const includeArrayEndPos = source.text.indexOf(']', includeKeywordPos);
-        return [new InsertChange(tsConfigPath, includeArrayEndPos, include)];
-    }
-    else {
-        return [];
-    }
-}
-exports.addIncludeToTsConfig = addIncludeToTsConfig;
-function getImport(source, predicate) {
-    const allImports = (0, find_nodes_1.findNodes)(source, ts.SyntaxKind.ImportDeclaration);
-    const matching = allImports.filter((i) => predicate(i.moduleSpecifier.getText()));
-    return matching.map((i) => {
-        const moduleSpec = i.moduleSpecifier
-            .getText()
-            .substring(1, i.moduleSpecifier.getText().length - 1);
-        const t = i.importClause.namedBindings.getText();
-        const bindings = t
-            .replace('{', '')
-            .replace('}', '')
-            .split(',')
-            .map((q) => q.trim());
-        return { moduleSpec, bindings };
-    });
-}
-exports.getImport = getImport;
-function addGlobal(source, modulePath, statement) {
-    const allImports = (0, find_nodes_1.findNodes)(source, ts.SyntaxKind.ImportDeclaration);
-    if (allImports.length > 0) {
-        const lastImport = allImports[allImports.length - 1];
-        return [
-            new InsertChange(modulePath, lastImport.end + 1, `\n${statement}\n`),
-        ];
-    }
-    else {
-        return [new InsertChange(modulePath, 0, `${statement}\n`)];
-    }
-}
-exports.addGlobal = addGlobal;
-function insert(host, modulePath, changes) {
-    if (changes.length < 1) {
-        return;
-    }
-    // sort changes so that the highest pos goes first
-    const orderedChanges = changes.sort((a, b) => b.order - a.order);
-    const recorder = host.beginUpdate(modulePath);
-    for (const change of orderedChanges) {
-        if (change.type == 'insert') {
-            recorder.insertLeft(change.pos, change.toAdd);
-        }
-        else if (change.type == 'remove') {
-            recorder.remove(change.pos - 1, change.toRemove.length + 1);
-        }
-        else if (change.type == 'replace') {
-            recorder.remove(change.pos, change.oldText.length);
-            recorder.insertLeft(change.pos, change.newText);
-        }
-        else if (change.type === 'noop') {
-            // do nothing
-        }
-        else {
-            throw new Error(`Unexpected Change '${change.constructor.name}'`);
-        }
-    }
-    host.commitUpdate(recorder);
-}
-exports.insert = insert;
-/**
- * This method is specifically for reading JSON files in a Tree
- * @param host The host tree
- * @param path The path to the JSON file
- * @returns The JSON data in the file.
- */
-function readJsonInTree(host, path) {
-    if (!host.exists(path)) {
-        throw new Error(`Cannot find ${path}`);
-    }
-    try {
-        return (0, devkit_1.parseJson)(host.read(path).toString('utf-8'));
-    }
-    catch (e) {
-        throw new Error(`Cannot parse ${path}: ${e.message}`);
-    }
-}
-exports.readJsonInTree = readJsonInTree;
-// TODO(v13): remove this deprecated method
-/**
- * @deprecated This method is deprecated
- */
-function getFileDataInHost(host, path) {
-    return {
-        file: path,
-        ext: (0, core_1.extname)((0, core_1.normalize)(path)),
-        hash: '',
-    };
-}
-exports.getFileDataInHost = getFileDataInHost;
-function allFilesInDirInHost(host, path, options = { recursive: true }) {
-    const dir = host.getDir(path);
-    const res = [];
-    dir.subfiles.forEach((p) => {
-        res.push((0, core_1.join)(path, p));
-    });
-    if (!options.recursive) {
-        return res;
-    }
-    dir.subdirs.forEach((p) => {
-        res.push(...allFilesInDirInHost(host, (0, core_1.join)(path, p)));
-    });
-    return res;
-}
-exports.allFilesInDirInHost = allFilesInDirInHost;
-/**
- * This method is specifically for updating JSON in a Tree
- * @param path Path of JSON file in the Tree
- * @param callback Manipulation of the JSON data
- * @returns A rule which updates a JSON file file in a Tree
- */
-function updateJsonInTree(path, callback) {
-    return (host, context) => {
-        if (!host.exists(path)) {
-            host.create(path, (0, devkit_1.serializeJson)(callback({}, context)));
-            return host;
-        }
-        host.overwrite(path, (0, devkit_1.serializeJson)(callback(readJsonInTree(host, path), context)));
-        return host;
-    };
-}
-exports.updateJsonInTree = updateJsonInTree;
-function updateWorkspaceInTree(callback) {
-    return (host, context = undefined) => {
-        const path = (0, cli_config_utils_1.getWorkspacePath)(host);
-        host.overwrite(path, (0, devkit_1.serializeJson)(callback(readJsonInTree(host, path), context, host)));
-        return host;
-    };
-}
-exports.updateWorkspaceInTree = updateWorkspaceInTree;
-function readNxJsonInTree(host) {
-    return readJsonInTree(host, 'nx.json');
-}
-exports.readNxJsonInTree = readNxJsonInTree;
-function libsDir(host) {
-    var _a, _b;
-    const json = readJsonInTree(host, 'nx.json');
-    return (_b = (_a = json === null || json === void 0 ? void 0 : json.workspaceLayout) === null || _a === void 0 ? void 0 : _a.libsDir) !== null && _b !== void 0 ? _b : 'libs';
-}
-exports.libsDir = libsDir;
-function appsDir(host) {
-    var _a, _b;
-    const json = readJsonInTree(host, 'nx.json');
-    return (_b = (_a = json === null || json === void 0 ? void 0 : json.workspaceLayout) === null || _a === void 0 ? void 0 : _a.appsDir) !== null && _b !== void 0 ? _b : 'apps';
-}
-exports.appsDir = appsDir;
-function updateNxJsonInTree(callback) {
-    return (host, context) => {
-        host.overwrite('nx.json', (0, devkit_1.serializeJson)(callback(readJsonInTree(host, 'nx.json'), context)));
-        return host;
-    };
-}
-exports.updateNxJsonInTree = updateNxJsonInTree;
-function readWorkspace(host) {
-    const path = (0, cli_config_utils_1.getWorkspacePath)(host);
-    return readJsonInTree(host, path);
-}
-exports.readWorkspace = readWorkspace;
-/**
- * verifies whether the given packageJson dependencies require an update
- * given the deps & devDeps passed in
- */
-function requiresAddingOfPackages(packageJsonFile, deps, devDeps) {
-    let needsDepsUpdate = false;
-    let needsDevDepsUpdate = false;
-    packageJsonFile.dependencies = packageJsonFile.dependencies || {};
-    packageJsonFile.devDependencies = packageJsonFile.devDependencies || {};
-    if (Object.keys(deps).length > 0) {
-        needsDepsUpdate = Object.keys(deps).some((entry) => !packageJsonFile.dependencies[entry]);
-    }
-    if (Object.keys(devDeps).length > 0) {
-        needsDevDepsUpdate = Object.keys(devDeps).some((entry) => !packageJsonFile.devDependencies[entry]);
-    }
-    return needsDepsUpdate || needsDevDepsUpdate;
-}
-/**
- * Updates the package.json given the passed deps and/or devDeps. Only updates
- * if the packages are not yet present
- *
- * @param deps the package.json dependencies to add
- * @param devDeps the package.json devDependencies to add
- * @param addInstall default `true`; set to false to avoid installs
- */
-function addDepsToPackageJson(deps, devDeps, addInstall = true) {
-    return (host, context) => {
-        const currentPackageJson = readJsonInTree(host, 'package.json');
-        if (requiresAddingOfPackages(currentPackageJson, deps, devDeps)) {
-            return (0, schematics_1.chain)([
-                updateJsonInTree('package.json', (json, context) => {
-                    json.dependencies = Object.assign(Object.assign(Object.assign({}, (json.dependencies || {})), deps), (json.dependencies || {}));
-                    json.devDependencies = Object.assign(Object.assign(Object.assign({}, (json.devDependencies || {})), devDeps), (json.devDependencies || {}));
-                    json.dependencies = sortObjectByKeys(json.dependencies);
-                    json.devDependencies = sortObjectByKeys(json.devDependencies);
-                    return json;
-                }),
-                (0, add_install_task_1.addInstallTask)({
-                    skipInstall: !addInstall,
-                }),
-            ]);
-        }
-        else {
-            return (0, schematics_1.noop)();
-        }
-    };
-}
-exports.addDepsToPackageJson = addDepsToPackageJson;
-function updatePackageJsonDependencies(deps, devDeps, addInstall = true) {
-    return (0, schematics_1.chain)([
-        updateJsonInTree('package.json', (json, context) => {
-            json.dependencies = Object.assign(Object.assign({}, (json.dependencies || {})), deps);
-            json.devDependencies = Object.assign(Object.assign({}, (json.devDependencies || {})), devDeps);
-            json.dependencies = sortObjectByKeys(json.dependencies);
-            json.devDependencies = sortObjectByKeys(json.devDependencies);
-            return json;
-        }),
-        (0, add_install_task_1.addInstallTask)({
-            skipInstall: !addInstall,
-        }),
-    ]);
-}
-exports.updatePackageJsonDependencies = updatePackageJsonDependencies;
-function getProjectConfig(host, name) {
-    const workspaceJson = readJsonInTree(host, (0, cli_config_utils_1.getWorkspacePath)(host));
-    const projectConfig = workspaceJson.projects[name];
-    if (!projectConfig) {
-        throw new Error(`Cannot find project '${name}'`);
-    }
-    else if (typeof projectConfig === 'string') {
-        return readJsonInTree(host, projectConfig);
-    }
-    else {
-        return projectConfig;
-    }
-}
-exports.getProjectConfig = getProjectConfig;
-function createOrUpdate(host, path, content) {
-    if (host.exists(path)) {
-        host.overwrite(path, content);
-    }
-    else {
-        host.create(path, content);
-    }
-}
-exports.createOrUpdate = createOrUpdate;
-function insertImport(source, fileToEdit, symbolName, fileName, isDefault = false) {
-    const rootNode = source;
-    const allImports = (0, find_nodes_1.findNodes)(rootNode, ts.SyntaxKind.ImportDeclaration);
-    // get nodes that map to import statements from the file fileName
-    const relevantImports = allImports.filter((node) => {
-        // StringLiteral of the ImportDeclaration is the import file (fileName in this case).
-        const importFiles = node
-            .getChildren()
-            .filter((child) => child.kind === ts.SyntaxKind.StringLiteral)
-            .map((n) => n.text);
-        return importFiles.filter((file) => file === fileName).length === 1;
-    });
-    if (relevantImports.length > 0) {
-        let importsAsterisk = false;
-        // imports from import file
-        const imports = [];
-        relevantImports.forEach((n) => {
-            Array.prototype.push.apply(imports, (0, find_nodes_1.findNodes)(n, ts.SyntaxKind.Identifier));
-            if ((0, find_nodes_1.findNodes)(n, ts.SyntaxKind.AsteriskToken).length > 0) {
-                importsAsterisk = true;
-            }
-        });
-        // if imports * from fileName, don't add symbolName
-        if (importsAsterisk) {
-            return new NoopChange();
-        }
-        const importTextNodes = imports.filter((n) => n.text === symbolName);
-        // insert import if it's not there
-        if (importTextNodes.length === 0) {
-            const fallbackPos = (0, find_nodes_1.findNodes)(relevantImports[0], ts.SyntaxKind.CloseBraceToken)[0].getStart() ||
-                (0, find_nodes_1.findNodes)(relevantImports[0], ts.SyntaxKind.FromKeyword)[0].getStart();
-            return insertAfterLastOccurrence(imports, `, ${symbolName}`, fileToEdit, fallbackPos);
-        }
-        return new NoopChange();
-    }
-    // no such import declaration exists
-    const useStrict = (0, find_nodes_1.findNodes)(rootNode, ts.SyntaxKind.StringLiteral).filter((n) => n.text === 'use strict');
-    let fallbackPos = 0;
-    if (useStrict.length > 0) {
-        fallbackPos = useStrict[0].end;
-    }
-    const open = isDefault ? '' : '{ ';
-    const close = isDefault ? '' : ' }';
-    // if there are no imports or 'use strict' statement, insert import at beginning of file
-    const insertAtBeginning = allImports.length === 0 && useStrict.length === 0;
-    const separator = insertAtBeginning ? '' : ';\n';
-    const toInsert = `${separator}import ${open}${symbolName}${close}` +
-        ` from '${fileName}'${insertAtBeginning ? ';\n' : ''}`;
-    return insertAfterLastOccurrence(allImports, toInsert, fileToEdit, fallbackPos, ts.SyntaxKind.StringLiteral);
-}
-exports.insertImport = insertImport;
-function replaceNodeValue(host, modulePath, node, content) {
-    insert(host, modulePath, [
-        new ReplaceChange(modulePath, node.getStart(node.getSourceFile()), node.getFullText(), content),
-    ]);
-}
-exports.replaceNodeValue = replaceNodeValue;
-function renameSyncInTree(tree, from, to, cb) {
-    if (!tree.exists(from)) {
-        cb(`Path: ${from} does not exist`);
-    }
-    else if (tree.exists(to)) {
-        cb(`Path: ${to} already exists`);
-    }
-    else {
-        renameFile(tree, from, to);
-        cb(null);
-    }
-}
-exports.renameSyncInTree = renameSyncInTree;
-function renameDirSyncInTree(tree, from, to, cb) {
-    const dir = tree.getDir(from);
-    if (!dirExists(dir)) {
-        cb(`Path: ${from} does not exist`);
-        return;
-    }
-    dir.visit((path) => {
-        const destination = path.replace(from, to);
-        renameFile(tree, path, destination);
-    });
-    cb(null);
-}
-exports.renameDirSyncInTree = renameDirSyncInTree;
-function dirExists(dir) {
-    return dir.subdirs.length + dir.subfiles.length !== 0;
-}
-function renameFile(tree, from, to) {
-    const buffer = tree.read(from);
-    if (!buffer) {
-        return;
-    }
-    tree.create(to, buffer);
-    tree.delete(from);
-}
-/**
- * Applies a template merge but skips for already existing entries
- */
-function applyWithSkipExisting(source, rules) {
-    return (tree, _context) => {
-        const rule = (0, schematics_1.mergeWith)((0, schematics_1.apply)(source, [
-            ...rules,
-            (0, schematics_1.forEach)((fileEntry) => {
-                if (tree.exists(fileEntry.path)) {
-                    return null;
-                }
-                return fileEntry;
-            }),
-        ]));
-        return rule(tree, _context);
-    };
-}
-exports.applyWithSkipExisting = applyWithSkipExisting;
+exports.getSourceNodes = exports.findNodes = void 0;
+var find_nodes_1 = require("../utilities/typescript/find-nodes"); // TODO(v16): Remove this
+Object.defineProperty(exports, "findNodes", { enumerable: true, get: function () { return find_nodes_1.findNodes; } });
+var get_source_nodes_1 = require("../utilities/typescript/get-source-nodes");
+Object.defineProperty(exports, "getSourceNodes", { enumerable: true, get: function () { return get_source_nodes_1.getSourceNodes; } });
 //# sourceMappingURL=ast-utils.js.map

package/src/utils/ast-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/ast-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/ast-utils.ts"],"names":[],"mappings":";;;AAEA,iEAA+D,CAAC,yBAAyB;AAAhF,uGAAA,SAAS,OAAA;AAClB,6EAA0E;AAAjE,kHAAA,cAAc,OAAA"}

package/src/utils/cli-config-utils.d.ts

@@ -1,6 +1,8 @@
-import { Tree } from '@angular-devkit/schematics';
+import type { Tree } from '@angular-devkit/schematics';
+/**
+ * @deprecated Nx no longer supports workspace.json
+ */
 export declare function getWorkspacePath(host: Tree): string;
-export declare function getNpmScope(host: Tree): string;
 export declare function parseTarget(targetString: string): {
     project: string;
     target: string;
@@ -12,4 +14,3 @@ export declare function serializeTarget({ project, target, config }: {
     target: any;
     config: any;
 }): string;
-export declare function replaceAppNameWithPath(node: any, appName: string, root: string): any;

package/src/utils/cli-config-utils.js

@@ -1,16 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.replaceAppNameWithPath = exports.serializeTarget = exports.editTarget = exports.parseTarget = exports.getNpmScope = exports.getWorkspacePath = void 0;
-const ast_utils_1 = require("./ast-utils");
+exports.serializeTarget = exports.editTarget = exports.parseTarget = exports.getWorkspacePath = void 0;
+/**
+ * @deprecated Nx no longer supports workspace.json
+ */
 function getWorkspacePath(host) {
     const possibleFiles = ['/angular.json', '/workspace.json'];
     return possibleFiles.filter((path) => host.exists(path))[0];
 }
 exports.getWorkspacePath = getWorkspacePath;
-function getNpmScope(host) {
-    return (0, ast_utils_1.readJsonInTree)(host, 'nx.json').npmScope;
-}
-exports.getNpmScope = getNpmScope;
 function parseTarget(targetString) {
     const [project, target, config] = targetString.split(':');
     return {
@@ -29,43 +27,4 @@ function serializeTarget({ project, target, config }) {
     return [project, target, config].filter((part) => !!part).join(':');
 }
 exports.serializeTarget = serializeTarget;
-function replaceAppNameWithPath(node, appName, root) {
-    if (typeof node === 'string') {
-        const matchPattern = new RegExp(`([^a-z0-9]*(${appName}))|((${appName})[^a-z0-9:]*)`, 'gi');
-        if (!!node.match(matchPattern) &&
-            node !== 'application' &&
-            node !== 'library') {
-            const r = node.replace(appName, root);
-            return r.startsWith('/apps') || r.startsWith('/libs')
-                ? r.substring(1)
-                : r;
-        }
-        else {
-            return node;
-        }
-    }
-    else if (Array.isArray(node)) {
-        return node.map((j) => replaceAppNameWithPath(j, appName, root));
-    }
-    else if (typeof node === 'object' && node) {
-        const forbiddenPropertyList = [
-            'prefix',
-            'builder',
-            'executor',
-            'browserTarget',
-            'tags',
-            'defaultConfiguration',
-            'maximumError',
-            'name',
-        ]; // Some of the properties should not be renamed
-        return Object.keys(node).reduce((m, c) => ((m[c] = !forbiddenPropertyList.includes(c)
-            ? replaceAppNameWithPath(node[c], appName, root)
-            : node[c]),
-            m), {});
-    }
-    else {
-        return node;
-    }
-}
-exports.replaceAppNameWithPath = replaceAppNameWithPath;
 //# sourceMappingURL=cli-config-utils.js.map