npm - @nrwl/workspace - Versions diffs - 12.10.0-beta.6 → 13.0.0-beta.3 - Mend

@nrwl/workspace 12.10.0-beta.6 → 13.0.0-beta.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (116) hide show

package/src/core/file-utils.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizedProjectRoot = exports.readEnvironment = exports.readWorkspaceFiles = exports.rootWorkspaceFileData = exports.rootWorkspaceFileNames = exports.workspaceLayout = exports.readNxJson = exports.readPackageJson = exports.defaultFileRead = exports.workspaceFileName = exports.readWorkspaceConfig = exports.readWorkspaceJson = exports.readFileIfExisting = exports.allFilesInDir = exports.TEN_MEGABYTES = exports.calculateFileChanges = exports.isWholeFileChange = exports.WholeFileChange = void 0;
+exports.normalizedProjectRoot = exports.readEnvironment = exports.updateProjectFileMap = exports.createProjectFileMap = exports.rootWorkspaceFileData = exports.rootWorkspaceFileNames = exports.workspaceLayout = exports.readNxJson = exports.readPackageJson = exports.defaultFileRead = exports.workspaceFileName = exports.readWorkspaceConfig = exports.readWorkspaceJson = exports.readFileIfExisting = exports.allFilesInDir = exports.TEN_MEGABYTES = exports.calculateFileChanges = exports.isWholeFileChange = exports.WholeFileChange = void 0;
 const workspace_1 = require("@nrwl/tao/src/shared/workspace");
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
@@ -12,7 +12,6 @@ const array_1 = require("../utilities/array");
 const fileutils_1 = require("../utilities/fileutils");
 const json_diff_1 = require("../utilities/json-diff");
 const file_hasher_1 = require("./hasher/file-hasher");
