@xfe-repo/web-app 1.2.3 → 1.2.6

package/deploy/.drone.yml

@@ -21,6 +21,7 @@ steps:
     commands:
       - pnpm config set registry https://registry.npmmirror.com
       - pnpm i
+      - cp -r node_modules/@xfe-repo/web-app/deploy deploy
 
   - name: build
     pull: if-not-exists
@@ -34,7 +35,6 @@ steps:
         path: /drone/src/node_modules
     commands:
       - export REACT_APP_RELEASE=$DRONE_REPO_NAME@${DRONE_TAG:CI_COMMIT_SHA}
-      - cp -r node_modules/@xfe-repo/web-app/deploy deploy
       - echo -n "$REACT_APP_RELEASE" > deploy/static/release
       - pnpm build
 

package/deploy/helm/values.yaml

@@ -10,11 +10,11 @@ virtualService:
   enabled: true
   hosts:
     test:
-      - '<<HOST_PREFIX>>.erpnew-o.t.zhixiangyao.com'
+      - '<<HOST_PREFIX>>.exam.t.eshetang.com'
     stage:
-      - 'stage.erpnew-o.t.zhixiangyao.com'
+      - 'stage.exam.t.eshetang.com'
     prod:
-      - 'erpnew-o.zhixiangyao.com'
+      - 'exam.eshetang.com'
   gateways:
-    - 'common-gateway-zhixiangyao'
+    - 'common-gateway-eshetang'
 targetK8s: 'saas'

package/dist/cli.js

@@ -51,11 +51,6 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __esm = function(fn, res) {
-    return function __init() {
-        return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
-    };
-};
 var __copyProps = function(to, from, except, desc) {
     if (from && typeof from === "object" || typeof from === "function") {
         var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
@@ -97,53 +92,49 @@ var __toESM = function(mod, isNodeMode, target) {
         enumerable: true
     }) : target, mod);
 };
