Update to version 0.7.7

mayneyao · Oct 12, 2024 · ce1a09a · ce1a09a
1 parent 3ca3336
commit ce1a09a
Show file tree

Hide file tree

Showing 6 changed files with 4,239 additions and 4,929 deletions.
diff --git a/.github/workflows/build-and-release-desktop-app.yml b/.github/workflows/build-and-release-desktop-app.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v2
         with:
-          version: 8
+          version: 9
 
       - name: Download and extract libsimple
         run: |

diff --git a/.github/workflows/build-and-release-windows-app.yml b/.github/workflows/build-and-release-windows-app.yml
@@ -20,7 +20,34 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v2
         with:
-          version: 8
+          version: 9
+
+      - name: Locate and modify pnpm.cjs
+        run: |
+          # https://github.com/pnpm/pnpm/issues/5638#issuecomment-1327988206 
+          # Get the path of pnpm.ps1
+          $pnpmPs1Path = (Get-Command pnpm).Source
+          Write-Host "pnpm.ps1 path: $pnpmPs1Path"
+          
+          # Get the base directory
+          $basedir = Split-Path $pnpmPs1Path -Parent
+          Write-Host "Base directory: $basedir"
+          
+          # Construct the path to pnpm.cjs
+          $pnpmCjsPath = Join-Path $basedir "node_modules\pnpm\bin\pnpm.cjs"
+          Write-Host "Inferred pnpm.cjs path: $pnpmCjsPath"
+          
+          if (Test-Path $pnpmCjsPath) {
+            Write-Host "pnpm.cjs file found"
+            # Read the content, modify the first line, and write it back
+            $content = Get-Content $pnpmCjsPath
+            $content[0] = "#!node"
+            $content | Set-Content $pnpmCjsPath
+            Write-Host "pnpm.cjs file has been modified"
+          } else {
+            Write-Error "pnpm.cjs file not found"
+          }
+        shell: pwsh
 
       - name: Download and extract libsimple
         run: |
@@ -33,7 +60,7 @@ jobs:
             New-Item -ItemType Directory -Name dist-simple
             Move-Item libsimple* dist-simple/
           }
-          # 重命名 simple.dll 为 libsimple.dll
+          # rename simple.dll to libsimple.dll
           Rename-Item -Path "dist-simple/simple.dll" -NewName "libsimple.dll"
           Get-ChildItem -Recurse dist-simple
         shell: pwsh

diff --git a/lib/env.ts b/lib/env.ts
@@ -1,5 +1,5 @@
 export const logger = console
-export const EIDOS_VERSION = "0.7.6"
+export const EIDOS_VERSION = "0.7.7"
 export const isDevMode = import.meta.env?.MODE === "development"
 export const isSelfHosted = import.meta.env?.VITE_EIDOS_SELF_HOSTED === "true"
 export const isInkServiceMode =

diff --git a/package.json b/package.json
@@ -1,13 +1,12 @@
 {
   "name": "eidos",
-  "version": "0.7.6",
+  "version": "0.7.7",
   "private": true,
   "type": "module",
   "description": "Eidos is an extensible framework for managing your personal data throughout your lifetime in one place.",
   "author": "mayneyao",
   "scripts": {
     "dev": "vite",
-    "rebuild": "electron-rebuild -f -w better-sqlite3",
     "build": "pnpm recursive run build && tsc && vite build",
     "build:self-host": "pnpm recursive run build && tsc && vite build --mode self-host",
     "dev:ink": "cross-env EIDOS_SERVICE_MODE=ink vite --mode ink",
@@ -27,7 +26,8 @@
     "major": "node scripts/version.cjs major",
     "test": "vitest",
     "start-electron": "electron .",
-    "pkg:desktop": "cross-env BUILD_MODE=1 electron-builder --publish never"
+    "pkg:desktop": "cross-env BUILD_MODE=1 electron-builder --publish never",
+    "postinstall": "electron-builder install-app-deps"
   },
   "start": "electron .",
   "main": "dist-electron/main.js",
@@ -63,7 +63,10 @@
       }
     ],
     "win": {
-      "target": "nsis"
+      "target": [
+        "nsis",
+        "zip"
+      ]
     },
     "afterSign": "scripts/notarize.cjs",
     "mac": {
@@ -220,6 +223,8 @@
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20240806.0",
+    "@electron/notarize": "^2.5.0",
+    "@electron/rebuild": "^3.7.0",
     "@ianvs/prettier-plugin-sort-imports": "^3.7.2",
     "@rollup/plugin-commonjs": "^26.0.1",
     "@rollup/plugin-esm-shim": "^0.1.7",
@@ -250,7 +255,6 @@
     "dotenv": "^16.4.5",
     "electron": "^32.0.1",
     "electron-builder": "^24.13.3",
-    "electron-notarize": "^1.2.2",
     "esbuild": "^0.23.0",
     "eslint": "^8.44.0",
     "eslint-config-prettier": "^8.8.0",