chore(release): version 0.36.0

.github/workflows/build.yml

@@ -104,35 +104,6 @@ jobs:
         name: mac-b${{ github.run_number }}-arm64
         path: |
           xmcl-electron-app/build/output/mac-arm64/
-    - name: Prepare Windows Asar
-      if: ${{ runner.os == 'Windows' && startsWith(github.event.head_commit.message, 'chore(release)') }} 
-      run: |
-        mkdir asar
-        mv xmcl-electron-app/build/output/app.asar asar/app-win.asar
-        mv xmcl-electron-app/build/output/app.asar.sha256 asar/app-win.asar.sha256
-    - name: Prepare macOS Asar
-      if: ${{ runner.os == 'macOS' && startsWith(github.event.head_commit.message, 'chore(release)') }} 
-      run: |
-        mkdir asar
-        mv "xmcl-electron-app/build/output/app.asar" asar/app-mac.asar
-        mv "xmcl-electron-app/build/output/app-arm64.asar" asar/app-mac-arm64.asar
-        mv "xmcl-electron-app/build/output/app.asar.sha256" asar/app-mac.asar.sha256
-        mv "xmcl-electron-app/build/output/app-arm64.asar.sha256" asar/app-mac-arm64.asar.sha256
-    - name: Prepare Linux Asar
-      if: ${{ runner.os == 'Linux' && startsWith(github.event.head_commit.message, 'chore(release)') }} 
-      run: |
-        mkdir asar
-        mv xmcl-electron-app/build/output/app.asar asar/app-linux.asar
-        mv xmcl-electron-app/build/output/app-arm64.asar asar/app-linux-arm64.asar
-        mv xmcl-electron-app/build/output/app.asar.sha256 asar/app-linux.asar.sha256
-        mv xmcl-electron-app/build/output/app-arm64.asar.sha256 asar/app-linux-arm64.asar.sha256
-    - name: Upload Asar
-      if: ${{ startsWith(github.event.head_commit.message, 'chore(release)') }} 
-      uses: actions/upload-artifact@v3
-      with:
-        name: build
-        path: |
-          asar/*.*
 
   prepare-release:
     runs-on: ubuntu-latest
@@ -231,18 +202,6 @@ jobs:
         git config user.email [email protected]
         git tag -f ${{ steps.prepare_release.outputs.tag }}
         git push origin tag ${{ steps.prepare_release.outputs.tag }} -f
-    - name: Rename asar
-      run: |
-        mv ./build/app-win.asar ./build/app-${{ steps.prepare_release.outputs.version }}-win.asar
-        mv ./build/app-mac.asar ./build/app-${{ steps.prepare_release.outputs.version }}-mac.asar
-        mv ./build/app-mac-arm64.asar ./build/app-${{ steps.prepare_release.outputs.version }}-mac-arm64.asar
-        mv ./build/app-linux.asar ./build/app-${{ steps.prepare_release.outputs.version }}-linux.asar
-        mv ./build/app-linux-arm64.asar ./build/app-${{ steps.prepare_release.outputs.version }}-linux-arm64.asar
-        mv ./build/app-win.asar.sha256 ./build/app-${{ steps.prepare_release.outputs.version }}-win.asar.sha256
-        mv ./build/app-mac.asar.sha256 ./build/app-${{ steps.prepare_release.outputs.version }}-mac.asar.sha256
-        mv ./build/app-mac-arm64.asar.sha256 ./build/app-${{ steps.prepare_release.outputs.version }}-mac-arm64.asar.sha256
-        mv ./build/app-linux.asar.sha256 ./build/app-${{ steps.prepare_release.outputs.version }}-linux.asar.sha256
-        mv ./build/app-linux-arm64.asar.sha256 ./build/app-${{ steps.prepare_release.outputs.version }}-linux-arm64.asar.sha256
     - name: Emit Version File
       run: |
         echo ${{ steps.prepare_release.outputs.version }}.${{ github.run_number }} > ./build/version

README.md

@@ -68,7 +68,8 @@ For i18n localization developer, please follow [Getting Started with Localizatio
 
 <!-- afdian-start -->
 <div style="display: flex; align-items: center; justify-items:center; gap: 0.2em; flex-wrap: wrap;">
-<a title="Vulcankta: ￥390.00" href="https://afdian.net/u/9d663ec6fb6711ec9ace52540025c377"> <img width="100" height="100" style="border-radius: 100%" src="https://pic1.afdiancdn.com/user/9d663ec6fb6711ec9ace52540025c377/avatar/22b173dd893745d7a9e8431a0d91b3e3_w7680_h8128_s5344.png"> </a>
+<a title="爱发电用户_9d663: ￥390.00" href="https://afdian.net/u/9d663ec6fb6711ec9ace52540025c377"> <img width="100" height="100" style="border-radius: 100%" src="https://pic1.afdiancdn.com/default/avatar/avatar-purple.png?imageView2/1/"> </a>
+<a title="爱发电用户_19e29: ￥300.00" href="https://afdian.net/u/19e292c21a1d11ee929a52540025c377"> <img width="100" height="100" style="border-radius: 100%" src="https://pic1.afdiancdn.com/default/avatar/avatar-purple.png?imageView2/1/"> </a>
 <a title="ahdg: ￥180.00" href="https://afdian.net/u/dd9058ce20df11eba5c052540025c377"> <img width="70" height="70" style="border-radius: 100%" src="https://pic1.afdiancdn.com/user/dd9058ce20df11eba5c052540025c377/avatar/0c776e6de1b1027e951c6d94919eb781_w1280_h1024_s364.jpg"> </a>
 <a title="Kandk: ￥30.00" href="https://afdian.net/u/404b86a078e111ecab3652540025c377"> <img width="50" height="50" style="border-radius: 100%" src="https://pic1.afdiancdn.com/user/404b86a078e111ecab3652540025c377/avatar/dfa3e35a696d8d8af5425dd400d68a8d_w607_h527_s432.png"> </a>
 <a title="白雨 楠: ￥30.00" href="https://afdian.net/u/7f6ad7161b3e11eb8d0e52540025c377"> <img width="50" height="50" style="border-radius: 100%" src="https://pic1.afdiancdn.com/user/7f6ad7161b3e11eb8d0e52540025c377/avatar/1fa3b75648a15aea8da202c6108d659b_w1153_h1153_s319.jpeg"> </a>
@@ -77,7 +78,7 @@ For i18n localization developer, please follow [Getting Started with Localizatio
 <a title="染川瞳: ￥5.00" href="https://afdian.net/u/89b1218c86e011eaa4d152540025c377"> <img width="50" height="50" style="border-radius: 100%" src="https://pic1.afdiancdn.com/user/89b1218c86e011eaa4d152540025c377/avatar/9bf08f81d231f3054c98f9e5c1c8ce40_w640_h640_s57.jpg"> </a>
 <a title="爱发电用户_CvQb: ￥5.00" href="https://afdian.net/u/177bea3cf47211ec990352540025c377"> <img width="50" height="50" style="border-radius: 100%" src="https://pic1.afdiancdn.com/default/avatar/avatar-purple.png"> </a>
 <a title="水合: ￥5.00" href="https://afdian.net/u/039508f2b17d11ebad1052540025c377"> <img width="50" height="50" style="border-radius: 100%" src="https://pic1.afdiancdn.com/default/avatar/avatar-orange.png"> </a>
-<a title="已注销: ￥5.00" href="https://afdian.net/u/0c5c865e08ee11ecba1352540025c377"> <img width="50" height="50" style="border-radius: 100%" src="https://pic1.afdiancdn.com/user/0c5c865e08ee11ecba1352540025c377/avatar/b7ae9f15fc461e68c4b9a853ee966a27_w448_h448_s290.png"> </a>
+<a title="爱发电用户_0c5c8: ￥5.00" href="https://afdian.net/u/0c5c865e08ee11ecba1352540025c377"> <img width="50" height="50" style="border-radius: 100%" src="https://pic1.afdiancdn.com/default/avatar/avatar-purple.png?imageView2/1/"> </a>
 <a title="DIO: ￥5.00" href="https://afdian.net/u/7ac297b4722211eab4a752540025c377"> <img width="50" height="50" style="border-radius: 100%" src="https://pic1.afdiancdn.com/default/avatar/avatar-purple.png"> </a>
 <a title="爱发电用户_DJpu: ￥5.00" href="https://afdian.net/u/8c23a236cf7311ec9c3452540025c377"> <img width="50" height="50" style="border-radius: 100%" src="https://pic1.afdiancdn.com/default/avatar/avatar-purple.png"> </a>
 </div>

README.zh.md

@@ -68,7 +68,8 @@ winget install CI010.XMinecraftLauncher
 
 <!-- afdian-start -->
 <div style="display: flex; align-items: center; justify-items:center; gap: 0.2em; flex-wrap: wrap;">
-<a title="Vulcankta: ￥390.00" href="https://afdian.net/u/9d663ec6fb6711ec9ace52540025c377"> <img width="100" height="100" style="border-radius: 100%" src="https://pic1.afdiancdn.com/user/9d663ec6fb6711ec9ace52540025c377/avatar/22b173dd893745d7a9e8431a0d91b3e3_w7680_h8128_s5344.png"> </a>
+<a title="爱发电用户_9d663: ￥390.00" href="https://afdian.net/u/9d663ec6fb6711ec9ace52540025c377"> <img width="100" height="100" style="border-radius: 100%" src="https://pic1.afdiancdn.com/default/avatar/avatar-purple.png?imageView2/1/"> </a>
+<a title="爱发电用户_19e29: ￥300.00" href="https://afdian.net/u/19e292c21a1d11ee929a52540025c377"> <img width="100" height="100" style="border-radius: 100%" src="https://pic1.afdiancdn.com/default/avatar/avatar-purple.png?imageView2/1/"> </a>
 <a title="ahdg: ￥180.00" href="https://afdian.net/u/dd9058ce20df11eba5c052540025c377"> <img width="70" height="70" style="border-radius: 100%" src="https://pic1.afdiancdn.com/user/dd9058ce20df11eba5c052540025c377/avatar/0c776e6de1b1027e951c6d94919eb781_w1280_h1024_s364.jpg"> </a>
 <a title="Kandk: ￥30.00" href="https://afdian.net/u/404b86a078e111ecab3652540025c377"> <img width="50" height="50" style="border-radius: 100%" src="https://pic1.afdiancdn.com/user/404b86a078e111ecab3652540025c377/avatar/dfa3e35a696d8d8af5425dd400d68a8d_w607_h527_s432.png"> </a>
 <a title="白雨 楠: ￥30.00" href="https://afdian.net/u/7f6ad7161b3e11eb8d0e52540025c377"> <img width="50" height="50" style="border-radius: 100%" src="https://pic1.afdiancdn.com/user/7f6ad7161b3e11eb8d0e52540025c377/avatar/1fa3b75648a15aea8da202c6108d659b_w1153_h1153_s319.jpeg"> </a>
@@ -77,7 +78,7 @@ winget install CI010.XMinecraftLauncher
 <a title="染川瞳: ￥5.00" href="https://afdian.net/u/89b1218c86e011eaa4d152540025c377"> <img width="50" height="50" style="border-radius: 100%" src="https://pic1.afdiancdn.com/user/89b1218c86e011eaa4d152540025c377/avatar/9bf08f81d231f3054c98f9e5c1c8ce40_w640_h640_s57.jpg"> </a>
 <a title="爱发电用户_CvQb: ￥5.00" href="https://afdian.net/u/177bea3cf47211ec990352540025c377"> <img width="50" height="50" style="border-radius: 100%" src="https://pic1.afdiancdn.com/default/avatar/avatar-purple.png"> </a>
 <a title="水合: ￥5.00" href="https://afdian.net/u/039508f2b17d11ebad1052540025c377"> <img width="50" height="50" style="border-radius: 100%" src="https://pic1.afdiancdn.com/default/avatar/avatar-orange.png"> </a>
-<a title="已注销: ￥5.00" href="https://afdian.net/u/0c5c865e08ee11ecba1352540025c377"> <img width="50" height="50" style="border-radius: 100%" src="https://pic1.afdiancdn.com/user/0c5c865e08ee11ecba1352540025c377/avatar/b7ae9f15fc461e68c4b9a853ee966a27_w448_h448_s290.png"> </a>
+<a title="爱发电用户_0c5c8: ￥5.00" href="https://afdian.net/u/0c5c865e08ee11ecba1352540025c377"> <img width="50" height="50" style="border-radius: 100%" src="https://pic1.afdiancdn.com/default/avatar/avatar-purple.png?imageView2/1/"> </a>
 <a title="DIO: ￥5.00" href="https://afdian.net/u/7ac297b4722211eab4a752540025c377"> <img width="50" height="50" style="border-radius: 100%" src="https://pic1.afdiancdn.com/default/avatar/avatar-purple.png"> </a>
 <a title="爱发电用户_DJpu: ￥5.00" href="https://afdian.net/u/8c23a236cf7311ec9c3452540025c377"> <img width="50" height="50" style="border-radius: 100%" src="https://pic1.afdiancdn.com/default/avatar/avatar-purple.png"> </a>
 </div>

package.json

@@ -1,5 +1,5 @@
 {
-    "version": "0.35.19",
+    "version": "0.36.0",
     "private": true,
     "license": "MIT",
     "packageManager": "[email protected]",

xmcl-electron-app/build.ts

@@ -3,17 +3,17 @@ import chalk from 'chalk'
 import { createHash } from 'crypto'
 import { Configuration, build as electronBuilder } from 'electron-builder'
 import { BuildOptions, build as esbuild } from 'esbuild'
-import { createReadStream, createWriteStream } from 'fs'
+import { createReadStream, createWriteStream, existsSync } from 'fs'
 import { copy, ensureFile } from 'fs-extra'
 import { copyFile, readdir, rm, stat } from 'fs/promises'
-import path, { resolve } from 'path'
+import path, { join, resolve } from 'path'
+import createPrintPlugin from 'plugins/esbuild.print.plugin'
 import { pipeline } from 'stream'
 import { promisify } from 'util'
 import { buildAppInstaller } from './build/appinstaller-builder'
 import { config as electronBuilderConfig } from './build/electron-builder.config'
 import esbuildConfig from './esbuild.config'
 import { version } from './package.json'
-import createPrintPlugin from 'plugins/esbuild.print.plugin'
 
 /**
  * @returns Hash string
@@ -101,6 +101,22 @@ async function start() {
       const time = await buildMain(esbuildConfig, true)
       console.log(`  ${chalk.blue('•')} compiled main process & preload in ${chalk.blue('time')}=${time}s`)
     },
+    async beforePack(context) {
+      const suffix = context.arch === 3 ? '-arm64' : context.arch === 0 ? '-ia32' : ''
+      const platformName = (process.platform === 'win32' ? 'win' : process.platform === 'darwin' ? 'mac' : 'linux') + suffix
+
+      const dest = `build/output/app-${version}-${platformName}.asar`
+      const destSha256 = dest + '.sha256'
+      let src = join(context.appOutDir, 'resources/app.asar')
+      if (!existsSync(src)) {
+        src = join(context.appOutDir, 'Resources/app.asar')
+      } else {
+        console.log(`  ${chalk.yellow('•')} fallback to ${chalk.yellow('Resources/app.asar')} for ${chalk.yellow('resources/app.asar')} not found`)
+      }
+      await copyFile(src, dest)
+      await writeHash('sha256', dest, destSha256)
+      console.log(`  ${chalk.blue('•')} prepare asar with checksum ${chalk.blue('from')}=${src} ${chalk.blue('to')}=${dest}`)
+    },
     async artifactBuildStarted(context) {
       if (context.targetPresentableName.toLowerCase() === 'appx') {
         console.log(`  ${chalk.blue('•')} copy appx icons`)

xmcl-electron-app/main/utils/updater.ts

@@ -33,9 +33,10 @@ export class DownloadAsarUpdateTask extends DownloadTask {
     version = version.startsWith('v') ? version.substring(1) : version
     const pl = platform()
     let platformFlag = pl === 'win32' ? 'win' : pl === 'darwin' ? 'mac' : 'linux'
-    const isArm = process.arch === 'arm64'
-    if (isArm) {
+    if (process.arch === 'arm64') {
       platformFlag += '-arm64'
+    } else if (process.arch === 'ia32') {
+      platformFlag += '-ia32'
     }
     super({
       url: [

xmcl-electron-app/package.json

@@ -2,7 +2,7 @@
     "name": "xmcl",
     "private": true,
     "main": "./index.js",
-    "version": "0.35.19",
+    "version": "0.36.0",
     "author": "ci010 <[email protected]>",
     "description": "A great minecraft launcher in the future",
     "license": "MIT",

xmcl-keystone-ui/package.json

@@ -2,7 +2,7 @@
     "name": "@xmcl/keystone-ui",
     "private": true,
     "productName": "xmcl",
-    "version": "0.34.15",
+    "version": "0.35.0",
     "author": "ci010 <[email protected]>",
     "description": "A great minecraft launcher in the future",
     "license": "MIT",

xmcl-runtime-api/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xmcl/runtime-api",
-    "version": "0.19.5",
+    "version": "0.20.0",
     "author": "ci010 <[email protected]>",
     "description": "Shared API for between launcher renderer & main process",
     "license": "MIT",

xmcl-runtime/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@xmcl/runtime",
     "private": true,
-    "version": "0.33.15",
+    "version": "0.34.0",
     "author": "ci010 <[email protected]>",
     "description": "The runtime for x minecraft launcher in nodejs",
     "license": "MIT",