Skip to content

Commit 8e508d9

Browse files
committed
chore(repo): update node version to 14
1 parent ae2ef20 commit 8e508d9

8 files changed

+320
-193
lines changed

.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10
1+
14

.travis.yml

+3-5
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,15 @@ addons:
1414
apt:
1515
packages:
1616
- rpm
17+
chrome: stable
1718

1819
git:
1920
depth: 5
2021

2122
language: node_js
2223

2324
node_js:
24-
- 10
25-
26-
addons:
27-
chrome: stable
25+
- 14.18.2
2826

2927
before_install:
3028
- |
@@ -53,7 +51,7 @@ cache:
5351
notifications:
5452
slack:
5553
rooms:
56-
secure: jjGWN5Ap6WinGX86KeIl2azccMWWiXqTf4XfAUteMobme5yn17WpyycD12WNChGLF2ieiNvxS/vsVaAKKx24WN5dZ9eggDMCBYHGqzQmuho26BZ4tc+Tzt+A2fFgJb5z9APThYT2W1lua6XumPzVnoJtrLV+hLU1xWPqF29/W76FC91MjFeLpjLmG51BUqTIBCABw+PVpG2z1+DU1NVT0zV0BoRafyHbn/3ezRRXwC5oV00kRswGHkSehj6+eGWDsUoOwupHJPgV/wl52sX9I+XpoherzjvB0p27820YKtkUiG7EIgriK1WSxT46zcPa+avV4tbqrAR2Jrz/GpNv+QVYN8giYClLqecFiHWYB1/WTNpALG30NzVrjPdEzSHJrtH1EFRmZjXn31i9pAinihsIedfbJfVpNIy6N/lhmu+WBoLnNsU7HE86d6cpMGr6EpGnN4LH5vJOmk2f38x0/VrdiO0EDMyTxBV15rqmVTfZkHU24TXyX4N4q2zI+40M4pGtRrvHx02WiA3GPEYHe/OXICPvlY4YCmzGo79FCqZMcCcBVdg4I1e/M64/982eNREQGmGHvNRtePZesvEoqvp4Ra2Oef9gFyDMx0mpWYkMUYwWEo0FzeoApQNw1ModOcD8QCpS527YODtEpxzfMRs6ILn4kFWdn+NptdPFjeY=
54+
- secure: jjGWN5Ap6WinGX86KeIl2azccMWWiXqTf4XfAUteMobme5yn17WpyycD12WNChGLF2ieiNvxS/vsVaAKKx24WN5dZ9eggDMCBYHGqzQmuho26BZ4tc+Tzt+A2fFgJb5z9APThYT2W1lua6XumPzVnoJtrLV+hLU1xWPqF29/W76FC91MjFeLpjLmG51BUqTIBCABw+PVpG2z1+DU1NVT0zV0BoRafyHbn/3ezRRXwC5oV00kRswGHkSehj6+eGWDsUoOwupHJPgV/wl52sX9I+XpoherzjvB0p27820YKtkUiG7EIgriK1WSxT46zcPa+avV4tbqrAR2Jrz/GpNv+QVYN8giYClLqecFiHWYB1/WTNpALG30NzVrjPdEzSHJrtH1EFRmZjXn31i9pAinihsIedfbJfVpNIy6N/lhmu+WBoLnNsU7HE86d6cpMGr6EpGnN4LH5vJOmk2f38x0/VrdiO0EDMyTxBV15rqmVTfZkHU24TXyX4N4q2zI+40M4pGtRrvHx02WiA3GPEYHe/OXICPvlY4YCmzGo79FCqZMcCcBVdg4I1e/M64/982eNREQGmGHvNRtePZesvEoqvp4Ra2Oef9gFyDMx0mpWYkMUYwWEo0FzeoApQNw1ModOcD8QCpS527YODtEpxzfMRs6ILn4kFWdn+NptdPFjeY=
5755
webhooks:
5856
urls:
5957
- secure: FKa1zx+QP/3Z66b7rsKnKkMcn/0yvqefhGNl85bXhOPusZJS09DZnFSmrz2nXtOTnDdxsh/pT+Xj29782aVy7ByV0ul+fBAqKAYbkOPsnDmkxZizxrHumY99hzdK+0EorOZSQLAkpaSpz46NE5Fm2pJTc67MP5ZpfNVPCCXq0SYIEBNt3D745tfEda9fJjc0g+8zjed2YqMqC3Gqbnq8ebQZ7vBbIFfTtn4wrYfrWeS1kv6MX8dndVDueuKgRH1o/h2DPYDCk9WpHDniQ1TtPiwhMXOEH8G0dMkcR9VbBCz3n28JjjrxpIpXY1Ulk5wF3Aj0/jxf5yH6kpu4XdBINsMHE6GFCKJ/pnBf6RbggMUUuU66F2DWb6oxcdVEpTkixaFrXBqbsfM+UYj+QYoLvyxHqB/XKL3AzwPrUqys4NU3RQTOAFn5YXxzFWzjKovMeq+6S6lDA4E/L4OvO7+iCghjmFFdE0FF30GTue/Q79RmNXRZAJh9uR1UOtppc1iMn+QardzfRJ20qaohvP++ODCMnDfYLKzTXaZS+xCpUpZplwbV9wJMGUVSEwSuOX2L0RH5oIHceFqflKpKAIVlxMMy33AmoVclDCenaCwSHgGBtY94JunGQSBB+nsZz2YEWKecdBeICMZ7VWG9NAZkYOzphothFZYiwJFCykprjIg=

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ If you prefer to have the application in English or any other language, you can
6666