-const project_graph_1 = require("./project-graph/project-graph");
 const ignore = require('ignore');
 class WholeFileChange {
     constructor() {
@@ -89,7 +88,7 @@ function getFileData(filePath) {
         hash: file_hasher_1.defaultFileHasher.hashFile(filePath),
     };
 }
-function allFilesInDir(dirName, recurse = true, projectGraphVersion = '3.0') {
+function allFilesInDir(dirName, recurse = true) {
     const ignoredGlobs = getIgnoredGlobs();
     const relDirName = path_1.relative(app_root_1.appRootPath, dirName);
     if (relDirName && ignoredGlobs.ignores(relDirName)) {
@@ -106,10 +105,10 @@ function allFilesInDir(dirName, recurse = true, projectGraphVersion = '3.0') {
                 const s = fs_1.statSync(child);
                 if (!s.isDirectory()) {
                     // add starting with "apps/myapp/..." or "libs/mylib/..."
-                    res.push(project_graph_1.projectFileDataCompatAdapter(getFileData(child), projectGraphVersion));
+                    res.push(getFileData(child));
                 }
                 else if (s.isDirectory() && recurse) {
-                    res = [...res, ...allFilesInDir(child, true, projectGraphVersion)];
+                    res = [...res, ...allFilesInDir(child, true)];
                 }
             }
             catch (e) { }
@@ -219,18 +218,18 @@ function rootWorkspaceFileNames() {
     return [`package.json`, workspaceFileName(), `nx.json`, `tsconfig.base.json`];
 }
 exports.rootWorkspaceFileNames = rootWorkspaceFileNames;
-function rootWorkspaceFileData(projectGraphVersion = '3.0') {
-    return rootWorkspaceFileNames().map((f) => project_graph_1.projectFileDataCompatAdapter(getFileData(`${app_root_1.appRootPath}/${f}`), projectGraphVersion));
+function rootWorkspaceFileData() {
+    return rootWorkspaceFileNames().map((f) => getFileData(`${app_root_1.appRootPath}/${f}`));
 }
 exports.rootWorkspaceFileData = rootWorkspaceFileData;
-function readWorkspaceFiles(projectGraphVersion = '3.0') {
+function readWorkspaceFiles() {
     file_hasher_1.defaultFileHasher.ensureInitialized();
     perf_hooks_1.performance.mark('read workspace files:start');
     if (file_hasher_1.defaultFileHasher.usesGitForHashing) {
         const ignoredGlobs = getIgnoredGlobs();
         const r = Array.from(file_hasher_1.defaultFileHasher.workspaceFiles)
             .filter((f) => !ignoredGlobs.ignores(f))
-            .map((f) => project_graph_1.projectFileDataCompatAdapter(getFileData(`${app_root_1.appRootPath}/${f}`), projectGraphVersion));
+            .map((f) => getFileData(`${app_root_1.appRootPath}/${f}`));
         perf_hooks_1.performance.mark('read workspace files:end');
         perf_hooks_1.performance.measure('read workspace files', 'read workspace files:start', 'read workspace files:end');
         r.sort((x, y) => x.file.localeCompare(y.file));
@@ -238,14 +237,14 @@ function readWorkspaceFiles(projectGraphVersion = '3.0') {
     }
     else {
         const r = [];
-        r.push(...rootWorkspaceFileData(projectGraphVersion));
+        r.push(...rootWorkspaceFileData());
         // Add known workspace files and directories
-        array_1.appendArray(r, allFilesInDir(app_root_1.appRootPath, false, projectGraphVersion));
-        array_1.appendArray(r, allFilesInDir(`${app_root_1.appRootPath}/tools`, true, projectGraphVersion));
+        array_1.appendArray(r, allFilesInDir(app_root_1.appRootPath, false));
+        array_1.appendArray(r, allFilesInDir(`${app_root_1.appRootPath}/tools`, true));
         const wl = workspaceLayout();
-        array_1.appendArray(r, allFilesInDir(`${app_root_1.appRootPath}/${wl.appsDir}`, true, projectGraphVersion));
+        array_1.appendArray(r, allFilesInDir(`${app_root_1.appRootPath}/${wl.appsDir}`, true));
         if (wl.appsDir !== wl.libsDir) {
-            array_1.appendArray(r, allFilesInDir(`${app_root_1.appRootPath}/${wl.libsDir}`, true, projectGraphVersion));
+            array_1.appendArray(r, allFilesInDir(`${app_root_1.appRootPath}/${wl.libsDir}`, true));
         }
         perf_hooks_1.performance.mark('read workspace files:end');
         perf_hooks_1.performance.measure('read workspace files', 'read workspace files:start', 'read workspace files:end');
@@ -253,7 +252,96 @@ function readWorkspaceFiles(projectGraphVersion = '3.0') {
         return r;
     }
 }
-exports.readWorkspaceFiles = readWorkspaceFiles;
+function sortProjects(workspaceJson) {
+    // Sorting here so `apps/client-e2e` comes before `apps/client` and has
+    // a chance to match prefix first.
+    return Object.keys(workspaceJson.projects).sort((a, b) => {
+        const projectA = workspaceJson.projects[a];
+        const projectB = workspaceJson.projects[b];
+        if (!projectA.root)
+            return -1;
+        if (!projectB.root)
+            return -1;
+        return projectA.root.length > projectB.root.length ? -1 : 1;
+    });
+}
+function createProjectFileMap(workspaceJson, allWorkspaceFiles) {
+    allWorkspaceFiles = allWorkspaceFiles || readWorkspaceFiles();
+    const projectFileMap = {};
+    const sortedProjects = sortProjects(workspaceJson);
+    const seen = new Set();
+    for (const projectName of sortedProjects) {
+        projectFileMap[projectName] = [];
+    }
+    for (const f of allWorkspaceFiles) {
+        if (seen.has(f.file))
+            continue;
+        seen.add(f.file);
+        for (const projectName of sortedProjects) {
+            const p = workspaceJson.projects[projectName];
+            if (f.file.startsWith(p.root || p.sourceRoot)) {
+                projectFileMap[projectName].push(f);
+                break;
+            }
+        }
+    }
+    return { projectFileMap, allWorkspaceFiles };
+}
+exports.createProjectFileMap = createProjectFileMap;
+function updateProjectFileMap(workspaceJson, projectFileMap, allWorkspaceFiles, updatedFiles, deletedFiles) {
+    const ignore = getIgnoredGlobs();
+    const sortedProjects = sortProjects(workspaceJson);
+    for (const f of updatedFiles.keys()) {
+        if (ignore.ignores(f))
+            continue;
+        for (const projectName of sortedProjects) {
+            const p = workspaceJson.projects[projectName];
+            if (f.startsWith(p.root || p.sourceRoot)) {
+                const fileData = projectFileMap[projectName].find((t) => t.file === f);
+                if (fileData) {
+                    fileData.hash = updatedFiles.get(f);
+                }
+                else {
+                    projectFileMap[projectName].push({
+                        file: f,
+                        hash: updatedFiles.get(f),
+                    });
+                }
+                break;
+            }
+        }
+        const fileData = allWorkspaceFiles.find((t) => t.file === f);
+        if (fileData) {
+            fileData.hash = updatedFiles.get(f);
+        }
+        else {
+            allWorkspaceFiles.push({
+                file: f,
+                hash: updatedFiles.get(f),
+            });
+        }
+    }
+    for (const f of deletedFiles) {
+        if (ignore.ignores(f))
+            continue;
+        for (const projectName of sortedProjects) {
+            const p = workspaceJson.projects[projectName];
+            if (f.startsWith(p.root || p.sourceRoot)) {
+                const index = projectFileMap[projectName].findIndex((t) => t.file === f);
+                if (index > -1) {
+                    projectFileMap[projectName].splice(index, 1);
+                }
+                break;
+            }
+        }
+        const index = allWorkspaceFiles.findIndex((t) => t.file === f);
+        if (index > -1) {
+            allWorkspaceFiles.splice(index, 1);
+        }
+    }
+    return { projectFileMap, allWorkspaceFiles };
+}
+exports.updateProjectFileMap = updateProjectFileMap;
 function readEnvironment(target, projects) {
     const nxJson = readNxJson();
     const workspaceJson = readWorkspaceJson();

package/src/core/file-utils.js.map CHANGED Viewed

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

package/src/core/hasher/file-hasher.d.ts CHANGED Viewed

@@ -15,22 +15,7 @@ export declare class FileHasher {
      * returns a Map containing this data.
      */
     init(): Map<string, string>;
-    /**
-     * This method is used in cases where we do not want to fully tear down the
-     * known state of file hashes, and instead only want to hash an updated Map
-     * of files which are provided to the method.
-     *
-     * For example, the daemon server performs file-watching and knows at a granular
-     * level what needs to be rehashed in order to accurately update the overall state.
-     */
-    incrementalUpdate(updatedHashes: Map<string, string>): void;
-    /**
-     * In the case of the daemon server, because it performs file-watching, it
-     * knows when one or more files have been deleted from the workspace and can
-     * therefore precisely update the source of truth for file hashes and workspace
-     * files.
-     */
-    removeFiles(deletedFiles: string[]): void;
+    incrementalUpdate(updatedFiles: Map<string, string>, deletedFiles?: string[]): void;
     hashFile(path: string): string;
     ensureInitialized(): void;
     private applyFileHashes;

package/src/core/hasher/file-hasher.js CHANGED Viewed

@@ -34,17 +34,9 @@ class FileHasher {
         perf_hooks_1.performance.measure('init hashing', 'init hashing:start', 'init hashing:end');
         return getFileHashesResult.untrackedUncommittedFiles;
     }
-    /**
-     * This method is used in cases where we do not want to fully tear down the
-     * known state of file hashes, and instead only want to hash an updated Map
-     * of files which are provided to the method.
-     *
-     * For example, the daemon server performs file-watching and knows at a granular
-     * level what needs to be rehashed in order to accurately update the overall state.
-     */
-    incrementalUpdate(updatedHashes) {
+    incrementalUpdate(updatedFiles, deletedFiles = []) {
         perf_hooks_1.performance.mark('incremental hashing:start');
-        updatedHashes.forEach((hash, filename) => {
+        updatedFiles.forEach((hash, filename) => {
             this.fileHashes[filename] = hash;
             /**
              * we have to store it separately because fileHashes can be modified
@@ -52,20 +44,12 @@ class FileHasher {
              */
             this.workspaceFiles.add(filename);
         });
-        perf_hooks_1.performance.mark('incremental hashing:end');
-        perf_hooks_1.performance.measure('incremental hashing', 'incremental hashing:start', 'incremental hashing:end');
-    }
-    /**
-     * In the case of the daemon server, because it performs file-watching, it
-     * knows when one or more files have been deleted from the workspace and can
-     * therefore precisely update the source of truth for file hashes and workspace
-     * files.
-     */
-    removeFiles(deletedFiles) {
         for (const deletedFile of deletedFiles) {
             delete this.fileHashes[deletedFile];
             this.workspaceFiles.delete(deletedFile);
         }
+        perf_hooks_1.performance.mark('incremental hashing:end');
+        perf_hooks_1.performance.measure('incremental hashing', 'incremental hashing:start', 'incremental hashing:end');
     }
     hashFile(path) {
         this.ensureInitialized();

package/src/core/hasher/file-hasher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"file-hasher.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/hasher/file-hasher.ts"],"names":[],"mappings":";;;AAAA,2DAA2D;AAC3D,2CAAyC;AACzC,6CAGsB;AACtB,iDAA6D;AAE7D,MAAa,UAAU;IAMrB,YAA6B,OAAoB;QAApB,YAAO,GAAP,OAAO,CAAa;QALjD,eAAU,GAA+B,EAAE,CAAC;QAC5C,mBAAc,GAAG,IAAI,GAAG,EAAU,CAAC;QACnC,sBAAiB,GAAG,KAAK,CAAC;QAClB,kBAAa,GAAG,KAAK,CAAC;IAEsB,CAAC;IAErD,KAAK;QACH,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;QACxC,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;IACjC,CAAC;IAED;;;;OAIG;IACH,IAAI;QACF,wBAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACvC,IAAI,CAAC,KAAK,EAAE,CAAC;QAEb,MAAM,mBAAmB,GAAG,0BAAa,CAAC,sBAAW,CAAC,CAAC;QACvD,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QACnD,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QACjE,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAE1B,wBAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACrC,wBAAW,CAAC,OAAO,CACjB,cAAc,EACd,oBAAoB,EACpB,kBAAkB,CACnB,CAAC;QAEF,OAAO,mBAAmB,CAAC,yBAAyB,CAAC;IACvD,CAAC;IAED~~;;;;;;;OAOG;IACH~~,iBAAiB,~~CAAC~~,~~aAAkC~~;~~QAClD~~,wBAAW,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;QAE9C,~~aAAa~~,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;~~YACvC~~,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;YACjC;;;eAGG;YACH,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QAEH,~~wBAAW~~,~~CAAC~~,IAAI,~~CAAC~~,~~yBAAyB,CAAC,CAAC~~;~~QAC5C~~,~~wBAAW,CAAC,~~OAAO,~~CACjB~~,~~qBAAqB~~,~~EACrB~~,~~2BAA2B~~,~~EAC3B~~,~~yBAAyB,CAC1B,~~CAAC~~;IACJ~~,CAAC;~~IAED;;;;;OAKG;IACH~~,~~WAAW~~,CAAC,~~YAAsB;QAChC~~,~~KAAK~~,MAAM,WAAW,~~IAAI~~,~~YAAY,EAAE~~;~~YACtC~~,~~OAAO~~,~~IAAI,~~CAAC,~~UAAU~~,CAAC,~~WAAW~~,CAAC,CAAC;~~YACpC~~,~~IAAI~~,CAAC,~~cAAc~~,~~CAAC~~,~~MAAM~~,~~CAAC~~,~~WAAW~~,~~CAAC~~,CAAC;~~SACzC;IACH~~,CAAC;IAED,QAAQ,CAAC,IAAY;QACnB,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAEzB,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,sBAAW,CAAC;YAC/C,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,sBAAW,CAAC,MAAM,GAAG,CAAC,CAAC;YACrC,CAAC,CAAC,IAAI,CAAC;QACT,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;YAClC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;SACxD;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;IACvC,CAAC;IAED,iBAAiB;QACf,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACvB,IAAI,CAAC,IAAI,EAAE,CAAC;SACb;IACH,CAAC;IAEO,eAAe,CAAC,QAA6B;QACnD,MAAM,UAAU,GAAG,sBAAW,CAAC,MAAM,GAAG,CAAC,CAAC;QAC1C,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;YAClC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,IAAI,CAAC;YACpD;;;eAGG;YACH,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,WAAW,CAAC,IAAY;QAC9B,IAAI;YACF,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;SACpC;QAAC,WAAM;YACN,OAAO,EAAE,CAAC;SACX;IACH,CAAC;CACF;~~AApHD~~,~~gCAoHC~~;AAEY,QAAA,iBAAiB,GAAG,IAAI,UAAU,CAAC,6BAAc,CAAC,CAAC"}
1	+ {"version":3,"file":"file-hasher.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/hasher/file-hasher.ts"],"names":[],"mappings":"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"}

package/src/core/nx-deps/nx-deps-cache.d.ts CHANGED Viewed

@@ -1,5 +1,4 @@
-import type { FileData, NxJsonConfiguration, ProjectGraph, ProjectGraphDependency, ProjectGraphNode, WorkspaceJsonConfiguration } from '@nrwl/devkit';
-import type { ProjectFileMap } from '../file-graph';
+import type { FileData, NxJsonConfiguration, ProjectFileMap, ProjectGraph, ProjectGraphDependency, ProjectGraphNode, WorkspaceJsonConfiguration } from '@nrwl/devkit';
 export interface ProjectGraphCache {
     version: string;
     deps: Record<string, string>;
@@ -13,14 +12,15 @@ export interface ProjectGraphCache {
 }
 export declare const nxDepsDir: string;
 export declare function ensureCacheDirectory(): void;
-export declare function readCache(): false | ProjectGraphCache;
-export declare function writeCache(packageJsonDeps: Record<string, string>, nxJson: NxJsonConfiguration, tsConfig: {
+export declare function readCache(): null | ProjectGraphCache;
+export declare function createCache(nxJson: NxJsonConfiguration<'*' | string[]>, packageJsonDeps: Record<string, string>, projectGraph: ProjectGraph<any>, tsConfig: {
     compilerOptions: {
         paths?: {
-            [k: string]: any;
+            [p: string]: any;
         };
     };
-}, projectGraph: ProjectGraph): void;
+}): ProjectGraphCache;
+export declare function writeCache(cache: ProjectGraphCache): void;
 export declare function shouldRecomputeWholeGraph(cache: ProjectGraphCache, packageJsonDeps: Record<string, string>, workspaceJson: WorkspaceJsonConfiguration, nxJson: NxJsonConfiguration, tsConfig: {
     compilerOptions: {
         paths: {

package/src/core/nx-deps/nx-deps-cache.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractCachedFileData = exports.shouldRecomputeWholeGraph = exports.writeCache = exports.readCache = exports.ensureCacheDirectory = exports.nxDepsDir = void 0;
+exports.extractCachedFileData = exports.shouldRecomputeWholeGraph = exports.writeCache = exports.createCache = exports.readCache = exports.ensureCacheDirectory = exports.nxDepsDir = void 0;
 const path_1 = require("path");
 const app_root_1 = require("@nrwl/tao/src/utils/app-root");
 const fs_1 = require("fs");
@@ -48,11 +48,10 @@ function readCache() {
     }
     perf_hooks_1.performance.mark('read cache:end');
     perf_hooks_1.performance.measure('read cache', 'read cache:start', 'read cache:end');
-    return data !== null && data !== void 0 ? data : false;
+    return data !== null && data !== void 0 ? data : null;
 }
 exports.readCache = readCache;
-function writeCache(packageJsonDeps, nxJson, tsConfig, projectGraph) {
-    perf_hooks_1.performance.mark('write cache:start');
+function createCache(nxJson, packageJsonDeps, projectGraph, tsConfig) {
     const nxJsonPlugins = (nxJson.plugins || []).map((p) => ({
         name: p,
         version: packageJsonDeps[p],
@@ -65,7 +64,12 @@ function writeCache(packageJsonDeps, nxJson, tsConfig, projectGraph) {
         nodes: projectGraph.nodes,
         dependencies: projectGraph.dependencies,
     };
-    fileutils_1.writeJsonFile(nxDepsPath, newValue);
+    return newValue;
+}
+exports.createCache = createCache;
+function writeCache(cache) {
+    perf_hooks_1.performance.mark('write cache:start');
+    fileutils_1.writeJsonFile(nxDepsPath, cache);
     perf_hooks_1.performance.mark('write cache:end');
     perf_hooks_1.performance.measure('write cache', 'write cache:start', 'write cache:end');
 }

package/src/core/nx-deps/nx-deps-cache.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"nx-deps-cache.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/nx-deps/nx-deps-cache.ts"],"names":[],"mappings":";;;~~AAQA~~,+BAA4B;AAC5B,2DAA2D;AAC3D,2BAAgC;AAChC,uCAAyC;AACzC,yDAKmC;~~AAEnC~~,2CAAyC;AACzC,qEAGyC;AAc5B,QAAA,SAAS,GAAG,gCAAc,CACrC,sBAAW,EACX,4CAA0B,CAAC,sBAAW,CAAC,CACxC,CAAC;AACF,MAAM,UAAU,GAAG,WAAI,CAAC,iBAAS,EAAE,aAAa,CAAC,CAAC;AAElD,SAAgB,oBAAoB;IAClC,IAAI;QACF,IAAI,CAAC,eAAU,CAAC,iBAAS,CAAC,EAAE;YAC1B,wBAAa,CAAC,iBAAS,CAAC,CAAC;SAC1B;KACF;IAAC,OAAO,CAAC,EAAE;QACV;;;;;;;;;WASG;QACH,IAAI,CAAC,2BAAe,CAAC,iBAAS,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CAAC,+BAA+B,iBAAS,EAAE,CAAC,CAAC;SAC7D;KACF;AACH,CAAC;AApBD,oDAoBC;AAED,SAAgB,SAAS;IACvB,wBAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IACrC,oBAAoB,EAAE,CAAC;IAEvB,IAAI,IAAI,GAAG,IAAI,CAAC;IAChB,IAAI;QACF,IAAI,sBAAU,CAAC,UAAU,CAAC,EAAE;YAC1B,IAAI,GAAG,wBAAY,CAAC,UAAU,CAAC,CAAC;SACjC;KACF;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,GAAG,CACT,kBAAkB,UAAU,4CAA4C,CACzE,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;KACpB;IAED,wBAAW,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACnC,wBAAW,CAAC,OAAO,CAAC,YAAY,EAAE,kBAAkB,EAAE,gBAAgB,CAAC,CAAC;IACxE,OAAO,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,~~KAAK~~,CAAC;~~AACvB~~,CAAC;AAnBD,8BAmBC;AAED,SAAgB,~~UAAU~~,~~CACxB~~,eAAuC,EACvC,~~MAA2B~~,~~EAC3B~~,QAA+D~~,EAC~~/D,~~YAA0B;IAE1B,wBAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACtC,~~MAAM,aAAa,GAAG,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACvD,IAAI,EAAE,CAAC;QACP,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC;KAC5B,CAAC,CAAC,CAAC;IACJ,MAAM,QAAQ,GAAsB;QAClC,OAAO,EAAE,YAAY,CAAC,OAAO,IAAI,KAAK;QACtC,IAAI,EAAE,eAAe;QACrB,YAAY,EAAE,QAAQ,CAAC,eAAe,CAAC,KAAK,IAAI,EAAE;QAClD,aAAa;QACb,KAAK,EAAE,YAAY,CAAC,KAAK;QACzB,YAAY,EAAE,YAAY,CAAC,YAAY;KACxC,CAAC;IACF,yBAAa,CAAC,UAAU,EAAE,~~QAAQ~~,CAAC,CAAC;~~IACpC~~,wBAAW,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACpC,wBAAW,CAAC,OAAO,CAAC,aAAa,EAAE,mBAAmB,EAAE,iBAAiB,CAAC,CAAC;AAC7E,CAAC;~~AAtBD~~,~~gCAsBC~~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"}
1	+ {"version":3,"file":"nx-deps-cache.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/nx-deps/nx-deps-cache.ts"],"names":[],"mappings":"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"}

package/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ import { ProjectFileMap, ProjectGraph, Workspace } from '@nrwl/devkit';
2	+ export declare function buildExplicitTypescriptAndPackageJsonDependencies(workspace: Workspace, projectGraph: ProjectGraph, filesToProcess: ProjectFileMap): any[];

package/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.js ADDED Viewed

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildExplicitTypescriptAndPackageJsonDependencies = void 0;
+const explicit_project_dependencies_1 = require("./explicit-project-dependencies");
+const explicit_package_json_dependencies_1 = require("./explicit-package-json-dependencies");
+function buildExplicitTypescriptAndPackageJsonDependencies(workspace, projectGraph, filesToProcess) {
+    return []
+        .concat(explicit_project_dependencies_1.buildExplicitTypeScriptDependencies(workspace, projectGraph, filesToProcess))
+        .concat(explicit_package_json_dependencies_1.buildExplicitPackageJsonDependencies(workspace, projectGraph, filesToProcess));
+}
+exports.buildExplicitTypescriptAndPackageJsonDependencies = buildExplicitTypescriptAndPackageJsonDependencies;
+//# sourceMappingURL=build-explicit-typescript-and-package-json-dependencies.js.map

package/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"build-explicit-typescript-and-package-json-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.ts"],"names":[],"mappings":";;;AACA,mFAAsF;AACtF,6FAA4F;AAE5F,SAAgB,iDAAiD,CAC/D,SAAoB,EACpB,YAA0B,EAC1B,cAA8B;IAE9B,OAAO,EAAE;SACN,MAAM,CACL,mEAAmC,CACjC,SAAS,EACT,YAAY,EACZ,cAAc,CACf,CACF;SACA,MAAM,CACL,yEAAoC,CAClC,SAAS,EACT,YAAY,EACZ,cAAc,CACf,CACF,CAAC;AACN,CAAC;AApBD,8GAoBC"}

package/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.d.ts CHANGED Viewed

@@ -1,2 +1,3 @@
-import { ProjectGraphBuilder, ProjectGraphProcessorContext } from '@nrwl/devkit';
-export declare function buildExplicitPackageJsonDependencies(ctx: ProjectGraphProcessorContext, builder: ProjectGraphBuilder): void;
+import { ProjectGraph } from '../project-graph-models';
+import { ProjectFileMap, Workspace } from '@nrwl/devkit';
+export declare function buildExplicitPackageJsonDependencies(workspace: Workspace, graph: ProjectGraph, filesToProcess: ProjectFileMap): any;

package/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.js CHANGED Viewed

@@ -3,27 +3,33 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildExplicitPackageJsonDependencies = void 0;
 const file_utils_1 = require("../../file-utils");
 const devkit_1 = require("@nrwl/devkit");
-function buildExplicitPackageJsonDependencies(ctx, builder) {
-    Object.keys(ctx.filesToProcess).forEach((source) => {
-        Object.values(ctx.filesToProcess[source]).forEach((f) => {
-            if (isPackageJsonAtProjectRoot(builder.graph.nodes, f.file)) {
-                processPackageJson(source, f.file, builder);
+function buildExplicitPackageJsonDependencies(workspace, graph, filesToProcess) {
+    const res = [];
+    Object.keys(filesToProcess).forEach((source) => {
+        Object.values(filesToProcess[source]).forEach((f) => {
+            if (isPackageJsonAtProjectRoot(graph.nodes, f.file)) {
+                processPackageJson(source, f.file, graph, res);
             }
         });
     });
+    return res;
 }
 exports.buildExplicitPackageJsonDependencies = buildExplicitPackageJsonDependencies;
 function isPackageJsonAtProjectRoot(nodes, fileName) {
     return Object.values(nodes).find((projectNode) => (projectNode.type === 'lib' || projectNode.type === 'app') &&
         devkit_1.joinPathFragments(projectNode.data.root, 'package.json') === fileName);
 }
-function processPackageJson(sourceProject, fileName, builder) {
+function processPackageJson(sourceProject, fileName, graph, collectedDeps) {
     try {
         const deps = readDeps(devkit_1.parseJson(file_utils_1.defaultFileRead(fileName)));
         deps.forEach((d) => {
             // package.json refers to another project in the monorepo
-            if (builder.graph.nodes[d]) {
-                builder.addExplicitDependency(sourceProject, fileName, d);
+            if (graph.nodes[d]) {
+                collectedDeps.push({
+                    sourceProjectName: sourceProject,
+                    targetProjectName: d,
+                    sourceProjectFile: fileName,
+                });
             }
         });
     }

package/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"explicit-package-json-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.ts"],"names":[],"mappings":";;;AACA,iDAAmD;AACnD,yCAKsB;AAEtB,SAAgB,oCAAoC,CAClD,~~GAAiC~~,~~EACjC~~,~~OAA4B~~;~~IAE5B~~,MAAM,CAAC,~~IAAI~~,CAAC,~~GAAG~~,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;~~QACjD~~,MAAM,CAAC,MAAM,CAAC,~~GAAG,CAAC,~~cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;~~YACtD~~,IAAI,0BAA0B,CAAC,~~OAAO,CAAC,~~KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE;~~gBAC3D~~,kBAAkB,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,~~OAAO~~,CAAC,CAAC;~~aAC7C~~;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;~~AACL~~,CAAC;~~AAXD~~,~~oFAWC~~;AAED,SAAS,0BAA0B,CACjC,KAA8B,EAC9B,QAAgB;IAEhB,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAC9B,CAAC,WAAW,EAAE,EAAE,CACd,CAAC,WAAW,CAAC,IAAI,KAAK,KAAK,IAAI,WAAW,CAAC,IAAI,KAAK,KAAK,CAAC;QAC1D,0BAAiB,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,KAAK,QAAQ,CACxE,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CACzB,aAAqB,EACrB,QAAgB,EAChB,~~OAA4B~~;~~IAE5B~~,IAAI;QACF,MAAM,IAAI,GAAG,QAAQ,CAAC,kBAAS,CAAC,4BAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC5D,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACjB,yDAAyD;YACzD,IAAI,~~OAAO,CAAC,~~KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;~~gBAC1B~~,~~OAAO~~,CAAC,~~qBAAqB~~,CAAC,~~aAAa~~,EAAE,~~QAAQ~~,EAAE,CAAC,CAAC,CAAC;~~aAC3D~~;QACH,CAAC,CAAC,CAAC;KACJ;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,MAAM,EAAE;YAC7C,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SAChB;KACF;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,eAAoB;;IACpC,OAAO;QACL,GAAG,MAAM,CAAC,IAAI,CAAC,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,YAAY,mCAAI,EAAE,CAAC;QACnD,GAAG,MAAM,CAAC,IAAI,CAAC,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,eAAe,mCAAI,EAAE,CAAC;KACvD,CAAC;AACJ,CAAC"}
1	+ {"version":3,"file":"explicit-package-json-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.ts"],"names":[],"mappings":";;;AACA,iDAAmD;AACnD,yCAKsB;AAEtB,SAAgB,oCAAoC,CAClD,SAAoB,EACpB,KAAmB,EACnB,cAA8B;IAE9B,MAAM,GAAG,GAAG,EAAS,CAAC;IACtB,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QAC7C,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAClD,IAAI,0BAA0B,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE;gBACnD,kBAAkB,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;aAChD;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACb,CAAC;AAdD,oFAcC;AAED,SAAS,0BAA0B,CACjC,KAA8B,EAC9B,QAAgB;IAEhB,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAC9B,CAAC,WAAW,EAAE,EAAE,CACd,CAAC,WAAW,CAAC,IAAI,KAAK,KAAK,IAAI,WAAW,CAAC,IAAI,KAAK,KAAK,CAAC;QAC1D,0BAAiB,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,KAAK,QAAQ,CACxE,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CACzB,aAAqB,EACrB,QAAgB,EAChB,KAAmB,EACnB,aAAoB;IAEpB,IAAI;QACF,MAAM,IAAI,GAAG,QAAQ,CAAC,kBAAS,CAAC,4BAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC5D,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACjB,yDAAyD;YACzD,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;gBAClB,aAAa,CAAC,IAAI,CAAC;oBACjB,iBAAiB,EAAE,aAAa;oBAChC,iBAAiB,EAAE,CAAC;oBACpB,iBAAiB,EAAE,QAAQ;iBAC5B,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;KACJ;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,MAAM,EAAE;YAC7C,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SAChB;KACF;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,eAAoB;;IACpC,OAAO;QACL,GAAG,MAAM,CAAC,IAAI,CAAC,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,YAAY,mCAAI,EAAE,CAAC;QACnD,GAAG,MAAM,CAAC,IAAI,CAAC,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,eAAe,mCAAI,EAAE,CAAC;KACvD,CAAC;AACJ,CAAC"}

package/src/core/project-graph/build-dependencies/explicit-project-dependencies.d.ts CHANGED Viewed

@@ -1,2 +1,3 @@
-import { ProjectGraphBuilder, ProjectGraphProcessorContext } from '@nrwl/devkit';
-export declare function buildExplicitTypeScriptDependencies(ctx: ProjectGraphProcessorContext, builder: ProjectGraphBuilder): void;
+import { ProjectGraph } from '../project-graph-models';
+import { ProjectFileMap, Workspace } from '@nrwl/devkit';
+export declare function buildExplicitTypeScriptDependencies(workspace: Workspace, graph: ProjectGraph, filesToProcess: ProjectFileMap): any;

package/src/core/project-graph/build-dependencies/explicit-project-dependencies.js CHANGED Viewed

@@ -3,19 +3,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildExplicitTypeScriptDependencies = void 0;
 const typescript_import_locator_1 = require("./typescript-import-locator");
 const target_project_locator_1 = require("../../target-project-locator");
-function buildExplicitTypeScriptDependencies(ctx, builder) {
+function buildExplicitTypeScriptDependencies(workspace, graph, filesToProcess) {
     const importLocator = new typescript_import_locator_1.TypeScriptImportLocator();
-    const targetProjectLocator = new target_project_locator_1.TargetProjectLocator(builder.graph.nodes);
-    Object.keys(ctx.filesToProcess).forEach((source) => {
-        Object.values(ctx.filesToProcess[source]).forEach((f) => {
+    const targetProjectLocator = new target_project_locator_1.TargetProjectLocator(graph.nodes);
+    const res = [];
+    Object.keys(filesToProcess).forEach((source) => {
+        Object.values(filesToProcess[source]).forEach((f) => {
             importLocator.fromFile(f.file, (importExpr, filePath, type) => {
-                const target = targetProjectLocator.findProjectWithImport(importExpr, f.file, ctx.workspace.npmScope);
+                const target = targetProjectLocator.findProjectWithImport(importExpr, f.file, workspace.npmScope);
                 if (target) {
-                    builder.addExplicitDependency(source, f.file, target);
+                    res.push({
+                        sourceProjectName: source,
+                        targetProjectName: target,
+                        sourceProjectFile: f.file,
+                    });
                 }
             });
         });
     });
+    return res;
 }
 exports.buildExplicitTypeScriptDependencies = buildExplicitTypeScriptDependencies;
 //# sourceMappingURL=explicit-project-dependencies.js.map

package/src/core/project-graph/build-dependencies/explicit-project-dependencies.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"explicit-project-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/build-dependencies/explicit-project-dependencies.ts"],"names":[],"mappings":";;;AACA,2EAAsE;AACtE,yEAAoE;~~AAMpE~~,SAAgB,mCAAmC,CACjD,~~GAAiC~~,~~EACjC~~,~~OAA4B~~;~~IAE5B~~,MAAM,aAAa,GAAG,IAAI,mDAAuB,EAAE,CAAC;IACpD,MAAM,oBAAoB,GAAG,IAAI,6CAAoB,CAAC,~~OAAO,CAAC,~~KAAK,CAAC,KAAK,CAAC,CAAC;~~IAC3E~~,MAAM,CAAC,~~IAAI~~,CAAC,~~GAAG~~,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;~~QACjD~~,MAAM,CAAC,MAAM,CAAC,~~GAAG,CAAC,~~cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;~~YACtD~~,aAAa,CAAC,QAAQ,CACpB,CAAC,CAAC,IAAI,EACN,CAAC,UAAkB,EAAE,QAAgB,EAAE,IAAoB,EAAE,EAAE;gBAC7D,MAAM,MAAM,GAAG,oBAAoB,CAAC,qBAAqB,CACvD,UAAU,EACV,CAAC,CAAC,IAAI,EACN,~~GAAG,CAAC,~~SAAS,CAAC,QAAQ,~~CACvB~~,CAAC;gBACF,IAAI,MAAM,EAAE;oBACV,~~OAAO~~,CAAC,~~qBAAqB~~,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,~~EAAE,MAAM,~~CAAC,CAAC;~~iBACvD~~;YACH,CAAC,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;~~AACL~~,CAAC;~~AAvBD~~,~~kFAuBC~~"}
1	+ {"version":3,"file":"explicit-project-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/build-dependencies/explicit-project-dependencies.ts"],"names":[],"mappings":";;;AACA,2EAAsE;AACtE,yEAAoE;AAQpE,SAAgB,mCAAmC,CACjD,SAAoB,EACpB,KAAmB,EACnB,cAA8B;IAE9B,MAAM,aAAa,GAAG,IAAI,mDAAuB,EAAE,CAAC;IACpD,MAAM,oBAAoB,GAAG,IAAI,6CAAoB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACnE,MAAM,GAAG,GAAG,EAAS,CAAC;IACtB,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QAC7C,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAClD,aAAa,CAAC,QAAQ,CACpB,CAAC,CAAC,IAAI,EACN,CAAC,UAAkB,EAAE,QAAgB,EAAE,IAAoB,EAAE,EAAE;gBAC7D,MAAM,MAAM,GAAG,oBAAoB,CAAC,qBAAqB,CACvD,UAAU,EACV,CAAC,CAAC,IAAI,EACN,SAAS,CAAC,QAAQ,CACnB,CAAC;gBACF,IAAI,MAAM,EAAE;oBACV,GAAG,CAAC,IAAI,CAAC;wBACP,iBAAiB,EAAE,MAAM;wBACzB,iBAAiB,EAAE,MAAM;wBACzB,iBAAiB,EAAE,CAAC,CAAC,IAAI;qBAC1B,CAAC,CAAC;iBACJ;YACH,CAAC,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACb,CAAC;AA9BD,kFA8BC"}

package/src/core/project-graph/build-project-graph.d.ts ADDED Viewed

@@ -0,0 +1,7 @@
+import { FileData, ProjectFileMap, ProjectGraph, WorkspaceJsonConfiguration } from '@nrwl/devkit';
+import { ProjectGraphCache } from '../nx-deps/nx-deps-cache';
+export declare function buildProjectGraph(projectGraphVersion?: string): Promise<ProjectGraph<any>>;
+export declare function buildProjectGraphUsingProjectFileMap(workspaceJson: WorkspaceJsonConfiguration, projectFileMap: ProjectFileMap, allWorkspaceFiles: FileData[], cache: ProjectGraphCache | null, shouldWriteCache: boolean, projectGraphVersion?: string): Promise<{
+    projectGraph: ProjectGraph;
+    projectGraphCache: ProjectGraphCache;
+}>;