fix(desktop): use top level package json for versioning

.github/workflows/desktop.release.reuse.yml

@@ -25,14 +25,17 @@ jobs:
           registry-url: 'https://registry.npmjs.org'
       - run: yarn install
       - run: yarn build:desktop
+      - run: export APP_VERSION=$(node -p "require('./package.json').version")
+
       - name: Compile Mac
         run: yarn run webpack --config desktop.webpack.prod.js
       - name: MacX64
         run: |
-          yarn run electron-builder --mac --x64 --publish=never
+          yarn run electron-builder --mac --x64 --publish=never --c.extraMetadata.version=$APP_VERSION
           node scripts/fixMacZip.js
       - name: MacArm64
-        run: yarn run electron-builder --mac --arm64 --publish=never
+        run: yarn run electron-builder --mac --arm64 --publish=never --c.extraMetadata.version=$APP_VERSION
+
       - name: Upload
         uses: actions/upload-artifact@v3.0.0
         with:
@@ -58,37 +61,41 @@ jobs:
         uses: ruby/setup-ruby@v1
       - name: Install FPM
         run: sudo gem install fpm -f
+
       - run: yarn install
       - run: yarn build:desktop
+
+      - run: export APP_VERSION=$(node -p "require('./package.json').version")
+
       - name: Compile for AppImage
         run: yarn run webpack --config desktop.webpack.prod.js
       - name: AppImage
-        run: yarn run electron-builder --linux --x64 --ia32 -c.linux.target=AppImage --publish=never
+        run: yarn run electron-builder --linux --x64 --ia32 -c.linux.target=AppImage --publish=never --c.extraMetadata.version=$APP_VERSION
       - name: AppImageX64
-        run: yarn run electron-builder --linux --x64 -c.linux.target=AppImage --publish=never
+        run: yarn run electron-builder --linux --x64 -c.linux.target=AppImage --publish=never --c.extraMetadata.version=$APP_VERSION
       - name: AppImageArm64
-        run: yarn run electron-builder --linux --arm64 -c.linux.target=AppImage --publish=never
+        run: yarn run electron-builder --linux --arm64 -c.linux.target=AppImage --publish=never --c.extraMetadata.version=$APP_VERSION
 
       - name: Deb
         run: |
           yarn run webpack --config desktop.webpack.prod.js --env deb
-          yarn run electron-builder --linux --x64 --ia32 -c.linux.target=deb --publish=never
+          yarn run electron-builder --linux --x64 --ia32 -c.linux.target=deb --publish=never --c.extraMetadata.version=$APP_VERSION
       - name: DebArm64
         env:
           npm_config_target_arch: 'arm64'
           USE_SYSTEM_FPM: 'true'
         run: |
           yarn run webpack --config desktop.webpack.prod.js --env deb
-          yarn run electron-builder --linux --arm64 -c.linux.target=deb --publish=never
+          yarn run electron-builder --linux --arm64 -c.linux.target=deb --publish=never --c.extraMetadata.version=$APP_VERSION
 
       - name: Dir
         run: |
           yarn run webpack --config desktop.webpack.prod.js
-          yarn run electron-builder --linux --x64 -c.linux.target=dir --publish=never
+          yarn run electron-builder --linux --x64 -c.linux.target=dir --publish=never --c.extraMetadata.version=$APP_VERSION
       - name: DirArm64
         run: |
           yarn run webpack --config desktop.webpack.prod.js
-          yarn run electron-builder --linux --arm64 -c.linux.target=dir --publish=never
+          yarn run electron-builder --linux --arm64 -c.linux.target=dir --publish=never --c.extraMetadata.version=$APP_VERSION
         env:
           npm_config_target_arch: 'arm64'
 
@@ -96,7 +103,7 @@ jobs:
         run: |
           sudo snap install snapcraft --classic
           yarn run webpack --config desktop.webpack.prod.js --env snap
-          yarn run electron-builder --linux --x64 -c.linux.target=snap --publish=never
+          yarn run electron-builder --linux --x64 -c.linux.target=snap --publish=never --c.extraMetadata.version=$APP_VERSION
 
       - name: Upload
         uses: actions/upload-artifact@v3.0.0
@@ -126,7 +133,8 @@ jobs:
       - run: yarn install
       - run: yarn build:desktop
       - run: yarn run webpack --config desktop.webpack.prod.js
-      - run: yarn run electron-builder --windows --x64 --ia32 --publish=never
+      - run: export APP_VERSION=$(node -p "require('./package.json').version")
+      - run: yarn run electron-builder --windows --x64 --ia32 --publish=never --c.extraMetadata.version=$APP_VERSION
 
       - name: Upload
         uses: actions/upload-artifact@v3.0.0

.github/workflows/desktop.windows.sign.yml

@@ -21,7 +21,8 @@ jobs:
       - run: yarn install
       - run: yarn build:desktop
       - run: yarn run webpack --config desktop.webpack.prod.js
-      - run: yarn run electron-builder --windows --x64 --ia32 --publish=never
+      - run: export APP_VERSION=$(node -p "require('./package.json').version")
+      - run: yarn run electron-builder --windows --x64 --ia32 --publish=never --c.extraMetadata.version=$APP_VERSION
 
       - name: Upload
         uses: actions/upload-artifact@v3.0.0

package.json

@@ -6,7 +6,6 @@
   "workspaces": {
     "packages": [
       "packages/*",
-      "packages/desktop/app",
       "packages/components/src/packages/*"
     ]
   },

packages/desktop/app/package.json

@@ -4,7 +4,6 @@
   "private": true,
   "description": "An end-to-end encrypted notes app for digitalists and professionals.",
   "author": "Standard Notes <help@standardnotes.com>",
-  "version": "3.22.5",
   "main": "./dist/index.js",
   "installConfig": {
     "selfReferences": true

packages/desktop/scripts/fixMacZip.js

@@ -31,7 +31,7 @@ async function getBlockMapInfo(fileName) {
 
 ;(async () => {
   try {
-    const { version } = JSON.parse(await fs.promises.readFile('app/package.json'))
+    const { version } = JSON.parse(await fs.promises.readFile('package.json'))
     const zipName = `standard-notes-${version}-mac-x64.zip`
     const zipPath = `dist/${zipName}`
     console.log(`Removing ${zipPath}`)