fix: remove msi builder, to fix node-gyp failed to rebuild @bitdisaster/exe-icon-extractor

.github/workflows/release.yml

@@ -215,8 +215,8 @@ jobs:
       - name: Install dependencies
         run: pnpm install --no-frozen-lockfile
         
-      - name: Add msi to path
+      # - name: Add msi to path
-        run: echo "${env:wix}bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+      #   run: echo "${env:wix}bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
       # Enable x32 if someone still need it
       # - name: Make Windows (ia32)
       #   run: pnpm run make:win-ia32
@@ -238,10 +238,10 @@ jobs:
           CI: true
           CI_PULL_REQUEST: ${{ github.event_name == 'pull_request' }}
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Rename (x64)
+      # - name: Rename (x64)
-        run: |
+      #   run: |
-          Get-ChildItem out/make/wix/x64
+      #     Get-ChildItem out/make/wix/x64
-          Rename-Item -Path "out/make/wix/x64/TidGi.msi" -NewName "Install-TidGi-Windows-x64.msi"
+      #     Rename-Item -Path "out/make/wix/x64/TidGi.msi" -NewName "Install-TidGi-Windows-x64.msi"
       - name: Make Windows (arm64)
         run: pnpm run make:win-arm
         env:
@@ -250,10 +250,10 @@ jobs:
           CI: true
           CI_PULL_REQUEST: ${{ github.event_name == 'pull_request' }}
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Rename (arm64)
+      # - name: Rename (arm64)
-        run: |
+      #   run: |
-          Get-ChildItem out/make/wix/arm64
+      #     Get-ChildItem out/make/wix/arm64
-          Rename-Item -Path "out/make/wix/arm64/TidGi.msi" -NewName "Install-TidGi-Windows-arm64.msi"
+      #     Rename-Item -Path "out/make/wix/arm64/TidGi.msi" -NewName "Install-TidGi-Windows-arm64.msi"
 
       - name: Create Release
         uses: softprops/action-gh-release@v1
@@ -261,9 +261,9 @@ jobs:
         with:
           draft: true
           generate_release_notes: true
+          # out/make/**/*.msi
           files: |
             out/make/**/*.exe
-            out/make/**/*.msi
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

forge.config.js

@@ -46,27 +46,28 @@ const config = {
         };
       },
     },
-    {
+    //  ✖ Preparing native dependencies: 0 / 1 [FAILED: node-gyp failed to rebuild '/Users/runner/work/TidGi-Desktop/TidGi-Desktop/node_modules/.pnpm/@bitdisaster+exe-icon-extractor@1.0.10/node_modules/@bitdisaster/exe-icon-extractor']
-      name: '@electron-forge/maker-wix',
+    // {
-      config: (arch) => {
+    //   name: '@electron-forge/maker-wix',
-        return {
+    //   config: (arch) => {
-          language: 1033,
+    //     return {
-          manufacturer: 'tiddlywiki.org',
+    //       language: 1033,
-          programFilesFolderName: 'TiddlyWiki',
+    //       manufacturer: 'tiddlywiki.org',
-          shortcutFolderName: 'TiddlyWiki',
+    //       programFilesFolderName: 'TiddlyWiki',
-          description,
+    //       shortcutFolderName: 'TiddlyWiki',
-          exe: 'TidGi',
+    //       description,
-          name: 'TidGi',
+    //       exe: 'TidGi',
-          ui: {
+    //       name: 'TidGi',
-            chooseDirectory: true,
+    //       ui: {
-          },
+    //         chooseDirectory: true,
-          appIconPath: 'build-resources/icon.ico',
+    //       },
-          // WiX distributables do not handle prerelease information in the app version, removing it from the MSI (-prerelease3.4)
+    //       appIconPath: 'build-resources/icon.ico',
-          // and https://github.com/felixrieseberg/electron-wix-msi/issues/110 ask use to use fixed number
+    //       // WiX distributables do not handle prerelease information in the app version, removing it from the MSI (-prerelease3.4)
-          version: '1.0.0',
+    //       // and https://github.com/felixrieseberg/electron-wix-msi/issues/110 ask use to use fixed number
-        };
+    //       version: '1.0.0',
-      },
+    //     };
-    },
+    //   },
+    // },
     {
       name: '@electron-forge/maker-zip',
       platforms: ['darwin'],

package.json

@@ -83,8 +83,6 @@
     "@electron-forge/maker-rpm": "7.4.0",
     "@electron-forge/maker-snap": "7.4.0",
     "@electron-forge/maker-squirrel": "7.4.0",
-    "@electron-forge/maker-wix": "7.4.0",
-    "electron-wix-msi": "^5.1.3",
     "@electron-forge/maker-zip": "7.4.0",
     "registry-js": "1.16.0"
   },

