daohualiuxiang
/
vscode
mirror of https://github.com/microsoft/vscode.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix problem with missing `vscode-web-playground`

pull/103431/head
Alex Dima 2020-07-27 14:08:15 +02:00
parent 6c99a9fca9
commit c3ed1c89cb
No known key found for this signature in database
GPG Key ID: 6E58D7B045760DA0
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/lib/extensions.js
View File

@ -191,15 +191,18 @@ function fromMarketplace(extensionName, version, metadata) {
.pipe(packageJsonFilter.restore);
}
exports.fromMarketplace = fromMarketplace;
const excludedExtensions = [
const excludedCommonExtensions = [
'vscode-api-tests',
'vscode-web-playground',
'vscode-colorize-tests',
'vscode-test-resolver',
'ms-vscode.node-debug',
'ms-vscode.node-debug2',
'vscode-notebook-tests'
];
const excludedDesktopExtensions = excludedCommonExtensions.concat([
'vscode-web-playground',
]);
const excludedWebExtensions = excludedCommonExtensions.concat([]);
const marketplaceWebExtensions = [
'ms-vscode.references-view'
];
@ -215,6 +218,7 @@ function isWebExtension(manifest) {
return (!Boolean(manifest.main) || Boolean(manifest.browser));
}
function packageLocalExtensionsStream(forWeb) {
const excludedLocalExtensions = (forWeb ? excludedWebExtensions : excludedDesktopExtensions);
const localExtensionsDescriptions = (glob.sync('extensions/*/package.json')
.map(manifestPath => {
const absoluteManifestPath = path.join(root, manifestPath);
@ -222,7 +226,7 @@ function packageLocalExtensionsStream(forWeb) {
const extensionName = path.basename(extensionPath);
return { name: extensionName, path: extensionPath, manifestPath: absoluteManifestPath };
})
.filter(({ name }) => excludedExtensions.indexOf(name) === -1)
.filter(({ name }) => excludedLocalExtensions.indexOf(name) === -1)
.filter(({ name }) => builtInExtensions.every(b => b.name !== name))
.filter(({ manifestPath }) => (forWeb ? isWebExtension(require(manifestPath)) : true)));
const localExtensionsStream = minifyExtensionResources(es.merge(...localExtensionsDescriptions.map(extension => {

12
build/lib/extensions.ts
View File

@ -224,16 +224,19 @@ export function fromMarketplace(extensionName: string, version: string, metadata
.pipe(json({ __metadata: metadata }))
.pipe(packageJsonFilter.restore);
}
const excludedExtensions = [
const excludedCommonExtensions = [
'vscode-api-tests',
'vscode-web-playground',
'vscode-colorize-tests',
'vscode-test-resolver',
'ms-vscode.node-debug',
'ms-vscode.node-debug2',
'vscode-notebook-tests'
];
const excludedDesktopExtensions = excludedCommonExtensions.concat([
'vscode-web-playground',
]);
const excludedWebExtensions = excludedCommonExtensions.concat([
]);
const marketplaceWebExtensions = [
'ms-vscode.references-view'
@ -266,6 +269,7 @@ function isWebExtension(manifest: IExtensionManifest): boolean {
}
export function packageLocalExtensionsStream(forWeb: boolean): Stream {
const excludedLocalExtensions = (forWeb ? excludedWebExtensions : excludedDesktopExtensions);
const localExtensionsDescriptions = (
(<string[]>glob.sync('extensions/*/package.json'))
.map(manifestPath => {
@ -274,7 +278,7 @@ export function packageLocalExtensionsStream(forWeb: boolean): Stream {
const extensionName = path.basename(extensionPath);
return { name: extensionName, path: extensionPath, manifestPath: absoluteManifestPath };
})
.filter(({ name }) => excludedExtensions.indexOf(name) === -1)
.filter(({ name }) => excludedLocalExtensions.indexOf(name) === -1)
.filter(({ name }) => builtInExtensions.every(b => b.name !== name))
.filter(({ manifestPath }) => (forWeb ? isWebExtension(require(manifestPath)) : true))
);