@forge/cli 4.2.0-test.8 → 4.3.0-next.8

package/out/bin/postinstall.js

@@ -10,7 +10,7 @@ const isSupportedShell_1 = require("../autocomplete/isSupportedShell");
 const unique_machine_id_1 = require("../command-line/unique-machine-id");
 const cached_config_service_1 = require("../service/cached-config-service");
 const ui = new cli_shared_1.CommandLineUI(() => true);
-const cachedConf = new cli_shared_1.CachedConf(unique_machine_id_1.FORGE_CLI_PACKAGE);
+const cachedConf = cli_shared_1.CachedConf.getCache(unique_machine_id_1.FORGE_CLI_PACKAGE);
 const configService = new cached_config_service_1.CachedConfigService(cachedConf);
 const analyticsClientReporter = new analytics_client_1.AnalyticsClientReporter(new local_file_storage_1.LocalFileStorage(), ui, configService);
 const cliDetails = version_info_1.getCLIDetails();

package/out/command-line/anon-user-id.js

@@ -7,15 +7,11 @@ const cli_shared_1 = require("@forge/cli-shared");
 const ANON_ID_CACHE_KEY = 'anonId';
 function getAnonId(createNew = false) {
     const cachedConf = cli_shared_1.CachedConf.getCache('@forge/cli');
-    const storedAnonId = cachedConf.get(ANON_ID_CACHE_KEY);
-    if (storedAnonId) {
-        return storedAnonId;
-    }
-    if (!createNew) {
-        return undefined;
-    }
-    const generatedAnonId = uuid_1.default();
-    cachedConf.set(ANON_ID_CACHE_KEY, generatedAnonId);
-    return generatedAnonId;
+    return cachedConf.cached(ANON_ID_CACHE_KEY, () => {
+        if (!createNew) {
+            return undefined;
+        }
+        return uuid_1.default();
+    });
 }
 exports.getAnonId = getAnonId;

package/out/command-line/cli-prerequisites.d.ts

@@ -1,3 +1,2 @@
 export declare function checkNodeVersion(): void;
-export declare function checkPythonVersion(): Promise<void>;
 //# sourceMappingURL=cli-prerequisites.d.ts.map

package/out/command-line/cli-prerequisites.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli-prerequisites.d.ts","sourceRoot":"","sources":["../../src/command-line/cli-prerequisites.ts"],"names":[],"mappings":"AAMA,wBAAgB,gBAAgB,IAAI,IAAI,CAYvC;AAED,wBAAgB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,CAyBlD"}
+{"version":3,"file":"cli-prerequisites.d.ts","sourceRoot":"","sources":["../../src/command-line/cli-prerequisites.ts"],"names":[],"mappings":"AAKA,wBAAgB,gBAAgB,IAAI,IAAI,CAYvC"}

package/out/command-line/cli-prerequisites.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkPythonVersion = exports.checkNodeVersion = void 0;
-const child_process_1 = require("child_process");
+exports.checkNodeVersion = void 0;
 const semver_1 = require("semver");
 const version_info_1 = require("./version-info");
 const cli_shared_1 = require("@forge/cli-shared");
@@ -18,25 +17,3 @@ function checkNodeVersion() {
     }
 }
 exports.checkNodeVersion = checkNodeVersion;
-function checkPythonVersion() {
-    return new Promise((resolve) => {
-        const opts = `-c "import platform; print(platform.python_version())"`;
-        let command = `python ${opts} || python2.7 ${opts}`;
-        if (process.env.PYTHON) {
-            command = `${process.env.PYTHON} ${opts}`;
-        }
-        child_process_1.exec(command, (err, stdout) => {
-            if (err) {
-                console.error(cli_shared_1.Text.error.failedGettingPythonVersion(err));
-                process.exit(1);
-            }
-            const pythonVersion = stdout.trim();
-            if (!pythonVersion.startsWith('2.')) {
-                console.error(cli_shared_1.Text.error.invalidPythonVersion(pythonVersion));
-                process.exit(1);
-            }
-            resolve();
-        });
-    });
-}
-exports.checkPythonVersion = checkPythonVersion;

package/out/command-line/unique-machine-id.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unique-machine-id.d.ts","sourceRoot":"","sources":["../../src/command-line/unique-machine-id.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,iBAAiB,eAAe,CAAC;AAW9C,eAAO,MAAM,YAAY,QAAO,MAS/B,CAAC"}
+{"version":3,"file":"unique-machine-id.d.ts","sourceRoot":"","sources":["../../src/command-line/unique-machine-id.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,iBAAiB,eAAe,CAAC;AAW9C,eAAO,MAAM,YAAY,QAAO,MACgE,CAAC"}

package/out/command-line/unique-machine-id.js

@@ -15,13 +15,4 @@ const generateMachineId = () => {
         return uuid_1.default();
     }
 };
-exports.getMachineId = () => {
-    const cachedConf = cli_shared_1.CachedConf.getCache(exports.FORGE_CLI_PACKAGE);
-    const storedMachineId = cachedConf.get(MACHINE_ID_CACHE_KEY);
-    if (storedMachineId) {
-        return storedMachineId;
-    }
-    const newMachineId = generateMachineId();
-    cachedConf.set(MACHINE_ID_CACHE_KEY, newMachineId);
-    return newMachineId;
-};
+exports.getMachineId = () => cli_shared_1.CachedConf.getCache(exports.FORGE_CLI_PACKAGE).cached(MACHINE_ID_CACHE_KEY, generateMachineId);

