Fix build error

getnimbus · Aug 7, 2022 · b0375a5 · b0375a5
1 parent 3f6e919
commit b0375a5
Show file tree

Hide file tree

Showing 19 changed files with 264 additions and 210 deletions.
diff --git a/package.json b/package.json
@@ -36,12 +36,11 @@
     "lodash": "^4.17.21",
     "mark.js": "^8.11.1",
     "numeral": "^2.0.6",
-    "svelte-portal": "^2.2.0",
     "svelte-windicss-preprocess": "^4.2.8",
     "tippy.js": "^6.3.7",
     "vite-imagetools": "^4.0.4",
     "webextension-polyfill": "^0.9.0",
     "windicss": "^3.5.6"
   },
   "type": "module"
-}
+}
diff --git a/src/components/ReportModal.svelte b/src/components/ReportModal.svelte
diff --git a/src/components/TxInfo/Changes.svelte b/src/components/TxInfo/Changes.svelte
@@ -3,6 +3,7 @@
 <script>
   import "./MoneyMove.svelte";
   import NoResultsIcon from "~/entries/contentScript/assets/no-results.png";
+  const NoResultsIconUrl = new URL(NoResultsIcon, import.meta.url).href;
 
   export let data;
   export let id;
@@ -26,7 +27,7 @@
   {:else}
     <img
       class="w-[84px] h-[84px] mx-auto"
-      src={NoResultsIcon}
+      src={NoResultsIconUrl}
       alt="no-results"
     />
   {/if}

diff --git a/src/entries/contentScript/primary/App.svelte b/src/entries/contentScript/primary/App.svelte
diff --git a/src/entries/contentScript/primary/main.ts b/src/entries/contentScript/primary/main.ts
diff --git a/src/entries/contentScript/views/TrxInfo.svelte b/src/entries/contentScript/views/TrxInfo.svelte
@@ -16,7 +16,6 @@
   import "~/components/TxInfo/User.svelte";
   import "~/components/TxInfo/MoneyMove.svelte";
   import "~/components/TxInfo/Changes.svelte";
-  import "~/components/ReportModal.svelte";
   import "~/components/Footer.svelte";
 
   export let hash;
@@ -62,7 +61,6 @@
         .then((response) => response.data);
 
       const transactionInfo = get(response, "data");
-      console.log("transactionInfo: ", transactionInfo);
 
       if (isEmpty(transactionInfo)) {
         unknownTRX = true;

diff --git a/src/entries/options/App.normal.svelte b/src/entries/options/App.normal.svelte
@@ -0,0 +1,9 @@
+<svelte:options tag="nimbus-options" />
+
+<script lang="ts">
+</script>
+
+<div>Options</div>
+
+<style>
+</style>
diff --git a/src/entries/options/App.svelte b/src/entries/options/App.svelte
diff --git a/src/entries/options/index.html b/src/entries/options/index.html
@@ -1,11 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <title>Options</title>
-  </head>
-  <body>
-    <div id="app"></div>
-    <script type="module" src="./main.ts"></script>
-  </body>
-</html>
+
+<head>
+  <meta charset="UTF-8" />
+  <title>Options</title>
+</head>
+
+<body>
+  <div id="app"></div>
+  <script type="module" src="./main.ts"></script>
+  <nimbus-options />
+</body>
+
+</html>
diff --git a/src/entries/options/main.ts b/src/entries/options/main.ts
@@ -1,5 +1,7 @@
-import App from "./App.svelte";
+import "./App.normal.svelte";
 
-new App({
-  target: document.getElementById("app"),
-});
+// TODO: Maybe we can code this page using React
+
+// new App({
+//   target: document.getElementById("app"),
+// });
diff --git a/src/entries/popup/App.normal.svelte b/src/entries/popup/App.normal.svelte
@@ -0,0 +1,10 @@
+<svelte:options tag="nimbus-popup" />
+
+<script lang="ts">
+  let hello = "Thanh Le";
+</script>
+
+<div>Hello {hello}</div>
+
+<style>
+</style>
diff --git a/src/entries/popup/App.svelte b/src/entries/popup/App.svelte
diff --git a/src/entries/popup/index.html b/src/entries/popup/index.html
@@ -1,11 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <title>Popup</title>
-  </head>
-  <body style="min-width: 100px">
-    <div id="app"></div>
-    <script type="module" src="./main.ts"></script>
-  </body>
-</html>
+
+<head>
+  <meta charset="UTF-8" />
+  <title>Popup</title>
+</head>
+
+<body style="min-width: 100px">
+  <div id="app"></div>
+  <script type="module" src="./main.ts"></script>
+  <nimbus-popup />
+</body>
+
+</html>
diff --git a/src/entries/popup/main.ts b/src/entries/popup/main.ts
@@ -1,5 +1,5 @@
-import App from "./App.svelte";
+import "./App.normal.svelte";
 
-new App({
-  target: document.getElementById("app"),
-});
+// new App({
+//   target: document.getElementById("app"),
+// });
diff --git a/src/lib/PageContent.svelte b/src/lib/PageContent.svelte
diff --git a/svelte.config.js b/svelte.config.js
diff --git a/vite.config.components.ts b/vite.config.components.ts
@@ -1,7 +1,6 @@
 import { defineConfig } from "vite";
 import { svelte } from "@sveltejs/vite-plugin-svelte";
 import { windi } from "svelte-windicss-preprocess";
-import { imagetools } from "vite-imagetools";
 import sveltePreprocess from "svelte-preprocess";
 import path from "path";
 
@@ -35,6 +34,5 @@ export default defineConfig({
       },
       preprocess: [sveltePreprocess(), windi({})],
     }),
-    imagetools(),
   ],
 });
diff --git a/vite.config.ts b/vite.config.ts
@@ -14,6 +14,7 @@ export default defineConfig(({ mode }) => {
     plugins: [
       svelte({
         preprocess: [sveltePreprocess(), windi({})],
+        exclude: ["*.normal.svelte"],
         compilerOptions: {
           customElement: true,
         },