From 531b1f1f2c2efd9de9ef6ae651e816edfb92b4a8 Mon Sep 17 00:00:00 2001 From: Erick Zhao Date: Mon, 20 Jan 2025 12:25:45 -0800 Subject: [PATCH 1/2] fix(maker-dmg): make `macos-alias` build on Node.js 22 --- package.json | 6 +++--- yarn.lock | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 24f44d15ce..e1bdd531f5 100644 --- a/package.json +++ b/package.json @@ -145,8 +145,7 @@ "electron-installer-snap": "^5.2.0", "electron-windows-store": "^2.1.0", "electron-winstaller": "^5.3.0", - "electron-wix-msi": "^5.1.3", - "macos-alias": "^0.2.11" + "electron-wix-msi": "^5.1.3" }, "peerDependencies": { "@electron/fuses": ">=1.0.0" @@ -175,6 +174,7 @@ ] }, "resolutions": { - "@malept/eslint-config/@typescript-eslint/parser": "^8.0.0" + "@malept/eslint-config/@typescript-eslint/parser": "^8.0.0", + "electron-installer-dmg/appdmg/ds-store/macos-alias": "^0.2.12" } } diff --git a/yarn.lock b/yarn.lock index 97a9f4f839..59abbdb409 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9536,10 +9536,10 @@ lunr@^2.3.9: resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.9.tgz#18b123142832337dd6e964df1a5a7707b25d35e1" integrity sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow== -macos-alias@^0.2.11, macos-alias@~0.2.5: - version "0.2.11" - resolved "https://registry.yarnpkg.com/macos-alias/-/macos-alias-0.2.11.tgz#feeea6c13ba119814a43fc43c470b31e59ef718a" - integrity sha512-zIUs3+qpml+w3wiRuADutd7XIO8UABqksot10Utl/tji4UxZzLG4fWDC+yJZoO8/Ehg5RqsvSRE/6TS5AEOeWw== +macos-alias@^0.2.12, macos-alias@~0.2.5: + version "0.2.12" + resolved "https://registry.yarnpkg.com/macos-alias/-/macos-alias-0.2.12.tgz#c984db71b7c2372924548291a0790b43c080606b" + integrity sha512-yiLHa7cfJcGRFq4FrR4tMlpNHb4Vy4mWnpajlSSIFM5k4Lv8/7BbbDLzCAVogWNl0LlLhizRp1drXv0hK9h0Yw== dependencies: nan "^2.4.0" @@ -10396,9 +10396,9 @@ mute-stream@^2.0.0: integrity sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA== nan@^2.4.0: - version "2.18.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.18.0.tgz#26a6faae7ffbeb293a39660e88a76b82e30b7554" - integrity sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w== + version "2.22.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.22.0.tgz#31bc433fc33213c97bad36404bb68063de604de3" + integrity sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw== nanoid@3.3.1: version "3.3.1" From d2c3300636dc66016f5da566acf48661d5b9e068 Mon Sep 17 00:00:00 2001 From: Erick Zhao Date: Mon, 20 Jan 2025 12:32:14 -0800 Subject: [PATCH 2/2] remove resolution? --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index e1bdd531f5..0a303ad4db 100644 --- a/package.json +++ b/package.json @@ -174,7 +174,6 @@ ] }, "resolutions": { - "@malept/eslint-config/@typescript-eslint/parser": "^8.0.0", - "electron-installer-dmg/appdmg/ds-store/macos-alias": "^0.2.12" + "@malept/eslint-config/@typescript-eslint/parser": "^8.0.0" } }