package/out/command-line/version-info.d.ts

@@ -2,7 +2,7 @@ export declare const VERSION_CACHE_KEY = "latest";
 export declare const VERSION_CACHE_INTERVAL: number;
 import { CLIDetails } from '@forge/cli-shared';
 export declare const getCLIDetails: () => CLIDetails | undefined;
-export declare const supportedNodeVersion = "12.x || 14.x || 16.x";
+export declare const supportedNodeVersion = "14.x || 16.x";
 export declare const cacheLatestVersion: (name: string) => Promise<void>;
 export declare const clearVersionCache: (name: string) => void;
 //# sourceMappingURL=version-info.d.ts.map

package/out/command-line/version-info.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version-info.d.ts","sourceRoot":"","sources":["../../src/command-line/version-info.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,iBAAiB,WAAW,CAAC;AAC1C,eAAO,MAAM,sBAAsB,QAAsB,CAAC;AAE1D,OAAO,EAAc,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE3D,eAAO,MAAM,aAAa,QAAO,UAAU,GAAG,SAgB7C,CAAC;AAEF,eAAO,MAAM,oBAAoB,yBAAyB,CAAC;AAE3D,eAAO,MAAM,kBAAkB,SAAgB,MAAM,KAAG,OAAO,CAAC,IAAI,CAInE,CAAC;AAEF,eAAO,MAAM,iBAAiB,SAAU,MAAM,SAG7C,CAAC"}
+{"version":3,"file":"version-info.d.ts","sourceRoot":"","sources":["../../src/command-line/version-info.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,iBAAiB,WAAW,CAAC;AAC1C,eAAO,MAAM,sBAAsB,QAAsB,CAAC;AAE1D,OAAO,EAAc,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE3D,eAAO,MAAM,aAAa,QAAO,UAAU,GAAG,SAgB7C,CAAC;AAEF,eAAO,MAAM,oBAAoB,iBAAiB,CAAC;AAEnD,eAAO,MAAM,kBAAkB,SAAgB,MAAM,KAAG,OAAO,CAAC,IAAI,CAInE,CAAC;AAEF,eAAO,MAAM,iBAAiB,SAAU,MAAM,SAG7C,CAAC"}

package/out/command-line/version-info.js

@@ -22,7 +22,7 @@ exports.getCLIDetails = () => {
         return undefined;
     }
 };
-exports.supportedNodeVersion = '12.x || 14.x || 16.x';
+exports.supportedNodeVersion = '14.x || 16.x';
 exports.cacheLatestVersion = async (name) => {
     const latest = await latest_version_1.default(name);
     const cachedConf = cli_shared_1.CachedConf.getCache(name);

package/out/workers/forge-cli-workers.js

@@ -9,7 +9,7 @@ const cached_config_service_1 = require("../service/cached-config-service");
 const cli_shared_1 = require("@forge/cli-shared");
 const unique_machine_id_1 = require("../command-line/unique-machine-id");
 const workerInfo = JSON.parse(process.argv[2]);
-const cachedConf = new cli_shared_1.CachedConf(unique_machine_id_1.FORGE_CLI_PACKAGE);
+const cachedConf = cli_shared_1.CachedConf.getCache(unique_machine_id_1.FORGE_CLI_PACKAGE);
 const cachedConfigService = new cached_config_service_1.CachedConfigService(cachedConf);
 const ALL_WORKERS = [
     new analytics_message_worker_1.AnalyticsMessageWorker(new local_file_storage_1.LocalFileStorage(), new analytics_message_handler_1.AnalyticsMessageHandler(workerInfo ? workerInfo.environment : undefined), cachedConfigService),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli",
-  "version": "4.2.0-test.8",
+  "version": "4.3.0-next.8",
   "description": "A command line interface for managing Atlassian-hosted apps",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -18,11 +18,11 @@
     "postinstall": "node -e \"process.exitCode = fs.existsSync('./out/bin/postinstall.js')\" || node ./out/bin/postinstall.js"
   },
   "dependencies": {
-    "@forge/bundler": "3.1.0-test.8",
-    "@forge/cli-shared": "2.4.0-next.7",
+    "@forge/bundler": "3.0.4-next.7",
+    "@forge/cli-shared": "2.4.1-next.7",
     "@forge/csp": "^1.10.0",
-    "@forge/lint": "3.0.4-next.7",
-    "@forge/manifest": "3.5.0-next.6",
+    "@forge/lint": "3.0.5-next.7",
+    "@forge/manifest": "3.6.0-next.7",
     "@forge/util": "1.2.0",
     "ajv": "^6.12.5",
     "archiver": "^5.2.0",

package/out/bin/preinstall.d.ts

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-export {};
-//# sourceMappingURL=preinstall.d.ts.map

package/out/bin/preinstall.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"preinstall.d.ts","sourceRoot":"","sources":["../../src/bin/preinstall.ts"],"names":[],"mappings":""}

package/out/bin/preinstall.js

@@ -1,9 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const cli_prerequisites_1 = require("../command-line/cli-prerequisites");
-async function main() {
-    cli_prerequisites_1.checkNodeVersion();
-    await cli_prerequisites_1.checkPythonVersion();
-}
-main();