feat: upgrade clang-format and gulp-clang-format.
This makes sure just running clang-format will use whatever version is used in the project, by loading it from the closest node_modules folder. It also moves the clang-format dependency to the top and explicitly passes it to gulp-clang-format, giving us more control over the version used.
This commit is contained in:
parent
d1f7900eeb
commit
1f7296c093
|
@ -1,11 +1,12 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var autoprefixer = require('gulp-autoprefixer');
|
var autoprefixer = require('gulp-autoprefixer');
|
||||||
|
var clangFormat = require('clang-format');
|
||||||
var del = require('del');
|
var del = require('del');
|
||||||
var format = require('gulp-clang-format');
|
|
||||||
var exec = require('child_process').exec;
|
var exec = require('child_process').exec;
|
||||||
var fork = require('child_process').fork;
|
var fork = require('child_process').fork;
|
||||||
var gulp = require('gulp');
|
var gulp = require('gulp');
|
||||||
|
var gulpFormat = require('gulp-clang-format');
|
||||||
var gulpPlugins = require('gulp-load-plugins')();
|
var gulpPlugins = require('gulp-load-plugins')();
|
||||||
var sass = require('gulp-sass');
|
var sass = require('gulp-sass');
|
||||||
var shell = require('gulp-shell');
|
var shell = require('gulp-shell');
|
||||||
|
@ -204,7 +205,7 @@ gulp.task('build/pubbuild.dart', pubbuild(gulp, gulpPlugins, {
|
||||||
|
|
||||||
function doCheckFormat() {
|
function doCheckFormat() {
|
||||||
return gulp.src(['modules/**/*.ts', 'tools/**/*.ts', '!**/typings/**/*.d.ts'])
|
return gulp.src(['modules/**/*.ts', 'tools/**/*.ts', '!**/typings/**/*.d.ts'])
|
||||||
.pipe(format.checkFormat('file'));
|
.pipe(gulpFormat.checkFormat('file', clangFormat));
|
||||||
}
|
}
|
||||||
|
|
||||||
gulp.task('check-format', function() {
|
gulp.task('check-format', function() {
|
||||||
|
|
|
@ -1667,6 +1667,14 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"clang-format": {
|
||||||
|
"version": "1.0.25",
|
||||||
|
"dependencies": {
|
||||||
|
"resolve": {
|
||||||
|
"version": "1.1.6"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"conventional-changelog": {
|
"conventional-changelog": {
|
||||||
"version": "0.0.17",
|
"version": "0.0.17",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
@ -3948,13 +3956,10 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"gulp-clang-format": {
|
"gulp-clang-format": {
|
||||||
"version": "1.0.19",
|
"version": "1.0.21",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"clang-format": {
|
|
||||||
"version": "1.0.21"
|
|
||||||
},
|
|
||||||
"gulp-util": {
|
"gulp-util": {
|
||||||
"version": "3.0.5",
|
"version": "3.0.6",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"array-differ": {
|
"array-differ": {
|
||||||
"version": "1.0.0"
|
"version": "1.0.0"
|
||||||
|
@ -3997,7 +4002,7 @@
|
||||||
"version": "4.0.1"
|
"version": "4.0.1"
|
||||||
},
|
},
|
||||||
"meow": {
|
"meow": {
|
||||||
"version": "3.1.0",
|
"version": "3.3.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"camelcase-keys": {
|
"camelcase-keys": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
|
@ -4091,10 +4096,49 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"object-assign": {
|
"object-assign": {
|
||||||
"version": "2.0.0"
|
"version": "3.0.0"
|
||||||
},
|
},
|
||||||
"replace-ext": {
|
"replace-ext": {
|
||||||
"version": "0.0.1"
|
"version": "0.0.1"
|
||||||
|
},
|
||||||
|
"through2": {
|
||||||
|
"version": "2.0.0",
|
||||||
|
"dependencies": {
|
||||||
|
"readable-stream": {
|
||||||
|
"version": "2.0.1",
|
||||||
|
"dependencies": {
|
||||||
|
"core-util-is": {
|
||||||
|
"version": "1.0.1"
|
||||||
|
},
|
||||||
|
"inherits": {
|
||||||
|
"version": "2.0.1"
|
||||||
|
},
|
||||||
|
"isarray": {
|
||||||
|
"version": "0.0.1"
|
||||||
|
},
|
||||||
|
"process-nextick-args": {
|
||||||
|
"version": "1.0.1"
|
||||||
|
},
|
||||||
|
"string_decoder": {
|
||||||
|
"version": "0.10.31"
|
||||||
|
},
|
||||||
|
"util-deprecate": {
|
||||||
|
"version": "1.0.1"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"vinyl": {
|
||||||
|
"version": "0.5.0",
|
||||||
|
"dependencies": {
|
||||||
|
"clone": {
|
||||||
|
"version": "1.0.2"
|
||||||
|
},
|
||||||
|
"clone-stats": {
|
||||||
|
"version": "0.0.1"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -9752,5 +9796,5 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"name": "angular",
|
"name": "angular",
|
||||||
"version": "2.0.0-alpha.27"
|
"version": "2.0.0-alpha.28"
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -56,6 +56,7 @@
|
||||||
"broccoli-writer": "^0.1.1",
|
"broccoli-writer": "^0.1.1",
|
||||||
"canonical-path": "0.0.2",
|
"canonical-path": "0.0.2",
|
||||||
"chokidar": "^1.0.1",
|
"chokidar": "^1.0.1",
|
||||||
|
"clang-format": "^1.0.25",
|
||||||
"conventional-changelog": "^0.0.17",
|
"conventional-changelog": "^0.0.17",
|
||||||
"css": "mlaval/css#issue65",
|
"css": "mlaval/css#issue65",
|
||||||
"del": "~1",
|
"del": "~1",
|
||||||
|
|
Loading…
Reference in New Issue