Skip to content

Commit

Permalink
Merge pull request #763 from mikeller/use_npm_for_production
Browse files Browse the repository at this point in the history
Changed to use npm for production node module install.
  • Loading branch information
mikeller authored Dec 4, 2017
2 parents 2c2a78a + e78e674 commit df66843
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
9 changes: 5 additions & 4 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ var NwBuilder = require('nw-builder');

var gulp = require('gulp');
var concat = require('gulp-concat');
var install = require("gulp-install");
var runSequence = require('run-sequence');
var os = require('os');

Expand Down Expand Up @@ -163,9 +164,6 @@ gulp.task('dist', ['clean-dist'], function () {
'./js/libraries/jquery.nouislider.pips.min.css',
'./js/libraries/switchery/switchery.css',
'./js/libraries/jquery.nouislider.min.css',
'./node_modules/jquery-ui-npm/jquery-ui.min.css',
'./node_modules/jquery-ui-npm/jquery-ui.theme.min.css',
'./node_modules/jquery-ui-npm/jquery-ui.structure.min.css',

// JavaScript
'./js/libraries/q.js',
Expand Down Expand Up @@ -251,7 +249,10 @@ gulp.task('dist', ['clean-dist'], function () {
'./resources/motor_order/*.svg',
];
return gulp.src(distSources, { base: '.' })
.pipe(gulp.dest(distDir));
.pipe(gulp.dest(distDir))
.pipe(install({
npm: '--production --ignore-scripts'
}));;
});

// Create runable app directories in ./apps
Expand Down
5 changes: 1 addition & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,13 @@
"author": "The Betaflight open source project.",
"license": "GPL-3.0",
"dependencies": {
"bluebird": "3.4.1",
"jquery": "2.1.4",
"nw": "^0.25.4-sdk",
"three": "0.72.0"
},
"devDependencies": {
"archiver": "^2.0.3",
"del": "^3.0.0",
"gulp": "~3.9.1",
"gulp-concat": "~2.6.1",
"gulp-install": "^1.1.0",
"inflection": "1.12.0",
"jquery-ui-npm": "1.12.0",
"nw-builder": "^3.4.1",
Expand Down

0 comments on commit df66843

Please sign in to comment.