@eodash/eodash 5.0.0-alpha.1.11 → 5.0.0-alpha.1.12

package/bin/serverConfig.js

@@ -2,17 +2,17 @@
 
 import vue from '@vitejs/plugin-vue';
 import vuetify, { transformAssetUrls } from 'vite-plugin-vuetify';
-import virtual, { updateVirtualModule } from 'vite-plugin-virtual'
 import { fileURLToPath, URL } from 'url';
 import {
   runtimeConfigPath,
   appPath, entryPath,
   cachePath, publicPath, userConfig,
-  buildTargetPath
+  buildTargetPath,
+  logger,
+  rootPath
 } from "./utils.js";
 import { readFile } from "fs/promises";
 import { defineConfig, searchForWorkspaceRoot } from "vite"
-import { getUserModules } from './utils.js';
 import { existsSync } from 'fs';
 import path from "path";
 
@@ -33,10 +33,6 @@ export const indexHtml = `
 </body>
 </html>`
 
-/**
- * @type {import('vite').Plugin | null}
- */
-let virtualPlugin = null;
 export const serverConfig = /** @type {import('vite').UserConfigFnPromise}*/(defineConfig(async ({ mode, command }) => {
   return {
     base: userConfig.base ?? '',
@@ -57,14 +53,15 @@ export const serverConfig = /** @type {import('vite').UserConfigFnPromise}*/(def
       (mode === "development" && {
         name: "inject-html",
         configureServer
-      }),
-      virtualPlugin = virtual(await getUserModules())
+      })
     ],
+    customLogger: logger,
     define: { 'process.env': {} },
     resolve: {
       alias: {
         '@': fileURLToPath(new URL('../core', import.meta.url)),
         '^': fileURLToPath(new URL('../widgets', import.meta.url)),
+        "user:config": entryPath
       },
       extensions: ['.js', '.json', '.jsx', '.mjs', '.ts', '.tsx', '.vue'],
     },
@@ -105,12 +102,26 @@ export const serverConfig = /** @type {import('vite').UserConfigFnPromise}*/(def
 async function configureServer(server) {
   server.watcher.add([entryPath, runtimeConfigPath])
 
+  let updatedPath = ''
+  const loggerInfo = logger.info
+  logger.info = (msg, options) => {
+    if (msg.includes('core')) {
+      const removedPath = msg.split('/')[0].split(" ")
+      removedPath.pop()
+      const updatedMsg = removedPath.join(" ") + " " + updatedPath.replace(rootPath, "")
+
+      return loggerInfo(updatedMsg, options)
+    }
+    return loggerInfo(msg, options)
+  }
+
   server.watcher.on('change', async (path) => {
-    if (path == runtimeConfigPath) {
-      server.hot.send('reload')
-    } else if (path === entryPath) {
-      updateVirtualModule(virtualPlugin, 'user:config',
-        await getUserModules().then(modules => modules['user:config']))
+    updatedPath = path
+    if (path === runtimeConfigPath) {
+      server.hot.send({
+        type: 'full-reload',
+        path: path
+      })
     }
   })
 

package/bin/utils.js

@@ -1,10 +1,9 @@
 #!/usr/bin/env node
 
-import { readFile } from 'fs/promises';
 import { existsSync, readFileSync } from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
-import { searchForWorkspaceRoot } from 'vite';
+import { searchForWorkspaceRoot, createLogger } from 'vite';
 import { Command } from 'commander';
 
 export const rootPath = searchForWorkspaceRoot(process.cwd());
@@ -58,6 +57,8 @@ export const appPath = fileURLToPath(new URL("..", import.meta.url)),
   cachePath = userConfig.cacheDir ? path.resolve(rootPath, userConfig.cacheDir) : path.join(dotEodashPath, 'cache');
 
 
+export const logger = createLogger()
+
 /**
  * @param {Options} options
  * @param {string | undefined} command
@@ -86,15 +87,3 @@ async function getUserConfig(options, command) {
     runtime: options.runtime ?? config?.runtime
   }
 }
-
-export const getUserModules = async () => {
-  /** @type {Record<string,string>} */
-  let userModules = {}
-  const indexJs = await readFile(entryPath, 'utf-8').catch(() => {
-    if (!existsSync(runtimeConfigPath)) {
-      console.error(new Error("no eodash configuration found"))
-    }
-  })
-  userModules['user:config'] = typeof indexJs === 'string' ? indexJs : ''
-  return userModules
-}

package/core/views/Dashboard.vue

@@ -11,7 +11,6 @@ import { useSTAcStore } from '@/store/stac';
 import { defineAsyncComponent } from "vue";
 import { useDisplay, useLayout } from "vuetify/lib/framework.mjs";
 import { loadFont } from '@/store/Actions'
-import { onUnmounted } from "vue";
 
 
 const eodashConfig = await useEodashRuntime()
@@ -31,15 +30,6 @@ const TemplateComponent = smAndDown.value ?
 const HeaderComponent = defineAsyncComponent(() => import(`@/components/Header.vue`))
 const FooterComponent = defineAsyncComponent(() => import(`@/components/Footer.vue`))
 const { mainRect } = useLayout()
-
-onUnmounted(() => {
-  theme.global.name.value = 'light'
-})
-
-import.meta.hot?.on('reload', () => {
-  window.location.reload()
-})
-
 </script>
 
 <style scoped lang="scss">
@@ -47,4 +37,3 @@ import.meta.hot?.on('reload', () => {
   font-family: v-bind('fontFamily');
 }
 </style>
-@/composables/DefineEodash

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eodash/eodash",
-  "version": "5.0.0-alpha.1.11",
+  "version": "5.0.0-alpha.1.12",
   "type": "module",
   "types": "./core/types.d.ts",
   "files": [
@@ -16,7 +16,7 @@
   },
   "browser": "./core/main.js",
   "scripts": {
-    "dev": "npx eodash dev",
+    "dev": "npx eodash dev --entryPoint core/eodash.js",
     "build": "npx eodash build",
     "check": "vue-tsc --noEmit --skipLibCheck && eslint .",
     "check:lint": "eslint .",
@@ -38,7 +38,6 @@
     "sass": "^1.60.0",
     "stac-ts": "^1.0.3",
     "vite": "^5.1.5",
-    "vite-plugin-virtual": "^0.3.0",
     "vite-plugin-vuetify": "^2.0.0",
     "vue": "^3.2.0",
     "vue-router": "^4.0.0",