Skip to content

Commit 1ef9a66

Browse files
joaomorenojoaomoreno
committed
Revert "revert changes to gulp files"
This reverts commit 23afe96.
1 parent 43c6e13 commit 1ef9a66

12 files changed

Lines changed: 920 additions & 941 deletions

File tree

‎.eslintrc‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
22
"env": {
3-
"node": true
3+
"node": true,
4+
"es6": true
45
},
56
"rules": {
6-
"no-undef": 2,
7-
"no-unused-vars": 1
8-
}
7+
"no-console": 0
8+
},
9+
"extends": "eslint:recommended"
910
}

‎.vscode/tasks.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
"absolute"
2626
],
2727
"pattern": {
28-
"regexp": "^\\*\\*\\* Error: ([^(]+)\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\): (.*)$",
28+
"regexp": "Error: ([^(]+)\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\): (.*)$",
2929
"file": 1,
3030
"location": 2,
3131
"message": 3
3232
},
3333
"watching": {
34-
"beginsPattern": "^\\*\\*\\* Starting\\.\\.\\.$",
35-
"endsPattern": "^\\*\\*\\* Finished"
34+
"beginsPattern": "Starting compilation",
35+
"endsPattern": "Finished compilation"
3636
}
3737
}
3838
},

‎build/gulpfile.common.js‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,13 @@ var util = require('./lib/util');
1717
var i18n = require('./lib/i18n');
1818
var gulpUtil = require('gulp-util');
1919

20-
var quiet = !!process.env['VSCODE_BUILD_QUIET'];
21-
2220
function log(prefix, message) {
2321
gulpUtil.log(gulpUtil.colors.cyan('[' + prefix + ']'), message);
2422
}
2523

2624
var root = path.dirname(__dirname);
2725
var commit = util.getVersion(root);
2826

29-
var tsOptions = {
30-
target: 'ES5',
31-
module: 'amd',
32-
verbose: !quiet,
33-
preserveConstEnums: true,
34-
experimentalDecorators: true,
35-
sourceMap: true,
36-
rootDir: path.join(path.dirname(__dirname), 'src')
37-
};
38-
3927
exports.loaderConfig = function (emptyPaths) {
4028
var result = {
4129
paths: {
@@ -75,7 +63,7 @@ function loader(bundledFileHeader) {
7563
.pipe(util.loadSourcemaps())
7664
.pipe(concat('vs/loader.js'))
7765
.pipe(es.mapSync(function (f) {
78-
f.sourceMap.sourceRoot = util.toFileUri(tsOptions.rootDir);
66+
f.sourceMap.sourceRoot = util.toFileUri(path.join(path.dirname(__dirname), 'src'));
7967
return f;
8068
}));
8169
}

‎build/gulpfile.extensions.js‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ var glob = require('glob');
1919
var sourcemaps = require('gulp-sourcemaps');
2020
var nlsDev = require('vscode-nls-dev');
2121

22-
var quiet = !!process.env['VSCODE_BUILD_QUIET'];
2322
var extensionsPath = path.join(path.dirname(__dirname), 'extensions');
2423

2524
var compilations = glob.sync('**/tsconfig.json', {
@@ -34,7 +33,7 @@ var tasks = compilations.map(function(tsconfigFile) {
3433
var relativeDirname = path.dirname(tsconfigFile);
3534

3635
var tsOptions = require(absolutePath).compilerOptions;
37-
tsOptions.verbose = !quiet;
36+
tsOptions.verbose = false;
3837
tsOptions.sourceMap = true;
3938

4039
var name = relativeDirname.replace(/\//g, '-');
@@ -56,15 +55,15 @@ var tasks = compilations.map(function(tsconfigFile) {
5655
var i18n = path.join(__dirname, '..', 'i18n');
5756

5857
function createPipeline(build) {
59-
var reporter = quiet ? null : createReporter();
58+
var reporter = createReporter();
6059

6160
tsOptions.inlineSources = !!build;
62-
var compilation = tsb.create(tsOptions, null, null, quiet ? null : function (err) { reporter(err.toString()); });
61+
var compilation = tsb.create(tsOptions, null, null, err => reporter(err.toString()));
6362

6463
return function () {
65-
var input = es.through();
66-
var tsFilter = filter(['**/*.ts', '!**/lib/lib*.d.ts', '!**/node_modules/**'], { restore: true });
67-
var output = input
64+
const input = es.through();
65+
const tsFilter = filter(['**/*.ts', '!**/lib/lib*.d.ts', '!**/node_modules/**'], { restore: true });
66+
const output = input
6867
.pipe(tsFilter)
6968
.pipe(util.loadSourcemaps())
7069
.pipe(compilation())
@@ -73,37 +72,37 @@ var tasks = compilations.map(function(tsconfigFile) {
7372
addComment: false,
7473
includeContent: !!build,
7574
sourceRoot: function(file) {
76-
var levels = file.relative.split(path.sep).length;
75+
const levels = file.relative.split(path.sep).length;
7776
return '../'.repeat(levels) + 'src';
7877
}
7978
}))
8079
.pipe(tsFilter.restore)
8180
.pipe(build ? nlsDev.createAdditionalLanguageFiles(languages, i18n, out) : es.through())
82-
.pipe(quiet ? es.through() : reporter.end());
81+
.pipe(reporter.end());
8382

8483
return es.duplex(input, output);
8584
};
86-
};
85+
}
8786

88-
var srcOpts = { cwd: path.dirname(__dirname), base: srcBase };
87+
const srcOpts = { cwd: path.dirname(__dirname), base: srcBase };
8988

9089
gulp.task(clean, function (cb) {
9190
rimraf(out, cb);
9291
});
9392

9493
gulp.task(compile, [clean], function () {
95-
var pipeline = createPipeline(false);
96-
var input = gulp.src(src, srcOpts);
94+
const pipeline = createPipeline(false);
95+
const input = gulp.src(src, srcOpts);
9796

9897
return input
9998
.pipe(pipeline())
10099
.pipe(gulp.dest(out));
101100
});
102101

103102
gulp.task(watch, [clean], function () {
104-
var pipeline = createPipeline(false);
105-
var input = gulp.src(src, srcOpts);
106-
var watchInput = watcher(src, srcOpts);
103+
const pipeline = createPipeline(false);
104+
const input = gulp.src(src, srcOpts);
105+
const watchInput = watcher(src, srcOpts);
107106

108107
return watchInput
109108
.pipe(util.incremental(pipeline, input))
@@ -115,17 +114,18 @@ var tasks = compilations.map(function(tsconfigFile) {
115114
});
116115

117116
gulp.task(compileBuild, [clean], function () {
118-
var pipeline = createPipeline(true);
119-
var input = gulp.src(src, srcOpts);
117+
const pipeline = createPipeline(true);
118+
const input = gulp.src(src, srcOpts);
120119

121120
return input
122121
.pipe(pipeline())
123122
.pipe(gulp.dest(out));
124123
});
125124

126125
gulp.task(watchBuild, [clean], function () {
127-
var input = gulp.src(src, srcOpts);
128-
var watchInput = watcher(src, srcOpts);
126+
const pipeline = createPipeline(true);
127+
const input = gulp.src(src, srcOpts);
128+
const watchInput = watcher(src, srcOpts);
129129

130130
return watchInput
131131
.pipe(util.incremental(function () { return pipeline(true); }, input))

0 commit comments

Comments
 (0)