development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-19 18:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

package.json filter fix for build/lib/extensions

Browse source
This commit is contained in:
Martin Aeschlimann 2020-06-11 00:20:14 +02:00
parent 57b0384a1a
commit 6bcf827d48
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build/lib/extensions.js
View file

@ -39,8 +39,8 @@ function minimizeLanguageJSON(input) {
}))
.pipe(tmLanguageJsonFilter.restore);
}
function updateExtensionPackageJSON(extensionPath, input, update) {
const packageJsonFilter = filter((f) => f.path === path.join(extensionPath, 'package.json'), { restore: true });
function updateExtensionPackageJSON(input, update) {
const packageJsonFilter = filter('extensions/*/package.json', { restore: true });
return input
.pipe(packageJsonFilter)
.pipe(buffer())
@ -58,7 +58,7 @@ function fromLocal(extensionPath, forWeb) {
? fromLocalWebpack(extensionPath, webpackConfigFileName)
: fromLocalNormal(extensionPath);
if (forWeb) {
input = updateExtensionPackageJSON(extensionPath, input, (data) => {
input = updateExtensionPackageJSON(input, (data) => {
if (data.browser) {
data.main = data.browser;
}
@ -67,7 +67,7 @@ function fromLocal(extensionPath, forWeb) {
});
}
else if (isWebPacked) {
input = updateExtensionPackageJSON(extensionPath, input, (data) => {
input = updateExtensionPackageJSON(input, (data) => {
if (data.main) {
data.main = data.main.replace('/out/', /dist/);
}

8
build/lib/extensions.ts
View file

@ -40,8 +40,8 @@ function minimizeLanguageJSON(input: Stream): Stream {
.pipe(tmLanguageJsonFilter.restore);
}
function updateExtensionPackageJSON(extensionPath: string, input: Stream, update: (data: any) => any): Stream {
const packageJsonFilter = filter((f: File) => f.path === path.join(extensionPath, 'package.json'), { restore: true });
function updateExtensionPackageJSON(input: Stream, update: (data: any) => any): Stream {
const packageJsonFilter = filter('extensions/*/package.json', { restore: true });
return input
.pipe(packageJsonFilter)
.pipe(buffer())
@ -62,7 +62,7 @@ function fromLocal(extensionPath: string, forWeb: boolean): Stream {
: fromLocalNormal(extensionPath);
if (forWeb) {
input = updateExtensionPackageJSON(extensionPath, input, (data: any) => {
input = updateExtensionPackageJSON(input, (data: any) => {
if (data.browser) {
data.main = data.browser;
}
@ -70,7 +70,7 @@ function fromLocal(extensionPath: string, forWeb: boolean): Stream {
return data;
});
} else if (isWebPacked) {
input = updateExtensionPackageJSON(extensionPath, input, (data: any) => {
input = updateExtensionPackageJSON(input, (data: any) => {
if (data.main) {
data.main = data.main.replace('/out/', /dist/);
}