From 738ccb86e9c87f7cf04a7b10c88bbec8a968d38c Mon Sep 17 00:00:00 2001
From: George Kudrayvtsev <george@stellar.org>
Date: Tue, 4 Apr 2023 16:26:21 -0700
Subject: [PATCH] Shuffle around dependencies

---
 .github/workflows/tests.yml      | 2 +-
 config/karma.conf.js             | 3 ++-
 config/webpack.config.browser.js | 5 +++--
 package.json                     | 8 ++++----
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 25b1156d..fe2cfcd7 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       fail-fast: false
-      max-parallel: 4
+      max-parallel: 2
       matrix:
         node-version: [14, 16, 18]
 
diff --git a/config/karma.conf.js b/config/karma.conf.js
index 7e2c4d1b..617c8177 100644
--- a/config/karma.conf.js
+++ b/config/karma.conf.js
@@ -1,4 +1,5 @@
-var webpackConfig = require('./webpack.config.browser.js');
+const webpackConfig = require('./webpack.config.browser.js');
+
 delete webpackConfig.output;
 webpackConfig.entry = {}; // karma fills these in
 webpackConfig.plugins.shift(); // drop eslinter plugin
diff --git a/config/webpack.config.browser.js b/config/webpack.config.browser.js
index 464823e1..5fd1585c 100644
--- a/config/webpack.config.browser.js
+++ b/config/webpack.config.browser.js
@@ -17,7 +17,8 @@ const config = {
       crypto: require.resolve('crypto-browserify'),
       stream: require.resolve('stream-browserify'),
       buffer: require.resolve('buffer')
-    }
+    },
+    extensions: ['.ts', '.js']
   },
   output: {
     clean: true,
@@ -67,7 +68,7 @@ const config = {
     })
   ],
   watchOptions: {
-    ignored: /(node_modules|coverage)/
+    ignored: /(node_modules|coverage|lib|dist)/
   }
 };
 
diff --git a/package.json b/package.json
index 471b83eb..f8603121 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "stellar-base",
   "version": "8.2.2",
   "description": "Low-level support library for the Stellar network.",
-  "main": "./lib/index.js",
+  "main": "./src/index.js",
   "types": "./types/index.d.ts",
   "scripts": {
     "build": "yarn build:node",
@@ -111,6 +111,8 @@
     "terser-webpack-plugin": "^5.3.7",
     "ts-node": "^10.9.1",
     "webpack": "^5.77.0",
+    "ghooks": "^2.0.4",
+    "typescript": "^5.0.3",
     "webpack-cli": "^5.0.1"
   },
   "dependencies": {
@@ -118,12 +120,10 @@
     "bignumber.js": "^9.1.1",
     "crc": "^4.3.2",
     "crypto-browserify": "^3.12.0",
-    "ghooks": "^2.0.4",
     "js-xdr": "^1.1.3",
     "lodash": "^4.17.21",
     "sha.js": "^2.3.6",
-    "tweetnacl": "^1.0.3",
-    "typescript": "^5.0.3"
+    "tweetnacl": "^1.0.3"
   },
   "optionalDependencies": {
     "sodium-native": "^3.3.0"