spex: upgrade to 0.2.0

zazuko · Jun 12, 2024 · 9d02f2a · 9d02f2a
1 parent 354c6cc
commit 9d02f2a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/.changeset/flat-eggs-live.md b/.changeset/flat-eggs-live.md
@@ -0,0 +1,5 @@
+---
+"trifid-plugin-spex": minor
+---
+
+Upgrade SPEX to 0.2.0.
diff --git a/packages/spex/index.js b/packages/spex/index.js
@@ -1,4 +1,4 @@
-import path, { dirname } from 'node:path'
+import { dirname, join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
 import { resolve } from 'import-meta-resolve'
@@ -7,7 +7,7 @@ import fastifyStatic from '@fastify/static'
 const __dirname = dirname(fileURLToPath(import.meta.url))
 
 const defaults = {
-  template: path.join(__dirname, 'views/index.hbs'),
+  template: join(__dirname, 'views/index.hbs'),
 }
 
 const defaultOptions = {
@@ -40,7 +40,7 @@ const createPlugin = async (server, config, render) => {
   config = { ...defaults, ...config, spexOptions }
 
   // Serve static files from SPEX dist folder
-  const distPath = resolve('@zazuko/spex/dist', import.meta.url)
+  const distPath = dirname(resolve('@zazuko/spex', import.meta.url))
   server.register(fastifyStatic, {
     root: distPath.replace(/^file:\/\//, ''),
     prefix: '/spex/static/',

diff --git a/packages/spex/test/test.js b/packages/spex/test/test.js
@@ -72,13 +72,13 @@ describe('trifid-plugin-spex', () => {
   })
 
   it('should serve the static JavaScript file', async () => {
-    const res = await fetch(`${getListenerURL(trifidListener)}/spex/static/spex.umd.min.js`)
+    const res = await fetch(`${getListenerURL(trifidListener)}/spex/static/spex.umd.cjs`)
     await res.text() // Just make sure that the stream is consumed
     strictEqual(res.status, 200)
   })
 
   it('should serve the static CSS file', async () => {
-    const res = await fetch(`${getListenerURL(trifidListener)}/spex/static/spex.css`)
+    const res = await fetch(`${getListenerURL(trifidListener)}/spex/static/style.css`)
     await res.text() // Just make sure that the stream is consumed
     strictEqual(res.status, 200)
   })

diff --git a/packages/spex/views/index.hbs b/packages/spex/views/index.hbs
@@ -2,7 +2,7 @@
   <div id="spex"></div>
 </div>
 
-<script type="text/javascript" src="static/spex.umd.min.js"></script>
+<script type="text/javascript" src="static/spex.umd.cjs"></script>
 <style type="text/css">
   html,
   body {
@@ -43,7 +43,7 @@
     // create style element in the shadow element to avoid any style conflicts
     const style = document.createElement("style");
     style.type = "text/css";
-    style.innerHTML = "@import url('static/spex.css');"
+    style.innerHTML = "@import url('static/style.css');"
 
     // create the shadow element and put the style element and the mount point
     const spexContainer = document.getElementById("spex");