From c1c214ec2bd11befebae06eaf35297b0f3443ee2 Mon Sep 17 00:00:00 2001
From: Ugo Bechameil <ugo.bechameil@hackolade.com>
Date: Mon, 1 Jul 2024 11:09:22 +0200
Subject: [PATCH] Fix packaging

---
 lib/pack.js                         | 18 ++++++++++--------
 package.json                        | 16 ++++++++--------
 studio-natives-modules/package.json |  2 +-
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/lib/pack.js b/lib/pack.js
index 7d80c75..1bb0c9c 100644
--- a/lib/pack.js
+++ b/lib/pack.js
@@ -82,6 +82,7 @@ export async function rescopeOfficialPrebuildsFromPackage({ buildMetadata, resco
 	const toPublish = [];
 
 	for (const meta of buildMetadata) {
+		log(">>>>>>>>>>>> RESCOPE: %O", meta);
 		if (!rescopeOnlyPrebuilds) {
 			const modulePkg = await readPackageData(meta.moduleBaseDir);
 			const newJSONPkg = sanitizeModulePackageJSON({
@@ -97,19 +98,20 @@ export async function rescopeOfficialPrebuildsFromPackage({ buildMetadata, resco
 				relocatePrebuilds: false,
 			});
 		}
-		for (const prebuildNpmMeta of meta.prebuildsAsNpmDependencies) {
+		for (const {moduleBaseDir, modulePkg: modulePkgMeta ,rescopedModuleBaseDir, prebuildsAsNpmDependencies, rescopedModuleName} of meta.prebuildsAsNpmDependencies) {
 			if (meta.prebuilds_as_npm_packages) {
-				const modulePkg = await readPackageData(prebuildNpmMeta.moduleBaseDir);
+				const modulePkg = await readPackageData(moduleBaseDir);
 				const newJSONPkg = sanitizeModulePackageJSON({
-					...prebuildNpmMeta,
+					prebuildsAsNpmDependencies,
+					rescopedModuleName,
 					modulePkg,
 					version: meta.version,
 					isPrebuild: true,
 				});
 
 				await pack({
-					srcBaseDir: prebuildNpmMeta.moduleBaseDir,
-					destBaseDir: prebuildNpmMeta.rescopedModuleBaseDir,
+					srcBaseDir: moduleBaseDir,
+					destBaseDir: rescopedModuleBaseDir,
 					packageJSONData: newJSONPkg.modulePkg,
 					modulesToPublish: toPublish,
 					mainFromConfig: meta.prebuildPackageMainEntry,
@@ -118,9 +120,9 @@ export async function rescopeOfficialPrebuildsFromPackage({ buildMetadata, resco
 			} else {
 				if (!meta.to_build) {
 					await pack({
-						srcBaseDir: prebuildNpmMeta.moduleBaseDir,
-						destBaseDir: prebuildNpmMeta.rescopedModuleBaseDir,
-						packageJSONData: prebuildNpmMeta.modulePkg,
+						srcBaseDir: moduleBaseDir,
+						destBaseDir: rescopedModuleBaseDir,
+						packageJSONData: modulePkgMeta,
 						modulesToPublish: toPublish,
 						mainFromConfig: meta?.prebuildPackageMainEntry,
 						filesFromConfig: meta?.prebuildPackageFiles,
diff --git a/package.json b/package.json
index c6b1a04..ed26cf5 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
 		"version_format": "<electron major version>.<package major>.<arbitrary patch>",
 		"nativeModules": {
 			"@parcel/watcher": {
-				"version": "31.2.20",
+				"version": "31.2.21",
 				"napi": true,
 				"prebuild_install": false,
 				"prebuilds_as_npm_packages": true,
@@ -65,7 +65,7 @@
 				"to_build": false
 			},
 			"couchbase": {
-				"version": "31.4.20",
+				"version": "31.4.21",
 				"napi": true,
 				"prebuild_install": false,
 				"prebuilds_as_npm_packages": true,
@@ -73,7 +73,7 @@
 				"to_build": false
 			},
 			"desktop-trampoline": {
-				"version": "31.2.20",
+				"version": "31.2.21",
 				"napi": false,
 				"prebuild_install": true,
 				"prebuilds_as_npm_packages": false,
@@ -85,28 +85,28 @@
 				]
 			},
 			"kerberos": {
-				"version": "31.2.20",
+				"version": "31.2.21",
 				"napi": true,
 				"prebuild_install": true,
 				"prebuilds_as_npm_packages": false,
 				"to_build": false
 			},
 			"kerberos-plugins": {
-				"version": "31.1.20",
+				"version": "31.1.21",
 				"napi": false,
 				"prebuild_install": true,
 				"prebuilds_as_npm_packages": false,
 				"to_build": true
 			},
 			"keytar": {
-				"version": "31.8.20",
+				"version": "31.8.21",
 				"napi": true,
 				"prebuild_install": true,
 				"prebuilds_as_npm_packages": false,
 				"to_build": false
 			},
 			"krb5": {
-				"version": "31.0.20",
+				"version": "31.0.21",
 				"napi": true,
 				"prebuild_install": true,
 				"prebuilds_as_npm_packages": false,
@@ -125,7 +125,7 @@
 				}
 			},
 			"mongodb-client-encryption": {
-				"version": "31.2.20",
+				"version": "31.2.21",
 				"prebuild_install": true,
 				"napi": true,
 				"prebuilds_as_npm_packages": false,
diff --git a/studio-natives-modules/package.json b/studio-natives-modules/package.json
index 65297a0..be9e895 100644
--- a/studio-natives-modules/package.json
+++ b/studio-natives-modules/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@hackolade/studio-native-modules",
-	"version": "31.0.20",
+	"version": "31.0.21",
 	"description": "A virtual package referencing all of the Studio native modules for a specific Electron version",
 	"keywords": [
 		"hackolade",