@next-core/build-next-bricks 1.4.1 → 1.5.0

package/bin/build-next-bricks.js

@@ -3,6 +3,7 @@ import path from "node:path";
 import { existsSync } from "node:fs";
 import build from "../src/build.js";
 import scanBricks from "../src/scanBricks.js";
+import generateMetadata from "../src/generateMetadata.js";
 
 /**
  * @typedef {T | Array<T>} MaybeArray<T>
@@ -66,6 +67,10 @@ try {
       });
     });
 
+    if (configList.some((config) => !config.type || config.type === "bricks")) {
+      await generateMetadata(packageDir);
+    }
+
     console.log(
       `Build bricks done in ${((Date.now() - startTime) / 1000).toFixed(2)}s`
     );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-core/build-next-bricks",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "description": "Build next bricks",
   "homepage": "https://github.com/easyops-cn/next-core/tree/master/packages/build-next-bricks",
   "license": "GPL-3.0",
@@ -12,6 +12,7 @@
   "files": [
     "bin",
     "src",
+    "template",
     "index.d.ts"
   ],
   "exports": {
@@ -46,5 +47,5 @@
     "typescript": "^5.0.3",
     "webpack": "^5.78.0"
   },
-  "gitHead": "4b4ee2a1f0853f0538ba78973cd10d76c5312027"
+  "gitHead": "99f27abad5e8358985c1f3bf8a180071afc3a74a"
 }

package/src/EmitBricksJsonPlugin.js

@@ -23,7 +23,7 @@ export default class EmitBricksJsonPlugin {
       compilation.hooks.processAssets.tapAsync(
         {
           name: pluginName,
-          stage: webpack.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_INLINE,
+          stage: webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONAL,
         },
         (compilationAssets, callback) => {
           const jsEntries = Object.keys(compilationAssets).filter(

package/src/generateMetadata.js

@@ -0,0 +1,92 @@
+#!/usr/bin/env node
+import path from "node:path";
+import { existsSync, mkdirSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+import { copyFile, readFile, writeFile } from "node:fs/promises";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+/**
+ * @param {string} packageDir
+ */
+export default async function generateMetadata(packageDir) {
+  const targetPkgBuildDir = path.join(packageDir, ".pkgbuild");
+  if (!existsSync(targetPkgBuildDir)) {
+    mkdirSync(targetPkgBuildDir);
+  }
+
+  const targetDeployDir = path.join(packageDir, "deploy");
+  if (!existsSync(targetDeployDir)) {
+    mkdirSync(targetDeployDir);
+  }
+
+  await Promise.all([
+    copyFile(
+      path.join(__dirname, "../template/.pkgbuild/PKGBUILD"),
+      path.join(targetPkgBuildDir, "PKGBUILD")
+    ),
+    [
+      "install_postscript.sh",
+      "update_postscript.sh",
+      "update_prescript.sh",
+    ].map((filename) =>
+      copyFile(
+        path.join(__dirname, "../template/deploy", filename),
+        path.join(targetDeployDir, filename)
+      )
+    ),
+  ]);
+
+  const pkgName = path.basename(packageDir);
+  /**
+   * @type {[string, string][]}
+   */
+  const patterns = Object.entries({
+    "$install-path-dir$": "bricks",
+    "$scope-name$": "bricks",
+    "$package-name$": pkgName,
+    "$suffix-name$": "NB",
+  });
+
+  await Promise.all(
+    [
+      path.join(targetPkgBuildDir, "PKGBUILD"),
+      path.join(targetDeployDir, "install_postscript.sh"),
+    ].map((filePath) => replacePatterns(filePath, patterns))
+  );
+
+  const defaultConfPath = path.join(
+    packageDir,
+    "deploy-default/package.conf.yaml"
+  );
+  const targetConfPath = path.join(packageDir, "deploy/package.conf.yaml");
+
+  if (existsSync(defaultConfPath)) {
+    // Todo: merge default conf with dependencies in package json.
+    await copyFile(defaultConfPath, targetConfPath);
+  } else {
+    await writeFile(
+      targetConfPath,
+      `install_path: /usr/local/easyops/bricks/${pkgName}-NB
+user: "easyops:easyops"
+dependencies:
+  - name: brick_next
+    version: ^2.86.3 || ^3.0.0
+    local_deploy: true
+`
+    );
+  }
+}
+
+/**
+ * @param {string} filePath
+ * @param {[string, string][]} replacements
+ */
+async function replacePatterns(filePath, replacements) {
+  const content = await readFile(filePath, "utf-8");
+  const newContent = replacements.reduce(
+    (str, [s, r]) => str.replace(s, r),
+    content
+  );
+  await writeFile(filePath, newContent);
+}