6767
### Development
6868

69-
1. Install node.js (version 10 required)
69+
1. Install node.js (refer to [.nvmrc](./.nvmrc) for required version)
7070
2. Install yarn: `npm install yarn -g`
7171
3. (For Android platform only) Install Java JDK 8, Gradle and Android Studio (Android SDK at least level 19)
7272
4. Change to project folder and run `yarn install`.

azure-pipelines.yml

+15-15
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ stages:
5050
vmImage: '$(windowsVmImage)'
5151

5252
steps:
53-
- task: UseNode@1
53+
- task: NodeTool@0
5454
inputs:
55-
version: '10.16.3'
56-
displayName: 'Install Node.js 10.16.3'
57-
- script: yarn install
55+
versionSpec: '14.18.2'
56+
displayName: 'Install Node.js 14.18.2'
57+
- script: yarn install --ignore-optional
5858
displayName: 'Run yarn install'
5959
- script: yarn test
6060
displayName: 'Run yarn test'
@@ -82,11 +82,11 @@ stages:
8282
vmImage: '$(windowsVmImage)'
8383

8484
steps:
85-
- task: UseNode@1
85+
- task: NodeTool@0
8686
inputs:
87-
version: '10.16.3'
88-
displayName: 'Install Node.js 10.16.3'
89-
- script: yarn install
87+
versionSpec: '14.18.2'
88+
displayName: 'Install Node.js 14.18.2'
89+
- script: yarn install --ignore-optional
9090
displayName: 'Run yarn install'
9191
- script: yarn gulp debug-release --android
9292
displayName: 'Run yarn release for android'
@@ -101,10 +101,10 @@ stages:
101101
vmImage: 'macos-10.15'
102102

103103
steps:
104-
- task: UseNode@1
104+
- task: NodeTool@0
105105
inputs:
106-
version: '10.16.3'
107-
displayName: 'Install Node.js 10.16.3'
106+
versionSpec: '14.18.2'
107+
displayName: 'Install Node.js 14.18.2'
108108
- script: npm install -g gulp
109109
displayName: 'Install Gulp'
110110
- script: yarn install
@@ -126,11 +126,11 @@ stages:
126126
vmImage: '$(linuxVmImage)'
127127

