diff --git a/.yarnrc b/.yarnrc index a61171a651af3..2461d707500ed 100644 --- a/.yarnrc +++ b/.yarnrc @@ -1,4 +1,4 @@ disturl "https://electronjs.org/headers" -target "24.0.0" +target "24.1.2" runtime "electron" build_from_source "true" diff --git a/build/lib/electron.js b/build/lib/electron.js index 3992d8b7c54bc..61b9ce2bf45e0 100644 --- a/build/lib/electron.js +++ b/build/lib/electron.js @@ -76,7 +76,7 @@ function darwinBundleDocumentTypes(types, icon) { }); } exports.config = { - version: product.electronRepository ? '24.0.0' : util.getElectronVersion(), + version: product.electronRepository ? '24.1.2' : util.getElectronVersion(), productAppName: product.nameLong, companyName: 'Microsoft Corporation', copyright: 'Copyright (C) 2023 Microsoft. All rights reserved', @@ -193,7 +193,7 @@ function getElectron(arch) { }; } async function main(arch = process.arch) { - const version = product.electronRepository ? '24.0.0' : util.getElectronVersion(); + const version = product.electronRepository ? '24.1.2' : util.getElectronVersion(); const electronPath = path.join(root, '.build', 'electron'); const versionFile = path.join(electronPath, 'version'); const isUpToDate = fs.existsSync(versionFile) && fs.readFileSync(versionFile, 'utf8') === `${version}`; diff --git a/build/lib/electron.ts b/build/lib/electron.ts index 27bf28ee68f9e..31cefe7448ed3 100644 --- a/build/lib/electron.ts +++ b/build/lib/electron.ts @@ -91,7 +91,7 @@ function darwinBundleDocumentTypes(types: { [name: string]: string | string[] }, } export const config = { - version: product.electronRepository ? '24.0.0' : util.getElectronVersion(), + version: product.electronRepository ? '24.1.2' : util.getElectronVersion(), productAppName: product.nameLong, companyName: 'Microsoft Corporation', copyright: 'Copyright (C) 2023 Microsoft. All rights reserved', @@ -212,7 +212,7 @@ function getElectron(arch: string): () => NodeJS.ReadWriteStream { } async function main(arch = process.arch): Promise { - const version = product.electronRepository ? '24.0.0' : util.getElectronVersion(); + const version = product.electronRepository ? '24.1.2' : util.getElectronVersion(); const electronPath = path.join(root, '.build', 'electron'); const versionFile = path.join(electronPath, 'version'); const isUpToDate = fs.existsSync(versionFile) && fs.readFileSync(versionFile, 'utf8') === `${version}`; diff --git a/cgmanifest.json b/cgmanifest.json index 74398edd70600..620bf42c672d7 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "chromium", "repositoryUrl": "https://chromium.googlesource.com/chromium/src", - "commitHash": "8e1a5127113793e25c8192936365df9c2b0fa496" + "commitHash": "7843fb10a32c3707495dc3bb0de801f7b3745721" } }, "licenseDetail": [ @@ -40,7 +40,7 @@ "SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ], "isOnlyProductionDependency": true, - "version": "112.0.5615.49" + "version": "112.0.5615.87" }, { "component": { @@ -528,12 +528,12 @@ "git": { "name": "electron", "repositoryUrl": "https://github.com/electron/electron", - "commitHash": "0c2cb449762898a5502b8c2bb4b3533d1d6792ea" + "commitHash": "56122f1491e586b8bbca87fe9d5bcac9bc33f5b9" } }, "isOnlyProductionDependency": true, "license": "MIT", - "version": "24.0.0" + "version": "24.1.2" }, { "component": { diff --git a/package.json b/package.json index 5dc40d9e404ad..8ca00a998885a 100644 --- a/package.json +++ b/package.json @@ -141,7 +141,7 @@ "cssnano": "^4.1.11", "debounce": "^1.0.0", "deemon": "^1.8.0", - "electron": "24.0.0", + "electron": "24.1.2", "eslint": "8.36.0", "eslint-plugin-header": "3.1.1", "eslint-plugin-jsdoc": "^39.3.2", @@ -231,4 +231,4 @@ "elliptic": "^6.5.3", "nwmatcher": "^1.4.4" } -} \ No newline at end of file +} diff --git a/yarn.lock b/yarn.lock index c1610e28844b5..18ad9d56b65fd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3536,10 +3536,10 @@ electron-to-chromium@^1.4.202: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.207.tgz#9c3310ebace2952903d05dcaba8abe3a4ed44c01" integrity sha512-piH7MJDJp4rJCduWbVvmUd59AUne1AFBJ8JaRQvk0KzNTSUnZrVXHCZc+eg+CGE4OujkcLJznhGKD6tuAshj5Q== -electron@24.0.0: - version "24.0.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-24.0.0.tgz#d50f92d1b21176ebf732c57d2b0902739913ad6e" - integrity sha512-QmL8L53fQ+xOAp8m2mSGNewhDvJqQttCxrcesf0cqndKQDsIq4QvR35wGJqHg7MyPQKcBErLhZj9QvRheO5qnA== +electron@24.1.2: + version "24.1.2" + resolved "https://registry.yarnpkg.com/electron/-/electron-24.1.2.tgz#8dd0b4928a08236be4791d39535d1d35cc05f04b" + integrity sha512-V0isWbyLYiXrSCcB4lrSVhS/U56NFGfuqHyc+yEPkyhhvY+h4F85cYGdEiZlXp6XjHT+/CLHmw0ltK54g9lvDw== dependencies: "@electron/get" "^2.0.0" "@types/node" "^18.11.18"