-// src/config.ts
-var config_exports = {};
-var import_path, import_fs, import_yaml, configDeploy;
-var init_config = __esm({
-    "src/config.ts": function() {
-        "use strict";
-        import_path = __toESM(require("path"));
-        import_fs = __toESM(require("fs"));
-        import_yaml = __toESM(require("yaml"));
-        configDeploy = function() {
-            var xfeConfig = JSON.parse(import_fs.default.readFileSync("./xfe.json", "utf8"));
-            if (!(xfeConfig === null || xfeConfig === void 0 ? void 0 : xfeConfig.deploy)) return;
-            var droneConfigFilePath = import_path.default.resolve(__dirname, "../deploy/.drone.yml");
-            import_fs.default.cpSync(droneConfigFilePath, xfeConfig.deploy.droneConfigPath || "./.drone.yml");
-            var valuesYamlFilePath = import_path.default.resolve(__dirname, "../deploy/helm/values.yaml");
-            var valuesYamlFile = import_fs.default.readFileSync(valuesYamlFilePath, "utf8");
-            var valuesYaml = import_yaml.default.parse(valuesYamlFile);
-            if (!valuesYaml.virtualService) valuesYaml.virtualService = {};
-            if (!valuesYaml.virtualService.hosts) valuesYaml.virtualService.hosts = {
-                test: [],
-                stage: [],
-                prod: []
-            };
-            var _xfeConfig_deploy = xfeConfig.deploy, _xfeConfig_deploy_virtualServiceEnabled = _xfeConfig_deploy.virtualServiceEnabled, virtualServiceEnabled = _xfeConfig_deploy_virtualServiceEnabled === void 0 ? true : _xfeConfig_deploy_virtualServiceEnabled, _xfeConfig_deploy_hostsProd = _xfeConfig_deploy.hostsProd, hostsProd = _xfeConfig_deploy_hostsProd === void 0 ? [] : _xfeConfig_deploy_hostsProd, _xfeConfig_deploy_hostsStage = _xfeConfig_deploy.hostsStage, hostsStage = _xfeConfig_deploy_hostsStage === void 0 ? [] : _xfeConfig_deploy_hostsStage, _xfeConfig_deploy_hostsTest = _xfeConfig_deploy.hostsTest, hostsTest = _xfeConfig_deploy_hostsTest === void 0 ? [] : _xfeConfig_deploy_hostsTest, _xfeConfig_deploy_gateways = _xfeConfig_deploy.gateways, gateways = _xfeConfig_deploy_gateways === void 0 ? [
-                "common-gateway-eshetang"
-            ] : _xfeConfig_deploy_gateways;
-            var _xfeConfig_deploy1 = xfeConfig.deploy, _xfeConfig_deploy_targetK8s = _xfeConfig_deploy1.targetK8s, targetK8s = _xfeConfig_deploy_targetK8s === void 0 ? "saas" : _xfeConfig_deploy_targetK8s, _xfeConfig_deploy_targetNamespace = _xfeConfig_deploy1.targetNamespace, targetNamespace = _xfeConfig_deploy_targetNamespace === void 0 ? "" : _xfeConfig_deploy_targetNamespace;
-            valuesYaml.virtualService.enabled = virtualServiceEnabled;
-            valuesYaml.virtualService.gateways = gateways;
-            valuesYaml.virtualService.hosts.prod = hostsProd;
-            valuesYaml.virtualService.hosts.stage = hostsStage;
-            valuesYaml.virtualService.hosts.test = hostsTest;
-            valuesYaml.targetK8s = targetK8s;
-            valuesYaml.namespace = targetNamespace;
-            var valuesYamlStr = import_yaml.default.stringify(valuesYaml, {
-                defaultStringType: "QUOTE_SINGLE",
-                defaultKeyType: "PLAIN"
-            });
-            import_fs.default.writeFileSync(valuesYamlFilePath, valuesYamlStr, "utf8");
-        };
-        configDeploy();
-    }
-});
 // src/cli.ts
 var import_minimist = __toESM(require("minimist"));
 var import_child_process = require("child_process");
 var import_path2 = __toESM(require("path"));
