From a4d92c0c7c9bbc7aa88770ff1ada75ae4e366b5d Mon Sep 17 00:00:00 2001
From: Billy Charlton <billy@okbecause.com>
Date: Tue, 23 Nov 2021 18:05:22 +0100
Subject: [PATCH] fix: Vite: faster builds & fewer dependencies

Use Vite instead of Webpack!
---
 package.json                      |  6 ++++++
 src/components/RunFinderPanel.vue |  4 +++-
 src/js/DashboardDataManager.ts    |  8 +++++++-
 src/router.ts                     | 17 ++++++++++++-----
 src/store.ts                      |  1 -
 src/templates/BlankDeckFrame.vue  |  1 -
 src/views/ScreenSplitter.vue      | 12 ++++++++----
 vite.config.ts                    |  6 +++---
 8 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 293665eb..908d636c 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,12 @@
   "name": "simwrapper",
   "version": "1.1.0",
   "private": true,
+  "license": "GPL-3.0-or-later",
+  "author": "Billy Charlton <charlton@tu-berlin.de>",
+  "contributors": [
+    "Friedrich Voelkers <friedrich.k.voelkers@tu-berlin.de>",
+    "Janek Laudan <laudan@vsp.tu-berlin.de>"
+  ],
   "scripts": {
     "serve": "vite",
     "build": "vite build",
diff --git a/src/components/RunFinderPanel.vue b/src/components/RunFinderPanel.vue
index e22a3440..3d453a8c 100644
--- a/src/components/RunFinderPanel.vue
+++ b/src/components/RunFinderPanel.vue
@@ -1,6 +1,6 @@
 <template lang="pug">
 .run-finder-panel
-  router-link.logo(:to="'/'")
+  router-link.logo(:to="baseURL")
     img(src="@/assets/simwrapper-logo/SW_logo_icon_white.png")
     h3 {{globalState.app }}
 
@@ -64,6 +64,8 @@ class MyComponent extends Vue {
 
   private rootNodes: any[] = []
 
+  private baseURL = import.meta.env.BASE_URL
+
   private mounted() {
     // start the run finder process
     runFinder.findRuns()
diff --git a/src/js/DashboardDataManager.ts b/src/js/DashboardDataManager.ts
index 0bef944e..3517c418 100644
--- a/src/js/DashboardDataManager.ts
+++ b/src/js/DashboardDataManager.ts
@@ -108,7 +108,13 @@ export default class DashboardDataManager {
   }
 
   public removeFilterListener(config: { dataset: string }, listener: any) {
-    this.datasets[config.dataset].filterListeners.delete(listener)
+    try {
+      if (this.datasets[config.dataset].filterListeners) {
+        this.datasets[config.dataset].filterListeners.delete(listener)
+      }
+    } catch (e) {
+      // doesn't matter
+    }
   }
 
   public clearCache() {
diff --git a/src/router.ts b/src/router.ts
index 68a08ac3..aa7e6691 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -5,22 +5,24 @@ import globalStore from '@/store'
 
 Vue.use(VueRouter)
 
+const BASE = import.meta.env.BASE_URL
+
 const routes = [
   {
-    path: '/gist/:id',
+    path: BASE + 'gist/:id',
     component: () => import(/* webpackChunkName: "gist" */ '@/views/GistView.vue'),
     props: (route: Route) => ({
       id: route.params.id,
     }),
   },
   {
-    path: '/*',
+    path: BASE + '*',
     component: () => import(/* webpackChunkName: "split" */ '@/views/ScreenSplitter.vue'),
   },
   {
     // catch-all back to home page
     path: '*',
-    redirect: '/',
+    redirect: BASE,
   },
 ]
 
@@ -29,7 +31,7 @@ function vizPlugins(): any[] {
   const plugins = []
   for (const plugin of globalStore.state.visualizationTypes.values()) {
     plugins.push({
-      path: '/v/' + plugin.kebabName + '/:slug/*',
+      path: BASE + 'v/' + plugin.kebabName + '/:slug/*',
       name: plugin.kebabName,
       component: plugin.component,
       props: (route: Route) => {
@@ -51,7 +53,7 @@ function vizPlugins(): any[] {
 
 const router = new VueRouter({
   mode: 'history',
-  base: process.env.BASE_URL,
+  base: '/',
   routes: vizPlugins().concat(routes),
   // native-like back/forward and top-of-page routing
   scrollBehavior(to, from, savedPosition) {
@@ -63,4 +65,9 @@ const router = new VueRouter({
   },
 })
 
+// router.beforeEach((to, from, next) => {
+//   console.log(to.path)
+//   next()
+// })
+
 export default router
diff --git a/src/store.ts b/src/store.ts
index d32e3832..dd2ca017 100644
--- a/src/store.ts
+++ b/src/store.ts
@@ -158,7 +158,6 @@ export default new Vuex.Store({
     setLocale(state: GlobalState, value: string) {
       state.locale = value.toLocaleLowerCase()
       localStorage.setItem('locale', state.locale)
-      console.log('NEW LOCALE:', state.locale)
     },
   },
 
diff --git a/src/templates/BlankDeckFrame.vue b/src/templates/BlankDeckFrame.vue
index 30c37549..24bb28ad 100644
--- a/src/templates/BlankDeckFrame.vue
+++ b/src/templates/BlankDeckFrame.vue
@@ -31,7 +31,6 @@ de:
 <script lang="ts">
 import { Vue, Component, Prop, Watch } from 'vue-property-decorator'
 import YAML from 'yaml'
-import { spawn, Worker, Thread, ModuleThread } from 'threads'
 
 import util from '@/js/util'
 import globalStore from '@/store'
diff --git a/src/views/ScreenSplitter.vue b/src/views/ScreenSplitter.vue
index 79112847..17ea377b 100644
--- a/src/views/ScreenSplitter.vue
+++ b/src/views/ScreenSplitter.vue
@@ -45,6 +45,8 @@ import SplashPage from '@/views/SplashPage.vue'
 class MyComponent extends Vue {
   // the calls to $forceUpdate() below are because Vue does not watch deep array contents.
 
+  private baseURL = import.meta.env.BASE_URL
+
   private panels = [
     {
       component: 'SplashPage',
@@ -64,7 +66,7 @@ class MyComponent extends Vue {
   }
 
   @Watch('$route') routeChanged(to: Route, from: Route) {
-    if (to.path === '/') {
+    if (to.path === this.baseURL) {
       // root node is not a normal splitpane, so we instead replace
       // with a brand new clean startpage.
       this.panels = [
@@ -162,6 +164,8 @@ class MyComponent extends Vue {
 
   private updateURL() {
     // console.log(this.panels)
+    const BASE = import.meta.env.BASE_URL
+
     if (this.panels.length === 1) {
       const root = this.panels[0].props.root || ''
       const xsubfolder = this.panels[0].props.xsubfolder || ''
@@ -169,13 +173,13 @@ class MyComponent extends Vue {
 
       if (yaml) {
         const base64 = btoa(JSON.stringify(this.panels))
-        this.$router.push(`/split/${base64}`)
+        this.$router.push(`${BASE}split/${base64}`)
       } else {
-        this.$router.push(`/${root}/${xsubfolder}`)
+        this.$router.push(`${BASE}${root}/${xsubfolder}`)
       }
     } else {
       const base64 = btoa(JSON.stringify(this.panels))
-      this.$router.push(`/split/${base64}`)
+      this.$router.push(`${BASE}split/${base64}`)
     }
   }
 }
diff --git a/vite.config.ts b/vite.config.ts
index 09c96391..69a0bbcf 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -3,14 +3,13 @@ import { createVuePlugin } from 'vite-plugin-vue2'
 import markdownPlugin from 'vite-plugin-md'
 
 export default defineConfig({
-  // base: '/',
-  // publicDir: '/simwrapper/',
+  base: '/simwrapper/',
+  build: { sourcemap: true },
   plugins: [
     // vue
     createVuePlugin({ include: [/\.vue$/, /\.md$/] }),
     markdownPlugin(),
   ],
-  build: { sourcemap: true },
   resolve: {
     alias: {
       '@': '/src',
@@ -25,4 +24,5 @@ export default defineConfig({
     // requireFromFile: null,
     // requireFromString: null,
   },
+  // optimizeDeps: { exclude: ['@deck.gl/layers'] },
 })