Skip to content

Commit 82cffae

Browse files
Merge pull request #1078 from Chia-Network/develop
Release 1.2.0
2 parents a022d73 + e8a2ef7 commit 82cffae

22 files changed

+17487
-23525
lines changed

.babelrc

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
{
2-
"presets": [
3-
"@babel/preset-env"
4-
],
5-
"plugins": [
6-
"@babel/plugin-transform-runtime"
7-
]
1+
{
2+
"presets": ["@babel/preset-env"],
3+
"plugins": [
4+
"@babel/plugin-transform-runtime"
5+
]
86
}

.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
REACT_APP_VERSION=$npm_package_version
1+
REACT_APP_VERSION=$npm_package_version
22
BROWSER=none

.eslintrc.json

+33-31
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,33 @@
1-
{
2-
"env": {
3-
"browser": true,
4-
"amd": true,
5-
"node": true
6-
},
7-
"parser": "babel-eslint",
8-
"parserOptions": {
9-
"ecmaFeatures": {
10-
"jsx": true
11-
}
12-
},
13-
"extends": [
14-
"eslint:recommended",
15-
"plugin:react/recommended",
16-
"plugin:mocha/recommended"
17-
],
18-
"rules": {
19-
"react/prop-types": "off",
20-
"mocha/no-mocha-arrows": 0
21-
},
22-
"plugins": [
23-
"react",
24-
"mocha"
25-
],
26-
"settings": {
27-
"react": {
28-
"version": "detect"
29-
}
30-
}
31-
}
1+
{
2+
"env": {
3+
"browser": true,
4+
"amd": true,
5+
"node": true
6+
},
7+
"parser": "@babel/eslint-parser",
8+
"parserOptions": {
9+
"requireConfigFile": false,
10+
"babelOptions": {
11+
"presets": ["@babel/preset-env", "@babel/preset-react"]
12+
},
13+
"ecmaFeatures": {
14+
"jsx": true
15+
}
16+
},
17+
"extends": [
18+
"eslint:recommended",
19+
"plugin:react/recommended",
20+
"plugin:mocha/recommended"
21+
],
22+
"rules": {
23+
"react/prop-types": "off",
24+
"mocha/no-mocha-arrows": 0,
25+
"no-unsafe-optional-chaining": "off"
26+
},
27+
"plugins": ["react", "mocha"],
28+
"settings": {
29+
"react": {
30+
"version": "detect"
31+
}
32+
}
33+
}

.github/workflows/build-installers.yaml

+23-8
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,13 @@ jobs:
2525
- name: Checkout Code
2626
uses: actions/checkout@v3
2727

28-
- name: Setup Node 16.x
28+
- name: Setup Node 16.10
2929
uses: actions/setup-node@v3
3030
with:
31-
node-version: '16.x'
31+
node-version: '16.10'
32+
33+
- name: Install Husky
34+
run: npm install --save-dev husky
3235

3336
- name: install dmg-license
3437
run: npm i dmg-license
@@ -72,10 +75,16 @@ jobs:
7275
- name: Checkout Code
7376
uses: actions/checkout@v3
7477

75-
- name: Setup Node 16.x
78+
- name: Setup Node 16.10
7679
uses: actions/setup-node@v3
7780
with:
78-
node-version: '16.x'
81+
node-version: '16.10'
82+
83+
- name: Install Husky
84+
run: npm install --save-dev husky
85+
86+
- name: Ignore Husky where not compatible
87+
run: npm pkg delete scripts.prepare
7988

8089
- name: npm install
8190
run: |
@@ -101,10 +110,13 @@ jobs:
101110
- name: Checkout Code
102111
uses: actions/checkout@v3
103112

104-
- name: Setup Node 16.x
113+
- name: Setup Node 16.10
105114
uses: actions/setup-node@v3
106115
with:
107-
node-version: '16.x'
116+
node-version: '16.10'
117+
118+
- name: Install Husky
119+
run: npm install --save-dev husky
108120

109121
- name: npm install
110122
run: |
@@ -133,10 +145,13 @@ jobs:
133145
- name: Checkout Code
134146
uses: actions/checkout@v3
135147

136-
- name: Setup Node 16.x
148+
- name: Setup Node 16.10
137149
uses: actions/setup-node@v3
138150
with:
139-
node-version: '16.x'
151+
node-version: '16.10'
152+
153+
- name: Install Husky
154+
run: npm install --save-dev husky
140155

141156
- name: npm install and build
142157
run: |

.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16.0.0
1+
16.10.0

0 commit comments

Comments
 (0)