Release 1.2.10, Update macOS signing

terreng · terreng · commit 7c2a6158bf30 · 2024-02-08T22:35:13.000-05:00
diff --git a/build/notarize.js b/build/notarize.js
@@ -1,5 +1,4 @@
-require('dotenv').config();
-const { notarize } = require('electron-notarize');
+const { notarize } = require('@electron/notarize');
 
 exports.default = async function notarizing(context) {
 
@@ -12,11 +11,10 @@ exports.default = async function notarizing(context) {
     console.log("Notarizing...");
 
     return await notarize({
-        appBundleId: 'org.simplewebserver.simplewebserver',
+        tool: "notarytool",
         appPath: `${appOutDir}/${appName}.app`,
-        appleId: process.env.APPLEID,
-        appleIdPassword: "@keychain:ElectronSigningAppleID",
-        teamId: process.env.TEAMID,
-        ascProvider: process.env.TEAMID
+        keychainProfile: "SWS_Electron_Signing"
     });
+
+    // xcrun notarytool store-credentials "SWS_Electron_Signing" --apple-id "email@example.com" --team-id "RXXXXXXXXX" --password "foos-bars-bazz-bang"
 };
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -17,10 +17,6 @@
     {
       "name": "Ethan O'Brien",
       "url": "https://github.com/ethanaobrien"
-    },
-    {
-      "name": "Kyle Graehl",
-      "url": "https://github.com/kzahel"
     }
   ],
   "license": "MIT",
@@ -54,7 +50,7 @@
     "make_all_windows": "npm run make_windows_x64 && npm run make_windows_ia32 && npm run make_windows_arm64 && npm run make_windows_zip_x64 && npm run make_windows_zip_ia32 && npm run make_windows_zip_arm64",
     "make_all_windows_appx": "npm run make_windows_appx_x64 && npm run make_windows_appx_ia32 && npm run make_windows_appx_arm64",
     "make_all_linux": "npm run make_linux_deb_x64 && npm run make_linux_deb_arm64 && npm run make_linux_rpm_x64 && npm run make_linux_rpm_arm64 && npm run make_linux_zip_x64 && npm run make_linux_zip_arm64",
