package.json filter fix for build/lib/extensions

aeschli · aeschli · commit 6bcf827d48f9 · 2020-06-11T10:18:39.000+02:00
diff --git a/build/lib/extensions.js b/build/lib/extensions.js
@@ -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/);
             }
diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts
@@ -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,15 +62,15 @@ 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;
 			}
 			data.extensionKind = ['web'];
 			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/);
 			}
