@eodash/eodash 5.0.0-alpha.1.8 → 5.0.0-alpha.1.9

package/bin/app.js

@@ -4,15 +4,12 @@ import { buildApp, createDevServer, previewApp } from './cli.js'
 
 const command = process.argv?.[2];
 (async () => {
-  const baseFlag = (  
-    process.argv.indexOf('--base') > -1 ? process.argv[process.argv.indexOf('--base')+1] : null
-  );
   switch (command) {
     case "dev":
       await createDevServer();
       break;
     case "build":
-      await buildApp(baseFlag);
+      await buildApp();
       break;
     case "preview":
       await previewApp();

package/bin/cli.js

@@ -3,7 +3,7 @@
 import { build, createServer, preview } from "vite"
 import {
   rootPath, appPath, buildTargetPath,
-  appPublicPath, rootPublicPath, runtimeConfigPath
+  userConfig, runtimeConfigPath,
 } from "./utils.js";
 import { writeFile, rm, cp } from "fs/promises";
 import { indexHtml, serverConfig } from "./serverConfig.js";
@@ -18,34 +18,22 @@ export const createDevServer = async () => {
   server.bindCLIShortcuts({ print: true })
 }
 
-export const buildApp = async (baseFlag) => {
+export const buildApp = async () => {
   const htmlPath = path.join(appPath, '/index.html')
   await writeFile(htmlPath, indexHtml).then(async () => {
-    if (rootPublicPath !== appPublicPath) {
-      await cp(rootPublicPath, appPublicPath, { recursive: true }).catch(err => {
-        console.error(err)
-      })
-      if (existsSync(runtimeConfigPath)) {
-        await cp(runtimeConfigPath, path.join(appPath, '/public/config.js')).catch((e) => {
+    const config = await serverConfig({ mode: 'production', command: 'build' });
+    await build(config)
+
+    if (existsSync(runtimeConfigPath)) {
+      await cp(runtimeConfigPath, path.join(buildTargetPath, 'config.js'),
+        { recursive: true }).catch((e) => {
           console.error(e)
         })
-      }
-    }
-
-    const config = await serverConfig({ mode: 'production', command: 'build' });
-    if (baseFlag !== null) {
-      config.base = baseFlag
     }
-    await build(config)
 
     await rm(htmlPath).catch(() => {
       console.error('failed to remove index.html')
     })
-    if (appPath.includes('node_modules') && existsSync(appPublicPath)) {
-      await rm(appPublicPath, { recursive: true }).catch((e) => {
-        console.error(e)
-      })
-    }
   })
 }
 
@@ -53,12 +41,14 @@ export const buildApp = async (baseFlag) => {
 export async function previewApp() {
   const previewServer = await preview({
     root: rootPath,
+    base: userConfig.base ?? '',
     preview: {
-      port: 8080,
-      open: true,
+      port: userConfig.port ?? 8080,
+      open: userConfig.open,
+      host: userConfig.host
     },
     build: {
-      outDir: buildTargetPath
+      outDir: buildTargetPath,
     }
   })
   previewServer.printUrls()

package/bin/serverConfig.js

@@ -1,7 +1,5 @@
 #!/usr/bin/env node
 
-
-
 import vue from '@vitejs/plugin-vue';
 import vuetify, { transformAssetUrls } from 'vite-plugin-vuetify';
 import virtual, { updateVirtualModule } from 'vite-plugin-virtual'
@@ -9,7 +7,7 @@ import { fileURLToPath, URL } from 'url';
 import {
   runtimeConfigPath,
   appPath, compiletimeConfigPath,
-  appPublicPath, cachePath, rootPublicPath,
+  cachePath, publicPath, userConfig,
   buildTargetPath
 } from "./utils.js";
 import { readFile } from "fs/promises";
@@ -41,7 +39,7 @@ export const indexHtml = `
 let virtualPlugin = null;
 export const serverConfig = /** @type {import('vite').UserConfigFnPromise}*/(defineConfig(async ({ mode, command }) => {
   return {
-    base: '',
+    base: userConfig.base ?? '',
     cacheDir: cachePath,
     plugins: [
       vue({
@@ -71,17 +69,20 @@ export const serverConfig = /** @type {import('vite').UserConfigFnPromise}*/(def
       extensions: ['.js', '.json', '.jsx', '.mjs', '.ts', '.tsx', '.vue'],
     },
     server: {
-      port: 3000,
+      port: userConfig.port ?? 3000,
+      open: userConfig.open,
       fs: {
         allow: [searchForWorkspaceRoot(process.cwd())]
       },
+      host: userConfig.host
     },
     root: fileURLToPath(new URL('..', import.meta.url)),
     optimizeDeps: mode === "development" ? {
       include: ["webfontloader", "vuetify", "vue", "pinia"],
       noDiscovery: true,
     } : {},
-    publicDir: command === 'build' ? appPublicPath : rootPublicPath,
+    /** @type {string|false} */
+    publicDir: userConfig.publicDir === false ? false : publicPath,
     build: {
       outDir: buildTargetPath,
       emptyOutDir: true,

package/bin/utils.js

@@ -1,23 +1,43 @@
 #!/usr/bin/env node
 
 import { readFile } from 'fs/promises';
-import { existsSync } from 'fs';
+import { existsSync, readFileSync } from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import { searchForWorkspaceRoot } from 'vite';
+import { Command } from 'commander';
+const cli = new Command('eodash')
 
-// global paths
+const pkg = JSON.parse(
+  readFileSync(
+    fileURLToPath(new URL('../package.json', import.meta.url))
+    , 'utf-8')
+);
+
+cli.version(pkg.version, '-v, --version', 'output the current version')
+  .option('--publicDir <path>', 'path to statically served assets folder')
+  .option('--no-publicDir', 'stop serving static assets')
+  .option('--outDir <path>', 'minified output folder')
+  .option('-e, --entryPoint <path>', 'file exporting `defineConfig`')
+  .option('-c, --cacheDir <path>', 'cache folder')
+  .option('-r, --runtime <path>', 'file exporting eodash runtime config')
+  .option('-b, --base <path>', 'base public path')
+  .option('-p, --port <port>', 'serving  port')
+  .option('-o, --open', 'open default browser when the server starts')
+  .option('--host [IP address]', 'specify which IP addresses the server should listen on')
+  .parse(process.argv)
+
+
+export const userConfig = cli.opts()
 export const appPath = fileURLToPath(new URL("..", import.meta.url)),
-  appPublicPath = path.join(appPath, './public'),
   rootPath = searchForWorkspaceRoot(process.cwd()),
-  rootPublicPath = path.join(rootPath, './public'),
+  publicPath = userConfig.publicDir ? path.resolve(rootPath, userConfig.publicDir) : path.join(rootPath, './public'),
   srcPath = path.join(rootPath, "/src"),
-  runtimeConfigPath = path.join(srcPath, "./config.runtime.js"),
-  compiletimeConfigPath = path.join(srcPath, "/config.js"),
+  runtimeConfigPath = userConfig.runtime ? path.resolve(rootPath, userConfig.runtime) : path.join(srcPath, "./config.runtime.js"),
+  compiletimeConfigPath = userConfig.entryPoint ? path.resolve(rootPath, userConfig.entryPoint) : path.join(srcPath, "/config.js"),
   dotEodashPath = path.join(rootPath, "/.eodash"),
-  buildTargetPath = path.join(dotEodashPath, '/dist'),
-  cachePath = path.join(dotEodashPath, 'cache');
-
+  buildTargetPath = userConfig.outDir ? path.resolve(rootPath, userConfig.outDir) : path.join(dotEodashPath, '/dist'),
+  cachePath = userConfig.cacheDir ? path.resolve(rootPath, userConfig.cacheDir) : path.join(dotEodashPath, 'cache');
 
 
 export const getUserModules = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eodash/eodash",
-  "version": "5.0.0-alpha.1.8",
+  "version": "5.0.0-alpha.1.9",
   "type": "module",
   "types": "./core/types.d.ts",
   "files": [
@@ -32,6 +32,7 @@
     "@vitejs/plugin-vue": "^5.0.0",
     "animated-details": "gist:2912bb049fa906671807415eb0e87188",
     "axios": "^1.6.2",
+    "commander": "^12.0.0",
     "core-js": "^3.29.0",
     "pinia": "^2.0.0",
     "sass": "^1.60.0",