From 6fc663289007952aa4b3a95de477658f5f14864a Mon Sep 17 00:00:00 2001
From: Trygve Lie <trygve.lie@finn.no>
Date: Fri, 30 Apr 2021 09:15:12 +0200
Subject: [PATCH] fix: Improve ESM exports to account for dual module exports

---
 lib/http-incoming.js |  3 ++-
 lib/main.js          | 46 ++++++++++++++++++++++----------------------
 package.json         |  4 ++--
 3 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/lib/http-incoming.js b/lib/http-incoming.js
index 0f6f709..27593e4 100644
--- a/lib/http-incoming.js
+++ b/lib/http-incoming.js
@@ -12,7 +12,7 @@ const urlFromRequest = request => {
     }
 };
 
-export default class PodiumHttpIncoming {
+export default class HttpIncoming {
     #development;
     #response;
     #request;
@@ -190,3 +190,4 @@ export default class PodiumHttpIncoming {
         return 'PodiumHttpIncoming';
     }
 };
+// export default HttpIncoming;
\ No newline at end of file
diff --git a/lib/main.js b/lib/main.js
index 9b8711c..652db9e 100644
--- a/lib/main.js
+++ b/lib/main.js
@@ -1,24 +1,24 @@
-import * as Incoming from "./http-incoming.js";
-import { document } from "./html-document.js";
-import * as Css from "./asset-css.js";
-import * as Js from "./asset-js.js";
-import * as utils from "./utils.js"
-import * as html from "./html-utils.js"
+export { default as HttpIncoming } from './http-incoming.js';
+export { default as AssetCss } from './asset-css.js';
+export { default as AssetJs } from './asset-js.js';
 
-export const {isString} = utils;
-export const {isFunction} = utils;
-export const {uriBuilder} = utils;
-export const {uriIsRelative} = utils;
-export const {pathnameBuilder} = utils;
-export const {uriRelativeToAbsolute} = utils;
-export const {setAtLocalsPodium} = utils;
-export const {getFromLocalsPodium} = utils;
-export const {duplicateOnLocalsPodium} = utils;
-export const {serializeContext} = utils;
-export const {deserializeContext} = utils;
-export const {buildScriptElement} = html;
-export const {buildLinkElement} = html;
-export const HttpIncoming = Incoming;
-export const template = document;
-export const AssetCss = Css;
-export const AssetJs = Js;
+export { document as template } from './html-document.js';
+
+export { 
+    buildScriptElement, 
+    buildLinkElement, 
+} from './html-utils.js';
+
+export {
+    duplicateOnLocalsPodium,
+    uriRelativeToAbsolute,
+    getFromLocalsPodium,
+    deserializeContext,
+    setAtLocalsPodium,
+    serializeContext,
+    pathnameBuilder,
+    uriIsRelative,
+    uriBuilder,
+    isFunction,
+    isString,
+} from './utils.js';
diff --git a/package.json b/package.json
index bd406ed..943e460 100644
--- a/package.json
+++ b/package.json
@@ -59,10 +59,10 @@
         "rollup": "2.45.2",
         "babel-eslint": "10.1.0",
         "tap": "15.0.5",
-        "prettier": "2.2.1"
+        "prettier": "2.2.1",
+        "@podium/schemas": "5.0.0-next.4"
     },
     "dependencies": {
-        "@podium/schemas": "5.0.0-next.4",
         "camelcase": "6.2.0",
         "original-url": "1.2.3"
     }