npm - @next-core/brick-container - Versions diffs - 2.92.13 → 2.92.15 - Mend

@next-core/brick-container 2.92.13 → 2.92.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (29) hide show

package/dist/preview.html CHANGED Viewed

	@@ -1 +1 @@
1	- <!doctype html><html lang="zh-CN" data-theme="light" data-mode="default"><head><meta charset="utf-8"/><base href="<!--# echo var='base_href' default='/' -->"/><script>window.DEVELOPER_PREVIEW = true;</script><link href="preview.d7c580cd31a9c96a53f7.css" rel="stylesheet"></head><body><div id="preview-root"><div id="main-mount-point"></div><div id="bg-mount-point" style="display: none"></div><div id="portal-mount-point"></div></div><script src="dll.~~2dbc409f~~.js"></script><script src="polyfill.5f60d909121d6c84d42d.js"></script><script src="preview.16f41cd133904776f25f.js"></script></body></html>
1	+ <!doctype html><html lang="zh-CN" data-theme="light" data-mode="default"><head><meta charset="utf-8"/><base href="<!--# echo var='base_href' default='/' -->"/><script>window.DEVELOPER_PREVIEW = true;</script><link href="preview.d7c580cd31a9c96a53f7.css" rel="stylesheet"></head><body><div id="preview-root"><div id="main-mount-point"></div><div id="bg-mount-point" style="display: none"></div><div id="portal-mount-point"></div></div><script src="dll.49bfc5a1.js"></script><script src="polyfill.5f60d909121d6c84d42d.js"></script><script src="preview.16f41cd133904776f25f.js"></script></body></html>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@next-core/brick-container",
-  "version": "2.92.13",
+  "version": "2.92.15",
   "description": "Brick Container Server",
   "homepage": "https://github.com/easyops-cn/next-core/tree/master/packages/brick-container",
   "license": "GPL-3.0",
@@ -41,18 +41,18 @@
     "ws": "^8.11.0"
   },
   "devDependencies": {
-    "@next-core/brick-dll": "^2.45.66",
-    "@next-core/brick-icons": "^2.33.28",
+    "@next-core/brick-dll": "^2.45.67",
+    "@next-core/brick-icons": "^2.33.29",
     "@next-core/custom-antd-styles": "^1.26.2",
     "@next-core/illustrations": "^0.11.27",
     "@next-core/less-plugin-css-variables": "^0.2.8",
     "@next-core/theme": "^1.4.4",
     "@next-core/webpack-config-factory": "^2.23.0",
-    "@next-dll/ace": "^2.0.721",
+    "@next-dll/ace": "^2.0.722",
     "@next-dll/d3": "^2.0.80",
     "@next-dll/echarts": "^2.0.81",
-    "@next-dll/editor-bricks-helper": "^0.38.66",
-    "@next-dll/react-dnd": "^0.1.659",
+    "@next-dll/editor-bricks-helper": "^0.38.67",
+    "@next-dll/react-dnd": "^0.1.660",
     "babel-loader": "^8.3.0",
     "clean-webpack-plugin": "^4.0.0",
     "copy-webpack-plugin": "^6.4.1",
@@ -73,5 +73,5 @@
     "webpack-dev-server": "^4.11.1",
     "webpack-merge": "^5.8.0"
   },
-  "gitHead": "086c74a9c87ebeca42c548e922e6681aa6140a2c"
+  "gitHead": "680e8ca98a5f54f2833431657f9968d24f85336f"
 }

package/tools/link_static_file.py CHANGED Viewed

@@ -5,6 +5,7 @@ import traceback
 import yaml
 import sys
 import errno
+import shutil
 reload(sys)
 sys.setdefaultencoding('utf-8')
@@ -19,7 +20,8 @@ _MICRO_APPS_FOLDER = "micro-apps"
 # 公共路径
 _INSTALL_BASE_PATH = "/usr/local/easyops"
-_DEPENDENCIES_LOCK_BASE_PATH = os.path.join(_INSTALL_BASE_PATH, _APPLICATIONS_SA_FOLDER, "dependencies_lock")
+_DEPENDENCIES_LOCK_BASE_PATH = os.path.join(
+    _INSTALL_BASE_PATH, _APPLICATIONS_SA_FOLDER, "dependencies_lock")
 def init_dependencies_lock_dir():
@@ -34,10 +36,12 @@ def init_dependencies_lock_dir():
     # 初始化子目录 bricks、templates、core、micro_apps
     bricks_path = os.path.join(_DEPENDENCIES_LOCK_BASE_PATH, _BRICKS_FOLDER)
-    templates_path = os.path.join(_DEPENDENCIES_LOCK_BASE_PATH, _TEMPLATES_FOLDER)
+    templates_path = os.path.join(
+        _DEPENDENCIES_LOCK_BASE_PATH, _TEMPLATES_FOLDER)
     core_path = os.path.join(_DEPENDENCIES_LOCK_BASE_PATH, _CORE_FOLDER)
