From 5b2b1e9a15ed6ee0abc51707d535c6d237146352 Mon Sep 17 00:00:00 2001
From: Seweryn Kras <seweryn.kras@golem.network>
Date: Thu, 10 Oct 2024 14:10:28 +0200
Subject: [PATCH] fix: remove commonjs hint from package.json to allow webpack
 to decide how to bundle browser package

---
 package-lock.json | 66 ++++++-----------------------------------------
 package.json      |  3 ---
 rollup.config.mjs |  2 --
 3 files changed, 8 insertions(+), 63 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a5b8c017e..112a4f256 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,6 @@
       ],
       "dependencies": {
         "@golem-sdk/pino-logger": "^1.1.0",
-        "@rollup/rollup-win32-x64-msvc": "^4",
         "async-lock": "^1.4.1",
         "async-retry": "^1.3.3",
         "axios": "^1.6.7",
@@ -37,9 +36,7 @@
         "@commitlint/cli": "^19.0.3",
         "@commitlint/config-conventional": "^19.0.3",
         "@johanblumenberg/ts-mockito": "^1.0.43",
-        "@rollup/plugin-alias": "^5.1.0",
         "@rollup/plugin-commonjs": "^25.0.7",
-        "@rollup/plugin-json": "^6.1.0",
         "@rollup/plugin-node-resolve": "^15.2.3",
         "@rollup/plugin-terser": "^0.4.4",
         "@rollup/plugin-typescript": "^11.1.6",
@@ -2770,25 +2767,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/@rollup/plugin-alias": {
-      "version": "5.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "slash": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "peerDependencies": {
-        "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
-      },
-      "peerDependenciesMeta": {
-        "rollup": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@rollup/plugin-commonjs": {
       "version": "25.0.7",
       "dev": true,
@@ -2834,25 +2812,6 @@
         }
       }
     },
-    "node_modules/@rollup/plugin-json": {
-      "version": "6.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@rollup/pluginutils": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "peerDependencies": {
-        "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
-      },
-      "peerDependenciesMeta": {
-        "rollup": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@rollup/plugin-node-resolve": {
       "version": "15.2.3",
       "dev": true,
@@ -3830,11 +3789,12 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "20.12.2",
+      "version": "20.16.11",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.11.tgz",
+      "integrity": "sha512-y+cTCACu92FyA5fgQSAI8A1H429g7aSK2HsO7K4XYUWc4dY5IUz55JSDIYT6/VsOLfGy8vmvQYC2hfb0iF16Uw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~6.19.2"
       }
     },
     "node_modules/@types/normalize-package-data": {
@@ -17173,17 +17133,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/slash": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/slice-ansi": {
       "version": "3.0.0",
       "dev": true,
@@ -18449,9 +18398,10 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "dev": true,
-      "license": "MIT"
+      "version": "6.19.8",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
+      "dev": true
     },
     "node_modules/unicode-emoji-modifier-base": {
       "version": "1.0.0",
diff --git a/package.json b/package.json
index cdaaf7888..1ade2c4b4 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,6 @@
     "marketplace"
   ],
   "main": "dist/golem-js.js",
-  "type": "commonjs",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -87,9 +86,7 @@
     "@commitlint/cli": "^19.0.3",
     "@commitlint/config-conventional": "^19.0.3",
     "@johanblumenberg/ts-mockito": "^1.0.43",
-    "@rollup/plugin-alias": "^5.1.0",
     "@rollup/plugin-commonjs": "^25.0.7",
-    "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^11.1.6",
diff --git a/rollup.config.mjs b/rollup.config.mjs
index b44f023f2..0e94c9cc6 100644
--- a/rollup.config.mjs
+++ b/rollup.config.mjs
@@ -1,7 +1,5 @@
 import { nodeResolve } from "@rollup/plugin-node-resolve";
 import commonjs from "@rollup/plugin-commonjs";
-import json from "@rollup/plugin-json";
-import alias from "@rollup/plugin-alias";
 import terser from "@rollup/plugin-terser";
 import typescript from "@rollup/plugin-typescript";
 import nodePolyfills from "rollup-plugin-polyfill-node";