pnpm-lock.yaml

@@ -165,15 +165,9 @@ importers:
       '@electron-forge/maker-squirrel':
         specifier: 7.4.0
         version: 7.4.0
-      '@electron-forge/maker-wix':
-        specifier: 7.4.0
-        version: 7.4.0
       '@electron-forge/maker-zip':
         specifier: 7.4.0
         version: 7.4.0
-      electron-wix-msi:
-        specifier: ^5.1.3
-        version: 5.1.3
       registry-js:
         specifier: 1.16.0
         version: 1.16.0
@@ -459,9 +453,6 @@ packages:
     resolution: {integrity: sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==}
     engines: {node: '>=6.9.0'}
 
-  '@bitdisaster/exe-icon-extractor@1.0.10':
-    resolution: {integrity: sha512-iTZ8cVGZ5dglNRyFdSj8U60mHIrC8XNIuOHN/NkM5/dQP4nsmpyqeQTAADLLQgoFCNJD+DiwQCv8dR2cCeWP4g==}
-
   '@colors/colors@1.5.0':
     resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==}
     engines: {node: '>=0.1.90'}
@@ -688,10 +679,6 @@ packages:
     resolution: {integrity: sha512-mCQyufnSNfjffiKho59ZqVg4W601zGOl6h01OyfDwjOU/G4iQtpnnDEOXGe26q7OVT5ORb1WDnfyGgBeJ6Ge7g==}
     engines: {node: '>= 16.4.0'}
 
-  '@electron-forge/maker-wix@7.4.0':
-    resolution: {integrity: sha512-+a5zNh/e8/aguDT7Ya+hEsKkkV7VSSaaB45RaA4ahI91bx/mRAWEhGQjnqakGkSAZkRzM6n37Tedx3wz0/2H4A==}
-    engines: {node: '>= 16.4.0'}
-
   '@electron-forge/maker-zip@7.4.0':
     resolution: {integrity: sha512-UGbMdpuK/P29x1FFRWNOs3bNz+7QNFWVWyTM5hcWqib66cNuUmoaPifQyuwW2POIrIohrxlzLK87/i9Zc8g4dA==}
     engines: {node: '>= 16.4.0'}
@@ -2802,10 +2789,6 @@ packages:
     resolution: {integrity: sha512-ml77/OmeeLFFc+dk3YCwPQrl8rthwYcAea6mMZPFq7cGXlpWyRmmT0LY73XdCukPnevguXJFs+4Xu+aGHJwFDA==}
     engines: {node: '>=8.0.0'}
 
-  electron-wix-msi@5.1.3:
-    resolution: {integrity: sha512-EYj1cm1nZoVHmIIx3o0aKt784lxdEpJnXbEnyypklUCnglqSb7ni+1xi1Vp/gtrGS/mzIxnWBT+x5fIfuDjhvA==}
-    engines: {node: '>=14.0.0'}
-
   electron@31.1.0:
     resolution: {integrity: sha512-TBOwqLxSxnx6+pH6GMri7R3JPH2AkuGJHfWZS0p1HsmN+Qr1T9b0IRJnnehSd/3NZAmAre4ft9Ljec7zjyKFJA==}
     engines: {node: '>= 12.20.55'}
