makepack 1.7.13 → 1.7.14

package/src/actions/start/index.js

@@ -1,216 +1,216 @@
-import express from 'express';
-import path from 'path';
-import fs from 'fs';
-import { pathToFileURL } from 'url';
-import { createRequire } from 'module';
-import chokidar from 'chokidar';
-import madge from 'madge';
-import viteSetup from './vite.js';
-import * as esbuild from 'esbuild';
-import { randomUUID } from 'crypto';
-import debounce from 'lodash.debounce';
-import { logger, concolor } from '../../helpers.js';
-
-const projectRoot = process.cwd();
-const requireFn = createRequire(import.meta.url);
-const mpack = path.join(projectRoot, '.mpack');
-
-let server = null;
-let app = null;
-let viteServer = null;
-
-const pkg = path.join(process.cwd(), 'package.json');
-const pkgjson = JSON.parse(fs.readFileSync(pkg, 'utf-8'));
-let isEsmProject = pkgjson.type === 'module';
-
-const uxpfileJS = path.resolve(projectRoot, 'express.js');
-const uxpfileTS = path.resolve(projectRoot, 'express.ts');
-const expExists = fs.existsSync(uxpfileJS) || fs.existsSync(uxpfileTS);
-let uxpfile = expExists ? (fs.existsSync(uxpfileJS) ? uxpfileJS : uxpfileTS) : null;
-
-const connections = new Set();
-
-function safeHandler(fn) {
-   return (req, res, next) => {
-      try {
-         const result = fn(req, res, next);
-         if (result && typeof result.catch === 'function') {
-            result.catch(next);
-         }
-      } catch (err) {
-         logger.error(`Error in request handler: ${err.message || err}`);
-         res.status(500).send('Internal Server Error');
-         // next();
-      }
-   };
-}
-
-function trackConnections(srv) {
-   srv.on('connection', (conn) => {
-      connections.add(conn);
-      conn.on('close', () => connections.delete(conn));
-   });
-}
-
-async function bootServer(args) {
-   let wasServer = !!server;
-   if (server) {
-      for (const conn of connections) {
-         conn.destroy();
-      }
-      await new Promise((resolve, reject) => {
-         server.close(err => {
-            if (err) {
-               logger.error(`while closing server: ${err.message || err}`);
-               reject(err);
-            } else {
-               resolve();
-            }
-         });
-      });
-      server = null;
-   }
-
-   if (viteServer) {
-      await viteServer.close();
-   }
-
-   app = express();
-
-   try {
-      const middleware = await loadExp();
-      if (typeof middleware === 'function') {
-         const _get = app.get.bind(app);
-         const _post = app.post.bind(app);
-         const _delete = app.delete.bind(app);
-         const _put = app.put.bind(app);
-
-         app.get = (path, ...handlers) => {
-            handlers = handlers.map(h => safeHandler(h));
-            return _get(path, ...handlers);
-         };
-
-         app.post = (path, ...handlers) => {
-            handlers = handlers.map(h => safeHandler(h));
-            return _post(path, ...handlers);
-         };
-
-         app.put = (path, ...handlers) => {
-            handlers = handlers.map(h => safeHandler(h));
-            return _put(path, ...handlers);
-         };
-
-         app.delete = (path, ...handlers) => {
-            handlers = handlers.map(h => safeHandler(h));
-            return _delete(path, ...handlers);
-         };
-         middleware(app);
-      }
-
-      viteServer = await viteSetup(app);
-      const port = args.port || 4000;
-      server = app.listen(port, () => {
-         if (!wasServer) {
-            logger.success(`Server running on: ${concolor.green(concolor.bold(`http://localhost:${port}`))}`, '')
-         }
-         trackConnections(server);
-      })
-   } catch (err) {
-      logger.error(`Failed to start server: ${err.message || err}`);
-   }
-}
-
-let esbuildCtx = null;
-
-const buildFile = path.join(mpack, `${randomUUID().substring(0, 15)}.js`);
-
-async function loadExp() {
-   if (!expExists) return null
-
-   const cacheKeys = Object.keys(requireFn.cache || {});
-   if (!isEsmProject) {
-      for (const key of cacheKeys) {
-         if (key.startsWith(process.cwd())) {
-            delete requireFn.cache[key];
-         }
-      }
-   }
-
-   const ext = path.extname(uxpfile);
-   const isTs = ext === '.ts' || ext === '.tsx';
-
-   if (isTs) {
-      if (esbuildCtx) {
-         await esbuildCtx.rebuild();
-      } else {
-         esbuildCtx = await esbuild.context({
-            entryPoints: [uxpfile],
-            outfile: buildFile,
-            format: isEsmProject ? 'esm' : 'cjs',
-            platform: 'node',
-            sourcemap: 'inline',
-            bundle: true,
-            packages: 'external',
-         });
-         await esbuildCtx.rebuild();
-      }
-
-      if (isEsmProject) {
-         const mod = await import(pathToFileURL(buildFile).href + `?update=${Date.now()}`);
-         return mod.default || mod;
-      } else {
-         return requireFn(buildFile);
-      }
-   }
-
-   if (isEsmProject) {
-      const mod = await import(pathToFileURL(uxpfile).href + `?update=${Date.now()}`);
-      return mod.default || mod;
-   } else {
-      return requireFn(uxpfile);
-   }
-}
-
-async function getAllDependencies() {
-   try {
-      if (!expExists) {
-         return [];
-      }
-      const result = await madge(uxpfile, { fileExtensions: ['ts', 'js'] });
-      const deps = Object.keys(result.obj());
-      // const circular = await result.circular();
-      // if (circular.length) {
-      //    logger.warning(`Circular dependencies detected: ${circular.map(c => c.join(' -> ')).join(', ')}`);
-      // }
-      return deps.map(dep => path.resolve(path.dirname(uxpfile), dep));
-   } catch (err) {
-      logger.error(`Failed to analyze dependencies with madge: ${err.message || err}`);
-      return [uxpfile];
-   }
-}
-
-
-let watcher;
-async function startDevServer(args) {
-   if (fs.existsSync(mpack)) {
-      fs.rmSync(mpack, { recursive: true, force: true });
-   }
-   fs.mkdirSync(mpack, { recursive: true });
-
-   await bootServer(args);
-   const filesToWatch = await getAllDependencies();
-   if (watcher) watcher.close();
-   watcher = chokidar.watch(filesToWatch, { ignoreInitial: true });
-
-   const reload = debounce(async (f) => {
-      await bootServer(args);
-      const prettyPath = concolor.dim(path.relative(process.cwd(), f));
-      logger.info(`${concolor.green('server reload')} ${prettyPath}`);
-   }, 100);
-
-   watcher.on('change', reload);
-   watcher.on('add', reload);
-   watcher.on('unlink', reload);
-}
-
+import express from 'express';
+import path from 'path';
+import fs from 'fs';
+import { pathToFileURL } from 'url';
+import { createRequire } from 'module';
+import chokidar from 'chokidar';
+import madge from 'madge';
+import viteSetup from './vite.js';
+import * as esbuild from 'esbuild';
+import { randomUUID } from 'crypto';
+import debounce from 'lodash.debounce';
+import { logger, concolor, loadViteConfig } from '../../helpers.js';
+
+const projectRoot = process.cwd();
+const requireFn = createRequire(import.meta.url);
+const mpack = path.join(projectRoot, '.mpack');
+
+let server = null;
+let app = null;
+let viteServer = null;
+
+const pkg = path.join(process.cwd(), 'package.json');
+const pkgjson = JSON.parse(fs.readFileSync(pkg, 'utf-8'));
+let isEsmProject = pkgjson.type === 'module';
+
+const uxpfileJS = path.resolve(projectRoot, 'express.js');
+const uxpfileTS = path.resolve(projectRoot, 'express.ts');
+const expExists = fs.existsSync(uxpfileJS) || fs.existsSync(uxpfileTS);
+let uxpfile = expExists ? (fs.existsSync(uxpfileJS) ? uxpfileJS : uxpfileTS) : null;
+
+const connections = new Set();
+
+function safeHandler(fn) {
+   return (req, res, next) => {
+      try {
+         const result = fn(req, res, next);
+         if (result && typeof result.catch === 'function') {
+            result.catch(next);
+         }
+      } catch (err) {
+         logger.error(`Error in request handler: ${err.message || err}`);
+         res.status(500).send('Internal Server Error');
+         // next();
+      }
+   };
+}
+
+function trackConnections(srv) {
+   srv.on('connection', (conn) => {
+      connections.add(conn);
+      conn.on('close', () => connections.delete(conn));
+   });
+}
+
+async function bootServer(args) {
+   let wasServer = !!server;
+   if (server) {
+      for (const conn of connections) {
+         conn.destroy();
+      }
+      await new Promise((resolve, reject) => {
+         server.close(err => {
+            if (err) {
+               logger.error(`while closing server: ${err.message || err}`);
+               reject(err);
+            } else {
+               resolve();
+            }
+         });
+      });
+      server = null;
+   }
+
+   if (viteServer) {
+      await viteServer.close();
+   }
+
+   app = express();
+
+   try {
+      const middleware = await loadExp();
+      if (typeof middleware === 'function') {
+         const _get = app.get.bind(app);
+         const _post = app.post.bind(app);
+         const _delete = app.delete.bind(app);
+         const _put = app.put.bind(app);
+
+         app.get = (path, ...handlers) => {
+            handlers = handlers.map(h => safeHandler(h));
+            return _get(path, ...handlers);
+         };
+
+         app.post = (path, ...handlers) => {
+            handlers = handlers.map(h => safeHandler(h));
+            return _post(path, ...handlers);
+         };
+
+         app.put = (path, ...handlers) => {
+            handlers = handlers.map(h => safeHandler(h));
+            return _put(path, ...handlers);
+         };
+
+         app.delete = (path, ...handlers) => {
+            handlers = handlers.map(h => safeHandler(h));
+            return _delete(path, ...handlers);
+         };
+         middleware(app);
+      }
+      const config = await loadViteConfig() || {}
+      viteServer = await viteSetup(app);
+      const port = args.port || config?.server?.port || 4000;
+      server = app.listen(port, () => {
+         if (!wasServer) {
+            logger.success(`Server running on: ${concolor.green(concolor.bold(`http://localhost:${port}`))}`, '')
+         }
+         trackConnections(server);
+      })
+   } catch (err) {
+      logger.error(`Failed to start server: ${err.message || err}`);
+   }
+}
+
+let esbuildCtx = null;
+
+const buildFile = path.join(mpack, `${randomUUID().substring(0, 15)}.js`);
+
+async function loadExp() {
+   if (!expExists) return null
+
+   const cacheKeys = Object.keys(requireFn.cache || {});
+   if (!isEsmProject) {
+      for (const key of cacheKeys) {
+         if (key.startsWith(process.cwd())) {
+            delete requireFn.cache[key];
+         }
+      }
+   }
+
+   const ext = path.extname(uxpfile);
+   const isTs = ext === '.ts' || ext === '.tsx';
+
+   if (isTs) {
+      if (esbuildCtx) {
+         await esbuildCtx.rebuild();
+      } else {
+         esbuildCtx = await esbuild.context({
+            entryPoints: [uxpfile],
+            outfile: buildFile,
+            format: isEsmProject ? 'esm' : 'cjs',
+            platform: 'node',
+            sourcemap: 'inline',
+            bundle: true,
+            packages: 'external',
+         });
+         await esbuildCtx.rebuild();
+      }
+
+      if (isEsmProject) {
+         const mod = await import(pathToFileURL(buildFile).href + `?update=${Date.now()}`);
+         return mod.default || mod;
+      } else {
+         return requireFn(buildFile);
+      }
+   }
+
+   if (isEsmProject) {
+      const mod = await import(pathToFileURL(uxpfile).href + `?update=${Date.now()}`);
+      return mod.default || mod;
+   } else {
+      return requireFn(uxpfile);
+   }
+}
+
+async function getAllDependencies() {
+   try {
+      if (!expExists) {
+         return [];
+      }
+      const result = await madge(uxpfile, { fileExtensions: ['ts', 'js'] });
+      const deps = Object.keys(result.obj());
+      // const circular = await result.circular();
+      // if (circular.length) {
+      //    logger.warning(`Circular dependencies detected: ${circular.map(c => c.join(' -> ')).join(', ')}`);
+      // }
+      return deps.map(dep => path.resolve(path.dirname(uxpfile), dep));
+   } catch (err) {
+      logger.error(`Failed to analyze dependencies with madge: ${err.message || err}`);
+      return [uxpfile];
+   }
+}
+
+
+let watcher;
+async function startDevServer(args) {
+   if (fs.existsSync(mpack)) {
+      fs.rmSync(mpack, { recursive: true, force: true });
+   }
+   fs.mkdirSync(mpack, { recursive: true });
+
+   await bootServer(args);
+   const filesToWatch = await getAllDependencies();
+   if (watcher) watcher.close();
+   watcher = chokidar.watch(filesToWatch, { ignoreInitial: true });
+
+   const reload = debounce(async (f) => {
+      await bootServer(args);
+      const prettyPath = concolor.dim(path.relative(process.cwd(), f));
+      logger.info(`${concolor.green('server reload')} ${prettyPath}`);
+   }, 100);
+
+   watcher.on('change', reload);
+   watcher.on('add', reload);
+   watcher.on('unlink', reload);
+}
+
 export default startDevServer

package/src/actions/start/vite.js

@@ -1,69 +1,73 @@
-// import react from '@vitejs/plugin-react'
-import { createServer as createViteServer } from 'vite';
-import { logger } from '../../helpers.js'
-import path from 'path';
-import fs from 'fs';
-
-const viteSetup = async (app) => {
-
-   // delete .vite directory if exists
-   const viteDir = path.join(process.cwd(), 'node_modules/.vite');
-   if (fs.existsSync(viteDir)) {
-      fs.rmSync(viteDir, { recursive: true, force: true });
-   }
-
-   const viteConfig = {
-      root: process.cwd(),
-      base: "/",
-      // plugins: [react()],
-      server: {
-         middlewareMode: true,
-      },
-      customLogger: {
-         info: (msg) => {
-            logger.info(msg)
-         },
-         warn: (msg) => logger.warning(msg),
-         error: (msg) => logger.error(msg),
-      },
-      appType: 'custom'
-   }
-
-   const vite = await createViteServer(viteConfig);
-   app.use(vite.middlewares);
-
-   // exists tsconfig.json in the root directory
-   const isTs = fs.existsSync(path.resolve(process.cwd(), 'main.tsx'))
-   let entry = `/main.${isTs ? "tsx" : "jsx"}`
-
-   app.get('*', async (req, res, next) => {
-      const url = req.originalUrl;
-
-      try {
-         let template = await vite.transformIndexHtml(url, `
-            <!doctype html>
-            <html lang="en">
-              <head>
-                <meta charset="UTF-8" />
-                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-              </head>
-              <body>
-                <div id="root"></div>
-                <script type="module" src="${entry}"></script>
-              </body>
-            </html>
-        `);
-
-         res.status(200).set({
-            'Content-Type': 'text/html'
-         }).end(template);
-      } catch (e) {
-         vite.ssrFixStacktrace(e);
-         next(e);
-      }
-   });
-   return vite;
-}
-
-
+// import react from '@vitejs/plugin-react'
+import { createServer as createViteServer } from 'vite';
+import { loadViteConfig, logger } from '../../helpers.js'
+import path from 'path';
+import fs from 'fs';
+
+const viteSetup = async (app) => {
+   const config = await loadViteConfig() || {}
+
+   // delete .vite directory if exists
+   const viteDir = path.join(process.cwd(), 'node_modules/.vite');
+   if (fs.existsSync(viteDir)) {
+      fs.rmSync(viteDir, { recursive: true, force: true });
+   }
+
+   const viteConfig = {
+      ...config,
+      configFile: false,
+      root: process.cwd(),
+      base: "/",
+      // plugins: [react()],
+      server: {
+         ...config?.server,
+         middlewareMode: true,
+      },
+      customLogger: {
+         info: (msg) => {
+            logger.info(msg)
+         },
+         warn: (msg) => logger.warning(msg),
+         error: (msg) => logger.error(msg),
+      },
+      appType: 'custom'
+   }
+
+   const vite = await createViteServer(viteConfig);
+   app.use(vite.middlewares);
+
+   // exists tsconfig.json in the root directory
+   const isTs = fs.existsSync(path.resolve(process.cwd(), 'main.tsx'))
+   let entry = `/main.${isTs ? "tsx" : "jsx"}`
+
+   app.get('*', async (req, res, next) => {
+      const url = req.originalUrl;
+
+      try {
+         let template = await vite.transformIndexHtml(url, `
+            <!doctype html>
+            <html lang="en">
+              <head>
+                <meta charset="UTF-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+              </head>
+              <body>
+                <div id="root"></div>
+                <script type="module" src="${entry}"></script>
+              </body>
+            </html>
+        `);
+
+         res.status(200).set({
+            'Content-Type': 'text/html'
+         }).end(template);
+      } catch (e) {
+         vite.ssrFixStacktrace(e);
+         next(e);
+      }
+   });
+   return vite;
+}
+
+
 export default viteSetup