-    "make_all": "npm run make_all_macos && npm run make_all_windows && npm run make_all_windows_appx && npm run make_all_linux"
+    "make_all": "npm run make_all_macos && npm run make_macos_mas_universal && npm run make_all_linux && npm run make_all_windows && npm run make_all_windows_appx"
   },
   "build": {
     "buildVersion": "28",
@@ -138,7 +134,7 @@
       "icon": "images/512x512.png",
       "category": "Development",
       "vendor": "Simple Web Server",
-      "artifactName": "Simple-Web-Server-${version}-${arch}.${ext}"
+      "artifactName": "Simple-Web-Server-Linux-${version}-${arch}.${ext}"
     },
     "appx": {
       "publisherDisplayName": "Terren",
@@ -157,10 +153,10 @@
     }
   },
   "devDependencies": {
+    "@electron/notarize": "^2.2.1",
     "dotenv": "^16.4.1",
     "electron": "^28.2.2",
     "electron-builder": "^24.9.1",
-    "electron-notarize": "^1.2.2",
     "electron-osx-sign": "^0.6.0"
   },
   "dependencies": {
diff --git a/website/src/download.md b/website/src/download.md
@@ -2,15 +2,15 @@
 
 <ms-store-badge productid="9PC6682RJCDD" style="margin-right: 10px;"></ms-store-badge><a href="https://apps.apple.com/us/app/simple-web-server/id1625925255?mt=12&amp;itsct=apps_box_badge&amp;itscg=30200" target="_blank" rel="noopener"><img src="/appstorebadge.svg" alt="Download on the Mac App Store" style="border-radius:13px;height: 60px;"></a>
 
-Current version: **1.2.9** | [Older versions and release notes](https://github.com/terreng/simple-web-server/releases)
+Current version: **1.2.10** | [Older versions and release notes](https://github.com/terreng/simple-web-server/releases)
 
 ## Direct download
 
 ### Windows
 
-**Installer (.exe):** [64 bit](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-Installer-1.2.9-x64.exe) | [32 bit](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-Installer-1.2.9-ia32.exe) | [ARM](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-Installer-1.2.9-arm64.exe)
+**Installer (.exe):** [64 bit](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-Installer-1.2.10-x64.exe) | [32 bit](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-Installer-1.2.10-ia32.exe) | [ARM](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-Installer-1.2.10-arm64.exe)
 
-**Portable (.zip):** [64 bit](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-1.2.9-win.zip) | [32 bit](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-1.2.9-ia32-win.zip) | [ARM](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-1.2.9-arm64-win.zip)
+**Portable (.zip):** [64 bit](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-1.2.10-win.zip) | [32 bit](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-1.2.10-ia32-win.zip) | [ARM](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-1.2.10-arm64-win.zip)
 
 [How to check if your computer is 32 bit or 64 bit](https://support.microsoft.com/en-us/windows/32-bit-and-64-bit-windows-frequently-asked-questions-c6ca9541-8dce-4d48-0415-94a3faa2e13d)
 
@@ -30,19 +30,19 @@ Current version: **1.2.9** | [Older versions and release notes](https://github.c
 
 ### macOS
 
-**Installer (.dmg):** [Intel Chip](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-1.2.9.dmg) | [Apple Silicon](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-1.2.9-arm64.dmg) (Mac OSX 10.12+)
+**Installer (.dmg):** [Intel Chip](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-1.2.10.dmg) | [Apple Silicon](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-1.2.10-arm64.dmg) (Mac OSX 10.12+)
 
-**Standalone (.app inside .zip):** [Intel Chip](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-1.2.9-mac.zip) | [Apple Silicon](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-1.2.9-arm64-mac.zip)
+**Standalone (.app inside .zip):** [Intel Chip](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-1.2.10-mac.zip) | [Apple Silicon](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-1.2.10-arm64-mac.zip)
 
 [How to check if your Mac has an Intel processor or Apple silicon](https://support.apple.com/en-us/HT211814)
 
 ### Linux
 
-**Debian/Ubuntu (.deb):** [64 bit](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-1.2.9-amd64.deb) | [ARM](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-1.2.9-arm64.deb)
+**Debian/Ubuntu (.deb):** [64 bit](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-Linux-1.2.10-amd64.deb) | [ARM](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-Linux-1.2.10-arm64.deb)
 
-**Fedora/openSUSE (.rpm):** [64 bit](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-1.2.9-x86_64.rpm) | [ARM](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-1.2.9-aarch64.rpm)
+**Fedora/openSUSE (.rpm):** [64 bit](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-Linux-1.2.10-x86_64.rpm) | [ARM](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-Linux-1.2.10-aarch64.rpm)
 
-**Portable (.zip):** [64 bit](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-1.2.9.zip) | [ARM](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-1.2.9-arm64.zip)
+**Portable (.zip):** [64 bit](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-Linux-1.2.10.zip) | [ARM](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-Linux-1.2.10-arm64.zip)
 
 If we don't have the download you need, you can [manually build](/docs/build.md) for your platform.
 
diff --git a/website/src/zh-CN/download.md b/website/src/zh-CN/download.md
@@ -2,15 +2,15 @@
 
 <ms-store-badge productid="9PC6682RJCDD" style="margin-right: 10px;"></ms-store-badge><a href="https://apps.apple.com/us/app/simple-web-server/id1625925255?mt=12&itsct=apps_box_badge&itscg=30200" target="_blank" rel="noopener"><img src="/appstorebadge.svg" alt="通过 Mac App Store 获取" style="border-radius:13px;height: 60px;"></a>
 
-当前版本: **1.2.9** | [历史版本和发行说明](https://github.com/terreng/simple-web-server/releases)
+当前版本: **1.2.10** | [历史版本和发行说明](https://github.com/terreng/simple-web-server/releases)
 
 ## 直接下载
 
 ### Windows
 
-**安装程序 (.exe):** [64 bit](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-Installer-1.2.9-x64.exe) | [32 bit](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-Installer-1.2.9-ia32.exe) | [ARM](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-Installer-1.2.9-arm64.exe)
+**安装程序 (.exe):** [64 bit](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-Installer-1.2.10-x64.exe) | [32 bit](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-Installer-1.2.10-ia32.exe) | [ARM](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-Installer-1.2.10-arm64.exe)
 
-**便携版本 (.zip):** [64 bit](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-1.2.9-win.zip) | [32 bit](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-1.2.9-ia32-win.zip) | [ARM](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-1.2.9-arm64-win.zip)
+**便携版本 (.zip):** [64 bit](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-1.2.10-win.zip) | [32 bit](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-1.2.10-ia32-win.zip) | [ARM](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-1.2.10-arm64-win.zip)
 
 [如何检查您的计算机是32位还是64位](https://support.microsoft.com/en-us/windows/32-bit-and-64-bit-windows-frequently-asked-questions-c6ca9541-8dce-4d48-0415-94a3faa2e13d)
 
@@ -31,19 +31,19 @@
 
 ### macOS
 
-**安装程序 (.dmg):** [Intel处理器](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-1.2.9.dmg) | [Apple处理器](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-1.2.9-arm64.dmg) (Mac OSX 10.12+)
+**安装程序 (.dmg):** [Intel处理器](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-1.2.10.dmg) | [Apple处理器](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-1.2.10-arm64.dmg) (Mac OSX 10.12+)
 
-**独立版本(.app inside .zip):** [Intel处理器](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-1.2.9-mac.zip) | [Apple处理器](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-1.2.9-arm64-mac.zip)
+**独立版本(.app inside .zip):** [Intel处理器](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-1.2.10-mac.zip) | [Apple处理器](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-1.2.10-arm64-mac.zip)
 
 [如何检查您的Mac是Intel处理器还是Apple处理器](https://support.apple.com/en-us/HT211814)
 
 ### Linux
 
-**Debian/Ubuntu (.deb):** [64 bit](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-1.2.9-amd64.deb) | [ARM](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-1.2.9-arm64.deb)
+**Debian/Ubuntu (.deb):** [64 bit](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-Linux-1.2.10-amd64.deb) | [ARM](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-Linux-1.2.10-arm64.deb)
 
-**Fedora/openSUSE (.rpm):** [64 bit](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-1.2.9-x86_64.rpm) | [ARM](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-1.2.9-aarch64.rpm)
+**Fedora/openSUSE (.rpm):** [64 bit](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-Linux-1.2.10-x86_64.rpm) | [ARM](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-Linux-1.2.10-aarch64.rpm)
 
-**Portable (.zip):** [64 bit](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-1.2.9.zip) | [ARM](https://github.com/terreng/simple-web-server/releases/download/v1.2.9/Simple-Web-Server-1.2.9-arm64.zip)
+**Portable (.zip):** [64 bit](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-Linux-1.2.10.zip) | [ARM](https://github.com/terreng/simple-web-server/releases/download/v1.2.10/Simple-Web-Server-Linux-1.2.10-arm64.zip)
 
 If we don't have the download you need, you can [manually build](/docs/build.md) for your platform.
 
