makepack 1.7.14 → 1.7.15

package/src/actions/create/makeFiles.js

@@ -1,65 +1,65 @@
-// import makepack from "./files/makepack.js";
-import packageJson from "./files/package-json.js";
-import gitignore from "./files/gitignore.js";
-import tsconfig from "./files/tsconfig.js";
-import projectJs from "./files/project-js.js";
-import projectJsx from "./files/project-jsx.js";
-import projectTs from "./files/project-ts.js";
-import projectTsx from "./files/project-tsx.js";
-import mainjs from "./files/main.js";
-import inquirer from 'inquirer'
-import fs from "fs-extra"
-import path from "path"
-import readmeMd from "./files/readme.md.js";
-
-export default async (info) => {
-   const files = [
-      await packageJson(info),
-      await gitignore(info),
-      await readmeMd(info),
-      await mainjs(info),
-   ];
-
-   switch (info.template) {
-      case "typescript":
-         files.push(await projectTs(info))
-         break
-      case "react with typescript":
-         files.push(await projectTsx(info))
-         break;
-      case "javascript":
-         files.push(await projectJs(info))
-         break
-      case "react with javascript":
-         files.push(await projectJsx(info))
-         break;
-   }
-
-   // push ts config
-   if (info.template.includes("typescript")) {
-      files.push(await tsconfig(info))
-   }
-
-   const rootdir = path.join(process.cwd(), info.pdir)
-
-   for (let file of files) {
-      // check if the file exists
-      if (fs.existsSync(path.join(rootdir, file.filename))) {
-         const { overwrite } = await inquirer.prompt([
-            {
-               type: "confirm",
-               name: 'overwrite',
-               message: `The file ${file.filename} already exists, do you want to overwrite it?`,
-               default: true
-            }
-         ])
-         if (!overwrite) {
-            continue
-         } else {
-            fs.removeSync(path.join(rootdir, file.filename))
-         }
-      }
-
-      fs.writeFileSync(path.join(rootdir, file.filename), file.content)
-   }
-}
+// import makepack from "./files/makepack.js";
+import packageJson from "./files/package-json.js";
+import gitignore from "./files/gitignore.js";
+import tsconfig from "./files/tsconfig.js";
+import projectJs from "./files/project-js.js";
+import projectJsx from "./files/project-jsx.js";
+import projectTs from "./files/project-ts.js";
+import projectTsx from "./files/project-tsx.js";
+import mainjs from "./files/main.js";
+import inquirer from 'inquirer'
+import fs from "fs-extra"
+import path from "path"
+import readmeMd from "./files/readme.md.js";
+
+export default async (info) => {
+   const files = [
+      await packageJson(info),
+      await gitignore(info),
+      await readmeMd(info),
+      await mainjs(info),
+   ];
+
+   switch (info.template) {
+      case "typescript":
+         files.push(await projectTs(info))
+         break
+      case "react with typescript":
+         files.push(await projectTsx(info))
+         break;
+      case "javascript":
+         files.push(await projectJs(info))
+         break
+      case "react with javascript":
+         files.push(await projectJsx(info))
+         break;
+   }
+
+   // push ts config
+   if (info.template.includes("typescript")) {
+      files.push(await tsconfig(info))
+   }
+
+   const rootdir = path.join(process.cwd(), info.pdir)
+
+   for (let file of files) {
+      // check if the file exists
+      if (fs.existsSync(path.join(rootdir, file.filename))) {
+         const { overwrite } = await inquirer.prompt([
+            {
+               type: "confirm",
+               name: 'overwrite',
+               message: `The file ${file.filename} already exists, do you want to overwrite it?`,
+               default: true
+            }
+         ])
+         if (!overwrite) {
+            continue
+         } else {
+            fs.removeSync(path.join(rootdir, file.filename))
+         }
+      }
+
+      fs.writeFileSync(path.join(rootdir, file.filename), file.content)
+   }
+}

package/src/actions/release/index.js

@@ -1,20 +1,20 @@
-import path from 'path'
-import { execSync, logger } from '../../helpers.js'
-import fs from 'fs-extra'
-
-const release = async () => {
-   const buildDir = path.join(process.cwd(), '.mpack')
-   const packageJsonPath = path.join(buildDir, 'package.json')
-   const exists = fs.existsSync(buildDir)
-   if (!exists || !fs.existsSync(packageJsonPath)) {
-      logger.error(`Project is not built yet. Please build the project first.`)
-      process.exit(1)
-   }
-
-   logger.info(`Releaseing the production build to the npm repository...`)
-   execSync(`npm publish`, {
-      cwd: buildDir
-   })
-}
-
+import path from 'path'
+import { execSync, logger } from '../../helpers.js'
+import fs from 'fs-extra'
+
+const release = async () => {
+   const buildDir = path.join(process.cwd(), '.mpack')
+   const packageJsonPath = path.join(buildDir, 'package.json')
+   const exists = fs.existsSync(buildDir)
+   if (!exists || !fs.existsSync(packageJsonPath)) {
+      logger.error(`Project is not built yet. Please build the project first.`)
+      process.exit(1)
+   }
+
+   logger.info(`Releaseing the production build to the npm repository...`)
+   execSync(`npm publish`, {
+      cwd: buildDir
+   })
+}
+
 export default release

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, 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);
-}
-
+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