Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-22 11:19:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

build

Browse Source
This commit is contained in:
Joao Moreno
2018-09-26 14:41:56 +02:00
parent bca9ef4361
commit 47bf9b65e8
2 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
build/lib/extensions.js
View File

@@ -25,7 +25,6 @@ var vsce = require("vsce");
var stats_1 = require("./stats"); var stats_1 = require("./stats");
var util2 = require("./util"); var util2 = require("./util");
var remote = require("gulp-remote-src"); var remote = require("gulp-remote-src");
var flatmap = require('gulp-flatmap');
var vzip = require('gulp-vinyl-zip'); var vzip = require('gulp-vinyl-zip');
var filter = require('gulp-filter'); var filter = require('gulp-filter');
var rename = require('gulp-rename'); var rename = require('gulp-rename');
@@ -44,7 +43,6 @@ function fromLocal(extensionPath, sourceMappingURLBase) {
return fromLocalNormal(extensionPath); return fromLocalNormal(extensionPath);
} }
} }
exports.fromLocal = fromLocal;
function fromLocalWebpack(extensionPath, sourceMappingURLBase) { function fromLocalWebpack(extensionPath, sourceMappingURLBase) {
var result = es.through(); var result = es.through();
var packagedDependencies = []; var packagedDependencies = [];
@@ -173,18 +171,15 @@ function fromMarketplace(extensionName, version, metadata) {
headers: baseHeaders headers: baseHeaders
} }
}; };
var packageJsonFilter = filter('package.json', { restore: true });
return remote('', options) return remote('', options)
.pipe(flatmap(function (stream) { .pipe(vzip.src())
var packageJsonFilter = filter('package.json', { restore: true }); .pipe(filter('extension/**'))
return stream .pipe(rename(function (p) { return p.dirname = p.dirname.replace(/^extension\/?/, ''); }))
.pipe(vzip.src()) .pipe(packageJsonFilter)
.pipe(filter('extension/**')) .pipe(buffer())
.pipe(rename(function (p) { return p.dirname = p.dirname.replace(/^extension\/?/, ''); })) .pipe(json({ __metadata: metadata }))
.pipe(packageJsonFilter) .pipe(packageJsonFilter.restore);
.pipe(buffer())
.pipe(json({ __metadata: metadata }))
.pipe(packageJsonFilter.restore);
}));
} }
exports.fromMarketplace = fromMarketplace; exports.fromMarketplace = fromMarketplace;
var excludedExtensions = [ var excludedExtensions = [

24
build/lib/extensions.ts
View File

@@ -14,7 +14,6 @@ import * as vsce from 'vsce';
import { createStatsStream } from './stats'; import { createStatsStream } from './stats';
import * as util2 from './util'; import * as util2 from './util';
import remote = require('gulp-remote-src'); import remote = require('gulp-remote-src');
const flatmap = require('gulp-flatmap');
const vzip = require('gulp-vinyl-zip'); const vzip = require('gulp-vinyl-zip');
const filter = require('gulp-filter'); const filter = require('gulp-filter');
const rename = require('gulp-rename'); const rename = require('gulp-rename');
@@ -26,7 +25,7 @@ const webpackGulp = require('webpack-stream');
const root = path.resolve(path.join(__dirname, '..', '..')); const root = path.resolve(path.join(__dirname, '..', '..'));
export function fromLocal(extensionPath: string, sourceMappingURLBase?: string): Stream { function fromLocal(extensionPath: string, sourceMappingURLBase?: string): Stream {
const webpackFilename = path.join(extensionPath, 'extension.webpack.config.js'); const webpackFilename = path.join(extensionPath, 'extension.webpack.config.js');
if (fs.existsSync(webpackFilename)) { if (fs.existsSync(webpackFilename)) {
return fromLocalWebpack(extensionPath, sourceMappingURLBase); return fromLocalWebpack(extensionPath, sourceMappingURLBase);
@@ -201,19 +200,16 @@ export function fromMarketplace(extensionName: string, version: string, metadata
} }
}; };
return remote('', options) const packageJsonFilter = filter('package.json', { restore: true });
.pipe(flatmap(stream => {
const packageJsonFilter = filter('package.json', { restore: true });
return stream return remote('', options)
.pipe(vzip.src()) .pipe(vzip.src())
.pipe(filter('extension/**')) .pipe(filter('extension/**'))
.pipe(rename(p => p.dirname = p.dirname.replace(/^extension\/?/, ''))) .pipe(rename(p => p.dirname = p.dirname.replace(/^extension\/?/, '')))
.pipe(packageJsonFilter) .pipe(packageJsonFilter)
.pipe(buffer()) .pipe(buffer())
.pipe(json({ __metadata: metadata })) .pipe(json({ __metadata: metadata }))
.pipe(packageJsonFilter.restore); .pipe(packageJsonFilter.restore);
}));
} }
interface IPackageExtensionsOptions { interface IPackageExtensionsOptions {