From c722a88d747562f507894f650b1833d5ad139582 Mon Sep 17 00:00:00 2001 From: Alphrag <34252790+Alphrag@users.noreply.github.com> Date: Mon, 14 Oct 2024 19:30:13 +0100 Subject: [PATCH] Upgrade notarize and electron-updater --- .github/workflows/builds.yml | 2 + build-helpers/notarize.js | 2 +- package.json | 4 +- pnpm-lock.yaml | 113 ++++++++++++++++++++++++++--------- 4 files changed, 90 insertions(+), 31 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 828a710a77..4109030949 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -5,6 +5,7 @@ # 'FERDIUM_PUBLISH_TOKEN' (A GitHub Personal Access Token with appropriate permissions - for publishing the built artifacts) # 'APPLEID' (The username of your Apple developer account - for notarizing the mac artifacts) # 'APPLEID_PASSWORD' (An app-specific password - for notarizing the mac artifacts) +# 'APPLE_TEAM_ID' (The TeamID in your Apple developer account - for notarizing the mac artifacts) # 'CSC_LINK' (The HTTPS link or local path to certificate - for code signing of mac artifacts) # 'CSC_KEY_PASSWORD' (The password to decrypt the certificate given in CSC_LINK - for code signing of mac artifacts) # 'WIN_CSC_LINK' (The HTTPS link or local path to certificate - for code signing of windows artifacts) @@ -207,6 +208,7 @@ jobs: CSC_IDENTITY_AUTO_DISCOVERY: true APPLEID: ${{ secrets.APPLEID }} APPLEID_PASSWORD: ${{ secrets.APPLEID_PASSWORD }} + APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} CSC_LINK: ${{ secrets.CSC_LINK }} CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} run: pnpm build --publish always diff --git a/build-helpers/notarize.js b/build-helpers/notarize.js index e3fece0b32..479a8cebf0 100644 --- a/build-helpers/notarize.js +++ b/build-helpers/notarize.js @@ -17,7 +17,7 @@ exports.default = async function notarizing(context) { await notarize({ tool: 'notarytool', appPath: `${appOutDir}/${appName}.app`, - teamId: '55E9FPJ93P', + teamId: process.env.APPLE_TEAM_ID || '', appleId: process.env.APPLEID || '', appleIdPassword: process.env.APPLEID_PASSWORD || '', }); diff --git a/package.json b/package.json index b771882454..fc4cf29aee 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "electron-dl": "3.5.2", "electron-find": "1.0.7", "electron-react-titlebar": "1.2.1", - "electron-updater": "6.2.1", + "electron-updater": "6.3.9", "electron-window-state": "5.0.3", "fast-folder-size": "2.2.0", "fs-extra": "11.2.0", @@ -135,7 +135,7 @@ "@biomejs/biome": "1.6.1", "@commitlint/cli": "19.3.0", "@commitlint/config-conventional": "19.2.2", - "@electron/notarize": "2.3.2", + "@electron/notarize": "2.5.0", "@eslint-react/eslint-plugin": "1.5.12", "@formatjs/cli": "6.2.12", "@jest/types": "29.6.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7825ce121e..b88b9b9410 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -105,8 +105,8 @@ importers: specifier: 1.2.1 version: 1.2.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) electron-updater: - specifier: 6.2.1 - version: 6.2.1 + specifier: 6.3.9 + version: 6.3.9 electron-window-state: specifier: 5.0.3 version: 5.0.3 @@ -269,8 +269,8 @@ importers: specifier: 19.2.2 version: 19.2.2 '@electron/notarize': - specifier: 2.3.2 - version: 2.3.2 + specifier: 2.5.0 + version: 2.5.0 '@eslint-react/eslint-plugin': specifier: 1.5.12 version: 1.5.12(@typescript-eslint/parser@7.10.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5) @@ -836,8 +836,8 @@ packages: resolution: {integrity: sha512-aL+bFMIkpR0cmmj5Zgy0LMKEpgy43/hw5zadEArgmAMWWlKc5buwFvFT9G/o/YJkvXAJm5q3iuTuLaiaXW39sg==} engines: {node: '>= 10.0.0'} - '@electron/notarize@2.3.2': - resolution: {integrity: sha512-zfayxCe19euNwRycCty1C7lF7snk9YwfRpB5M8GLr1a4ICH63znxaPNAubrMvj0yDvVozqfgsdYpXVUnpWBDpg==} + '@electron/notarize@2.5.0': + resolution: {integrity: sha512-jNT8nwH1f9X5GEITXaQ8IF/KdskvIkOFfB2CvwumsveVidzpSc+mvhhTMdAGSYF3O+Nq49lJ7y+ssODRXu06+A==} engines: {node: '>= 10.0.0'} '@electron/osx-sign@1.0.5': @@ -2481,6 +2481,10 @@ packages: buffer@5.7.1: resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==} + builder-util-runtime@9.2.10: + resolution: {integrity: sha512-6p/gfG1RJSQeIbz8TK5aPNkoztgY1q5TgmGFMAXcY8itsGW6Y2ld1ALsZ5UJn8rog7hKF3zHx5iQbNQ8uLcRlw==} + engines: {node: '>=12.0.0'} + builder-util-runtime@9.2.4: resolution: {integrity: sha512-upp+biKpN/XZMLim7aguUyW8s0FUpDvOtK6sbanMFDAMBzpHDqdhgVYm6zc9HJ6nWo7u2Lxk60i2M6Jd3aiNrA==} engines: {node: '>=12.0.0'} @@ -3231,8 +3235,8 @@ packages: electron-to-chromium@1.4.710: resolution: {integrity: sha512-w+9yAVHoHhysCa+gln7AzbO9CdjFcL/wN/5dd+XW/Msl2d/4+WisEaCF1nty0xbAKaxdaJfgLB2296U7zZB7BA==} - electron-updater@6.2.1: - resolution: {integrity: sha512-83eKIPW14qwZqUUM6wdsIRwVKZyjmHxQ4/8G+1C6iS5PdDt7b1umYQyj1/qPpH510GmHEQe4q0kCPe3qmb3a0Q==} + electron-updater@6.3.9: + resolution: {integrity: sha512-2PJNONi+iBidkoC5D1nzT9XqsE8Q1X28Fn6xRQhO3YX8qRRyJ3mkV4F1aQsuRnYPqq6Hw+E51y27W75WgDoofw==} electron-window-state@5.0.3: resolution: {integrity: sha512-1mNTwCfkolXl3kMf50yW3vE2lZj0y92P/HYWFBrb+v2S/pCka5mdwN3cagKm458A7NjndSwijynXgcLWRodsVg==} @@ -4007,6 +4011,10 @@ packages: engines: {node: '>=16 || 14 >=14.17'} hasBin: true + glob@10.4.5: + resolution: {integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==} + hasBin: true + glob@7.2.3: resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} @@ -4305,6 +4313,7 @@ packages: inflight@1.0.6: resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==} + deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful. info-symbol@0.1.0: resolution: {integrity: sha512-qkc9wjLDQ+dYYZnY5uJXGNNHyZ0UOMDUnhvy0SEZGVVYmQ5s4i8cPAin2MbU6OxJgi8dfj/AnwqPx0CJE6+Lsw==} @@ -4680,6 +4689,9 @@ packages: resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==} engines: {node: '>=14'} + jackspeak@3.4.3: + resolution: {integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==} + jake@10.8.7: resolution: {integrity: sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==} engines: {node: '>=10'} @@ -5171,9 +5183,8 @@ packages: resolution: {integrity: sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==} engines: {node: '>=8'} - lru-cache@10.1.0: - resolution: {integrity: sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==} - engines: {node: 14 || >=16.14} + lru-cache@10.4.3: + resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==} lru-cache@4.1.5: resolution: {integrity: sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==} @@ -5400,6 +5411,10 @@ packages: resolution: {integrity: sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==} engines: {node: '>=16 || 14 >=14.17'} + minipass@7.1.2: + resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==} + engines: {node: '>=16 || 14 >=14.17'} + minizlib@2.1.2: resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==} engines: {node: '>= 8'} @@ -5753,6 +5768,9 @@ packages: resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} engines: {node: '>=6'} + package-json-from-dist@1.0.1: + resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==} + parent-module@1.0.1: resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} engines: {node: '>=6'} @@ -5820,6 +5838,10 @@ packages: resolution: {integrity: sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==} engines: {node: '>=16 || 14 >=14.17'} + path-scurry@1.11.1: + resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==} + engines: {node: '>=16 || 14 >=14.18'} + path-to-regexp@2.4.0: resolution: {integrity: sha512-G6zHoVqC6GGTQkZwF4lkuEyMbVOjoBKAEybQUypI1WTkqinCOrq2x6U2+phkJ1XsEMTy4LjtwPI7HW+NVrRR2w==} @@ -8159,7 +8181,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@electron/notarize@2.3.2': + '@electron/notarize@2.5.0': dependencies: debug: 4.3.7(supports-color@5.5.0) fs-extra: 9.1.0 @@ -8931,7 +8953,7 @@ snapshots: agent-base: 7.1.1 http-proxy-agent: 7.0.2 https-proxy-agent: 7.0.1 - lru-cache: 10.1.0 + lru-cache: 10.4.3 socks-proxy-agent: 8.0.3 transitivePeerDependencies: - supports-color @@ -10282,6 +10304,13 @@ snapshots: base64-js: 1.5.1 ieee754: 1.2.1 + builder-util-runtime@9.2.10: + dependencies: + debug: 4.3.7(supports-color@5.5.0) + sax: 1.3.0 + transitivePeerDependencies: + - supports-color + builder-util-runtime@9.2.4: dependencies: debug: 4.3.7(supports-color@5.5.0) @@ -10348,9 +10377,9 @@ snapshots: dependencies: '@npmcli/fs': 3.1.1 fs-minipass: 3.0.3 - glob: 10.3.10 - lru-cache: 10.1.0 - minipass: 7.0.4 + glob: 10.4.5 + lru-cache: 10.4.3 + minipass: 7.1.2 minipass-collect: 2.0.1 minipass-flush: 1.0.5 minipass-pipeline: 1.2.4 @@ -11164,9 +11193,9 @@ snapshots: electron-to-chromium@1.4.710: {} - electron-updater@6.2.1: + electron-updater@6.3.9: dependencies: - builder-util-runtime: 9.2.4 + builder-util-runtime: 9.2.10 fs-extra: 10.1.0 js-yaml: 4.1.0 lazy-val: 1.0.5 @@ -12205,7 +12234,7 @@ snapshots: fs-minipass@3.0.3: dependencies: - minipass: 7.0.4 + minipass: 7.1.2 optional: true fs.realpath@1.0.0: {} @@ -12325,6 +12354,16 @@ snapshots: minipass: 7.0.4 path-scurry: 1.10.1 + glob@10.4.5: + dependencies: + foreground-child: 3.1.1 + jackspeak: 3.4.3 + minimatch: 9.0.4 + minipass: 7.1.2 + package-json-from-dist: 1.0.1 + path-scurry: 1.11.1 + optional: true + glob@7.2.3: dependencies: fs.realpath: 1.0.0 @@ -13019,9 +13058,16 @@ snapshots: optionalDependencies: '@pkgjs/parseargs': 0.11.0 + jackspeak@3.4.3: + dependencies: + '@isaacs/cliui': 8.0.2 + optionalDependencies: + '@pkgjs/parseargs': 0.11.0 + optional: true + jake@10.8.7: dependencies: - async: 3.2.5 + async: 3.2.6 chalk: 4.1.2 filelist: 1.0.4 minimatch: 3.1.2 @@ -13718,7 +13764,7 @@ snapshots: lowercase-keys@2.0.0: {} - lru-cache@10.1.0: {} + lru-cache@10.4.3: {} lru-cache@4.1.5: dependencies: @@ -13774,7 +13820,7 @@ snapshots: cacache: 18.0.3 http-cache-semantics: 4.1.1 is-lambda: 1.0.1 - minipass: 7.0.4 + minipass: 7.1.2 minipass-fetch: 3.0.5 minipass-flush: 1.0.5 minipass-pipeline: 1.2.4 @@ -13933,7 +13979,7 @@ snapshots: minipass-collect@2.0.1: dependencies: - minipass: 7.0.4 + minipass: 7.1.2 optional: true minipass-fetch@1.4.1: @@ -13947,7 +13993,7 @@ snapshots: minipass-fetch@3.0.5: dependencies: - minipass: 7.0.4 + minipass: 7.1.2 minipass-sized: 1.0.3 minizlib: 2.1.2 optionalDependencies: @@ -13979,6 +14025,8 @@ snapshots: minipass@7.0.4: {} + minipass@7.1.2: {} + minizlib@2.1.2: dependencies: minipass: 3.3.6 @@ -14384,6 +14432,9 @@ snapshots: p-try@2.2.0: {} + package-json-from-dist@1.0.1: + optional: true + parent-module@1.0.1: dependencies: callsites: 3.1.0 @@ -14431,8 +14482,14 @@ snapshots: path-scurry@1.10.1: dependencies: - lru-cache: 10.1.0 - minipass: 7.0.4 + lru-cache: 10.4.3 + minipass: 7.1.2 + + path-scurry@1.11.1: + dependencies: + lru-cache: 10.4.3 + minipass: 7.1.2 + optional: true path-to-regexp@2.4.0: {} @@ -15622,7 +15679,7 @@ snapshots: ssri@10.0.6: dependencies: - minipass: 7.0.4 + minipass: 7.1.2 optional: true ssri@8.0.1: @@ -16404,7 +16461,7 @@ snapshots: dependencies: '@colors/colors': 1.5.0 '@dabh/diagnostics': 2.0.3 - async: 3.2.5 + async: 3.2.6 is-stream: 2.0.1 logform: 2.4.2 one-time: 1.0.0