@solana-mobile/dapp-store-cli 0.12.0 → 0.13.0

package/lib/CliUtils.js

@@ -145,6 +145,7 @@ import { readFile } from 'fs/promises';
 var cliPackage = JSON.parse((await readFile(new URL("./package.json", import.meta.url))).toString());
 import boxen from "boxen";
 import ver from "semver";
+import path from "path";
 import { CachedStorageDriver } from "./upload/CachedStorageDriver.js";
 import { EnvVariables } from "./config/index.js";
 import { S3Client } from "@aws-sdk/client-s3";
@@ -154,12 +155,12 @@ export var Constants = function Constants() {
     "use strict";
     _class_call_check(this, Constants);
 };
-_define_property(Constants, "CLI_VERSION", "0.12.0");
+_define_property(Constants, "CLI_VERSION", "0.13.0");
 _define_property(Constants, "CONFIG_FILE_NAME", "config.yaml");
 _define_property(Constants, "DEFAULT_RPC_DEVNET", "https://api.devnet.solana.com");
 _define_property(Constants, "DEFAULT_PRIORITY_FEE", 500000);
 _define_property(Constants, "getConfigFilePath", function() {
-    return "".concat(process.cwd(), "/").concat(Constants.CONFIG_FILE_NAME);
+    return path.join(process.cwd(), Constants.CONFIG_FILE_NAME);
 });
 export var debug = debugModule("CLI");
 export var checkForSelfUpdate = function() {

package/lib/commands/scaffolding/ScaffoldInit.js

@@ -2,10 +2,11 @@ import { dump } from "js-yaml";
 import { readFile } from 'fs/promises';
 var releaseSchema = JSON.parse((await readFile(new URL("../../generated/config_obj.json", import.meta.url))).toString());
 import fs from "fs";
+import path from "path";
 import { Constants } from "../../CliUtils.js";
 export var initScaffold = function() {
     var outputYaml = Constants.CONFIG_FILE_NAME;
-    var outFile = "".concat(process.cwd(), "/").concat(outputYaml);
+    var outFile = path.join(process.cwd(), outputYaml);
     if (fs.existsSync(outFile)) {
         throw Error("Configuration file already present; please use to intialize a new config file.");
     }

package/lib/config/PublishDetails.js

@@ -260,7 +260,7 @@ export var loadPublishDetails = function(configPath) {
 export var loadPublishDetailsWithChecks = function() {
     var buildToolsDir = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : null;
     return _async_to_generator(function() {
-        var _config_app_media_find, _config_app_media, _config_release_media_find, _config_release_media, _config_release_media_find1, _config_release_media1, _config_release_media_find2, _config_release_media2, _config_release_media3, _config_release_media4, config, apkEntry, apkPath, developerOverridenLocales, _, appIcon, iconPath, iconBuffer, releaseIcon, iconPath1, banner, bannerPath, featureGraphic, featureGraphicPath, screenshots, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, mediaPath, err, videos, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, video, mediaPath1, err, googlePkg, pkgCompare, alpha_testers, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, wallet;
+        var _config_release_android_details, _config_release, _config_app_media_find, _config_app_media, _config_release_media_find, _config_release_media, _config_release_media_find1, _config_release_media1, _config_release_media_find2, _config_release_media2, _config_release_media3, _config_release_media4, config, apkEntry, apkPath, developerOverridenLocales, _, appIcon, iconPath, iconBuffer, releaseIcon, iconPath1, banner, bannerPath, featureGraphic, featureGraphicPath, screenshots, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, mediaPath, err, videos, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, video, mediaPath1, err, googlePkg, pkgCompare, alpha_testers, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, wallet;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -278,7 +278,7 @@ export var loadPublishDetailsWithChecks = function() {
                     if (!fs.existsSync(apkPath)) {
                         throw new Error("Invalid path to APK file.");
                     }
-                    developerOverridenLocales = config.release.android_details.locales;
+                    developerOverridenLocales = (_config_release = config.release) === null || _config_release === void 0 ? void 0 : (_config_release_android_details = _config_release.android_details) === null || _config_release_android_details === void 0 ? void 0 : _config_release_android_details.locales;
                     if (!buildToolsDir) return [
                         3,
                         3
@@ -872,7 +872,7 @@ export var extractCertFingerprint = function(aaptDir, apkPath) {
 export var writeToPublishDetails = function(param) {
     var app = param.app, release = param.release, lastSubmittedVersionOnChain = param.lastSubmittedVersionOnChain, lastUpdatedVersionOnStore = param.lastUpdatedVersionOnStore;
     return _async_to_generator(function() {
-        var _release_android_details, _release_android_details1, _release_android_details2, _release_android_details3, _release_android_details4, currentConfig, _app_address, _release_address, _release_android_details_cert_fingerprint, _release_android_details_min_sdk, _release_android_details_version, _release_android_details_version_code, _release_android_details_locales, newConfig;
+        var _release_android_details, _currentConfig_release_android_details, _release_android_details1, _currentConfig_release_android_details1, _release_android_details2, _currentConfig_release_android_details2, _release_android_details3, _currentConfig_release_android_details3, _release_android_details4, _currentConfig_release_android_details4, currentConfig, _app_address, _release_address, _release_android_details_cert_fingerprint, _release_android_details_min_sdk, _release_android_details_version, _release_android_details_version_code, _release_android_details_locales, newConfig;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -892,11 +892,11 @@ export var writeToPublishDetails = function(param) {
                         release: _object_spread_props(_object_spread({}, currentConfig.release), {
                             address: (_release_address = release === null || release === void 0 ? void 0 : release.address) !== null && _release_address !== void 0 ? _release_address : currentConfig.release.address,
                             android_details: {
-                                cert_fingerprint: (_release_android_details_cert_fingerprint = release === null || release === void 0 ? void 0 : (_release_android_details = release.android_details) === null || _release_android_details === void 0 ? void 0 : _release_android_details.cert_fingerprint) !== null && _release_android_details_cert_fingerprint !== void 0 ? _release_android_details_cert_fingerprint : currentConfig.release.android_details.cert_fingerprint,
-                                min_sdk: (_release_android_details_min_sdk = release === null || release === void 0 ? void 0 : (_release_android_details1 = release.android_details) === null || _release_android_details1 === void 0 ? void 0 : _release_android_details1.min_sdk) !== null && _release_android_details_min_sdk !== void 0 ? _release_android_details_min_sdk : currentConfig.release.android_details.min_sdk,
-                                version: (_release_android_details_version = release === null || release === void 0 ? void 0 : (_release_android_details2 = release.android_details) === null || _release_android_details2 === void 0 ? void 0 : _release_android_details2.version) !== null && _release_android_details_version !== void 0 ? _release_android_details_version : currentConfig.release.android_details.version,
-                                version_code: (_release_android_details_version_code = release === null || release === void 0 ? void 0 : (_release_android_details3 = release.android_details) === null || _release_android_details3 === void 0 ? void 0 : _release_android_details3.version_code) !== null && _release_android_details_version_code !== void 0 ? _release_android_details_version_code : currentConfig.release.android_details.version_code,
-                                locales: (_release_android_details_locales = release === null || release === void 0 ? void 0 : (_release_android_details4 = release.android_details) === null || _release_android_details4 === void 0 ? void 0 : _release_android_details4.locales) !== null && _release_android_details_locales !== void 0 ? _release_android_details_locales : currentConfig.release.android_details.locales
+                                cert_fingerprint: (_release_android_details_cert_fingerprint = release === null || release === void 0 ? void 0 : (_release_android_details = release.android_details) === null || _release_android_details === void 0 ? void 0 : _release_android_details.cert_fingerprint) !== null && _release_android_details_cert_fingerprint !== void 0 ? _release_android_details_cert_fingerprint : (_currentConfig_release_android_details = currentConfig.release.android_details) === null || _currentConfig_release_android_details === void 0 ? void 0 : _currentConfig_release_android_details.cert_fingerprint,
+                                min_sdk: (_release_android_details_min_sdk = release === null || release === void 0 ? void 0 : (_release_android_details1 = release.android_details) === null || _release_android_details1 === void 0 ? void 0 : _release_android_details1.min_sdk) !== null && _release_android_details_min_sdk !== void 0 ? _release_android_details_min_sdk : (_currentConfig_release_android_details1 = currentConfig.release.android_details) === null || _currentConfig_release_android_details1 === void 0 ? void 0 : _currentConfig_release_android_details1.min_sdk,
+                                version: (_release_android_details_version = release === null || release === void 0 ? void 0 : (_release_android_details2 = release.android_details) === null || _release_android_details2 === void 0 ? void 0 : _release_android_details2.version) !== null && _release_android_details_version !== void 0 ? _release_android_details_version : (_currentConfig_release_android_details2 = currentConfig.release.android_details) === null || _currentConfig_release_android_details2 === void 0 ? void 0 : _currentConfig_release_android_details2.version,
+                                version_code: (_release_android_details_version_code = release === null || release === void 0 ? void 0 : (_release_android_details3 = release.android_details) === null || _release_android_details3 === void 0 ? void 0 : _release_android_details3.version_code) !== null && _release_android_details_version_code !== void 0 ? _release_android_details_version_code : (_currentConfig_release_android_details3 = currentConfig.release.android_details) === null || _currentConfig_release_android_details3 === void 0 ? void 0 : _currentConfig_release_android_details3.version_code,
+                                locales: (_release_android_details_locales = release === null || release === void 0 ? void 0 : (_release_android_details4 = release.android_details) === null || _release_android_details4 === void 0 ? void 0 : _release_android_details4.locales) !== null && _release_android_details_locales !== void 0 ? _release_android_details_locales : (_currentConfig_release_android_details4 = currentConfig.release.android_details) === null || _currentConfig_release_android_details4 === void 0 ? void 0 : _currentConfig_release_android_details4.locales
                             }
                         }),
                         solana_mobile_dapp_publisher_portal: currentConfig.solana_mobile_dapp_publisher_portal,

package/lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana-mobile/dapp-store-cli",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "license": "Apache-2.0",
   "type": "module",
   "sideEffects": false,
@@ -53,7 +53,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.321.1",
     "@metaplex-foundation/js-plugin-aws": "^0.20.0",
-    "@solana-mobile/dapp-store-publishing-tools": "workspace:0.12.0",
+    "@solana-mobile/dapp-store-publishing-tools": "workspace:0.13.0",
     "@solana/web3.js": "1.92.1",
     "@types/semver": "^7.3.13",
     "ajv": "^8.11.0",

package/lib/upload/CachedStorageDriver.js

@@ -166,6 +166,7 @@ function _ts_generator(thisArg, body) {
     }
 }
 import fs from "fs";
+import path from "path";
 import { createHash } from "crypto";
 // TODO(jon): We need to manage the removal / replacement of assets in the manifest
 export var CachedStorageDriver = /*#__PURE__*/ function() {
@@ -267,7 +268,7 @@ export var CachedStorageDriver = /*#__PURE__*/ function() {
                                 };
                                 return [
                                     4,
-                                    fs.promises.writeFile("".concat(process.cwd(), "/").concat(this.assetManifestPath), // Something is really weird, I can't seem to stringify `this.assetManifest` straight-up. Here be dragons
+                                    fs.promises.writeFile(path.join(process.cwd(), this.assetManifestPath), // Something is really weird, I can't seem to stringify `this.assetManifest` straight-up. Here be dragons
                                     JSON.stringify({
                                         assets: _object_spread({}, this.assetManifest.assets)
                                     }, null, 2), "utf-8")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana-mobile/dapp-store-cli",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "license": "Apache-2.0",
   "type": "module",
   "sideEffects": false,
@@ -46,7 +46,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.321.1",
     "@metaplex-foundation/js-plugin-aws": "^0.20.0",
-    "@solana-mobile/dapp-store-publishing-tools": "0.12.0",
+    "@solana-mobile/dapp-store-publishing-tools": "0.13.0",
     "@solana/web3.js": "1.92.1",
     "@types/semver": "^7.3.13",
     "ajv": "^8.11.0",

package/src/CliUtils.ts

@@ -12,6 +12,7 @@ import { readFile } from 'fs/promises';
 const cliPackage = JSON.parse((await readFile(new URL("./package.json", import.meta.url))).toString());
 import boxen from "boxen";
 import ver from "semver";
+import path from "path";
 import { CachedStorageDriver } from "./upload/CachedStorageDriver.js";
 import { EnvVariables } from "./config/index.js";
 import { S3Client } from "@aws-sdk/client-s3";
@@ -19,13 +20,13 @@ import { awsStorage } from "@metaplex-foundation/js-plugin-aws";
 import { S3StorageManager } from "./config/index.js";
 
 export class Constants {
-  static CLI_VERSION = "0.12.0";
+  static CLI_VERSION = "0.13.0";
   static CONFIG_FILE_NAME = "config.yaml";
   static DEFAULT_RPC_DEVNET = "https://api.devnet.solana.com";
   static DEFAULT_PRIORITY_FEE = 500000;
 
   static getConfigFilePath = () => {
-    return `${process.cwd()}/${Constants.CONFIG_FILE_NAME}`;
+    return path.join(process.cwd(), Constants.CONFIG_FILE_NAME);
   };
 }
 

package/src/commands/scaffolding/ScaffoldInit.ts

@@ -3,11 +3,12 @@ import yaml, { dump } from "js-yaml";
 import { readFile } from 'fs/promises';
 const releaseSchema = JSON.parse((await readFile(new URL("../../generated/config_obj.json", import.meta.url))).toString());
 import fs from "fs";
+import path from "path";
 import { Constants } from "../../CliUtils.js";
 
 export const initScaffold = (): string => {
   const outputYaml = Constants.CONFIG_FILE_NAME;
-  const outFile = `${process.cwd()}/${outputYaml}`;
+  const outFile = path.join(process.cwd(), outputYaml);
 
   if (fs.existsSync(outFile)) {
     throw Error("Configuration file already present; please use to intialize a new config file.");

package/src/config/PublishDetails.ts

@@ -83,7 +83,7 @@ export const loadPublishDetailsWithChecks = async (
     throw new Error("Invalid path to APK file.");
   }
 
-  const developerOverridenLocales = config.release.android_details.locales
+  const developerOverridenLocales = config.release?.android_details?.locales
 
   if (buildToolsDir) {
     config.release.android_details = await getAndroidDetails(
@@ -438,11 +438,11 @@ export const writeToPublishDetails = async ({ app, release, lastSubmittedVersion
       ...currentConfig.release,
       address: release?.address ?? currentConfig.release.address,
       android_details: {
-        cert_fingerprint: release?.android_details?.cert_fingerprint ?? currentConfig.release.android_details.cert_fingerprint,
-        min_sdk: release?.android_details?.min_sdk ?? currentConfig.release.android_details.min_sdk,
-        version: release?.android_details?.version ?? currentConfig.release.android_details.version,
-        version_code: release?.android_details?.version_code ?? currentConfig.release.android_details.version_code,
-        locales: release?.android_details?.locales ?? currentConfig.release.android_details.locales
+        cert_fingerprint: release?.android_details?.cert_fingerprint ?? currentConfig.release.android_details?.cert_fingerprint,
+        min_sdk: release?.android_details?.min_sdk ?? currentConfig.release.android_details?.min_sdk,
+        version: release?.android_details?.version ?? currentConfig.release.android_details?.version,
+        version_code: release?.android_details?.version_code ?? currentConfig.release.android_details?.version_code,
+        locales: release?.android_details?.locales ?? currentConfig.release.android_details?.locales
       }
     },
     solana_mobile_dapp_publisher_portal: currentConfig.solana_mobile_dapp_publisher_portal,

package/src/upload/CachedStorageDriver.ts

@@ -1,4 +1,5 @@
 import fs from "fs";
+import path from "path";
 import type { MetaplexFile, StorageDriver } from "@metaplex-foundation/js";
 import { createHash } from "crypto";
 
@@ -86,7 +87,7 @@ export class CachedStorageDriver implements StorageDriver {
     };
 
     await fs.promises.writeFile(
-      `${process.cwd()}/${this.assetManifestPath}`,
+      path.join(process.cwd(), this.assetManifestPath),
       // Something is really weird, I can't seem to stringify `this.assetManifest` straight-up. Here be dragons
       JSON.stringify({ assets: { ...this.assetManifest.assets } }, null, 2),
       "utf-8"