From 462b3b3ac5eab0724f0e81215a78284825b821b1 Mon Sep 17 00:00:00 2001
From: bat <bat@noreply.codeberg.org>
Date: Wed, 26 Apr 2023 04:11:46 +0000
Subject: [PATCH] just get version from package.json

---
 app.js | 33 +++++++++------------------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/app.js b/app.js
index 4f0a8ca..4d1624a 100644
--- a/app.js
+++ b/app.js
@@ -71,9 +71,8 @@ window.editorLib = {
 }`
 
 class Builder {
-  jApiBaseUrl = 'https://data.jsdelivr.com/v1/'
-  jCdnBaseUrl = 'https://cdn.jsdelivr.net/npm/'
-
+  // any URL that supports pkg/path or pkg@version/path
+  baseUrl = 'https://unpkg.com'
   scripts = {
     '@rollup/browser': {
       version: '3.20.4',
@@ -105,26 +104,13 @@ class Builder {
 
   async loadDep(dep) {
     this.scripts[dep] = {}
-    const dataResp = await fetch(
-      this.jApiBaseUrl +
-      `packages/npm/${dep}/resolved`,
-      {
-        headers: {
-          'User-Agent':
-            'https://codeberg.org/macchiato',
-        },
-      },
-    )
-    this.checkOk(dataResp)
-    const {version} = await dataResp.json()
-    this.scripts[dep].version = version
     const pkgResp = await fetch(
-      this.jCdnBaseUrl +
-      `${dep}@${version}/package.json`
+      `${this.baseUrl}/${dep}/package.json`
     )
     this.checkOk(pkgResp)
     this.log(dep)
     const pkg = await pkgResp.json()
+    this.scripts[dep].version = pkg.version
     this.scripts[dep].path = (
       pkg.module ?? pkg.main
     )
@@ -168,8 +154,8 @@ class Builder {
       return script.text
     }
     const url = (
-      this.jCdnBaseUrl +
-      `${name}@${script.version}/${script.path}`
+      `${this.baseUrl}/${name}@${script.version}/` +
+      script.path
     )
     const resp = await fetch(url)
     this.checkOk(resp)
@@ -295,20 +281,18 @@ class Editor extends HTMLElement {
     this.shadowRoot.adoptedStyleSheets = [
       this.constructor.styleSheet
     ]
-    this.el = document.createElement('div')
-    this.shadowRoot.append(this.el)
   }
 
   connectedCallback() {
     const {EditorView, basicSetup} = window.editorLib
-    new EditorView({
+    this.view = new EditorView({
       doc: '',
       extensions: [
         basicSetup,
       ],
-      parent: this.el,
       root: this.shadowRoot,
     })
+    this.shadowRoot.append(this.view.dom)
   }
 
   static get styleSheet() {
@@ -326,6 +310,7 @@ class Editor extends HTMLElement {
       align-items: stretch;
       height: 33vh;
       background-color: #fff;
+      border: 5px solid red
     }
     :host > * {
       flex-grow: 1;