From ab5636b4ea8af170d47e0dc0c06a4e25c6e70ff0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 2 Feb 2023 06:36:31 +0000 Subject: [PATCH 1/5] fix(deps): update dependency electron-updater to v4.6.5 --- packages/neuron-wallet/package.json | 2 +- yarn.lock | 46 ++++++++++++++--------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json index f7ece57da4..3398a6f4b2 100644 --- a/packages/neuron-wallet/package.json +++ b/packages/neuron-wallet/package.json @@ -49,7 +49,7 @@ "chalk": "3.0.0", "dotenv": "8.6.0", "electron-log": "4.4.8", - "electron-updater": "4.2.0", + "electron-updater": "4.6.5", "electron-window-state": "5.0.3", "elliptic": "6.5.4", "hw-app-ckb": "0.1.2", diff --git a/yarn.lock b/yarn.lock index dbd2b288ea..bddc574c12 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5140,12 +5140,7 @@ resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== -"@types/semver@^6.0.2": - version "6.2.3" - resolved "https://registry.yarnpkg.com/@types/semver/-/semver-6.2.3.tgz#5798ecf1bec94eaa64db39ee52808ec0693315aa" - integrity sha512-KQf+QAMWKMrtBMsB8/24w53tEsxllMj6TuA80TT/5igJalLI/zm0L3oXRbIAl4Ohfc85gyHX/jhMwsVkmhLU4A== - -"@types/semver@^7.3.12": +"@types/semver@^7.3.12", "@types/semver@^7.3.6": version "7.3.13" resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91" integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw== @@ -7763,12 +7758,12 @@ buffer@^5.1.0, buffer@^5.5.0, buffer@^5.6.0: base64-js "^1.3.1" ieee754 "^1.1.13" -builder-util-runtime@8.4.0: - version "8.4.0" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.4.0.tgz#3163fffc078e6b8f3dd5b6eb12a8345573590682" - integrity sha512-CJB/eKfPf2vHrkmirF5eicVnbDCkMBbwd5tRYlTlgud16zFeqD7QmrVUAOEXdnsrcNkiLg9dbuUsQKtl/AwsYQ== +builder-util-runtime@8.9.2: + version "8.9.2" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz#a9669ae5b5dcabfe411ded26678e7ae997246c28" + integrity sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A== dependencies: - debug "^4.1.1" + debug "^4.3.2" sax "^1.2.4" builder-util-runtime@9.1.1: @@ -10220,19 +10215,19 @@ electron-to-chromium@^1.3.247, electron-to-chromium@^1.4.251: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592" integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA== -electron-updater@4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.2.0.tgz#f9ecfc657f65ead737d42b9efecf628d3756b550" - integrity sha512-GuS3g7HDh17x/SaFjxjswlWUaKHczksYkV2Xc5CKj/bZH0YCvTSHtOmnBAdAmCk99u/71p3zP8f0jIqDfGcjww== +electron-updater@4.6.5: + version "4.6.5" + resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.6.5.tgz#e9a75458bbfd6bb41a58a829839e150ad2eb2d3d" + integrity sha512-kdTly8O9mSZfm9fslc1mnCY+mYOeaYRy7ERa2Fed240u01BKll3aiupzkd07qKw69KvhBSzuHroIW3mF0D8DWA== dependencies: - "@types/semver" "^6.0.2" - builder-util-runtime "8.4.0" - fs-extra "^8.1.0" - js-yaml "^3.13.1" - lazy-val "^1.0.4" + "@types/semver" "^7.3.6" + builder-util-runtime "8.9.2" + fs-extra "^10.0.0" + js-yaml "^4.1.0" + lazy-val "^1.0.5" + lodash.escaperegexp "^4.1.2" lodash.isequal "^4.5.0" - pako "^1.0.10" - semver "^6.3.0" + semver "^7.3.5" electron-window-state@5.0.3: version "5.0.3" @@ -15618,6 +15613,11 @@ lodash.escape@^4.0.1: resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98" integrity sha512-nXEOnb/jK9g0DYMr1/Xvq6l5xMD7GDG55+GSYIYmS0G4tBk/hURD4JR9WCavs04t33WmJx9kCyp9vJ+mr4BOUw== +lodash.escaperegexp@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347" + integrity sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw== + lodash.flatten@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" @@ -17649,7 +17649,7 @@ pacote@^9.2.3, pacote@^9.5.0: unique-filename "^1.1.1" which "^1.3.1" -pako@^1.0.10, pako@~1.0.5: +pako@~1.0.5: version "1.0.11" resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw== From 7761c7e2eb4356187416eb5de95e58d1d1f30b09 Mon Sep 17 00:00:00 2001 From: yanguoyu <841185308@qq.com> Date: Thu, 2 Feb 2023 18:46:28 +0800 Subject: [PATCH 2/5] fix: Fix test case after update electron-updater --- .../tests/controllers/export-debug.test.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/neuron-wallet/tests/controllers/export-debug.test.ts b/packages/neuron-wallet/tests/controllers/export-debug.test.ts index 7b361a65b7..9ab2b6b6d6 100644 --- a/packages/neuron-wallet/tests/controllers/export-debug.test.ts +++ b/packages/neuron-wallet/tests/controllers/export-debug.test.ts @@ -63,6 +63,16 @@ jest.mock('../../src/services/networks', () => { } }) +jest.mock('../../src/services/settings', () => { + return { + getInstance() { + return { + ckbDataPath: '' + } + } + } +}) + import { dialog } from 'electron' import logger from '../../src/utils/logger' import ExportDebugController from '../../src/controllers/export-debug' From 34ed9efe4e73c3fcb5d4780b0938cda4537be565 Mon Sep 17 00:00:00 2001 From: yanguoyu <841185308@qq.com> Date: Thu, 2 Feb 2023 20:21:16 +0800 Subject: [PATCH 3/5] fix: Refresh node_modules cache. --- .github/workflows/package.yml | 2 +- .github/workflows/package_for_test.yml | 2 +- .github/workflows/unit_tests.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 8ffe4f2b7b..f3e35aa540 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -43,7 +43,7 @@ jobs: path: | node_modules */*/node_modules - key: 2022-12-21-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}} + key: 2023-02-02-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}} - name: Add msbuild to PATH if: matrix.os == 'windows-2019' diff --git a/.github/workflows/package_for_test.yml b/.github/workflows/package_for_test.yml index 81622cc921..97d6ad693f 100644 --- a/.github/workflows/package_for_test.yml +++ b/.github/workflows/package_for_test.yml @@ -38,7 +38,7 @@ jobs: path: | node_modules */*/node_modules - key: 2022-12-21-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}} + key: 2023-02-02-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}} - name: Add msbuild to PATH if: matrix.os == 'windows-2019' diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 77d33c4f46..0a09eedf4e 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -40,7 +40,7 @@ jobs: path: | node_modules */*/node_modules - key: 2022-05-07-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}} + key: 2023-02-02-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}} - name: Install libudev if: matrix.os == 'ubuntu-20.04' From 1b23777133cdb507e4046599352df94c63351afd Mon Sep 17 00:00:00 2001 From: yanguoyu <841185308@qq.com> Date: Fri, 3 Feb 2023 11:56:29 +0800 Subject: [PATCH 4/5] Revert "fix: Refresh node_modules cache." This reverts commit 34ed9efe4e73c3fcb5d4780b0938cda4537be565. --- .github/workflows/package.yml | 2 +- .github/workflows/package_for_test.yml | 2 +- .github/workflows/unit_tests.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index f3e35aa540..8ffe4f2b7b 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -43,7 +43,7 @@ jobs: path: | node_modules */*/node_modules - key: 2023-02-02-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}} + key: 2022-12-21-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}} - name: Add msbuild to PATH if: matrix.os == 'windows-2019' diff --git a/.github/workflows/package_for_test.yml b/.github/workflows/package_for_test.yml index 97d6ad693f..81622cc921 100644 --- a/.github/workflows/package_for_test.yml +++ b/.github/workflows/package_for_test.yml @@ -38,7 +38,7 @@ jobs: path: | node_modules */*/node_modules - key: 2023-02-02-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}} + key: 2022-12-21-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}} - name: Add msbuild to PATH if: matrix.os == 'windows-2019' diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 0a09eedf4e..77d33c4f46 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -40,7 +40,7 @@ jobs: path: | node_modules */*/node_modules - key: 2023-02-02-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}} + key: 2022-05-07-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}} - name: Install libudev if: matrix.os == 'ubuntu-20.04' From 7855ee61f6335623240887cdc241fc1d1eb4f106 Mon Sep 17 00:00:00 2001 From: yanguoyu <841185308@qq.com> Date: Fri, 3 Feb 2023 11:58:07 +0800 Subject: [PATCH 5/5] fix: Add timeout for yarn --- .yarnrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.yarnrc b/.yarnrc index d810339acf..db18ac8fbd 100644 --- a/.yarnrc +++ b/.yarnrc @@ -1,2 +1,3 @@ registry "https://registry.yarnpkg.com" nodeLinker: node-modules +network-timeout 120000