Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update to node 14 #2367

Merged
merged 2 commits into from
Dec 20, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10
14.18.2
8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,15 @@ addons:
apt:
packages:
- rpm
chrome: stable
chmelevskij marked this conversation as resolved.
Show resolved Hide resolved

git:
depth: 5

language: node_js

node_js:
- 10

addons:
chrome: stable
chmelevskij marked this conversation as resolved.
Show resolved Hide resolved
- 14.18.2

before_install:
- |
Expand Down Expand Up @@ -53,7 +51,7 @@ cache:
notifications:
slack:
rooms:
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=
- 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=
webhooks:
urls:
- secure: FKa1zx+QP/3Z66b7rsKnKkMcn/0yvqefhGNl85bXhOPusZJS09DZnFSmrz2nXtOTnDdxsh/pT+Xj29782aVy7ByV0ul+fBAqKAYbkOPsnDmkxZizxrHumY99hzdK+0EorOZSQLAkpaSpz46NE5Fm2pJTc67MP5ZpfNVPCCXq0SYIEBNt3D745tfEda9fJjc0g+8zjed2YqMqC3Gqbnq8ebQZ7vBbIFfTtn4wrYfrWeS1kv6MX8dndVDueuKgRH1o/h2DPYDCk9WpHDniQ1TtPiwhMXOEH8G0dMkcR9VbBCz3n28JjjrxpIpXY1Ulk5wF3Aj0/jxf5yH6kpu4XdBINsMHE6GFCKJ/pnBf6RbggMUUuU66F2DWb6oxcdVEpTkixaFrXBqbsfM+UYj+QYoLvyxHqB/XKL3AzwPrUqys4NU3RQTOAFn5YXxzFWzjKovMeq+6S6lDA4E/L4OvO7+iCghjmFFdE0FF30GTue/Q79RmNXRZAJh9uR1UOtppc1iMn+QardzfRJ20qaohvP++ODCMnDfYLKzTXaZS+xCpUpZplwbV9wJMGUVSEwSuOX2L0RH5oIHceFqflKpKAIVlxMMy33AmoVclDCenaCwSHgGBtY94JunGQSBB+nsZz2YEWKecdBeICMZ7VWG9NAZkYOzphothFZYiwJFCykprjIg=
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ If you prefer to have the application in English or any other language, you can

### Development

1. Install node.js (version 10 required)
1. Install node.js (refer to [.nvmrc](./.nvmrc) for required version)
chmelevskij marked this conversation as resolved.
Show resolved Hide resolved
2. Install yarn: `npm install yarn -g`
3. (For Android platform only) Install Java JDK 8, Gradle and Android Studio (Android SDK at least level 19)
4. Change to project folder and run `yarn install`.
Expand Down
30 changes: 15 additions & 15 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ stages:
vmImage: '$(windowsVmImage)'

steps:
- task: UseNode@1
- task: NodeTool@0
inputs:
version: '10.16.3'
displayName: 'Install Node.js 10.16.3'
- script: yarn install
versionSpec: '14.18.2'
displayName: 'Install Node.js 14.18.2'
- script: yarn install --ignore-optional
displayName: 'Run yarn install'
- script: yarn test
displayName: 'Run yarn test'
Expand Down Expand Up @@ -82,11 +82,11 @@ stages:
vmImage: '$(windowsVmImage)'

steps:
- task: UseNode@1
- task: NodeTool@0
inputs:
version: '10.16.3'
displayName: 'Install Node.js 10.16.3'
- script: yarn install
versionSpec: '14.18.2'
displayName: 'Install Node.js 14.18.2'
- script: yarn install --ignore-optional
displayName: 'Run yarn install'
- script: yarn gulp debug-release --android
displayName: 'Run yarn release for android'
Expand All @@ -101,10 +101,10 @@ stages:
vmImage: 'macos-10.15'

steps:
- task: UseNode@1
- task: NodeTool@0
inputs:
version: '10.16.3'
displayName: 'Install Node.js 10.16.3'
versionSpec: '14.18.2'
displayName: 'Install Node.js 14.18.2'
- script: npm install -g gulp
displayName: 'Install Gulp'
- script: yarn install
Expand All @@ -126,11 +126,11 @@ stages:
vmImage: '$(linuxVmImage)'

steps:
- task: UseNode@1
- task: NodeTool@0
inputs:
version: '10.16.3'
displayName: 'Install Node.js 10.16.3'
- script: yarn install
versionSpec: '14.18.2'
displayName: 'Install Node.js 14.18.2'
- script: yarn install --ignore-optional
displayName: 'Run yarn install'
- script: yarn gulp release --linux64
displayName: 'Run yarn release for linux64'
Expand Down
31 changes: 31 additions & 0 deletions gulp-appdmg.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@

const appdmg = require('appdmg');
const through = require('through2');
const gutil = require('gulp-util');

const PluginError = gutil.PluginError;
const PLUGIN_NAME = 'gulp-appdmg';

module.exports = function(options) {
const stream = through.obj(function(file, encoding, next) {
next();
}, function(callback) {
const self = this;
const ee = appdmg(options);

ee.on('progress', function(info) {
gutil.log(info.current + '/' + info.total + ' ' + info.type + ' ' + (info.title || info.status));
});

ee.on('error', function(err) {
self.emit('error', new PluginError(PLUGIN_NAME, err));
callback();
});

ee.on('finish', callback);
});

// returning the file stream
stream.resume();
return stream;
};
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,7 @@ function getLinuxPackageArch(type, arch) {
}
// Create distribution package for macOS platform
function release_osx64(appDirectory) {
const appdmg = require('gulp-appdmg');
const appdmg = require('./gulp-appdmg');

// The appdmg does not generate the folder correctly, manually
createDirIfNotExists(RELEASE_DIR);
Expand Down
14 changes: 8 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"release:windows": "set NODE_ENV=production&& gulp release",
"pretest": "yarn run lint",
"test": "karma start test/karma.conf.js",
"lint": "eslint --ext .js,.vue src gulpfile.js",
"lint:fix": "eslint --fix src gulpfile.js"
"lint": "eslint --ext .js,.vue src gulpfile.js gulp-appdmg.js",
"lint:fix": "eslint --fix src gulpfile.js gulp-appdmg.js"
},
"window": {
"icon": "images/bf_icon_128.png",
Expand Down Expand Up @@ -47,7 +47,7 @@
"author": "The Betaflight open source project.",
"license": "GPL-3.0",
"engines": {
"node": "10.x"
"node": "14.x"
},
"dependencies": {
"@fortawesome/fontawesome-free": "^5.13.0",
Expand Down Expand Up @@ -98,8 +98,9 @@
"gulp-prompt": "^1.2.0",
"gulp-rename": "^2.0.0",
"gulp-replace": "^1.0.0",
"gulp-xml-transformer": "^3.0.0",
"gulp-yarn": "^2.0.0",
"gulp-util": "^3.0.8",
"gulp-xml-transformer": "^5.1.1",
"gulp-yarn": "^3.0.0",
"gulp-zip": "^5.0.0",
"husky": "^4.3.0",
"karma": "^4.0.1",
Expand All @@ -124,12 +125,13 @@
"sinon-chai": "^3.5.0",
"targz": "^1.0.1",
"temp": "^0.9.1",
"through2": "^4.0.2",
"vinyl-source-stream": "^2.0.0",
"vue-template-compiler": "^2.6.12",
"yarn": "^1.22.17"
},
"optionalDependencies": {
"gulp-appdmg": "^1.0.3"
"appdmg": "^0.6.2"
},
"husky": {
"hooks": {
Expand Down
Loading