@sevenvip666/rop 0.1.13 → 0.1.14

package/dist/bin/index.mjs

@@ -100,7 +100,6 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
-var frameworkList = ['tauri', 'capacitor', 'flutter'];
 var Framework;
 (function (Framework) {
     Framework["TAURI"] = "tauri";
@@ -332,149 +331,6 @@ var getTauriEnv = function (projectPath) {
     }
 };
 
-var tauri = {
-	macos: [
-		{
-			arch: "x64",
-			artifacts: {
-				target: {
-					path: "${basePath}/x86_64-apple-darwin/release/bundle/dmg/${appName}_${version}_${arch}.dmg"
-				},
-				update: {
-					path: "${basePath}/x86_64-apple-darwin/release/bundle/macos/${appName}.app.tar.gz",
-					name: "${appName}_${version}_${arch}.app.tar.gz"
-				},
-				sig: {
-					path: "${basePath}/x86_64-apple-darwin/release/bundle/macos/${appName}.app.tar.gz.sig"
-				}
-			}
-		},
-		{
-			arch: "arm64",
-			artifacts: {
-				target: {
-					path: "${basePath}/aarch64-apple-darwin/release/bundle/dmg/${appName}_${version}_aarch64.dmg",
-					name: "${appName}_${version}_${arch}.dmg"
-				},
-				update: {
-					path: "${basePath}/aarch64-apple-darwin/release/bundle/macos/${appName}.app.tar.gz",
-					name: "${appName}_${version}_${arch}.app.tar.gz"
-				},
-				sig: {
-					path: "${basePath}/aarch64-apple-darwin/release/bundle/macos/${appName}.app.tar.gz.sig"
-				}
-			}
-		},
-		{
-			arch: "universal",
-			artifacts: {
-				target: {
-					path: "${basePath}/universal-apple-darwin/release/bundle/dmg/${appName}_${version}_${arch}.dmg"
-				},
-				update: {
-					path: "${basePath}/universal-apple-darwin/release/bundle/macos/${appName}.app.tar.gz",
-					name: "${appName}_${version}_${arch}.app.tar.gz"
-				},
-				sig: {
-					path: "${basePath}/universal-apple-darwin/release/bundle/macos/${appName}.app.tar.gz.sig"
-				}
-			}
-		}
-	],
-	windows: [
-		{
-			arch: "x64",
-			installerType: "nsis",
-			artifacts: {
-				target: {
-					path: "${basePath}/release/bundle/nsis/${appName}_${version}_${arch}-setup.exe"
-				},
-				update: {
-					path: "${basePath}/release/bundle/nsis/${appName}_${version}_${arch}-setup.nsis.zip"
-				},
-				sig: {
-					path: "${basePath}/release/bundle/nsis/${appName}_${version}_${arch}-setup.nsis.zip.sig"
-				}
-			}
-		}
-	]
-};
-var flutter = {
-	ios: [
-		{
-			arch: "universal",
-			artifacts: {
-				target: {
-					path: "build/ios/ipa/${appName}.ipa",
-					name: "${appName}_${version}.ipa"
-				}
-			}
-		}
-	],
-	android: [
-		{
-			arch: "universal",
-			artifacts: {
-				target: {
-					path: "build/app/outputs/flutter-apk/app-release.apk",
-					name: "${appName}_${version}.apk"
-				}
-			}
-		}
-	],
-	macos: [
-		{
-			arch: "universal",
-			artifacts: {
-				target: {
-					path: "build/${appName}.dmg",
-					name: "${appName}_${version}.dmg"
-				}
-			}
-		}
-	]
-};
-var capacitor = {
-	ios: [
-		{
-			arch: "universal",
-			artifacts: {
-				target: {
-					path: "ios/build/release/App.ipa",
-					name: "${appName}_${version}.ipa"
-				}
-			}
-		}
-	],
-	android: [
-		{
-			arch: "universal",
-			artifacts: {
-				target: {
-					path: "android/app/build/outputs/release/apk/app-release.apk",
-					name: "${appName}_${version}.apk"
-				}
-			}
-		}
-	],
-	web: [
-		{
-			arch: "universal",
-			artifacts: {
-				target: {
-					path: "${appName}.zip",
-					name: "${appName}_${version}.zip"
-				}
-			}
-		}
-	]
-};
-var platformDefaultConfigMap = {
-	tauri: tauri,
-	flutter: flutter,
-	capacitor: capacitor
-};
-
 var getFlutterEnv = function (projectPath) {
     var dir = getDir$1(projectPath !== null && projectPath !== void 0 ? projectPath : '.');
     if (dir !== null) {
@@ -508,7 +364,7 @@ function getDir$1(root) {
     return resolve(root, confPaths[0], '..');
 }
 
-var getIonicEnv = function (projectPath) {
+var getCapacitorEnv = function (projectPath) {
     var dir = getDir(projectPath !== null && projectPath !== void 0 ? projectPath : '.');
     if (dir !== null) {
         if (existsSync(join(dir, 'package.json')) && existsSync(join(dir, 'capacitor.config.ts'))) {
@@ -573,7 +429,7 @@ var getBranch = function () { return __awaiter(void 0, void 0, void 0, function
 }); };
 // 读取 JSON 文件并替换模版变量
 function loadJsonWithEnv(_a) {
-    var _b, _c, _d, _e, _f;
+    var _b, _c;
     var platform = _a.platform, arch = _a.arch;
     var configFilePath = path.join('.', 'rop.json');
     var configData = fs$1.readFileSync(configFilePath, 'utf8');
@@ -592,21 +448,13 @@ function loadJsonWithEnv(_a) {
         arch: _arch,
     };
     var config;
-    if (!inputConfig.platforms && ((_b = inputConfig.framework) === null || _b === void 0 ? void 0 : _b.name) && frameworkList.includes((_c = inputConfig.framework) === null || _c === void 0 ? void 0 : _c.name)) {
-        var framework = inputConfig.framework.name;
-        var defaultPlatformConfig = platformDefaultConfigMap[framework];
-        var _config = __assign(__assign({}, inputConfig), { platforms: defaultPlatformConfig });
-        config = _config;
-    }
-    else {
-        config = inputConfig;
-    }
+    config = inputConfig;
     if (!config.platforms || Object.keys(config.platforms).length == 0) {
         console.log(colors.red('The platforms property in rop.json cannot be empty.'));
         return;
     }
-    var _autoEnv = getAutoEnvByFramework((_d = config === null || config === void 0 ? void 0 : config.framework) === null || _d === void 0 ? void 0 : _d.name, config.projectPath);
-    env = __assign(__assign(__assign({}, env), (_autoEnv !== null && _autoEnv !== void 0 ? _autoEnv : {})), ((_f = (_e = config.framework) === null || _e === void 0 ? void 0 : _e.env) !== null && _f !== void 0 ? _f : {}));
+    var _autoEnv = getAutoEnvByFramework((_b = config === null || config === void 0 ? void 0 : config.framework) === null || _b === void 0 ? void 0 : _b.name, config.projectPath);
+    env = __assign(__assign(__assign({}, env), (_autoEnv !== null && _autoEnv !== void 0 ? _autoEnv : {})), ((_c = config.variables) !== null && _c !== void 0 ? _c : {}));
     // 确保配置文件中存在 host 属性
     if (!env.version) {
         console.log(colors.red('The version property in rop.json cannot be empty.'));
@@ -655,7 +503,7 @@ var getAutoEnvByFramework = function (framework, projectPath) {
         case Framework.FLUTTER:
             return getFlutterEnv(projectPath);
         case Framework.CAPACITOR:
-            return getIonicEnv(projectPath);
+            return getCapacitorEnv(projectPath);
         default:
             return undefined;
     }
@@ -824,15 +672,189 @@ var RopUploadApi = /** @class */ (function () {
     return RopUploadApi;
 }());
 
+var framework$2 = {
+	name: "tauri"
+};
+var platforms$2 = {
+	macos: [
+		{
+			arch: "x64",
+			artifacts: {
+				target: {
+					path: "${basePath}/x86_64-apple-darwin/release/bundle/dmg/${appName}_${version}_${arch}.dmg"
+				},
+				update: {
+					path: "${basePath}/x86_64-apple-darwin/release/bundle/macos/${appName}.app.tar.gz",
+					name: "${appName}_${version}_${arch}.app.tar.gz"
+				},
+				sig: {
+					path: "${basePath}/x86_64-apple-darwin/release/bundle/macos/${appName}.app.tar.gz.sig"
+				}
+			}
+		},
+		{
+			arch: "arm64",
+			artifacts: {
+				target: {
+					path: "${basePath}/aarch64-apple-darwin/release/bundle/dmg/${appName}_${version}_aarch64.dmg",
+					name: "${appName}_${version}_${arch}.dmg"
+				},
+				update: {
+					path: "${basePath}/aarch64-apple-darwin/release/bundle/macos/${appName}.app.tar.gz",
+					name: "${appName}_${version}_${arch}.app.tar.gz"
+				},
+				sig: {
+					path: "${basePath}/aarch64-apple-darwin/release/bundle/macos/${appName}.app.tar.gz.sig"
+				}
+			}
+		},
+		{
+			arch: "universal",
+			artifacts: {
+				target: {
+					path: "${basePath}/universal-apple-darwin/release/bundle/dmg/${appName}_${version}_${arch}.dmg"
+				},
+				update: {
+					path: "${basePath}/universal-apple-darwin/release/bundle/macos/${appName}.app.tar.gz",
+					name: "${appName}_${version}_${arch}.app.tar.gz"
+				},
+				sig: {
+					path: "${basePath}/universal-apple-darwin/release/bundle/macos/${appName}.app.tar.gz.sig"
+				}
+			}
+		}
+	],
+	windows: [
+		{
+			arch: "x64",
+			installerType: "nsis",
+			artifacts: {
+				target: {
+					path: "${basePath}/release/bundle/nsis/${appName}_${version}_${arch}-setup.exe"
+				},
+				update: {
+					path: "${basePath}/release/bundle/nsis/${appName}_${version}_${arch}-setup.nsis.zip"
+				},
+				sig: {
+					path: "${basePath}/release/bundle/nsis/${appName}_${version}_${arch}-setup.nsis.zip.sig"
+				}
+			}
+		}
+	]
+};
+var tauriTemplate = {
+	framework: framework$2,
+	platforms: platforms$2
+};
+
+var framework$1 = {
+	name: "capacitor"
+};
+var platforms$1 = {
+	ios: [
+		{
+			arch: "universal",
+			artifacts: {
+				target: {
+					path: "ios/build/release/App.ipa",
+					name: "${appName}_${version}.ipa"
+				}
+			}
+		}
+	],
+	android: [
+		{
+			arch: "universal",
+			artifacts: {
+				target: {
+					path: "android/app/build/outputs/release/apk/app-release.apk",
+					name: "${appName}_${version}.apk"
+				}
+			}
+		}
+	],
+	web: [
+		{
+			arch: "universal",
+			artifacts: {
+				target: {
+					path: "${appName}.zip",
+					name: "${appName}_${version}.zip"
+				}
+			}
+		}
+	]
+};
+var capacitorTemplate = {
+	framework: framework$1,
+	platforms: platforms$1
+};
+
+var framework = {
+	name: "flutter"
+};
+var platforms = {
+	ios: [
+		{
+			arch: "universal",
+			artifacts: {
+				target: {
+					path: "build/ios/ipa/${appName}.ipa",
+					name: "${appName}_${version}.ipa"
+				}
+			}
+		}
+	],
+	android: [
+		{
+			arch: "universal",
+			artifacts: {
+				target: {
+					path: "build/app/outputs/flutter-apk/app-release.apk",
+					name: "${appName}_${version}.apk"
+				}
+			}
+		}
+	],
+	macos: [
+		{
+			arch: "universal",
+			artifacts: {
+				target: {
+					path: "build/${appName}.dmg",
+					name: "${appName}_${version}.dmg"
+				}
+			}
+		}
+	]
+};
+var flutterTemplate = {
+	framework: framework,
+	platforms: platforms
+};
+
 var InitApi = /** @class */ (function () {
     function InitApi() {
     }
     InitApi.prototype.initProjectConfigJson = function (framework) {
         return __awaiter(this, void 0, void 0, function () {
-            var jsonConfigPath, jsonConfigData, flag, str;
+            var template, jsonConfigPath, jsonConfigData, flag, str;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        switch (framework) {
+                            case 'tauri':
+                                template = tauriTemplate;
+                                break;
+                            case 'capacitor':
+                                template = capacitorTemplate;
+                                break;
+                            case 'flutter':
+                                template = flutterTemplate;
+                                break;
+                            default:
+                                template = {};
+                        }
                         jsonConfigPath = path.join('.', 'rop.json');
                         if (!fs$1.existsSync(jsonConfigPath)) return [3 /*break*/, 2];
                         return [4 /*yield*/, confirm({
@@ -845,21 +867,10 @@ var InitApi = /** @class */ (function () {
                         }
                         str = fs$1.readFileSync(jsonConfigPath, 'utf8');
                         jsonConfigData = JSON.parse(str);
-                        if (!jsonConfigData.framework) {
-                            jsonConfigData.framework = {
-                                name: framework,
-                            };
-                        }
-                        else {
-                            jsonConfigData.framework.name = framework;
-                        }
+                        jsonConfigData = __assign(__assign({}, template), jsonConfigData);
                         return [3 /*break*/, 3];
                     case 2:
-                        jsonConfigData = {
-                            framework: {
-                                name: framework,
-                            },
-                        };
+                        jsonConfigData = __assign({}, template);
                         _a.label = 3;
                     case 3:
                         fs$1.writeFileSync(jsonConfigPath, JSON.stringify(jsonConfigData, null, 2), 'utf8');

package/dist/cjs/index.js

@@ -52,6 +52,17 @@ PERFORMANCE OF THIS SOFTWARE.
 /* global Reflect, Promise, SuppressedError, Symbol */
 
 
+var __assign = function() {
+    __assign = Object.assign || function __assign(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+
 function __awaiter(thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -273,15 +284,189 @@ var RopUploadApi = /** @class */ (function () {
     return RopUploadApi;
 }());
 
+var framework$2 = {
+	name: "tauri"
+};
+var platforms$2 = {
+	macos: [
+		{
+			arch: "x64",
+			artifacts: {
+				target: {
+					path: "${basePath}/x86_64-apple-darwin/release/bundle/dmg/${appName}_${version}_${arch}.dmg"
+				},
+				update: {
+					path: "${basePath}/x86_64-apple-darwin/release/bundle/macos/${appName}.app.tar.gz",
+					name: "${appName}_${version}_${arch}.app.tar.gz"
+				},
+				sig: {
+					path: "${basePath}/x86_64-apple-darwin/release/bundle/macos/${appName}.app.tar.gz.sig"
+				}
+			}
+		},
+		{
+			arch: "arm64",
+			artifacts: {
+				target: {
+					path: "${basePath}/aarch64-apple-darwin/release/bundle/dmg/${appName}_${version}_aarch64.dmg",
+					name: "${appName}_${version}_${arch}.dmg"
+				},
+				update: {
+					path: "${basePath}/aarch64-apple-darwin/release/bundle/macos/${appName}.app.tar.gz",
+					name: "${appName}_${version}_${arch}.app.tar.gz"
+				},
+				sig: {
+					path: "${basePath}/aarch64-apple-darwin/release/bundle/macos/${appName}.app.tar.gz.sig"
+				}
+			}
+		},
+		{
+			arch: "universal",
+			artifacts: {
+				target: {
+					path: "${basePath}/universal-apple-darwin/release/bundle/dmg/${appName}_${version}_${arch}.dmg"
+				},
+				update: {
+					path: "${basePath}/universal-apple-darwin/release/bundle/macos/${appName}.app.tar.gz",
+					name: "${appName}_${version}_${arch}.app.tar.gz"
+				},
+				sig: {
+					path: "${basePath}/universal-apple-darwin/release/bundle/macos/${appName}.app.tar.gz.sig"
+				}
+			}
+		}
+	],
+	windows: [
+		{
+			arch: "x64",
+			installerType: "nsis",
+			artifacts: {
+				target: {
+					path: "${basePath}/release/bundle/nsis/${appName}_${version}_${arch}-setup.exe"
+				},
+				update: {
+					path: "${basePath}/release/bundle/nsis/${appName}_${version}_${arch}-setup.nsis.zip"
+				},
+				sig: {
+					path: "${basePath}/release/bundle/nsis/${appName}_${version}_${arch}-setup.nsis.zip.sig"
+				}
+			}
+		}
+	]
+};
+var tauriTemplate = {
+	framework: framework$2,
+	platforms: platforms$2
+};
+
+var framework$1 = {
+	name: "capacitor"
+};
+var platforms$1 = {
+	ios: [
+		{
+			arch: "universal",
+			artifacts: {
+				target: {
+					path: "ios/build/release/App.ipa",
+					name: "${appName}_${version}.ipa"
+				}
+			}
+		}
+	],
+	android: [
+		{
+			arch: "universal",
+			artifacts: {
+				target: {
+					path: "android/app/build/outputs/release/apk/app-release.apk",
+					name: "${appName}_${version}.apk"
+				}
+			}
+		}
+	],
+	web: [
+		{
+			arch: "universal",
+			artifacts: {
+				target: {
+					path: "${appName}.zip",
+					name: "${appName}_${version}.zip"
+				}
+			}
+		}
+	]
+};
+var capacitorTemplate = {
+	framework: framework$1,
+	platforms: platforms$1
+};
+
+var framework = {
+	name: "flutter"
+};
+var platforms = {
+	ios: [
+		{
+			arch: "universal",
+			artifacts: {
+				target: {
+					path: "build/ios/ipa/${appName}.ipa",
+					name: "${appName}_${version}.ipa"
+				}
+			}
+		}
+	],
+	android: [
+		{
+			arch: "universal",
+			artifacts: {
+				target: {
+					path: "build/app/outputs/flutter-apk/app-release.apk",
+					name: "${appName}_${version}.apk"
+				}
+			}
+		}
+	],
+	macos: [
+		{
+			arch: "universal",
+			artifacts: {
+				target: {
+					path: "build/${appName}.dmg",
+					name: "${appName}_${version}.dmg"
+				}
+			}
+		}
+	]
+};
+var flutterTemplate = {
+	framework: framework,
+	platforms: platforms
+};
+
 var InitApi = /** @class */ (function () {
     function InitApi() {
     }
     InitApi.prototype.initProjectConfigJson = function (framework) {
         return __awaiter(this, void 0, void 0, function () {
-            var jsonConfigPath, jsonConfigData, flag, str;
+            var template, jsonConfigPath, jsonConfigData, flag, str;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        switch (framework) {
+                            case 'tauri':
+                                template = tauriTemplate;
+                                break;
+                            case 'capacitor':
+                                template = capacitorTemplate;
+                                break;
+                            case 'flutter':
+                                template = flutterTemplate;
+                                break;
+                            default:
+                                template = {};
+                        }
                         jsonConfigPath = path$1.join('.', 'rop.json');
                         if (!fs$1.existsSync(jsonConfigPath)) return [3 /*break*/, 2];
                         return [4 /*yield*/, prompts.confirm({
@@ -294,21 +479,10 @@ var InitApi = /** @class */ (function () {
                         }
                         str = fs$1.readFileSync(jsonConfigPath, 'utf8');
                         jsonConfigData = JSON.parse(str);
-                        if (!jsonConfigData.framework) {
-                            jsonConfigData.framework = {
-                                name: framework,
-                            };
-                        }
-                        else {
-                            jsonConfigData.framework.name = framework;
-                        }
+                        jsonConfigData = __assign(__assign({}, template), jsonConfigData);
                         return [3 /*break*/, 3];
                     case 2:
-                        jsonConfigData = {
-                            framework: {
-                                name: framework,
-                            },
-                        };
+                        jsonConfigData = __assign({}, template);
                         _a.label = 3;
                     case 3:
                         fs$1.writeFileSync(jsonConfigPath, JSON.stringify(jsonConfigData, null, 2), 'utf8');