feat: separate packaging for macOS x64 and arm64 architectures (#1389)

* feat: separate packaging for macOS x64 and arm64 architectures

* feat: merge yml script

* fix: outDir

* fix: path

* fix: path

Author: DIYgod

forge.config.ts

@@ -11,6 +11,7 @@ import { FusesPlugin } from "@electron-forge/plugin-fuses"
 import type { ForgeConfig } from "@electron-forge/shared-types"
 import MakerAppImage from "@pengx17/electron-forge-maker-appimage"
 import setLanguages from "electron-packager-languages"
+import yaml from "js-yaml"
 import { rimraf, rimrafSync } from "rimraf"
 
 const artifactRegex = /.*\.(?:exe|dmg|AppImage|zip)$/
@@ -233,20 +234,14 @@ const config: ForgeConfig = {
         return result
       })
       yml.releaseDate = new Date().toISOString()
-      const ymlStr =
-        `version: ${yml.version}\n` +
-        `files:\n${yml.files
-          .map(
-            (file) =>
-              `  - url: ${file.url}\n` +
-              `    sha512: ${file.sha512}\n` +
-              `    size: ${file.size}\n`,
-          )
-          .join("")}releaseDate: ${yml.releaseDate}\n`
 
       const ymlPath = `${path.dirname(makeResults[0].artifacts[0])}/${
         ymlMapsMap[makeResults[0].platform]
       }`
+
+      const ymlStr = yaml.dump(yml, {
+        lineWidth: -1,
+      })
       fs.writeFileSync(ymlPath, ymlStr)
 
       makeResults.push({

package.json

@@ -16,7 +16,7 @@
   "scripts": {
     "analyze:web": "npx vite-bundle-visualizer",
     "build": "electron-vite build && electron-forge make",
-    "build:macos": "electron-vite build && electron-forge make --arch=universal --platform=darwin",
+    "build:macos": "electron-vite build && electron-forge make --arch=x64 --platform=darwin && electron-forge make --arch=arm64 --platform=darwin && tsx scripts/merge-yml.ts",
     "build:web": "rm -rf out/web && vite build",
     "bump": "vv",
     "dedupe:locales": "eslint --fix locales/**/*.json",
@@ -84,6 +84,7 @@
     "fake-indexeddb": "6.0.0",
     "happy-dom": "15.8.0",
     "hono": "4.6.8",
+    "js-yaml": "4.1.0",
     "lint-staged": "15.2.10",
     "nbump": "2.0.7",
     "postcss": "8.4.47",

pnpm-lock.yaml

@@ -0,0 +1,56 @@
+import fs from "node:fs"
+import path from "node:path"
+
+import yaml from "js-yaml"
+
+const outDir = "./out/make"
+
+function findYmlFiles(dir: string): string[] {
+  let results: string[] = []
+  const items = fs.readdirSync(dir)
+
+  items.forEach((item) => {
+    const fullPath = path.join(dir, item)
+    if (fs.statSync(fullPath).isDirectory()) {
+      results = results.concat(findYmlFiles(fullPath))
+    } else if (item.endsWith(".yml")) {
+      results.push(fullPath)
+    }
+  })
+
+  return results
+}
+
+const ymlFiles = findYmlFiles(outDir)
+
+let mergedContent = {
+  version: "",
+  files: [],
+  releaseDate: "",
+}
+
+ymlFiles.forEach((file) => {
+  const fileContent = fs.readFileSync(file, "utf8")
+  const ymlData = yaml.load(fileContent)
+
+  if (!mergedContent.version) {
+    mergedContent.version = ymlData.version
+  }
+
+  mergedContent = {
+    version: ymlData.version,
+    files: mergedContent.files.concat(ymlData.files),
+    releaseDate: ymlData.releaseDate,
+  }
+})
+
+const mergedYml = yaml.dump(mergedContent, {
+  lineWidth: -1,
+})
+fs.mkdirSync(path.join(outDir, "merged"), { recursive: true })
+const mergedFilePath = path.join(outDir, "merged", path.basename(ymlFiles[0]))
+fs.writeFileSync(mergedFilePath, mergedYml)
+
+ymlFiles.forEach((file) => {
+  fs.unlinkSync(file)
+})