@eodash/eodash 5.0.0-alpha.1 → 5.0.0-alpha.1.1

package/bin/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import { build, createServer, preview } from "vite"
-import { execPath, appPath, buildTargetPath } from "./utils.js";
+import { rootPath, appPath, buildTargetPath, appPublicPath } from "./utils.js";
 import { writeFile, rm, cp } from "fs/promises";
 import { update } from "./update.js";
 import { indexHtml, serverConfig } from "./serverConfig.js";
@@ -25,7 +25,6 @@ export const buildApp = async () => {
     await rm(htmlPath).catch(() => {
       console.error('failed to remove index.html')
     })
-    const appPublicPath = path.join(appPath, './public')
     if (appPath.includes('node_modules') && existsSync(appPublicPath)) {
       await rm(appPublicPath, { recursive: true }).catch((e) => {
         console.error(e)
@@ -34,7 +33,7 @@ export const buildApp = async () => {
   })
 
   if (appPath.includes('node_modules')) {
-    await cp(appPath + 'dist', buildTargetPath, { recursive: true }).then(() => {
+    await cp(path.join(appPath, 'dist'), buildTargetPath, { recursive: true }).then(() => {
       console.info('dashboard built successfully')
     }).catch((e) => {
       console.error(e)
@@ -45,7 +44,7 @@ export const buildApp = async () => {
 
 export async function previewApp() {
   const previewServer = await preview({
-    root: execPath,
+    root: rootPath,
     preview: {
       port: 8080,
       open: true,

package/bin/serverConfig.js

@@ -6,7 +6,11 @@ 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 { execPath, runtimeConfigPath, appPath, dotEodashPath, compiletimeConfigPath } from "./utils.js";
+import {
+  runtimeConfigPath,
+  appPath, compiletimeConfigPath,
+  appPublicPath, cachePath, rootPublicPath
+} from "./utils.js";
 import { readFile } from "fs/promises";
 import { defineConfig, searchForWorkspaceRoot } from "vite"
 import { getUserModules } from './utils.js';
@@ -37,7 +41,7 @@ let virtualPlugin = null;
 export const serverConfig = /** @type {import('vite').UserConfigFnPromise}*/(defineConfig(async ({ mode, command }) => {
   return {
     base: '',
-    cacheDir: dotEodashPath + '/cache',
+    cacheDir: cachePath,
     plugins: [
       vue({
         template: {
@@ -77,7 +81,7 @@ export const serverConfig = /** @type {import('vite').UserConfigFnPromise}*/(def
       include: ["webfontloader", "vuetify", "vue", "pinia"],
       noDiscovery: true,
     } : {},
-    publicDir: command === 'build' ? path.join(appPath, './public') : path.join(execPath, '/public'),
+    publicDir: command === 'build' ? appPublicPath : rootPublicPath,
     build: {
       outDir: 'dist',
       rollupOptions: {

package/bin/update.js

@@ -1,13 +1,11 @@
 import { cp } from "fs/promises";
-import { execPath, appPath, runtimeConfigPath } from "./utils.js";
+import { rootPublicPath, appPath, runtimeConfigPath, appPublicPath } from "./utils.js";
 import { existsSync } from "fs";
 import path from "path";
 
 export async function update() {
-  const execPublicPath = path.join(execPath, "/public"),
-    appPublicPath = path.join(appPath, "/public")
-  if (execPublicPath !== appPublicPath) {
-    await cp(execPublicPath, appPublicPath, { recursive: true }).catch(err => {
+  if (rootPublicPath !== appPublicPath) {
+    await cp(rootPublicPath, appPublicPath, { recursive: true }).catch(err => {
       console.error(err)
     })
     if (existsSync(runtimeConfigPath)) {

package/bin/utils.js

@@ -4,14 +4,19 @@ import { readFile } from 'fs/promises';
 import { existsSync } from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
+import { searchForWorkspaceRoot } from 'vite';
 
 // global paths
-export const appPath = fileURLToPath(new URL("..", import.meta.url));
-export const execPath = fileURLToPath(new URL(process.cwd(), import.meta.url));
-export const dotEodashPath = path.join(execPath, "/.eodash");
-export const runtimeConfigPath = path.join(dotEodashPath, "./config.runtime.js");
-export const compiletimeConfigPath = path.join(dotEodashPath, "/config.js");
-export const buildTargetPath = path.join(dotEodashPath, '/dist')
+export const appPath = fileURLToPath(new URL("..", import.meta.url)),
+  appPublicPath = path.join(appPath, './public'),
+  rootPath = searchForWorkspaceRoot(process.cwd()),
+  rootPublicPath = path.join(rootPath, './public'),
+  srcPath = path.join(rootPath, "/src"),
+  runtimeConfigPath = path.join(srcPath, "./config.runtime.js"),
+  compiletimeConfigPath = path.join(srcPath, "/config.js"),
+  dotEodashPath = path.join(rootPath, "/.eodash"),
+  buildTargetPath = path.join(dotEodashPath, '/dist'),
+  cachePath = path.join(dotEodashPath, 'cache');
 
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eodash/eodash",
-  "version": "5.0.0-alpha.1",
+  "version": "5.0.0-alpha.1.1",
   "type": "module",
   "types": "./core/types.d.ts",
   "files": [