@@ -4099,10 +4082,6 @@ packages:
     resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
     engines: {node: '>=0.10.0'}
 
-  klaw@4.1.0:
-    resolution: {integrity: sha512-1zGZ9MF9H22UnkpVeuaGKOjfA2t6WrfdrJmGjy16ykcjnKQDmHVX+KI477rpbGevz/5FD4MC3xf1oxylBgcaQw==}
-    engines: {node: '>=14.14.0'}
-
   knuth-shuffle-seeded@1.0.6:
     resolution: {integrity: sha512-9pFH0SplrfyKyojCLxZfMcvkhf5hH0d+UwR9nTVJ/DDQJGuzcXjTwB7TP7sDfehSudlGGaOLblmEWqv04ERVWg==}
 
@@ -5018,9 +4997,6 @@ packages:
     resolution: {integrity: sha512-bZdaQi34krFWhrDn+O53ccBDw0MkAT2Vhu75SqhtvhQu4OPyFM4RoVheyYiVQYdjhUi6EJMVWQ0tR6bCIYVkUg==}
     engines: {node: '>= 14.0.0'}
 
-  rcinfo@0.1.3:
-    resolution: {integrity: sha512-c2XV2aYgY7x3BscO+/B/nCTtMvnclZ8w5D7R6zgK4sGOQnE0MjlXhOPynno7yp6Iw1RPNSXBwXwB1svZVRfcSw==}
-
   react-dom@18.3.1:
     resolution: {integrity: sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==}
     peerDependencies:
@@ -6400,9 +6376,6 @@ snapshots:
       '@babel/helper-validator-identifier': 7.22.20
       to-fast-properties: 2.0.0
 
-  '@bitdisaster/exe-icon-extractor@1.0.10':
-    optional: true
-
   '@colors/colors@1.5.0': {}
 
   '@colors/colors@1.6.0': {}
@@ -6732,18 +6705,6 @@ snapshots:
       - supports-color
     optional: true
 
-  '@electron-forge/maker-wix@7.4.0':
-    dependencies:
-      '@electron-forge/maker-base': 7.4.0
-      '@electron-forge/shared-types': 7.4.0
-      chalk: 4.1.2
-      electron-wix-msi: 5.1.3
-      log-symbols: 4.1.0
-      parse-author: 2.0.0
-    transitivePeerDependencies:
-      - supports-color
-    optional: true
-
   '@electron-forge/maker-zip@7.4.0':
     dependencies:
       '@electron-forge/maker-base': 7.4.0
@@ -9254,22 +9215,6 @@ snapshots:
       - supports-color
     optional: true
 
-  electron-wix-msi@5.1.3:
-    dependencies:
-      '@electron/windows-sign': 1.1.2
-      debug: 4.3.4(supports-color@8.1.1)
-      fs-extra: 10.1.0
-      klaw: 4.1.0
-      lodash: 4.17.21
-      rcedit: 4.0.1
-      rcinfo: 0.1.3
-      semver: 7.6.2
-    optionalDependencies:
-      '@bitdisaster/exe-icon-extractor': 1.0.10
-    transitivePeerDependencies:
-      - supports-color
-    optional: true
-
   electron@31.1.0:
     dependencies:
       '@electron/get': 2.0.2
@@ -10910,9 +10855,6 @@ snapshots:
 
   kind-of@6.0.3: {}
 
-  klaw@4.1.0:
-    optional: true
-
   knuth-shuffle-seeded@1.0.6:
     dependencies:
       seed-random: 2.2.0
@@ -11843,9 +11785,6 @@ snapshots:
     dependencies:
       cross-spawn-windows-exe: 1.2.0
 
-  rcinfo@0.1.3:
-    optional: true
-
   react-dom@18.3.1(react@18.3.1):
     dependencies:
       loose-envify: 1.4.0