-    micro_apps_path = os.path.join(_DEPENDENCIES_LOCK_BASE_PATH, _MICRO_APPS_FOLDER)
+    micro_apps_path = os.path.join(
+        _DEPENDENCIES_LOCK_BASE_PATH, _MICRO_APPS_FOLDER)
     paths = [bricks_path, templates_path, core_path, micro_apps_path]
     for path in paths:
@@ -90,9 +94,11 @@ def build_dependencies_path_tree(dependencies):
             dependency_type = name
         # /usr/local/easyops/applications_sa/dependencies_lock  templates   general-list    1.30.0
-        link_path_base = os.path.join(_DEPENDENCIES_LOCK_BASE_PATH, dependency_type, un_suffix_name, actual_version)
+        link_path_base = os.path.join(
+            _DEPENDENCIES_LOCK_BASE_PATH, dependency_type, un_suffix_name, actual_version)
         if un_suffix_name == _BRICK_NEXT_FOLDER:
-            link_path_base = os.path.join(_DEPENDENCIES_LOCK_BASE_PATH, dependency_type, actual_version)
+            link_path_base = os.path.join(
+                _DEPENDENCIES_LOCK_BASE_PATH, dependency_type, actual_version)
         dependency = {}
         # 直接在这里记录路径
@@ -110,7 +116,8 @@ def build_dependencies_path_tree(dependencies):
 def read_dependencies_yaml(install_app_path):
-    dependencies_yaml_path = os.path.join(install_app_path, "dependencies", "micro_app_dependencies.yaml")
+    dependencies_yaml_path = os.path.join(
+        install_app_path, "dependencies", "micro_app_dependencies.yaml")
     print u"dependencies_yaml_path: {}".format(dependencies_yaml_path)
     dependencies_fp = open(dependencies_yaml_path, "r")
     data = yaml.load(dependencies_fp)
@@ -129,7 +136,6 @@ def get_static_file_map(path):
         for filename in files:
             file_path = os.path.join(root, filename)
             if os.path.islink(file_path):
-                print u"current file is link: {}".format(file_path)
                 continue
             file_map[root].append(filename)
@@ -142,7 +148,8 @@ def link_install_app_static_file(install_app_path, plugin_name, app_version):
     if not os.path.exists(current_app_path):
         print u"current app path: {} not exist".format(current_app_path)
         return
-    current_app_path_public = os.path.join(_DEPENDENCIES_LOCK_BASE_PATH, _MICRO_APPS_FOLDER, plugin_name, version)
+    current_app_path_public = os.path.join(
+        _DEPENDENCIES_LOCK_BASE_PATH, _MICRO_APPS_FOLDER, plugin_name, version)
     if not os.path.exists(current_app_path_public):
         os.makedirs(current_app_path_public)
@@ -151,17 +158,19 @@ def link_install_app_static_file(install_app_path, plugin_name, app_version):
     static_file_map = get_static_file_map(current_app_path)
     print u"---------------------------------------------"
     for file_path_base, files in static_file_map.items():
-        _link_static_file(files, file_path_base, current_app_path, current_app_path_public)
+        _link_static_file(files, file_path_base,
+                          current_app_path, current_app_path_public)
     print u"---------------------------------------------"
     print u"\n\n"
 # 硬链
-def link_dependency_static_file(install_app_path, app_version):
+def link_dependency_static_file(install_app_path, app_id,  app_version, is_sa_na_dep_dir_present):
     dependency_apps = read_dependencies_yaml(install_app_path)
     # 依赖的路径树
-    dependencies_path_tree = build_dependencies_path_tree(dependency_apps)  # type: dict
+    dependencies_path_tree = build_dependencies_path_tree(
+        dependency_apps)  # type: dict
     # 区分版本
     for dependency_name, dependency_info in dependencies_path_tree.items():
         dependency_type = dependency_info["dependency_type"]
@@ -176,27 +185,74 @@ def link_dependency_static_file(install_app_path, app_version):
             dependency_dir_inside_base = os.path.join(install_app_path, "versions",
                                                       app_version, "webroot", "-", _CORE_FOLDER)
