Merge branch 'main' into dev-2.0.0

This commit is contained in:
Ilya Kreymer
2024-03-06 17:09:40 -08:00
4 changed files with 355 additions and 688 deletions
+1
View File
@@ -36,6 +36,7 @@ jobs:
env: env:
APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_ID: ${{ secrets.APPLE_ID }}
APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
CSC_LINK: ${{ secrets.CSC_LINK }} CSC_LINK: ${{ secrets.CSC_LINK }}
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }} WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }}
+2
View File
@@ -22,6 +22,8 @@ exports.default = async function notarizing(context) {
const appName = context.packager.appInfo.productFilename; const appName = context.packager.appInfo.productFilename;
return await notarize({ return await notarize({
tool: 'notarytool',
teamId: process.env.APPLE_TEAM_ID,
appBundleId: 'net.webrecorder.replayweb.page', appBundleId: 'net.webrecorder.replayweb.page',
appPath: `${appOutDir}/${appName}.app`, appPath: `${appOutDir}/${appName}.app`,
appleId: process.env.APPLE_ID, appleId: process.env.APPLE_ID,
+6 -5
View File
@@ -12,7 +12,7 @@
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-free": "^5.15.4", "@fortawesome/fontawesome-free": "^5.15.4",
"@shoelace-style/shoelace": "^2.8.0", "@shoelace-style/shoelace": "^2.8.0",
"@webrecorder/wabac": "^2.16.13", "@webrecorder/wabac": "^2.17.1",
"bulma": "^0.9.3", "bulma": "^0.9.3",
"electron-log": "^4.4.1", "electron-log": "^4.4.1",
"electron-updater": "^5.3.0", "electron-updater": "^5.3.0",
@@ -37,11 +37,11 @@
"@typescript-eslint/parser": "^6.12.0", "@typescript-eslint/parser": "^6.12.0",
"copy-webpack-plugin": "^9.0.1", "copy-webpack-plugin": "^9.0.1",
"css-loader": "^6.2.0", "css-loader": "^6.2.0",
"electron": "^25.1.1", "electron": "^29.0.1",
"electron-builder": "^23.0.3", "electron-builder": "^24.13.3",
"electron-notarize": "^1.1.1", "electron-notarize": "^1.2.2",
"eslint": "^8.54.0", "eslint": "^8.54.0",
"eslint-config-prettier": "^8.3.0", "eslint-config-prettier": "^9.0.0",
"eslint-plugin-lit": "^1.10.1", "eslint-plugin-lit": "^1.10.1",
"eslint-plugin-wc": "^1.3.2", "eslint-plugin-wc": "^1.3.2",
"http-server": "^13.0.2", "http-server": "^13.0.2",
@@ -130,6 +130,7 @@
"arch": "universal" "arch": "universal"
} }
], ],
"notarize": false,
"hardenedRuntime": true, "hardenedRuntime": true,
"gatekeeperAssess": false, "gatekeeperAssess": false,
"entitlements": "build/entitlements.mac.plist", "entitlements": "build/entitlements.mac.plist",
+346 -683
View File
File diff suppressed because it is too large Load Diff