Skip to content

Commit a3c9f31

Browse files
authored
Merge pull request #638 from nervosnetwork/rc/v0.1.0-alpha.4
[ᚬmaster] Rc/v0.1.0 alpha.5
2 parents 3352ca5 + 34da278 commit a3c9f31

File tree

8 files changed

+19
-18
lines changed

8 files changed

+19
-18
lines changed

.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,13 @@ services:
1111
- xvfb
1212

1313
node_js:
14-
- '11'
1514
- '12'
1615

1716
cache:
1817
- npm
1918
- yarn
2019

2120
before_install:
22-
# - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.13.0
23-
# - export PATH=$HOME/.yarn/bin:$PATH
2421
- yarn global add lerna
2522

2623
install:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Nervos CKB Wallet
1212

1313
### Prerequisites
1414

15-
You will need `node >= 11` and `yarn >= 1.12` to build and run this Neuron.
15+
You will need `node >= 12` and `yarn >= 1.14` to build and run Neuron.
1616

1717
Please be noted that Neuron depends on [node-gyp](https://github.com/nodejs/node-gyp) to build native NPM modules. Follow [this](https://github.com/nodejs/node-gyp#installation) to install node-gyp dependencies.
1818

azure-pipelines.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ jobs:
2222
vmImage: 'macos-10.14'
2323
strategy:
2424
matrix:
25-
node_11_x:
26-
node_version: 11.x
2725
node_12_x:
2826
node_version: 12.x
2927
steps:
@@ -44,8 +42,6 @@ jobs:
4442
vmImage: 'ubuntu-16.04'
4543
strategy:
4644
matrix:
47-
node_11_x:
48-
node_version: 11.x
4945
node_12_x:
5046
node_version: 12.x
5147
steps:
@@ -69,8 +65,6 @@ jobs:
6965
vmImage: 'windows-2019'
7066
strategy:
7167
matrix:
72-
node_11_x:
73-
node_version: 11.x
7468
node_12_x:
7569
node_version: 12.x
7670
steps:

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"packages": [
33
"packages/*"
44
],
5-
"version": "0.1.0-alpha.4",
5+
"version": "0.1.0-alpha.5",
66
"npmClient": "yarn",
77
"useWorkspaces": true
88
}

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@nervosnetwork/neuron",
33
"productName": "Neuron",
44
"description": "CKB Neuron Wallet",
5-
"version": "0.1.0-alpha.4",
5+
"version": "0.1.0-alpha.5",
66
"private": true,
77
"author": {
88
"name": "Nervos Core Dev",
@@ -11,8 +11,8 @@
1111
},
1212
"license": "MIT",
1313
"engines": {
14-
"node": ">= 11.10",
15-
"yarn": ">= 1.12"
14+
"node": ">= 12.0",
15+
"yarn": ">= 1.14"
1616
},
1717
"workspaces": [
1818
"packages/*"

packages/neuron-ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nervosnetwork/neuron-ui",
3-
"version": "0.1.0-alpha.4",
3+
"version": "0.1.0-alpha.5",
44
"private": true,
55
"author": {
66
"name": "Nervos Core Dev",

packages/neuron-wallet/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"productName": "Neuron",
44
"description": "CKB Neuron Wallet",
55
"homepage": "https://www.nervos.org/",
6-
"version": "0.1.0-alpha.4",
6+
"version": "0.1.0-alpha.5",
77
"private": true,
88
"author": {
99
"name": "Nervos Core Dev",
@@ -48,7 +48,7 @@
4848
},
4949
"devDependencies": {
5050
"@nervosnetwork/ckb-types": "0.15.0",
51-
"@nervosnetwork/neuron-ui": "0.1.0-alpha.4",
51+
"@nervosnetwork/neuron-ui": "0.1.0-alpha.5",
5252
"@types/async": "3.0.0",
5353
"@types/electron-devtools-installer": "2.2.0",
5454
"@types/elliptic": "6.4.8",

packages/neuron-wallet/src/utils/logger.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,17 @@ import env from '../env'
44
import app from '../app'
55

66
const { isDevMode } = env
7-
const basePath = isDevMode ? './' : `${app.getPath('logs')}`
7+
8+
let basePath
9+
if (isDevMode) {
10+
basePath = './'
11+
} else {
12+
try {
13+
basePath = app.getPath('logs')
14+
} catch {
15+
basePath = path.join(app.getPath('userData'), 'logs')
16+
}
17+
}
818

919
const { combine, timestamp, json } = format
1020

0 commit comments

Comments
 (0)