use deno.land for liveviewjs imports

floodfx · Apr 3, 2022 · dec3fce · dec3fce
1 parent a40f715
commit dec3fce
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 24 deletions.
diff --git a/packages/deno/app.ts b/packages/deno/app.ts
@@ -1,10 +1,8 @@
-import { Application, nanoid, Router, send } from "./deps.ts";
-import { LiveViewRouter, WsMessageRouter, SingleProcessPubSub } from "./liveviewjs.ts";
+import { Application, nanoid, Router, send, LiveViewRouter, WsMessageRouter, SingleProcessPubSub } from "./deps.ts";
 
 import { configLiveViewHandler } from "./liveViewAppAdaptor.ts";
 import { rootTemplateRenderer } from "./liveViewRootTemplate.ts";
 import { DenoJwtSerDe } from "./serDe.ts";
-// import { SingleProcessPubSub } from "./pubSub.ts";
 import { DenoWsAdaptor } from "./wsAdaptor.ts";
 
 import { LightLiveViewComponent } from "./liveviewjs-examples/liveview-examples.mjs";

diff --git a/packages/deno/deps.ts b/packages/deno/deps.ts
@@ -22,5 +22,16 @@ export {
   send,
 } from "https://deno.land/x/[email protected]/mod.ts";
 
-// export { EventEmitter } from "https://deno.land/[email protected]/node/events.ts";
-// export * as crypto from "https://deno.land/[email protected]/node/crypto.ts";
+export {
+  WsMessageRouter, SingleProcessPubSub, handleHttpLiveView, html, live_title_tag
+} from "https://deno.land/x/[email protected]/mod.ts"
+
+export type {
+  LiveViewRouter,
+  LiveViewTemplate,
+  PageTitleDefaults,
+  HttpRequestAdaptor,
+  SerDe,
+  SessionData,
+  WsAdaptor
+} from "https://deno.land/x/[email protected]/mod.ts";
diff --git a/packages/deno/import_map.json b/packages/deno/import_map.json
@@ -3,6 +3,6 @@
     "zod": "https://deno.land/x/[email protected]/mod.ts",
     "crypto": "https://deno.land/[email protected]/node/crypto.ts",
     "events": "https://deno.land/[email protected]/node/events.ts",
-    "liveviewjs": "./liveviewjs.ts"
+    "liveviewjs": "https://deno.land/x/liveviewjs@0.3.0-rc.1/mod.ts"
   }
 }
diff --git a/packages/deno/liveViewAppAdaptor.ts b/packages/deno/liveViewAppAdaptor.ts
@@ -5,10 +5,9 @@ import type {
   HttpRequestAdaptor,
   SerDe,
   SessionData,
-} from "./liveviewjs.ts";
-import { handleHttpLiveView } from "./liveviewjs.ts";
+} from "./deps.ts";
+import { Context, nanoid, handleHttpLiveView } from "./deps.ts";
 import { DenoJwtSerDe } from "./serDe.ts";
-import { Context, nanoid } from "./deps.ts";
 
 export const configLiveViewHandler = (
   getRouter: () => LiveViewRouter,

diff --git a/packages/deno/liveViewRootTemplate.ts b/packages/deno/liveViewRootTemplate.ts
@@ -1,5 +1,5 @@
-import type { LiveViewTemplate, PageTitleDefaults } from "./liveviewjs.ts";
-import { html, live_title_tag } from "./liveviewjs.ts";
+import type { LiveViewTemplate, PageTitleDefaults } from "./deps.ts";
+import { html, live_title_tag } from "./deps.ts";
 
 export const rootTemplateRenderer = (
   pageTitleDefault: PageTitleDefaults,

diff --git a/packages/deno/liveViewRouterAdaptor.ts b/packages/deno/liveViewRouterAdaptor.ts
@@ -5,10 +5,9 @@ import type {
   HttpRequestAdaptor,
   SerDe,
   SessionData,
-} from "./liveviewjs.ts";
-import { handleHttpLiveView } from "./liveviewjs.ts";
+} from "./deps.ts";
+import { nanoid, handleHttpLiveView, RouterContext } from "./deps.ts";
 import { DenoJwtSerDe } from "./serDe.ts";
-import { RouterContext, nanoid } from "./deps.ts";
 
 interface ParamsDictionary {
   [key: string]: string;
@@ -21,7 +20,6 @@ export const configLiveViewHandler = (
     csrfToken: string,
     content: LiveViewTemplate,
   ) => LiveViewTemplate,
-  signingSecret: string,
   pageTitleDefaults?: PageTitleDefaults,
   liveViewTemplateRenderer?: (
     session: SessionData,

diff --git a/packages/deno/liveviewjs.ts b/packages/deno/liveviewjs.ts
diff --git a/packages/deno/pubSub.ts b/packages/deno/pubSub.ts
@@ -1,8 +1,8 @@
-import {
-  Publisher,
-  Subscriber,
-  SubscriberFunction,
-} from "./liveviewjs.ts";
+// import {
+//   Publisher,
+//   Subscriber,
+//   SubscriberFunction,
+// } from "./deps.ts";
 
 // const broadcastChannel = new BroadcastChannel();
 

diff --git a/packages/deno/serDe.ts b/packages/deno/serDe.ts
@@ -1,5 +1,4 @@
-import { create, verify } from "./deps.ts";
-import { SerDe } from "./liveviewjs.ts";
+import { create, verify, SerDe } from "./deps.ts";
 export * as crypto from "https://deno.land/[email protected]/node/crypto.ts";
 
 // Attempt to reuse the crypto key otherwise restarting server will

diff --git a/packages/deno/wsAdaptor.ts b/packages/deno/wsAdaptor.ts
@@ -1,4 +1,4 @@
-import type { WsAdaptor } from "./liveviewjs.ts";
+import type { WsAdaptor } from "./deps.ts";
 
 export class DenoWsAdaptor implements WsAdaptor {
   private ws: WebSocket;