128128
steps:
129-
- task: UseNode@1
129+
- task: NodeTool@0
130130
inputs:
131-
version: '10.16.3'
132-
displayName: 'Install Node.js 10.16.3'
133-
- script: yarn install
131+
versionSpec: '14.18.2'
132+
displayName: 'Install Node.js 14.18.2'
133+
- script: yarn install --ignore-optional
134134
displayName: 'Run yarn install'
135135
- script: yarn gulp release --linux64
136136
displayName: 'Run yarn release for linux64'

gulp-appdmg.js

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
2+
const appdmg = require('appdmg');
3+
const through = require('through2');
4+
const gutil = require('gulp-util');
5+
6+
const PluginError = gutil.PluginError;
7+
const PLUGIN_NAME = 'gulp-appdmg';
8+
9+
module.exports = function(options) {
10+
const stream = through.obj(function(file, encoding, next) {
11+
next();
12+
}, function(callback) {
13+
const self = this;
14+
const ee = appdmg(options);
15+
16+
ee.on('progress', function(info) {
17+
gutil.log(info.current + '/' + info.total + ' ' + info.type + ' ' + (info.title || info.status));
18+
});
19+
20+
ee.on('error', function(err) {
21+
self.emit('error', new PluginError(PLUGIN_NAME, err));
22+
callback();
23+
});
24+
25+
ee.on('finish', callback);
26+
});
27+
28+
// returning the file stream
29+
stream.resume();
30+
return stream;
31+
};

gulpfile.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,7 @@ function getLinuxPackageArch(type, arch) {
803803
}
804804
// Create distribution package for macOS platform
805805
function release_osx64(appDirectory) {
806-
const appdmg = require('gulp-appdmg');
806+
const appdmg = require('./gulp-appdmg');
807807

808808
// The appdmg does not generate the folder correctly, manually
809809
createDirIfNotExists(RELEASE_DIR);

package.json

+8-6
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"release:windows": "set NODE_ENV=production&& gulp release",
1616
"pretest": "yarn run lint",
1717
"test": "karma start test/karma.conf.js",
18-
"lint": "eslint --ext .js,.vue src gulpfile.js",
19-
"lint:fix": "eslint --fix src gulpfile.js"
18+
"lint": "eslint --ext .js,.vue src gulpfile.js gulp-appdmg.js",
19+
"lint:fix": "eslint --fix src gulpfile.js gulp-appdmg.js"
2020
},
2121
"window": {
2222
"icon": "images/bf_icon_128.png",
@@ -47,7 +47,7 @@
4747
"author": "The Betaflight open source project.",
4848
"license": "GPL-3.0",
4949
"engines": {
50-
"node": "10.x"
50+
"node": "14.x"
5151
},
5252
"dependencies": {
5353
"@fortawesome/fontawesome-free": "^5.13.0",
@@ -98,8 +98,9 @@
9898
"gulp-prompt": "^1.2.0",
9999
"gulp-rename": "^2.0.0",
100100
"gulp-replace": "^1.0.0",
101-
"gulp-xml-transformer": "^3.0.0",
102-
"gulp-yarn": "^2.0.0",
101+
"gulp-util": "^3.0.8",
102+
"gulp-xml-transformer": "^5.1.1",
103+
"gulp-yarn": "^3.0.0",
103104
"gulp-zip": "^5.0.0",
104105
"husky": "^4.3.0",
105106
"karma": "^4.0.1",
@@ -124,12 +125,13 @@
124125
"sinon-chai": "^3.5.0",
125126
"targz": "^1.0.1",
126127
"temp": "^0.9.1",
128+
"through2": "^4.0.2",
127129
"vinyl-source-stream": "^2.0.0",
128130
"vue-template-compiler": "^2.6.12",
129131
"yarn": "^1.22.17"
130132
},
131133
"optionalDependencies": {
132-
"gulp-appdmg": "^1.0.3"
134+
"appdmg": "^0.6.2"
133135
},
134136
"husky": {
135137
"hooks": {

0 commit comments

Comments
 (0)