Skip to content

Commit 18c4629

Browse files
alexdimaalexdima
committed
Rename gulp tasks around extensions
1 parent 1a97264 commit 18c4629

8 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎build/gulpfile.extensions.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ var extensionsPath = path.join(path.dirname(__dirname), 'extensions');
2626

2727
function getTSConfig(plugin) {
2828
var script = (plugin.desc && plugin.desc.scripts && plugin.desc.scripts['vscode:prepublish']) || '';
29-
var match = /^node \.\.\/\.\.\/node\_modules\/gulp\/bin\/gulp\.js \-\-gulpfile \.\.\/\.\.\/build\/gulpfile\.extensions\.js compile-plugin:([^ ]+) ?(.*tsconfig\.json)/.exec(script);
29+
var match = /^node \.\.\/\.\.\/node\_modules\/gulp\/bin\/gulp\.js \-\-gulpfile \.\.\/\.\.\/build\/gulpfile\.extensions\.js compile-extension:([^ ]+) ?(.*tsconfig\.json)/.exec(script);
3030

3131
if (!match) {
3232
return;
@@ -72,9 +72,9 @@ var tasks = readAllPlugins()
7272

7373
var name = plugin.desc.name;
7474
var pluginRoot = path.join(extensionsPath, name);
75-
var clean = 'clean-plugin:' + name;
76-
var compile = 'compile-plugin:' + name;
77-
var watch = 'watch-plugin:' + name;
75+
var clean = 'clean-extension:' + name;
76+
var compile = 'compile-extension:' + name;
77+
var watch = 'watch-extension:' + name;
7878

7979
var sources = 'extensions/' + name + '/src/**';
8080
var deps = [
@@ -136,6 +136,6 @@ var tasks = readAllPlugins()
136136
})
137137
.filter(function(task) { return !!task; });
138138

139-
gulp.task('clean-plugins', tasks.map(function (t) { return t.clean; }));
140-
gulp.task('compile-plugins', tasks.map(function (t) { return t.compile; }));
141-
gulp.task('watch-plugins', tasks.map(function (t) { return t.watch; }));
139+
gulp.task('clean-extensions', tasks.map(function (t) { return t.clean; }));
140+
gulp.task('compile-extensions', tasks.map(function (t) { return t.compile; }));
141+
gulp.task('watch-extensions', tasks.map(function (t) { return t.watch; }));

‎build/gulpfile.vscode.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ var BUNDLED_FILE_HEADER = [
7777
].join('\n');
7878

7979
gulp.task('clean-optimized-vscode', util.rimraf('out-vscode'));
80-
gulp.task('optimize-vscode', ['clean-optimized-vscode', 'compile-build', 'compile-plugins'], common.optimizeTask({
80+
gulp.task('optimize-vscode', ['clean-optimized-vscode', 'compile-build', 'compile-extensions'], common.optimizeTask({
8181
entryPoints: vscodeEntryPoints,
8282
otherSources: [],
8383
resources: vscodeResources,

‎extensions/javascript-migration/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"main": "./out/extension",
1818

1919
"scripts": {
20-
"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-plugin:javascript-migration ./src/tsconfig.json"
20+
"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:javascript-migration ./src/tsconfig.json"
2121
},
2222
"devDependencies": {
2323
"typescript": "^1.7.5",

‎extensions/json/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
],
1111
"main": "./out/jsonMain",
1212
"scripts": {
13-
"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-plugin:json ./src/tsconfig.json",
13+
"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:json ./src/tsconfig.json",
1414
"postinstall": "cd server && npm install && npm run compile && cd .."
1515
},
1616
"contributes": {

‎extensions/php/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@
4141
}
4242
},
4343
"scripts": {
44-
"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-plugin:php ./src/tsconfig.json"
44+
"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:php ./src/tsconfig.json"
4545
}
4646
}

‎extensions/typescript/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"vscode-extension-telemetry": "^0.0.4"
1515
},
1616
"scripts": {
17-
"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-plugin:typescript ./src/tsconfig.json"
17+
"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:typescript ./src/tsconfig.json"
1818
},
1919
"activationEvents": [
2020
"onLanguage:javascript",

‎extensions/vscode-api-tests/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"scripts": {
1111
"compile": "node ./node_modules/vscode/bin/compile -watch -p ./",
12-
"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-plugin:vscode-api-tests ./tsconfig.json",
12+
"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:vscode-api-tests ./tsconfig.json",
1313
"postinstall": "node ./node_modules/vscode/bin/install"
1414
},
1515
"devDependencies": {

‎gulpfile.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ gulp.task('watch-build', ['clean-build'], watchTask('out-build', true));
114114
gulp.task('default', ['compile']);
115115

116116
// All
117-
gulp.task('clean', ['clean-client', 'clean-plugins']);
118-
gulp.task('compile', ['compile-client', 'compile-plugins']);
119-
gulp.task('watch', ['watch-client', 'watch-plugins']);
117+
gulp.task('clean', ['clean-client', 'clean-extensions']);
118+
gulp.task('compile', ['compile-client', 'compile-extensions']);
119+
gulp.task('watch', ['watch-client', 'watch-extensions']);
120120

121121
gulp.task('test', function () {
122122
return gulp.src('test/all.js')

0 commit comments

Comments
 (0)