@nx/shared-fs-cache 1.3.1 → 1.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/shared-fs-cache",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "A Nx plugin to enable you to use a shared file system directory",
   "type": "commonjs",
   "main": "src/index.js",
@@ -21,7 +21,7 @@
   ],
   "dependencies": {
     "@nx/devkit": ">= 19 < 21",
-    "@nx/key": "1.3.1",
+    "@nx/key": "1.3.2",
     "semver": "7.5.4"
   }
 }

package/src/generators/init/generator.js

@@ -1,42 +1,45 @@
-import { formatFiles, installPackagesTask, NX_VERSION, readNxJson, updateJson, updateNxJson, workspaceRoot, } from '@nx/devkit';
-import { autoRegisterNxKey } from '@nx/key';
-import { gte } from 'semver';
-import { name as PACKAGE_NAME } from '../../../package.json';
-export async function initGenerator(tree) {
-    await autoRegisterNxKey(workspaceRoot);
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.initGenerator = initGenerator;
+const devkit_1 = require("@nx/devkit");
+const key_1 = require("@nx/key");
+const semver_1 = require("semver");
+const package_json_1 = require("../../../package.json");
+async function initGenerator(tree) {
+    await (0, key_1.autoRegisterNxKey)(devkit_1.workspaceRoot);
     enableDbCache(tree);
     const task = tree.exists('package.json')
         ? updateDependencies(tree)
         : () => {
             // noop
         };
-    await formatFiles(tree);
+    await (0, devkit_1.formatFiles)(tree);
     return task;
 }
-export default initGenerator;
+exports.default = initGenerator;
 function enableDbCache(tree) {
-    if (gte(NX_VERSION, '20.0.0')) {
+    if ((0, semver_1.gte)(devkit_1.NX_VERSION, '20.0.0')) {
         return;
     }
-    const nxJson = readNxJson(tree);
+    const nxJson = (0, devkit_1.readNxJson)(tree);
     nxJson.enableDbCache = true;
-    updateNxJson(tree, nxJson);
+    (0, devkit_1.updateNxJson)(tree, nxJson);
 }
 function updateDependencies(tree) {
     let wasUpdated = false;
-    updateJson(tree, 'package.json', (packageJson) => {
+    (0, devkit_1.updateJson)(tree, 'package.json', (packageJson) => {
         packageJson.dependencies = packageJson.dependencies || {};
         packageJson.devDependencies = packageJson.devDependencies || {};
-        if (packageJson.dependencies[PACKAGE_NAME]) {
-            packageJson.devDependencies[PACKAGE_NAME] =
-                packageJson.dependencies[PACKAGE_NAME];
-            delete packageJson.dependencies[PACKAGE_NAME];
+        if (packageJson.dependencies[package_json_1.name]) {
+            packageJson.devDependencies[package_json_1.name] =
+                packageJson.dependencies[package_json_1.name];
+            delete packageJson.dependencies[package_json_1.name];
             wasUpdated = true;
         }
         return packageJson;
     });
     return wasUpdated
-        ? () => installPackagesTask(tree)
+        ? () => (0, devkit_1.installPackagesTask)(tree)
         : () => {
             /* noop */
         };

package/src/generators/init/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/shared-fs-cache/src/generators/init/generator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,mBAAmB,EACnB,UAAU,EACV,UAAU,EAEV,UAAU,EACV,YAAY,EACZ,aAAa,GACd,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAE7B,OAAO,EAAE,IAAI,IAAI,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE7D,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,IAAU;IAC5C,MAAM,iBAAiB,CAAC,aAAa,CAAC,CAAC;IACvC,aAAa,CAAC,IAAI,CAAC,CAAC;IAEpB,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC;QACtC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC;QAC1B,CAAC,CAAC,GAAG,EAAE;YACH,OAAO;QACT,CAAC,CAAC;IAEN,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;IAExB,OAAO,IAAI,CAAC;AACd,CAAC;AAED,eAAe,aAAa,CAAC;AAE7B,SAAS,aAAa,CAAC,IAAU;IAC/B,IAAI,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC9B,OAAO;IACT,CAAC;IAED,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAQ,CAAC;IACvC,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC;IAE5B,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAU;IACpC,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,UAAU,CAAC,IAAI,EAAE,cAAc,EAAE,CAAC,WAAW,EAAE,EAAE;QAC/C,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC;QAC1D,WAAW,CAAC,eAAe,GAAG,WAAW,CAAC,eAAe,IAAI,EAAE,CAAC;QAEhE,IAAI,WAAW,CAAC,YAAY,CAAC,YAAY,CAAC,EAAE,CAAC;YAC3C,WAAW,CAAC,eAAe,CAAC,YAAY,CAAC;gBACvC,WAAW,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;YACzC,OAAO,WAAW,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;YAC9C,UAAU,GAAG,IAAI,CAAC;QACpB,CAAC;QACD,OAAO,WAAW,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,OAAO,UAAU;QACf,CAAC,CAAC,GAAG,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC;QACjC,CAAC,CAAC,GAAG,EAAE;YACH,UAAU;QACZ,CAAC,CAAC;AACR,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/shared-fs-cache/src/generators/init/generator.ts"],"names":[],"mappings":";;AAeA,sCAaC;AA5BD,uCASoB;AACpB,iCAA4C;AAC5C,mCAA6B;AAE7B,wDAA6D;AAEtD,KAAK,UAAU,aAAa,CAAC,IAAU;IAC5C,MAAM,IAAA,uBAAiB,EAAC,sBAAa,CAAC,CAAC;IACvC,aAAa,CAAC,IAAI,CAAC,CAAC;IAEpB,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC;QACtC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC;QAC1B,CAAC,CAAC,GAAG,EAAE;YACH,OAAO;QACT,CAAC,CAAC;IAEN,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAExB,OAAO,IAAI,CAAC;AACd,CAAC;AAED,kBAAe,aAAa,CAAC;AAE7B,SAAS,aAAa,CAAC,IAAU;IAC/B,IAAI,IAAA,YAAG,EAAC,mBAAU,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC9B,OAAO;IACT,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAQ,CAAC;IACvC,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC;IAE5B,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAU;IACpC,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,WAAW,EAAE,EAAE;QAC/C,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC;QAC1D,WAAW,CAAC,eAAe,GAAG,WAAW,CAAC,eAAe,IAAI,EAAE,CAAC;QAEhE,IAAI,WAAW,CAAC,YAAY,CAAC,mBAAY,CAAC,EAAE,CAAC;YAC3C,WAAW,CAAC,eAAe,CAAC,mBAAY,CAAC;gBACvC,WAAW,CAAC,YAAY,CAAC,mBAAY,CAAC,CAAC;YACzC,OAAO,WAAW,CAAC,YAAY,CAAC,mBAAY,CAAC,CAAC;YAC9C,UAAU,GAAG,IAAI,CAAC;QACpB,CAAC;QACD,OAAO,WAAW,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,OAAO,UAAU;QACf,CAAC,CAAC,GAAG,EAAE,CAAC,IAAA,4BAAmB,EAAC,IAAI,CAAC;QACjC,CAAC,CAAC,GAAG,EAAE;YACH,UAAU;QACZ,CAAC,CAAC;AACR,CAAC"}

package/src/index.js

@@ -1,23 +1,26 @@
-import { output, workspaceRoot } from '@nx/devkit';
-import { assertFeaturePermission, FeaturePermission, getNxKeyInformationAsync, } from '@nx/key';
-import { isCI } from 'nx/src/utils/is-ci';
-import { SharedFsCache } from './remote-cache';
-export async function getRemoteCache() {
-    const key = await getNxKeyInformationAsync(workspaceRoot);
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRemoteCache = getRemoteCache;
+const devkit_1 = require("@nx/devkit");
+const key_1 = require("@nx/key");
+const is_ci_1 = require("nx/src/utils/is-ci");
+const remote_cache_1 = require("./remote-cache");
+async function getRemoteCache() {
+    const key = await (0, key_1.getNxKeyInformationAsync)(devkit_1.workspaceRoot);
     if (!key) {
-        output.warn({
+        devkit_1.output.warn({
             title: 'No self-hosted cache key found. The shared fs cache will not be used.',
             bodyLines: ['You can register a key for free by using `nx register`.'],
         });
         return null;
     }
-    if (!isCI()) {
+    if (!(0, is_ci_1.isCI)()) {
         return null;
     }
-    assertFeaturePermission(key, FeaturePermission.SelfHostedCache);
+    (0, key_1.assertFeaturePermission)(key, key_1.FeaturePermission.SelfHostedCache);
     /**
      * This is the same cache that is used by Nx but with a different database which is within the cache directory.
      */
-    return new SharedFsCache();
+    return new remote_cache_1.SharedFsCache();
 }
 //# sourceMappingURL=index.js.map

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/nx-packages/shared-fs-cache/src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EACL,uBAAuB,EACvB,iBAAiB,EACjB,wBAAwB,GACzB,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,MAAM,GAAG,GAAG,MAAM,wBAAwB,CAAC,aAAa,CAAC,CAAC;IAE1D,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,CAAC,IAAI,CAAC;YACV,KAAK,EACH,uEAAuE;YACzE,SAAS,EAAE,CAAC,yDAAyD,CAAC;SACvE,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;QACZ,OAAO,IAAI,CAAC;IACd,CAAC;IACD,uBAAuB,CAAC,GAAG,EAAE,iBAAiB,CAAC,eAAe,CAAC,CAAC;IAEhE;;OAEG;IACH,OAAO,IAAI,aAAa,EAAE,CAAC;AAC7B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/nx-packages/shared-fs-cache/src/index.ts"],"names":[],"mappings":";;AAUA,wCAqBC;AA/BD,uCAAmD;AACnD,iCAIiB;AAEjB,8CAA0C;AAC1C,iDAA+C;AAExC,KAAK,UAAU,cAAc;IAClC,MAAM,GAAG,GAAG,MAAM,IAAA,8BAAwB,EAAC,sBAAa,CAAC,CAAC;IAE1D,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,eAAM,CAAC,IAAI,CAAC;YACV,KAAK,EACH,uEAAuE;YACzE,SAAS,EAAE,CAAC,yDAAyD,CAAC;SACvE,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC,IAAA,YAAI,GAAE,EAAE,CAAC;QACZ,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAA,6BAAuB,EAAC,GAAG,EAAE,uBAAiB,CAAC,eAAe,CAAC,CAAC;IAEhE;;OAEG;IACH,OAAO,IAAI,4BAAa,EAAE,CAAC;AAC7B,CAAC"}

package/src/remote-cache.js

@@ -1,11 +1,14 @@
-import { cacheDir, workspaceRoot } from '@nx/devkit';
-import { renameSync, rmdirSync } from 'fs';
-import { NxCache } from 'nx/src/native';
-import { getDbConnection } from 'nx/src/utils/db-connection';
-import { join } from 'path';
-export class SharedFsCache {
-    cache = new NxCache(workspaceRoot, cacheDir, getDbConnection({
-        directory: cacheDir,
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SharedFsCache = void 0;
+const devkit_1 = require("@nx/devkit");
+const fs_1 = require("fs");
+const native_1 = require("nx/src/native");
+const db_connection_1 = require("nx/src/utils/db-connection");
+const path_1 = require("path");
+class SharedFsCache {
+    cache = new native_1.NxCache(devkit_1.workspaceRoot, devkit_1.cacheDir, (0, db_connection_1.getDbConnection)({
+        directory: devkit_1.cacheDir,
         dbName: 'shared',
     }), false);
     async retrieve(hash) {
@@ -13,12 +16,12 @@ export class SharedFsCache {
     }
     async store(hash, _, terminalOutput, code) {
         try {
-            const hashPath = join(this.cache.cacheDirectory, hash);
+            const hashPath = (0, path_1.join)(this.cache.cacheDirectory, hash);
             const tmpBackup = hashPath + '-backup';
-            renameSync(hashPath, tmpBackup);
+            (0, fs_1.renameSync)(hashPath, tmpBackup);
             this.cache.put(hash, terminalOutput, [], code);
-            rmdirSync(hashPath, { recursive: true });
-            renameSync(tmpBackup, hashPath);
+            (0, fs_1.rmdirSync)(hashPath, { recursive: true });
+            (0, fs_1.renameSync)(tmpBackup, hashPath);
             return true;
         }
         catch (e) {
@@ -26,4 +29,5 @@ export class SharedFsCache {
         }
     }
 }
+exports.SharedFsCache = SharedFsCache;
 //# sourceMappingURL=remote-cache.js.map

package/src/remote-cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"remote-cache.js","sourceRoot":"","sources":["../../../../../libs/nx-packages/shared-fs-cache/src/remote-cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAC3C,OAAO,EAAgB,OAAO,EAAE,MAAM,eAAe,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,MAAM,OAAO,aAAa;IAChB,KAAK,GAAG,IAAI,OAAO,CACzB,aAAa,EACb,QAAQ,EACR,eAAe,CAAC;QACd,SAAS,EAAE,QAAQ;QACnB,MAAM,EAAE,QAAQ;KACjB,CAAC,EACF,KAAK,CACN,CAAC;IAEF,KAAK,CAAC,QAAQ,CAAC,IAAY;QACzB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,KAAK,CACT,IAAY,EACZ,CAAS,EACT,cAAsB,EACtB,IAAY;QAEZ,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;YACvD,MAAM,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;YACvC,UAAU,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YAChC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;YAC/C,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACzC,UAAU,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;YAChC,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"remote-cache.js","sourceRoot":"","sources":["../../../../../libs/nx-packages/shared-fs-cache/src/remote-cache.ts"],"names":[],"mappings":";;;AAAA,uCAAqD;AACrD,2BAA2C;AAC3C,0CAAsD;AAEtD,8DAA6D;AAC7D,+BAA4B;AAE5B,MAAa,aAAa;IAChB,KAAK,GAAG,IAAI,gBAAO,CACzB,sBAAa,EACb,iBAAQ,EACR,IAAA,+BAAe,EAAC;QACd,SAAS,EAAE,iBAAQ;QACnB,MAAM,EAAE,QAAQ;KACjB,CAAC,EACF,KAAK,CACN,CAAC;IAEF,KAAK,CAAC,QAAQ,CAAC,IAAY;QACzB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,KAAK,CACT,IAAY,EACZ,CAAS,EACT,cAAsB,EACtB,IAAY;QAEZ,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;YACvD,MAAM,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;YACvC,IAAA,eAAU,EAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YAChC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;YAC/C,IAAA,cAAS,EAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACzC,IAAA,eAAU,EAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;YAChC,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;CACF;AAjCD,sCAiCC"}