Skip to content

Commit 38e3682

Browse files
authored
Merge branch 'develop' into dependabot/npm_and_yarn/packages/neuron-ui/storybook-8.6.15
2 parents b39e6cf + fb31790 commit 38e3682

File tree

10 files changed

+127
-195
lines changed

10 files changed

+127
-195
lines changed

.ckb-light-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.5.3
1+
v0.5.4

.ckb-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.203.0
1+
v0.204.0

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Download [CKB Indexer](https://github.com/nervosnetwork/ckb-indexer/releases) an
4444

4545
As of `v0.26.0`, Neuron bundles a CKB binary and starts it for Mainnet automatically. If you prefer to run a local CKB node yourself instead, please follow the [Nervos CKB doc](https://docs.nervos.org/docs/basics/guides/mainnet) to get it up and running before launching Neuron.
4646

47-
**Note**: If you run CKB node on Windows but it fails to start, you may need to download and install the latest [Microsoft Visual C++ Redistributable for Visual Studio 2015, 2017 and 2019](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads).
47+
**Note**: If you run CKB node on Windows but it fails to start, you may need to download and install the latest [Microsoft Visual C++ Redistributable for Visual Studio 2015, 2017 and 2019](https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170).
4848

4949
### Start Neuron in Development Mode
5050

compatible.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"fullVersions": [
3+
"0.204",
34
"0.203",
45
"0.202",
56
"0.201",
@@ -33,6 +34,7 @@
3334
"compatible": {
3435
"0.111": {
3536
"full": [
37+
"0.204",
3638
"0.203",
3739
"0.202",
3840
"0.201",
@@ -60,6 +62,7 @@
6062
},
6163
"0.110": {
6264
"full": [
65+
"0.204",
6366
"0.203",
6467
"0.202",
6568
"0.201",
@@ -103,6 +106,7 @@
103106
},
104107
"0.112": {
105108
"full": [
109+
"0.204",
106110
"0.203",
107111
"0.202",
108112
"0.201",
@@ -130,6 +134,7 @@
130134
},
131135
"0.114": {
132136
"full": [
137+
"0.204",
133138
"0.203",
134139
"0.202",
135140
"0.201",
@@ -157,6 +162,7 @@
157162
},
158163
"0.116": {
159164
"full": [
165+
"0.204",
160166
"0.203",
161167
"0.202",
162168
"0.201",
@@ -184,6 +190,7 @@
184190
},
185191
"0.117": {
186192
"full": [
193+
"0.204",
187194
"0.203",
188195
"0.202",
189196
"0.201",
@@ -211,6 +218,7 @@
211218
},
212219
"0.119": {
213220
"full": [
221+
"0.204",
214222
"0.203",
215223
"0.202",
216224
"0.201",
@@ -238,6 +246,7 @@
238246
},
239247
"0.120": {
240248
"full": [
249+
"0.204",
241250
"0.203",
242251
"0.202",
243252
"0.201",
@@ -265,6 +274,7 @@
265274
},
266275
"0.121": {
267276
"full": [
277+
"0.204",
268278
"0.203",
269279
"0.202",
270280
"0.201",
@@ -292,6 +302,7 @@
292302
},
293303
"0.201": {
294304
"full": [
305+
"0.204",
295306
"0.203",
296307
"0.202",
297308
"0.201",
@@ -319,6 +330,7 @@
319330
},
320331
"0.202": {
321332
"full": [
333+
"0.204",
322334
"0.203",
323335
"0.202",
324336
"0.201",

packages/neuron-wallet/electron-builder.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
appId: com.nervos.neuron
1+
appId: com.nervos.app5.neuron
22
copyright: Copyright (C) 2019-2025 Nervos Foundation.
33
productName: Neuron
44

packages/neuron-wallet/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"sqlite3": "5.1.6",
7070
"subleveldown": "4.1.4",
7171
"tslib": "2.6.3",
72-
"typeorm": "0.3.17",
72+
"typeorm": "0.3.26",
7373
"uuid": "8.3.2"
7474
},
7575
"devDependencies": {

packages/neuron-wallet/scripts/notarize.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ exports.default = async function notarizing(context) {
2626

2727
try {
2828
await notarize({
29-
appBundleId: 'com.nervos.neuron',
29+
appBundleId: 'com.nervos.app5.neuron',
3030
appPath: `${appOutDir}/${appName}.app`,
3131
appleId,
3232
appleIdPassword,

packages/neuron-wallet/src/services/node.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ class NodeService {
224224
noLink: true,
225225
})
226226
.then(() => {
227-
const VC_REDIST_URL = `https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads`
227+
const VC_REDIST_URL = `https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170`
228228
shell.openExternal(VC_REDIST_URL)
229229
env.app.quit()
230230
return false

renovate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
"addLabels": ["types"]
99
}
1010
],
11-
"reviewers": ["Magickbase/neuron"]
11+
"reviewers": ["Appfi5/neuron"]
1212
}

0 commit comments

Comments
 (0)