fix issues with circular imports

Parts of this commit are from a patch by sebasjm.  The circular imports
caused an issue with webpack.  While we don't use webpack in the wallet,
the wallet should still be importable by webpack.

Some packages were importing their dependencies via "index.js", which
re-exports public exports of the package.  This resulted in circular
dependencies which were resolved correctly by rollup, but not by
webpack.

1 files changed, 9 insertions, 9 deletions

diff --git a/packages/taler-wallet-core/src/index.ts b/packages/taler-wallet-core/src/index.ts
index 1f3901273..26701256c 100644
--- a/packages/taler-wallet-core/src/index.ts
+++ b/packages/taler-wallet-core/src/index.ts
@@ -18,11 +18,16 @@
  * Module entry point for the wallet when used as a node module.
  */
 
-export { Wallet } from "./wallet";
-
 // Errors
 export * from "./operations/errors";
 
+// Util functionality
+export { Logger } from "./util/logging";
+export { URL } from "./util/url";
+export * from "./util/promiseUtils";
+export * from "./util/query";
+export * from "./util/http";
+
 // Utils for using the wallet under node
 export { NodeHttpLib } from "./headless/NodeHttpLib";
 export {
@@ -44,13 +49,8 @@ export type { CryptoWorker } from "./crypto/workers/cryptoWorker";
 export { CryptoWorkerFactory, CryptoApi } from "./crypto/workers/cryptoApi";
 export * from "./crypto/talerCrypto";
 
-// Util functionality
-export { Logger } from "./util/logging";
-export { URL } from "./util/url";
-export * from "./util/promiseUtils";
-export * from "./util/query";
-export * from "./util/http";
-
 export * from "./pending-types";
 
 export * from "./util/debugFlags";
+
+export { Wallet } from "./wallet";