+// src/config.ts
+var import_path = __toESM(require("path"));
+var import_fs = __toESM(require("fs"));
+var import_yaml = __toESM(require("yaml"));
+var configDeploy = function() {
+    var xfeConfig = JSON.parse(import_fs.default.readFileSync("./xfe.json", "utf8"));
+    if (!(xfeConfig === null || xfeConfig === void 0 ? void 0 : xfeConfig.deploy)) return;
+    var droneConfigFilePath = import_path.default.resolve(__dirname, "../deploy/.drone.yml");
+    import_fs.default.cpSync(droneConfigFilePath, xfeConfig.deploy.droneConfigPath || "./.drone.yml");
+    var valuesYamlFilePath = import_path.default.resolve(__dirname, "../deploy/helm/values.yaml");
+    var valuesYamlFile = import_fs.default.readFileSync(valuesYamlFilePath, "utf8");
+    var valuesYaml = import_yaml.default.parse(valuesYamlFile);
+    if (!valuesYaml.virtualService) valuesYaml.virtualService = {};
+    if (!valuesYaml.virtualService.hosts) valuesYaml.virtualService.hosts = {
+        test: [],
+        stage: [],
+        prod: []
+    };
+    var _xfeConfig_deploy = xfeConfig.deploy, _xfeConfig_deploy_virtualServiceEnabled = _xfeConfig_deploy.virtualServiceEnabled, virtualServiceEnabled = _xfeConfig_deploy_virtualServiceEnabled === void 0 ? true : _xfeConfig_deploy_virtualServiceEnabled, _xfeConfig_deploy_hostsProd = _xfeConfig_deploy.hostsProd, hostsProd = _xfeConfig_deploy_hostsProd === void 0 ? [] : _xfeConfig_deploy_hostsProd, _xfeConfig_deploy_hostsStage = _xfeConfig_deploy.hostsStage, hostsStage = _xfeConfig_deploy_hostsStage === void 0 ? [] : _xfeConfig_deploy_hostsStage, _xfeConfig_deploy_hostsTest = _xfeConfig_deploy.hostsTest, hostsTest = _xfeConfig_deploy_hostsTest === void 0 ? [] : _xfeConfig_deploy_hostsTest, _xfeConfig_deploy_gateways = _xfeConfig_deploy.gateways, gateways = _xfeConfig_deploy_gateways === void 0 ? [
+        "common-gateway-eshetang"
+    ] : _xfeConfig_deploy_gateways;
+    var _xfeConfig_deploy1 = xfeConfig.deploy, _xfeConfig_deploy_targetK8s = _xfeConfig_deploy1.targetK8s, targetK8s = _xfeConfig_deploy_targetK8s === void 0 ? "saas" : _xfeConfig_deploy_targetK8s, _xfeConfig_deploy_targetNamespace = _xfeConfig_deploy1.targetNamespace, targetNamespace = _xfeConfig_deploy_targetNamespace === void 0 ? "" : _xfeConfig_deploy_targetNamespace;
+    valuesYaml.virtualService.enabled = virtualServiceEnabled;
+    valuesYaml.virtualService.gateways = gateways;
+    valuesYaml.virtualService.hosts.prod = hostsProd;
+    valuesYaml.virtualService.hosts.stage = hostsStage;
+    valuesYaml.virtualService.hosts.test = hostsTest;
+    valuesYaml.targetK8s = targetK8s;
+    valuesYaml.namespace = targetNamespace;
+    var valuesYamlStr = import_yaml.default.stringify(valuesYaml, {
+        defaultStringType: "QUOTE_SINGLE",
+        defaultKeyType: "PLAIN"
+    });
+    import_fs.default.writeFileSync(valuesYamlFilePath, valuesYamlStr, "utf8");
+};
+var config = function() {
+    configDeploy();
+};
+// src/cli.ts
 var argv = (0, import_minimist.default)(process.argv.slice(2));
 var commands = argv._;
 var _commands = _sliced_to_array(commands, 1), command = _commands[0];
@@ -157,7 +148,5 @@ if (command === "dev") {
         stdio: "inherit"
     });
 } else if (command === "config") {
-    Promise.resolve().then(function() {
-        return init_config();
-    });
+    config();
 }

package/dist/config.d.ts

@@ -1,2 +1,3 @@
+declare const config: () => void;
 
-export {  }
+export { config };

package/dist/config.js

@@ -5,6 +5,12 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = function(target, all) {
+    for(var name in all)__defProp(target, name, {
+        get: all[name],
+        enumerable: true
+    });
+};
 var __copyProps = function(to, from, except, desc) {
     if (from && typeof from === "object" || typeof from === "function") {
         var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
@@ -46,7 +52,19 @@ var __toESM = function(mod, isNodeMode, target) {
         enumerable: true
     }) : target, mod);
 };
+var __toCommonJS = function(mod) {
+    return __copyProps(__defProp({}, "__esModule", {
+        value: true
+    }), mod);
+};
 // src/config.ts
+var config_exports = {};
+__export(config_exports, {
+    config: function() {
+        return config;
+    }
+});
+module.exports = __toCommonJS(config_exports);
 var import_path = __toESM(require("path"));
 var import_fs = __toESM(require("fs"));
 var import_yaml = __toESM(require("yaml"));
@@ -81,4 +99,10 @@ var configDeploy = function() {
     });
     import_fs.default.writeFileSync(valuesYamlFilePath, valuesYamlStr, "utf8");
 };
-configDeploy();
+var config = function() {
+    configDeploy();
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+    config: config
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfe-repo/web-app",
-  "version": "1.2.3",
+  "version": "1.2.6",
   "bin": {
     "xfe-web": "./bin/index.js"
   },