@next-core/brick-container 2.62.1 → 2.63.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-core/brick-container",
-  "version": "2.62.1",
+  "version": "2.63.0",
   "description": "Brick Container Server",
   "homepage": "https://github.com/easyops-cn/next-core/tree/master/packages/brick-container",
   "license": "GPL-3.0",
@@ -44,7 +44,7 @@
     "@next-core/brick-dll": "^2.28.8",
     "@next-core/brick-icons": "^2.26.1",
     "@next-core/color-theme": "^0.4.0",
-    "@next-core/custom-antd-styles": "^1.23.0",
+    "@next-core/custom-antd-styles": "^1.23.2",
     "@next-core/illustrations": "^0.4.6",
     "@next-core/less-plugin-css-variables": "^0.2.1",
     "@next-core/webpack-config-factory": "^2.15.2",
@@ -72,5 +72,5 @@
     "webpack-dev-server": "^4.6.0",
     "webpack-merge": "^5.8.0"
   },
-  "gitHead": "7a0bd9f093ebf713a979cea1915b489203e7a58b"
+  "gitHead": "a53fd6dda3d21aa9312337470c86a2c17536d996"
 }

package/serve/getProxies.js

@@ -52,14 +52,14 @@ module.exports = (env) => {
     },
   };
   if (useRemote) {
-    const assetRoot = standaloneMicroApps ? `${standaloneAppDir}-` : "";
+    const assetRoot = standaloneMicroApps ? `${standaloneAppDir}-/` : "";
     if (standaloneMicroApps) {
       // 在「独立应用」模式中，静态资源路径在 `your-app/-/` 目录下。
       proxyPaths.push(assetRoot);
     }
 
     const assetPaths = ["bricks", "micro-apps", "templates"];
-    proxyPaths.push(...assetPaths.map((p) => `${assetRoot}/${p}`));
+    proxyPaths.push(...assetPaths.map((p) => `${assetRoot}${p}`));
 
     apiProxyOptions.onProxyRes = (proxyRes, req, res) => {
       // 设定透传远端请求时，可以指定特定的 brick-packages, micro-apps, templates 使用本地文件。

package/tools/report_installed_theme_template.py

@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+import sys
+import os
+import simplejson
+import requests
+import ens_api
+
+def collect(install_path):
+  if not os.path.exists(install_path):
+    raise Exception("could not find install path {}".format(install_path))
+  theme_template_path = os.path.join(install_path, "theme.json")
+  if not os.path.exists(theme_template_path):
+    raise Exception("could not find theme path {}".format(theme_template_path))
+  with open(theme_template_path) as f:
+    theme_content = f.read()
+    theme_json = simplejson.loads(theme_content)
+  return theme_json
+
+
+def create_or_update_theme_template_data(data, org):
+  session_id, ip, port = ens_api.get_service_by_name("web.brick_next", "logic.next_builder_service")
+  if session_id <= 0:
+    raise Exception("get nameservice logic.micro_app_service error, session_id={}".format(session_id))
+  address = "{}:{}".format(ip, port)
+  headers = {"org": str(org), "user": "defaultUser"}
+  url = "http://{}/api/v1/next-builder/theme-data-import".format(address)
+  param = {"themeData": data}
+  rsp = requests.post(url, json=param, headers=headers)
+  rsp.raise_for_status()
+
+
+def report(org, theme_template_data):
+  create_or_update_theme_template_data(theme_template_data, org)
+
+
+if __name__ == "__main__":
+  if len(sys.argv) < 3:
+    print "Usage: ./report_installed_theme_template.py $org $install_path"
+    sys.exit(1)
+
+  org = sys.argv[1]
+  install_path = sys.argv[2]
+  theme_template_json = collect(install_path)
+  if theme_template_json:
+    report(org, theme_template_json)