@nrwl/workspace 12.9.0-rc.0 → 12.10.0-beta.3

package/src/generators/init/schema.json

@@ -12,8 +12,7 @@
     },
     "defaultBase": {
       "type": "string",
-      "description": "Default base branch for affected.",
-      "default": "master"
+      "description": "Default base branch for affected."
     },
     "skipInstall": {
       "type": "boolean",

package/src/generators/new/new.js

@@ -6,9 +6,11 @@ const devkit_1 = require("@nrwl/devkit");
 const path_1 = require("path");
 const yargsParser = require("yargs-parser");
 const child_process_1 = require("child_process");
+const semver_1 = require("semver");
 const workspace_1 = require("../workspace/workspace");
 const versions_1 = require("../../utils/versions");
 const presets_1 = require("../utils/presets");
+const default_base_1 = require("../../utilities/default-base");
 function generatePreset(host, opts) {
     const cliCommand = opts.cli === 'angular' ? 'ng' : 'nx';
     const parsedArgs = yargsParser(process.argv, {
@@ -76,8 +78,8 @@ function initializeGitRepo(host, rootDirectory, options) {
                 });
             });
         };
-        const hasCommand = yield execute(['--version']).then(() => true, () => false);
-        if (!hasCommand) {
+        const gitVersion = default_base_1.checkGitVersion();
+        if (!gitVersion) {
             return;
         }
         const insideRepo = yield execute(['rev-parse', '--is-inside-work-tree'], true).then(() => true, () => false);
@@ -85,7 +87,14 @@ function initializeGitRepo(host, rootDirectory, options) {
             console.info(`Directory is already under version control. Skipping initialization of git.`);
             return;
         }
-        yield execute(['init']);
+        const defaultBase = options.defaultBase || default_base_1.deduceDefaultBase();
+        if (semver_1.gte(gitVersion, '2.28.0')) {
+            yield execute(['init', '-b', defaultBase]);
+        }
+        else {
+            yield execute(['init']);
+            yield execute(['checkout', '-b', defaultBase]);
+        }
         yield execute(['add', '.']);
         if (options.commit) {
             const message = options.commit.message || 'initial commit';

package/src/generators/new/new.js.map

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

package/src/generators/new/schema.json

@@ -31,8 +31,7 @@
     },
     "defaultBase": {
       "type": "string",
-      "description": "Default base branch for affected.",
-      "default": "master"
+      "description": "Default base branch for affected."
     },
     "skipInstall": {
       "description": "Skip installing dependency packages.",

package/src/generators/workspace/schema.json

@@ -54,8 +54,7 @@
     },
     "defaultBase": {
       "type": "string",
-      "description": "Default base branch for affected.",
-      "default": "master"
+      "description": "Default base branch for affected."
     },
     "skipInstall": {
       "description": "Skip installing dependency packages.",

package/src/generators/workspace/workspace.js

@@ -8,6 +8,7 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const workspace_1 = require("@nrwl/tao/src/shared/workspace");
 const presets_1 = require("../utils/presets");
+const default_base_1 = require("../../utilities/default-base");
 exports.DEFAULT_NRWL_PRETTIER_CONFIG = {
     singleQuote: true,
 };
@@ -90,6 +91,7 @@ function workspaceGenerator(host, options) {
         if (!options.name) {
             throw new Error(`Invalid options, "name" is required.`);
         }
+        options = normalizeOptions(options);
         createFiles(host, options);
         createPrettierrc(host, options);
         if (options.cli === 'angular') {
@@ -114,4 +116,8 @@ function addPropertyWithStableKeys(obj, key, value) {
         obj[k] = copy[k];
     });
 }
+function normalizeOptions(options) {
+    let defaultBase = options.defaultBase || default_base_1.deduceDefaultBase();
+    return Object.assign(Object.assign({}, options), { defaultBase });
+}
 //# sourceMappingURL=workspace.js.map

package/src/generators/workspace/workspace.js.map

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

package/src/tasks-runner/cache.d.ts

@@ -19,11 +19,11 @@ export declare class Cache {
     removeOldCacheRecords(): void;
     get(task: Task): Promise<CachedResult>;
     put(task: Task, terminalOutput: string | null, outputs: string[], code: number): Promise<void>;
-    copyFilesFromCache(hash: string, cachedResult: CachedResult, outputs: string[]): void;
+    copyFilesFromCache(hash: string, cachedResult: CachedResult, outputs: string[]): Promise<void>;
     temporaryOutputPath(task: Task): string;
-    removeRecordedOutputsHashes(outputs: string[]): void;
-    recordOutputsHash(outputs: string[], hash: string): void;
-    shouldCopyOutputsFromCache(taskWithCachedResult: TaskWithCachedResult, outputs: string[]): boolean;
+    removeRecordedOutputsHashes(outputs: string[]): Promise<void>;
+    recordOutputsHash(outputs: string[], hash: string): Promise<void>;
+    shouldCopyOutputsFromCache(taskWithCachedResult: TaskWithCachedResult, outputs: string[]): Promise<boolean>;
     private areLatestOutputsHashesDifferentThanTaskHash;
     private getLatestRecordedHashForTask;
     private isAnyOutputMissing;

package/src/tasks-runner/cache.js

@@ -8,7 +8,11 @@ const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
 const child_process_1 = require("child_process");
 const cache_directory_1 = require("../utilities/cache-directory");
-const fileutils_1 = require("../utilities/fileutils");
+const util = require('util');
+const readFileAsync = util.promisify(fs_extra_1.readFile);
+const existsAsync = util.promisify(fs_1.exists);
+const lstatAsync = util.promisify(fs_1.lstat);
+const readdirAsync = util.promisify(fs_1.readdir);
 class Cache {
     constructor(options) {
         this.options = options;
@@ -40,7 +44,7 @@ class Cache {
     }
     get(task) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const res = this.getFromLocalDir(task);
+            const res = yield this.getFromLocalDir(task);
             // didn't find it locally but we have a remote cache
             if (!res && this.options.remoteCache) {
                 // attempt remote cache
@@ -58,119 +62,151 @@ class Cache {
             const td = path_1.join(this.cachePath, task.hash);
             const tdCommit = path_1.join(this.cachePath, `${task.hash}.commit`);
             // might be left overs from partially-completed cache invocations
-            fs_extra_1.removeSync(tdCommit);
-            fs_extra_1.removeSync(td);
-            fs_1.mkdirSync(td);
-            fs_1.writeFileSync(path_1.join(td, 'terminalOutput'), terminalOutput !== null && terminalOutput !== void 0 ? terminalOutput : 'no terminal output');
-            fs_1.mkdirSync(path_1.join(td, 'outputs'));
-            outputs.forEach((f) => {
+            yield fs_extra_1.remove(tdCommit);
+            yield fs_extra_1.remove(td);
+            yield fs_extra_1.mkdir(td);
+            yield fs_extra_1.writeFile(path_1.join(td, 'terminalOutput'), terminalOutput !== null && terminalOutput !== void 0 ? terminalOutput : 'no terminal output');
+            yield fs_extra_1.mkdir(path_1.join(td, 'outputs'));
+            for (const f of outputs) {
                 const src = path_1.join(this.root, f);
-                if (fs_1.existsSync(src)) {
+                if (yield existsAsync(src)) {
                     const cached = path_1.join(td, 'outputs', f);
                     // Ensure parent directory is created if src is a file
-                    const isFile = fs_1.lstatSync(src).isFile();
+                    const isFile = (yield lstatAsync(src)).isFile();
                     const directory = isFile ? path_1.resolve(cached, '..') : cached;
-                    fs_extra_1.ensureDirSync(directory);
-                    fs_extra_1.copySync(src, cached);
+                    yield fs_extra_1.ensureDir(directory);
+                    yield fs_extra_1.copy(src, cached);
                 }
-            });
+            }
             // we need this file to account for partial writes to the cache folder.
             // creating this file is atomic, whereas creating a folder is not.
             // so if the process gets terminated while we are copying stuff into cache,
             // the cache entry won't be used.
-            fs_1.writeFileSync(path_1.join(td, 'code'), code.toString());
-            fs_1.writeFileSync(tdCommit, 'true');
+            yield fs_extra_1.writeFile(path_1.join(td, 'code'), code.toString());
+            yield fs_extra_1.writeFile(tdCommit, 'true');
             if (this.options.remoteCache) {
                 yield this.options.remoteCache.store(task.hash, this.cachePath);
             }
         });
     }
     copyFilesFromCache(hash, cachedResult, outputs) {
-        this.removeRecordedOutputsHashes(outputs);
-        outputs.forEach((f) => {
-            const cached = path_1.join(cachedResult.outputsPath, f);
-            if (fs_1.existsSync(cached)) {
-                const isFile = fs_1.lstatSync(cached).isFile();
-                const src = path_1.join(this.root, f);
-                fs_extra_1.removeSync(src);
-                // Ensure parent directory is created if src is a file
-                const directory = isFile ? path_1.resolve(src, '..') : src;
-                fs_extra_1.ensureDirSync(directory);
-                fs_extra_1.copySync(cached, src);
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            yield this.removeRecordedOutputsHashes(outputs);
+            for (const f of outputs) {
+                const cached = path_1.join(cachedResult.outputsPath, f);
+                if (yield existsAsync(cached)) {
+                    const isFile = (yield lstatAsync(cached)).isFile();
+                    const src = path_1.join(this.root, f);
+                    yield fs_extra_1.remove(src);
+                    // Ensure parent directory is created if src is a file
+                    const directory = isFile ? path_1.resolve(src, '..') : src;
+                    yield fs_extra_1.ensureDir(directory);
+                    yield fs_extra_1.copy(cached, src);
+                }
             }
+            yield this.recordOutputsHash(outputs, hash);
         });
-        this.recordOutputsHash(outputs, hash);
     }
     temporaryOutputPath(task) {
         return path_1.join(this.terminalOutputsDir, task.hash);
     }
     removeRecordedOutputsHashes(outputs) {
-        outputs.forEach((output) => {
-            const hashFile = this.getFileNameWithLatestRecordedHashForOutput(output);
-            try {
-                fs_1.unlinkSync(hashFile);
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            for (const output of outputs) {
+                const hashFile = this.getFileNameWithLatestRecordedHashForOutput(output);
+                try {
+                    yield fs_extra_1.unlink(hashFile);
+                }
+                catch (e) { }
             }
-            catch (e) { }
         });
     }
     recordOutputsHash(outputs, hash) {
-        outputs.forEach((output) => {
-            const hashFile = this.getFileNameWithLatestRecordedHashForOutput(output);
-            fileutils_1.writeToFile(hashFile, hash);
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            for (const output of outputs) {
+                const hashFile = this.getFileNameWithLatestRecordedHashForOutput(output);
+                try {
+                    yield fs_extra_1.ensureDir(path_1.dirname(hashFile));
+                    yield fs_extra_1.writeFile(hashFile, hash);
+                }
+                catch (_a) { }
+            }
         });
     }
     shouldCopyOutputsFromCache(taskWithCachedResult, outputs) {
-        return (this.areLatestOutputsHashesDifferentThanTaskHash(outputs, taskWithCachedResult.task.hash) || this.isAnyOutputMissing(taskWithCachedResult.cachedResult, outputs));
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return ((yield this.areLatestOutputsHashesDifferentThanTaskHash(outputs, taskWithCachedResult.task.hash)) ||
+                (yield this.isAnyOutputMissing(taskWithCachedResult.cachedResult, outputs)));
+        });
     }
     areLatestOutputsHashesDifferentThanTaskHash(outputs, hash) {
-        return outputs.some((output) => this.getLatestRecordedHashForTask(output) !== hash);
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            for (let output of outputs) {
+                if ((yield this.getLatestRecordedHashForTask(output)) !== hash)
+                    return true;
+            }
+            return false;
+        });
     }
     getLatestRecordedHashForTask(output) {
-        try {
-            return fs_1.readFileSync(this.getFileNameWithLatestRecordedHashForOutput(output)).toString();
-        }
-        catch (e) {
-            return null;
-        }
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            try {
+                return (yield readFileAsync(this.getFileNameWithLatestRecordedHashForOutput(output))).toString();
+            }
+            catch (e) {
+                return null;
+            }
+        });
     }
     isAnyOutputMissing(cachedResult, outputs) {
-        return outputs.some((output) => {
-            const cacheOutputPath = path_1.join(cachedResult.outputsPath, output);
-            const rootOutputPath = path_1.join(this.root, output);
-            if (fs_1.existsSync(cacheOutputPath) && fs_1.lstatSync(cacheOutputPath).isFile()) {
-                return (fs_1.existsSync(path_1.join(cachedResult.outputsPath, output)) &&
-                    !fs_1.existsSync(path_1.join(this.root, output)));
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            for (let output of outputs) {
+                const cacheOutputPath = path_1.join(cachedResult.outputsPath, output);
+                const rootOutputPath = path_1.join(this.root, output);
+                if ((yield existsAsync(cacheOutputPath)) &&
+                    (yield lstatAsync(cacheOutputPath)).isFile()) {
+                    if ((yield existsAsync(path_1.join(cachedResult.outputsPath, output))) &&
+                        !(yield existsAsync(path_1.join(this.root, output)))) {
+                        return true;
+                    }
+                }
+                const haveDifferentAmountOfFiles = (yield existsAsync(cacheOutputPath)) &&
+                    (yield existsAsync(rootOutputPath)) &&
+                    (yield readdirAsync(cacheOutputPath)).length !==
+                        (yield readdirAsync(rootOutputPath)).length;
+                if (((yield existsAsync(cacheOutputPath)) &&
+                    !(yield existsAsync(rootOutputPath))) ||
+                    haveDifferentAmountOfFiles) {
+                    return true;
+                }
             }
-            const haveDifferentAmountOfFiles = fs_1.existsSync(cacheOutputPath) &&
-                fs_1.existsSync(rootOutputPath) &&
-                fs_extra_1.readdirSync(cacheOutputPath).length !==
-                    fs_extra_1.readdirSync(rootOutputPath).length;
-            return ((fs_1.existsSync(cacheOutputPath) && !fs_1.existsSync(rootOutputPath)) ||
-                haveDifferentAmountOfFiles);
+            return false;
         });
     }
     getFileNameWithLatestRecordedHashForOutput(output) {
         return path_1.join(this.latestOutputsHashesDir, `${output.split(path_1.sep).join('-')}.hash`);
     }
     getFromLocalDir(task) {
-        const tdCommit = path_1.join(this.cachePath, `${task.hash}.commit`);
-        const td = path_1.join(this.cachePath, task.hash);
-        if (fs_1.existsSync(tdCommit)) {
-            const terminalOutput = fs_1.readFileSync(path_1.join(td, 'terminalOutput'), 'utf-8');
-            let code = 0;
-            try {
-                code = Number(fs_1.readFileSync(path_1.join(td, 'code'), 'utf-8'));
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const tdCommit = path_1.join(this.cachePath, `${task.hash}.commit`);
+            const td = path_1.join(this.cachePath, task.hash);
+            if (yield existsAsync(tdCommit)) {
+                const terminalOutput = yield fs_extra_1.readFile(path_1.join(td, 'terminalOutput'), 'utf-8');
+                let code = 0;
+                try {
+                    code = Number(yield fs_extra_1.readFile(path_1.join(td, 'code'), 'utf-8'));
+                }
+                catch (e) { }
+                return {
+                    terminalOutput,
+                    outputsPath: path_1.join(td, 'outputs'),
+                    code,
+                };
             }
-            catch (e) { }
-            return {
-                terminalOutput,
-                outputsPath: path_1.join(td, 'outputs'),
-                code,
-            };
-        }
-        else {
-            return null;
-        }
+            else {
+                return null;
+            }
+        });
     }
     createCacheDir() {
         const dir = cache_directory_1.cacheDirectory(this.root, this.options.cacheDirectory);

package/src/tasks-runner/cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/cache.ts"],"names":[],"mappings":";;;;AAAA,2DAA2D;AAE3D,2BAOY;AACZ,uCAA4E;AAC5E,+BAA0C;AAE1C,iDAAsC;AACtC,kEAA8D;AAC9D,sDAAqD;AASrD,MAAa,KAAK;IAMhB,YAA6B,OAAkC;QAAlC,YAAO,GAAP,OAAO,CAA2B;QAL/D,SAAI,GAAG,sBAAW,CAAC;QACnB,cAAS,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAClC,uBAAkB,GAAG,IAAI,CAAC,wBAAwB,EAAE,CAAC;QACrD,2BAAsB,GAAG,IAAI,CAAC,4BAA4B,EAAE,CAAC;IAEK,CAAC;IAEnE,qBAAqB;QACnB;;;WAGG;QACH,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;QAChE,IAAI,kBAAkB,EAAE;YACtB,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAChC,8DAA8D,EAC9D,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACvB,CAAC;YAEF,IAAI;gBACF,MAAM,CAAC,GAAG,qBAAK,CAAC,MAAM,EAAE,CAAC,UAAU,EAAE,IAAI,IAAI,CAAC,SAAS,GAAG,CAAC,EAAE;oBAC3D,KAAK,EAAE,QAAQ;oBACf,QAAQ,EAAE,IAAI;iBACf,CAAC,CAAC;gBACH,CAAC,CAAC,KAAK,EAAE,CAAC;aACX;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,GAAG,CAAC,kDAAkD,CAAC,CAAC;gBAChE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;aACxB;SACF;IACH,CAAC;IAEK,GAAG,CAAC,IAAU;;YAClB,MAAM,GAAG,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YAEvC,oDAAoD;YACpD,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;gBACpC,uBAAuB;gBACvB,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;gBACnE,6BAA6B;gBAC7B,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;aACnC;iBAAM;gBACL,OAAO,GAAG,CAAC;aACZ;QACH,CAAC;KAAA;IAEK,GAAG,CACP,IAAU,EACV,cAA6B,EAC7B,OAAiB,EACjB,IAAY;;YAEZ,MAAM,EAAE,GAAG,WAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC3C,MAAM,QAAQ,GAAG,WAAI,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,SAAS,CAAC,CAAC;YAE7D,iEAAiE;YACjE,qBAAU,CAAC,QAAQ,CAAC,CAAC;YACrB,qBAAU,CAAC,EAAE,CAAC,CAAC;YAEf,cAAS,CAAC,EAAE,CAAC,CAAC;YACd,kBAAa,CACX,WAAI,CAAC,EAAE,EAAE,gBAAgB,CAAC,EAC1B,cAAc,aAAd,cAAc,cAAd,cAAc,GAAI,oBAAoB,CACvC,CAAC;YAEF,cAAS,CAAC,WAAI,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC,CAAC;YAC/B,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACpB,MAAM,GAAG,GAAG,WAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBAC/B,IAAI,eAAU,CAAC,GAAG,CAAC,EAAE;oBACnB,MAAM,MAAM,GAAG,WAAI,CAAC,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;oBACtC,sDAAsD;oBACtD,MAAM,MAAM,GAAG,cAAS,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;oBACvC,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,cAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;oBAC1D,wBAAa,CAAC,SAAS,CAAC,CAAC;oBAEzB,mBAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;iBACvB;YACH,CAAC,CAAC,CAAC;YACH,uEAAuE;YACvE,kEAAkE;YAClE,2EAA2E;YAC3E,iCAAiC;YACjC,kBAAa,CAAC,WAAI,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YACjD,kBAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YAEhC,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;gBAC5B,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;aACjE;QACH,CAAC;KAAA;IAED,kBAAkB,CAChB,IAAY,EACZ,YAA0B,EAC1B,OAAiB;QAEjB,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC;QAC1C,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACpB,MAAM,MAAM,GAAG,WAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;YACjD,IAAI,eAAU,CAAC,MAAM,CAAC,EAAE;gBACtB,MAAM,MAAM,GAAG,cAAS,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;gBAC1C,MAAM,GAAG,GAAG,WAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBAC/B,qBAAU,CAAC,GAAG,CAAC,CAAC;gBAEhB,sDAAsD;gBACtD,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,cAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;gBACpD,wBAAa,CAAC,SAAS,CAAC,CAAC;gBACzB,mBAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;aACvB;QACH,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACxC,CAAC;IAED,mBAAmB,CAAC,IAAU;QAC5B,OAAO,WAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC;IAED,2BAA2B,CAAC,OAAiB;QAC3C,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,0CAA0C,CAAC,MAAM,CAAC,CAAC;YACzE,IAAI;gBACF,eAAU,CAAC,QAAQ,CAAC,CAAC;aACtB;YAAC,OAAO,CAAC,EAAE,GAAE;QAChB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,iBAAiB,CAAC,OAAiB,EAAE,IAAY;QAC/C,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,0CAA0C,CAAC,MAAM,CAAC,CAAC;YACzE,uBAAW,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;IACL,CAAC;IAED,0BAA0B,CACxB,oBAA0C,EAC1C,OAAiB;QAEjB,OAAO,CACL,IAAI,CAAC,2CAA2C,CAC9C,OAAO,EACP,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAC/B,IAAI,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,YAAY,EAAE,OAAO,CAAC,CACzE,CAAC;IACJ,CAAC;IAEO,2CAA2C,CACjD,OAAiB,EACjB,IAAY;QAEZ,OAAO,OAAO,CAAC,IAAI,CACjB,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,4BAA4B,CAAC,MAAM,CAAC,KAAK,IAAI,CAC/D,CAAC;IACJ,CAAC;IAEO,4BAA4B,CAAC,MAAc;QACjD,IAAI;YACF,OAAO,iBAAY,CACjB,IAAI,CAAC,0CAA0C,CAAC,MAAM,CAAC,CACxD,CAAC,QAAQ,EAAE,CAAC;SACd;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IAEO,kBAAkB,CACxB,YAA0B,EAC1B,OAAiB;QAEjB,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YAC7B,MAAM,eAAe,GAAG,WAAI,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YAC/D,MAAM,cAAc,GAAG,WAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAE/C,IAAI,eAAU,CAAC,eAAe,CAAC,IAAI,cAAS,CAAC,eAAe,CAAC,CAAC,MAAM,EAAE,EAAE;gBACtE,OAAO,CACL,eAAU,CAAC,WAAI,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;oBAClD,CAAC,eAAU,CAAC,WAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CACrC,CAAC;aACH;YAED,MAAM,0BAA0B,GAC9B,eAAU,CAAC,eAAe,CAAC;gBAC3B,eAAU,CAAC,cAAc,CAAC;gBAC1B,sBAAW,CAAC,eAAe,CAAC,CAAC,MAAM;oBACjC,sBAAW,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC;YAEvC,OAAO,CACL,CAAC,eAAU,CAAC,eAAe,CAAC,IAAI,CAAC,eAAU,CAAC,cAAc,CAAC,CAAC;gBAC5D,0BAA0B,CAC3B,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,0CAA0C,CAAC,MAAc;QAC/D,OAAO,WAAI,CACT,IAAI,CAAC,sBAAsB,EAC3B,GAAG,MAAM,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CACtC,CAAC;IACJ,CAAC;IAEO,eAAe,CAAC,IAAU;QAChC,MAAM,QAAQ,GAAG,WAAI,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,SAAS,CAAC,CAAC;QAC7D,MAAM,EAAE,GAAG,WAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAE3C,IAAI,eAAU,CAAC,QAAQ,CAAC,EAAE;YACxB,MAAM,cAAc,GAAG,iBAAY,CAAC,WAAI,CAAC,EAAE,EAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC,CAAC;YACzE,IAAI,IAAI,GAAG,CAAC,CAAC;YACb,IAAI;gBACF,IAAI,GAAG,MAAM,CAAC,iBAAY,CAAC,WAAI,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;aACxD;YAAC,OAAO,CAAC,EAAE,GAAE;YACd,OAAO;gBACL,cAAc;gBACd,WAAW,EAAE,WAAI,CAAC,EAAE,EAAE,SAAS,CAAC;gBAChC,IAAI;aACL,CAAC;SACH;aAAM;YACL,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IAEO,cAAc;QACpB,MAAM,GAAG,GAAG,gCAAc,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACnE,wBAAa,CAAC,GAAG,CAAC,CAAC;QACnB,OAAO,GAAG,CAAC;IACb,CAAC;IAEO,wBAAwB;QAC9B,MAAM,IAAI,GAAG,WAAI,CAAC,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;QACrD,wBAAa,CAAC,IAAI,CAAC,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,4BAA4B;QAClC,MAAM,IAAI,GAAG,WAAI,CAAC,IAAI,CAAC,SAAS,EAAE,qBAAqB,CAAC,CAAC;QACzD,wBAAa,CAAC,IAAI,CAAC,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA5OD,sBA4OC"}
+{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/cache.ts"],"names":[],"mappings":"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"}

package/src/tasks-runner/forked-process-task-runner.d.ts

@@ -23,8 +23,12 @@ export declare class ForkedProcessTaskRunner {
         terminalOutput: string;
     }>;
     private readTerminalOutput;
-    private envForForkedProcess;
-    private envForForkedProcessForTask;
+    private getEnvVariablesForProcess;
+    private getEnvVariablesForTask;
+    private getNxEnvVariablesForForkedProcess;
+    private getNxEnvVariablesForTask;
+    private getDotenvVariablesForForkedProcess;
+    private getDotenvVariablesForTask;
     private signalToCode;
     private setupOnProcessExitListener;
 }

package/src/tasks-runner/forked-process-task-runner.js

@@ -21,9 +21,6 @@ class ForkedProcessTaskRunner {
     forkProcessForBatch({ executorName, taskGraph }) {
         return new Promise((res, rej) => {
             try {
-                const env = this.envForForkedProcess(process.env.FORCE_COLOR === undefined
-                    ? 'true'
-                    : process.env.FORCE_COLOR);
                 const count = Object.keys(taskGraph.tasks).length;
                 if (count > 1) {
                     output_1.output.logSingleLine(`Running ${output_1.output.bold(count)} ${output_1.output.bold('tasks')} with ${output_1.output.bold(executorName)}`);
@@ -35,7 +32,7 @@ class ForkedProcessTaskRunner {
                 }
                 const p = child_process_1.fork(workerPath, {
                     stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
-                    env: Object.assign(Object.assign({}, env), process.env),
+                    env: this.getEnvVariablesForProcess(),
                 });
                 this.processes.add(p);
                 p.once('exit', (code, signal) => {
@@ -73,9 +70,6 @@ class ForkedProcessTaskRunner {
     forkProcessPipeOutputCapture(task, { forwardOutput }) {
         return new Promise((res, rej) => {
             try {
-                const env = this.envForForkedProcessForTask(task, process.env.FORCE_COLOR === undefined
-                    ? 'true'
-                    : process.env.FORCE_COLOR, undefined, forwardOutput);
                 const args = utils_1.getCommandArgsForTask(task);
                 const commandLine = `nx ${args.join(' ')}`;
                 if (forwardOutput) {
@@ -83,7 +77,9 @@ class ForkedProcessTaskRunner {
                 }
                 const p = child_process_1.fork(this.cliPath, args, {
                     stdio: ['inherit', 'pipe', 'pipe', 'ipc'],
-                    env: Object.assign(Object.assign({}, env), process.env),
+                    env: this.getEnvVariablesForTask(task, process.env.FORCE_COLOR === undefined
+                        ? 'true'
+                        : process.env.FORCE_COLOR, undefined, forwardOutput),
                 });
                 this.processes.add(p);
                 let out = [];
@@ -123,7 +119,6 @@ class ForkedProcessTaskRunner {
     forkProcessDirectOutputCapture(task, { forwardOutput, temporaryOutputPath, }) {
         return new Promise((res, rej) => {
             try {
-                const env = this.envForForkedProcessForTask(task, undefined, temporaryOutputPath, forwardOutput);
                 const args = utils_1.getCommandArgsForTask(task);
                 const commandLine = `nx ${args.join(' ')}`;
                 if (forwardOutput) {
@@ -131,7 +126,7 @@ class ForkedProcessTaskRunner {
                 }
                 const p = child_process_1.fork(this.cliPath, args, {
                     stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
-                    env: Object.assign(Object.assign({}, env), process.env),
+                    env: this.getEnvVariablesForTask(task, undefined, temporaryOutputPath, forwardOutput),
                 });
                 this.processes.add(p);
                 p.on('exit', (code, signal) => {
@@ -169,9 +164,19 @@ class ForkedProcessTaskRunner {
             return null;
         }
     }
-    envForForkedProcess(forceColor, outputPath, forwardOutput) {
-        const envsFromFiles = Object.assign(Object.assign(Object.assign({}, parseEnv('.env')), parseEnv('.local.env')), parseEnv('.env.local'));
-        const env = Object.assign(Object.assign({}, envsFromFiles), { FORCE_COLOR: forceColor, NX_INVOKED_BY_RUNNER: 'true', NX_WORKSPACE_ROOT: this.workspaceRoot });
+    // region Environment Variables
+    getEnvVariablesForProcess() {
+        return Object.assign(Object.assign(Object.assign({}, this.getDotenvVariablesForForkedProcess()), process.env), this.getNxEnvVariablesForForkedProcess(process.env.FORCE_COLOR === undefined ? 'true' : process.env.FORCE_COLOR));
+    }
+    getEnvVariablesForTask(task, forceColor, outputPath, forwardOutput) {
+        return Object.assign(Object.assign(Object.assign({}, this.getDotenvVariablesForTask(task)), process.env), this.getNxEnvVariablesForTask(task, forceColor, outputPath, forwardOutput));
+    }
+    getNxEnvVariablesForForkedProcess(forceColor, outputPath, forwardOutput) {
+        const env = {
+            FORCE_COLOR: forceColor,
+            NX_INVOKED_BY_RUNNER: 'true',
+            NX_WORKSPACE_ROOT: this.workspaceRoot,
+        };
         if (outputPath) {
             env.NX_TERMINAL_OUTPUT_PATH = outputPath;
             if (this.options.captureStderr) {
@@ -183,15 +188,24 @@ class ForkedProcessTaskRunner {
         }
         return env;
     }
-    envForForkedProcessForTask(task, forceColor, outputPath, forwardOutput) {
-        const envsFromFiles = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, parseEnv(`.${task.target.target}.env`)), parseEnv(`.env.${task.target.target}`)), parseEnv(`${task.projectRoot}/.env`)), parseEnv(`${task.projectRoot}/.local.env`)), parseEnv(`${task.projectRoot}/.env.local`)), parseEnv(`${task.projectRoot}/.${task.target.target}.env`)), parseEnv(`${task.projectRoot}/.env.${task.target.target}`));
-        const env = Object.assign(Object.assign(Object.assign({}, this.envForForkedProcess(forceColor, outputPath, forwardOutput)), envsFromFiles), { NX_TASK_TARGET_PROJECT: task.target.project, NX_TASK_HASH: task.hash });
+    getNxEnvVariablesForTask(task, forceColor, outputPath, forwardOutput) {
+        const env = {
+            NX_TASK_TARGET_PROJECT: task.target.project,
+            NX_TASK_HASH: task.hash,
+        };
         // TODO: remove this once we have a reasonable way to configure it
         if (task.target.target === 'test') {
             env.NX_TERMINAL_CAPTURE_STDERR = 'true';
         }
-        return env;
+        return Object.assign(Object.assign({}, this.getNxEnvVariablesForForkedProcess(forceColor, outputPath, forwardOutput)), env);
+    }
+    getDotenvVariablesForForkedProcess() {
+        return Object.assign(Object.assign(Object.assign({}, parseEnv('.env')), parseEnv('.local.env')), parseEnv('.env.local'));
+    }
+    getDotenvVariablesForTask(task) {
+        return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, this.getDotenvVariablesForForkedProcess()), parseEnv(`.${task.target.target}.env`)), parseEnv(`.env.${task.target.target}`)), parseEnv(`${task.projectRoot}/.env`)), parseEnv(`${task.projectRoot}/.local.env`)), parseEnv(`${task.projectRoot}/.env.local`)), parseEnv(`${task.projectRoot}/.${task.target.target}.env`)), parseEnv(`${task.projectRoot}/.env.${task.target.target}`));
     }
+    // endregion Environment Variables
     signalToCode(signal) {
         if (signal === 'SIGHUP')
             return 128 + 1;