1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-24 16:55:24 +03:00

Moved from 'npm' to 'yarn'. (#1408)

Moved from 'npm' to 'yarn'.
This commit is contained in:
Michael Keller 2019-05-02 00:09:38 +12:00 committed by GitHub
commit aeda56ba40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 5090 additions and 7093 deletions

View file

@ -24,12 +24,11 @@ addons:
before_install:
- npm i -g npm@6.0.1
- npm install gulp -g
script:
- npm test
- gulp release
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then gulp release --chromeos; fi
- yarn test
- yarn gulp release
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then yarn gulp release --chromeos; fi
cache:
directories:

View file

@ -47,19 +47,18 @@ Unstable testing versions of the lates builds of the configurator for most platf
### Development
1. Install node.js
2. Change to project folder and run `npm install`.
3. Run `npm start`.
2. Change to project folder and run `yarn install`.
3. Run `yarn start`.
### Running tests
`npm test`
`yarn test`
### App build and release
The tasks are defined in `gulpfile.js` and can be run either via `gulp <task-name>` (if the command is in PATH or via `../node_modules/gulp/bin/gulp.js <task-name>`:
The tasks are defined in `gulpfile.js` and can be run either `yarn gulp <task-name>`:
1. Optional, install gulp `npm install --global gulp-cli`.
2. Run `gulp <taskname> [[platform] [platform] ...]`.
2. Run `yarn gulp <taskname> [[platform] [platform] ...]`.
List of possible values of `<task-name>`:
* **dist** copies all the JS and CSS files in the `./dist` folder.
@ -73,11 +72,11 @@ List of possible values of `<task-name>`:
To build or release only for one specific platform you can append the plaform after the `task-name`.
If no platform is provided, all the platforms will be done in sequence.
* **MacOS** use `gulp <task-name> --osx64`
* **Linux** use `gulp <task-name> --linux64`
* **Windows** use `gulp <task-name> --win32`
* **MacOS** use `yarn gulp <task-name> --osx64`
* **Linux** use `yarn gulp <task-name> --linux64`
* **Windows** use `yarn gulp <task-name> --win32`
You can also use multiple platforms e.g. `gulp <taskname> --osx64 --linux64`.
You can also use multiple platforms e.g. `yarn gulp <taskname> --osx64 --linux64`.
## Languages

View file

@ -228,7 +228,7 @@ function dist_src() {
.pipe(gulp.src('changelog.html', { passthrougth: true }))
.pipe(gulp.dest(DIST_DIR))
.pipe(install({
npm: '--production --ignore-scripts'
yarn: '--production --ignore-scripts'
}));
};
@ -588,7 +588,8 @@ function release_rpm(arch, done) {
tempDir: path.join(RELEASE_DIR,'tmp-rpm-build-' + arch),
keepTemp: false,
verbose: false,
rpmDest: RELEASE_DIR
rpmDest: RELEASE_DIR,
execOpts: { maxBuffer: 1024 * 1024 * 16 },
};
buildRpm(options, function(err, rpm) {

7073
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -6,9 +6,8 @@
"bg-script": "js/eventPage.js",
"default_locale": "en",
"scripts": {
"start": "node node_modules/gulp/bin/gulp.js debug",
"_postinstall": "node ./node_modules/platform-dependent-modules/cli.js",
"postinstall": "npm run _postinstall",
"start": "gulp debug",
"postinstall": "platform-dependent-modules",
"gulp": "gulp",
"test": "karma start test/karma.conf.js"
},
@ -38,6 +37,7 @@
"author": "The Betaflight open source project.",
"license": "GPL-3.0",
"dependencies": {
"gulp": "^4.0.1",
"i18next": "^14.1.1",
"i18next-xhr-backend": "^2.0.0",
"jquery-textcomplete": "^1.8.5",
@ -53,7 +53,6 @@
"del": "^3.0.0",
"follow-redirects": "^1.6.1",
"fs-extra": "^7.0.1",
"gulp": "~4.0.0",
"gulp-concat": "~2.6.1",
"gulp-debian": "~0.1.8",
"gulp-git": "^2.9.0",

5072
yarn.lock Normal file

File diff suppressed because it is too large Load diff