package/template/.pkgbuild/PKGBUILD

@@ -0,0 +1,3 @@
+source "$startdir"/../../../.pkgbuild/@$scope-name$/PKGBUILD
+pkgname=$package-name$-$suffix-name$
+pkgver=0.0.0 # placeholder

package/template/deploy/install_postscript.sh

@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# easyops 安装根目录
+install_base="/usr/local/easyops"
+
+install_path_dir='$install-path-dir$'
+scope_name='$scope-name$'
+plugin_name='$package-name$'
+suffix='$suffix-name$'
+
+install_path="${install_base}/${install_path_dir}/${plugin_name}-${suffix}"
+
+function report_micro_app() {
+  install_base=$1
+  org=$2
+  install_path=$3
+  ${install_base}/python/bin/python ${install_base}/brick_next/packages/brick-container/tools/report_installed_micro_app.py ${org} ${install_path}
+  if [[ $? -ne 0 ]]; then
+      echo "report installed micro app error"
+      exit 1
+  fi
+}
+
+function report_package() {
+  install_base=$1
+  install_path=$2
+  if [[ -f ${install_base}/brick_next/packages/brick-container/tools/report_installed_brick_next_package.py ]];then
+      ${install_base}/python/bin/python ${install_base}/brick_next/packages/brick-container/tools/report_installed_brick_next_package.py ${org} ${install_path}
+      if [[ $? -ne 0 ]]; then
+          echo "report installed micro app error"
+          exit 1
+      fi
+  fi
+}
+
+# 优先取环境变量里面的org
+if [[ ${org}X == X ]]; then
+    org=$(/usr/local/easyops/deploy_init/tools/get_env.py common org)
+    [[ $? -ne 0 ]] && echo "get org error, exit" && exit 1
+fi
+
+# 是否以克隆模式部署(小产品支持多org部署)，如果是的话，不用删除上一个版本的组件目录
+if [[ ${cloned_install_path}X != X ]]; then
+  # 上报当前安装小产品
+  if [[ ${suffix} == "NA" ]]; then
+    report_micro_app ${install_base} ${org} ${cloned_install_path}
+  fi
+  # 上报当前安装小产品
+  if [[ ${suffix} == "NB" || ${suffix} == "NT" ]]; then
+    report_package ${install_base} ${cloned_install_path}
+  fi
+else
+  # 构件目录
+  plugins_dir="${install_base}/brick_next/${scope_name}"
+
+  # 删除上一个版本
+  rm -rf "${plugins_dir:?}/${plugin_name}"
+
+  # 确保存在插件目录
+  mkdir -p "${plugins_dir}"
+  # 这边转换插件的名字，不用 -NB 后缀
+  ln -snf "${install_path}" "${plugins_dir}/${plugin_name}"
+
+  # 上报当前安装小产品
+  if [[ ${suffix} == "NA" ]]; then
+    report_micro_app ${install_base} ${org} ${install_path}
+  fi
+
+  # 上报当前安装小产品
+  if [[ ${suffix} == "NB" || ${suffix} == "NT" ]]; then
+    report_package ${install_base} ${install_path}
+  fi
+
+fi
+
+exit 0
+

package/template/deploy/update_postscript.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# 为保证一致，直接用 install_postscript.sh
+bash ./deploy/install_postscript.sh

package/template/deploy/update_prescript.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# 先清理原有的 index.[hashid].js
+rm -rf ./dist/*