-        print u"---------------------------------------------"
-        print dependency_type, dependency_name, "\n\t", dependency_dir_inside_base, "\n\t", dependency_dir_public
+        # 如果sa-na目录下没有bricks/template/core目录(说明是体积精简)，从dependencies_lock 硬链到sa-na目录
+        #  否则， 从sa-na硬链接到dependencies_lock下
+        if is_sa_na_dep_dir_present:
+            static_file_map = get_static_file_map(dependency_dir_inside_base)
+            for file_path_base, files in static_file_map.items():
+                _link_static_file(
+                    files, file_path_base, dependency_dir_inside_base, dependency_dir_public)
+        else:
+            try:
+                static_file_map = get_static_file_map(dependency_dir_public)
+                for file_path_base, files in static_file_map.items():
+                    _link_static_file_to_sa_na(
+                        files, file_path_base, dependency_dir_inside_base, dependency_dir_public)
+            except Exception as e:
+                # sa-na下bricks/core/templates目录为空(即体积精简才会走到else) 如果link了一半报错，要删除sa-na下的公共依赖目录， 保证下次还能link
+                webroot_dir = os.path.join(
+                    install_app_path, "versions", app_version, "webroot", "-")
+                remove_sa_na_deps_dir(webroot_dir)
+                raise RuntimeError(
+                    "stanalone-na size optimization: handle standalone-na:{} dependencies info err: {}...".format(app_id, e))
+def _link_static_file_to_sa_na(files, file_path_base, dependency_dir_inside_base, dependency_dir_public):
+    for filename in files:
+        file_path = os.path.join(file_path_base, filename)
+        link_file_path = file_path.replace(
+            dependency_dir_public, dependency_dir_inside_base)
+        link_file_path_base = os.path.dirname(link_file_path)
-        static_file_map = get_static_file_map(dependency_dir_inside_base)
-        for file_path_base, files in static_file_map.items():
-            _link_static_file(files, file_path_base, dependency_dir_inside_base, dependency_dir_public)
+        try:
+            if not os.path.exists(link_file_path_base):
+                os.makedirs(link_file_path_base)
+            # 创建硬链接, src存在， dst不存在
+            if not os.path.exists(link_file_path):
+                print("link src: {} dst: {}".format(file_path, link_file_path))
+                os.link(file_path, link_file_path)
+            else:
+                print("hard link already exists for {}".format(link_file_path))
+        except Exception as e:
+            raise RuntimeError("link file(src:{} dst: {}) err: {}".format(
+                file_path, link_file_path, e))
+def remove_sa_na_deps_dir(webroot_dir):
+    deps_dir = [
+        os.path.join(webroot_dir, _BRICKS_FOLDER),
+        os.path.join(webroot_dir, _TEMPLATES_FOLDER),
+        os.path.join(webroot_dir, _CORE_FOLDER)
+    ]
+    for dep_dir in deps_dir:
+        if os.path.exists(dep_dir):
+            # 目录非空也要删除
+            shutil.rmtree(dep_dir)
 def _link_static_file(files, file_path_base, dependency_dir_inside_base, dependency_dir_public):
-    print "\tfile count: {}".format(len(files))
     for filename in files:
         file_path = os.path.join(file_path_base, filename)
         file_path_backup = file_path + ".back"
-        link_file_path = file_path.replace(dependency_dir_inside_base, dependency_dir_public)
+        link_file_path = file_path.replace(
+            dependency_dir_inside_base, dependency_dir_public)
         link_file_path_base = link_file_path.replace(filename, "")
-        print u"\t\tfile_path: ", file_path
-        print u"\t\tlink_file_path: ", link_file_path
         try:
             if not os.path.exists(link_file_path_base):
                 os.makedirs(link_file_path_base)
             # 先备份文件
@@ -222,6 +278,16 @@ def _link_static_file(files, file_path_base, dependency_dir_inside_base, depende
                 os.remove(file_path_backup)
+def check_standalone_na_dep_dir(install_app_path, app_version):
+    bricks_dir = os.path.join(
+        install_app_path, "versions", app_version, "webroot", "-", _BRICKS_FOLDER)
+    templates_dir = os.path.join(
+        install_app_path, "versions", app_version, "webroot", "-", _TEMPLATES_FOLDER)
+    core_dir = os.path.join(install_app_path, "versions",
+                            app_version, "webroot", "-", _CORE_FOLDER)
+    return os.path.exists(bricks_dir) and os.path.exists(templates_dir) and os.path.exists(core_dir)
 if __name__ == "__main__":
     if len(sys.argv) < 4:
         print u"Usage: ./symlink_dependencies.py $install_path $plugin_name $version, Got: {}".format(sys.argv)
@@ -230,16 +296,16 @@ if __name__ == "__main__":
     plugin_name = sys.argv[2]
     version = sys.argv[3]
-    """
-    本地测试实例：
-        python2 symlink_dependencies.py /usr/local/easyops/applications_sa/easy-agile-standalone-NA 1.0.13
-    """
     # must init
     init_dependencies_lock_dir()
     # 硬链当前APP
     link_install_app_static_file(install_path, plugin_name, version)
+    # 通过判断standalone-na目录下是否存在bricks/core/templates目录来判断是否需要体积精简
+    is_sa_na_dep_dir_present = check_standalone_na_dep_dir(
+        install_path, version)
     # 硬链依赖APP
-    link_dependency_static_file(install_path, version)
+    link_dependency_static_file(
+        install_path, plugin_name, version, is_sa_na_dep_dir_present)