makepack 1.6.7 → 1.6.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "makepack",
-  "version": "1.6.7",
+  "version": "1.6.9",
   "type": "module",
   "description": "A CLI tool to create, build, and manage JavaScript, TypeScript, React, and React-TypeScript libraries for npm projects.",
   "files": [
@@ -36,7 +36,6 @@
     "cosmiconfig": "^9.0.0",
     "esbuild": "^0.25.0",
     "express": "^4.21.1",
-    "figlet": "^1.8.0",
     "figures": "^6.1.0",
     "fs-extra": "^11.2.0",
     "glob": "^11.0.0",

package/src/actions/build/index.js

@@ -1,17 +1,16 @@
 import esbuild from 'esbuild'
 import fs from 'fs-extra'
 import path from 'path'
-import chalk from 'chalk'
 import ora from 'ora'
 import { glob } from 'glob'
 import ts from 'typescript'
+import { concolor, logger } from '../../helpers.js'
 
 const eBuild = async (conf) => {
 
    await esbuild.build({
       jsx: 'automatic',
       ...conf,
-      // outExtension: { '.js': ebconfig.format === 'esm' ? '.mjs' : '.cjs' },
       loader: {
          '.ts': 'ts',
          '.tsx': 'tsx'
@@ -70,12 +69,12 @@ const build = async (args) => {
       }
       if (args.format === 'default') {
          await eBuild({ ...config, format: "esm" });
-         spinner.succeed('ESM build generated successfully!');
+         logger.success('ESM build generated successfully!');
          await eBuild({ ...config, format: "cjs" });
-         spinner.succeed('CJS build generated successfully!');
+         logger.success('CJS build generated successfully!');
       } else {
          await eBuild({ ...config, format: args.format });
-         spinner.succeed(`${args.format} build generated successfully!`);
+         logger.success(`${args.format} build generated successfully!`);
       }
    }
 
@@ -91,7 +90,7 @@ const build = async (args) => {
          );
 
          if (!parsedConfig) {
-            console.error("❌ Error parsing tsconfig.json");
+            logger.error("Error parsing tsconfig.json");
             process.exit(1);
          } else {
             tsconfig = parsedConfig.options;
@@ -120,13 +119,13 @@ const build = async (args) => {
             const message = ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n');
             if (diagnostic.file) {
                const { line, character } = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start);
-               spinner.fail(`Error at ${diagnostic.file.fileName} (${line + 1},${character + 1}): ${message}`);
+               logger.error(`Error at ${diagnostic.file.fileName} (${line + 1},${character + 1}): ${message}`);
             } else {
-               spinner.fail(`Error: ${message}`);
+               logger.error(`${message}`);
             }
          });
       } else {
-         spinner.succeed("TypeScript declaration files generated successfully!")
+         logger.success("TypeScript declaration files generated successfully!")
       }
    }
    spinner.text = "Copying package.json and readme.md files..."
@@ -135,33 +134,20 @@ const build = async (args) => {
    const pkgPath = path.join(process.cwd(), 'package.json');
    if (fs.existsSync(pkgPath)) {
       const pkgjson = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
-      if (args.format === 'default') {
-         pkgjson.main = "./index.cjs";
-         pkgjson.module = "./index.mjs";
-         pkgjson.types = './index.d.ts'
-      } else {
-         let t = args.format === 'mjs' ? 'module' : 'main';
-         pkgjson[t] = `./index.${args.format}`;
-      }
-
-      if (args.declaration) {
-         pkgjson.types = `./index.d.ts`;
-      }
-
       delete pkgjson.scripts
       delete pkgjson.type
-
       fs.writeFileSync(path.join(outdir, 'package.json'), JSON.stringify(pkgjson, null, 2));
    } else {
-      spinner.fail("package.json not found!");
+      logger.error("package.json not found!");
       return;
    }
 
    fs.copyFileSync(path.join(process.cwd(), '/readme.md'), path.join(outdir, `/readme.md`))
-   spinner.succeed("package.json and readme.md files copied successfully!")
-   console.log(chalk.green(`\nBuild completed successfully!`));
-   console.log(`\nTo publish your package to npm:`);
-   console.log(`${chalk.green(`npm run release`)} or navigate to the ${chalk.green(`.mpack`)} directory and run ${chalk.green(`npm publish`)}`);
+   logger.success("package.json and readme.md files copied successfully!")
+   logger.success(`completed successfully!`, 'BUILD:', true);
+   logger.info(`To publish your package to npm:`, 'INFO:', true);
+   logger.info(`${concolor.yellow(`npm run release`)} or navigate to the ${concolor.yellow(`.mpack`)} directory and run ${concolor.yellow(`npm publish`)}`, 'RELEASE:', true)
+   spinner.stop();
 }
 
 export default build

package/src/actions/create/files/package-json.js

@@ -53,7 +53,7 @@ export default async (info) => {
                "default": "./*.js"
             }
          },
-         "./cjs": null,
+         "./cjs": null
       },
       dependencies,
       devDependencies

package/src/actions/create/index.js

@@ -1,10 +1,8 @@
-import { execSync, logger } from "../../helpers.js"
+import { execSync, concolor, logger } from "../../helpers.js"
 import makeFiles from "./makeFiles.js"
 import path from 'path'
 import inquirer from 'inquirer'
-import figlet from 'figlet'
 import fs from "fs-extra"
-import chalk from 'chalk';
 const cwd = process.cwd()
 const cwdFolder = cwd.split(path.sep).pop()
 
@@ -89,16 +87,10 @@ const create = async () => {
 
    logger.success("Project setup complete!", "")
    if (isCurrentDir) {
-      console.log(`Run the development server: ${chalk.blue("npm start")}\nEnjoy your new project! 😊`);
+      logger.info(`Run the development server: ${concolor.yellow("npm start")}\nEnjoy your new project! 😊`);
    } else {
-      console.log(`Navigate to your project directory:\n${chalk.blue("cd " + info.pdir, false)} and Run the development server: ${chalk.blue("npm start")}\nEnjoy your new project! 😊`);
+      logger.info(`Navigate to your project directory:\n${concolor.yellow("cd " + info.pdir, false)} and Run the development server: ${concolor.yellow("npm start")}\nEnjoy your new project! 😊`);
    }
-
-   figlet("Makepack CLI", function (err, data) {
-      if (!err) {
-         console.log(data);
-      }
-   });
 }
 
 export default create

package/src/actions/start/express.js

@@ -1,12 +1,10 @@
 import express from 'express';
-import { logger } from '../../helpers.js'
-import chalk from 'chalk';
 import path from 'path'
 import fs from 'fs'
 import viteSetup from './vite.js';
 const port = process.env.PORT || 3000;
 const app = express();
-const server = async () => {
+const server = async (cb) => {
 
    // get type from package.json
    const pkg = path.join(process.cwd(), 'package.json');
@@ -16,19 +14,23 @@ const server = async () => {
       type = pkgjson.type || 'module';
    }
 
-   const mpack = path.join(process.cwd(), '.mpack');
-   const uxp = path.join(mpack, 'uxp.js')
-   if (fs.existsSync(uxp)) {
-      // load user-express.js based on type
-      if (type === 'module') {
-         const { default: userExpress } = await import(uxp);
-         userExpress(app);
-      } else {
-         const userExpress = require(uxp).default;
-         userExpress(app);
-      }
+   if (cb) {
+      cb(app)
    }
 
+   // const mpack = path.join(process.cwd(), '.mpack');
+   // const uxp = path.join(mpack, 'uxp.js')
+   // if (fs.existsSync(uxp)) {
+   //    // load user-express.js based on type
+   //    if (type === 'module') {
+   //       const { default: userExpress } = await import(uxp);
+   //       userExpress(app);
+   //    } else {
+   //       const userExpress = require(uxp).default;
+   //       userExpress(app);
+   //    }
+   // }
+
 
    await viteSetup(app)
    app.use((_req, res) => {
@@ -36,8 +38,8 @@ const server = async () => {
    });
 
    app.listen(port, () => {
-      logger.success(`Server is running on ${chalk.blue(chalk.underline(`http://localhost:${port}`))}`);
+      console.log(`Server is running on: http://localhost:${port}`);
    });
 }
 
-server()
+export default server;

package/src/actions/start/index.js

@@ -15,7 +15,6 @@ if (typeof import.meta.url !== 'undefined') {
    __dirname = __dirname;
 }
 
-
 const startServer = () => {
    const mpack = path.join(process.cwd(), '.mpack')
    const server = spawn('node', [path.resolve(mpack, 'index.js')], {
@@ -29,11 +28,8 @@ const startServer = () => {
 }
 
 const start = async (args) => {
-   let { port } = args
+   let port = args.port || 4000
 
-   if (!port) {
-      port = 4000;
-   }
    // create a folder call .mpack
    const mpack = path.join(process.cwd(), '.mpack')
    if (fs.existsSync(mpack)) {
@@ -41,10 +37,7 @@ const start = async (args) => {
    }
    fs.mkdirSync(mpack)
 
-
-   // build ./express.js to .mpack/index.js with esbuild
    let format = 'esm'
-   // get format from package.json
    const pkg = path.join(process.cwd(), 'package.json')
    if (fs.existsSync(pkg)) {
       const pkgjson = JSON.parse(fs.readFileSync(pkg, 'utf-8'))
@@ -53,28 +46,11 @@ const start = async (args) => {
       }
    }
 
-   const uxpjs = path.join(process.cwd(), 'express.js')
-   const uxpts = path.join(process.cwd(), 'express.ts')
-
-   if (fs.existsSync(uxpjs) || fs.existsSync(uxpts)) {
-      let filename = fs.existsSync(uxpjs) ? "express.js" : "express.ts";
-      let outfile = path.join(mpack, 'uxp.js');
-
-      const ctx = await esbuild.context({
-         entryPoints: [filename],
-         outfile,
-         bundle: true,
-         format: 'esm',
-         platform: 'node',
-         packages: 'external',
-      })
-      ctx.watch()
-   }
-
    await esbuild.build({
       entryPoints: [path.resolve(__dirname, 'express.js')],
-      outfile: path.join(mpack, 'index.js'),
+      outfile: path.join(mpack, 'core.js'),
       bundle: true,
+      minify: true,
       format,
       platform: 'node',
       packages: 'external',
@@ -83,18 +59,41 @@ const start = async (args) => {
       },
    })
 
-   let server = startServer();
-
-   const uxp = path.join(mpack, 'uxp.js')
+   const uxpjs = path.join(process.cwd(), 'express.js')
+   const uxpts = path.join(process.cwd(), 'express.ts')
+   const exists = fs.existsSync(uxpjs) || fs.existsSync(uxpts);
+   const uxpFile = exists ? (fs.existsSync(uxpjs) ? 'express.js' : 'express.ts') : '';
+   let contents = `import server from './.mpack/core';`;
+   contents += uxpFile ? `
+         import uxp from './${uxpFile}';
+         server(uxp);
+      ` : `server();`;
+
+   const result = await esbuild.build({
+      bundle: true,
+      stdin: {
+         contents,
+         resolveDir: process.cwd(),
+         sourcefile: 'virtual.js',
+         loader: 'ts',
+      },
+      format,
+      outfile: path.join(mpack, 'index.js'),
+      platform: 'node',
+      packages: 'external',
+      sourcemap: true,
+      metafile: true,
+   })
 
-   if (fs.existsSync(uxp)) {
-      const watcher = chokidar.watch(uxp, {
-         persistent: true,
-         ignoreInitial: true,
+   let server = startServer();
+   if (uxpFile) {
+      const importedFiles = Object.keys(result.metafile.inputs);
+      const watcher = chokidar.watch(importedFiles, {
+         ignored: /node_modules/,
+         ignoreInitial: true
       });
 
       watcher.on('change', async () => {
-         // restart the server and remove log Server exited with code
          server.kill();
          server = startServer();
       });

package/src/helpers.js

@@ -1,7 +1,4 @@
 import child_process from 'child_process'
-import chalk from 'chalk';
-import figures from 'figures';
-
 export const execSync = (command, option = {}) => {
    try {
       const result = child_process.execSync(command, {
@@ -17,21 +14,59 @@ export const execSync = (command, option = {}) => {
 };
 
 
+export const conicon = {
+   info: 'ℹ',
+   success: '✔',
+   warning: '⚠',
+   error: '✖',
+   dot: '․',
+   pointer: '❯',
+   arrowRight: '→',
+   arrowDown: '↓',
+   arrowUp: '↑',
+   star: '★',
+   check: '✅',
+   cross: '❌',
+   question: '?',
+   ellipsis: '…',
+   clock: '⏱',
+   hourglass: '⏳',
+   rocket: '🚀',
+   bug: '🐞',
+};
+
+export const concolor = {
+   reset: (str) => `\x1b[0m${str}\x1b[0m`,
+   red: (str) => `\x1b[31m${str}\x1b[0m`,
+   green: (str) => `\x1b[32m${str}\x1b[0m`,
+   yellow: (str) => `\x1b[33m${str}\x1b[0m`,
+   blue: (str) => `\x1b[34m${str}\x1b[0m`,
+   magenta: (str) => `\x1b[35m${str}\x1b[0m`,
+   cyan: (str) => `\x1b[36m${str}\x1b[0m`,
+   white: (str) => `\x1b[37m${str}\x1b[0m`,
+   bold: (str) => `\x1b[1m${str}\x1b[0m`,
+   dim: (str) => `\x1b[2m${str}\x1b[0m`,
+   underline: (str) => `\x1b[4m${str}\x1b[0m`,
+};
+
 
 export const logger = {
+   log: (message, prefix, icon, color) => {
+      let _color = concolor[color] || concolor.reset;
+      let _icon = conicon[icon] || '';
+      prefix = prefix ? _color(concolor.bold(prefix)) : "";
+      console.log(`${_icon ? _color(_icon) + " " : ""}${prefix} ${message}`);
+   },
    info: (message, prefix = 'INFO', icon = true) => {
-      console.log(`${icon ? chalk.blue(figures.info) + " " : ""}${chalk.cyan.bold(prefix)} ${message}`);
+      logger.log(message, prefix, icon ? 'info' : '', 'blue');
    },
    success: (message, prefix = 'SUCCESS:', icon = true) => {
-      console.log(`${icon ? chalk.green(figures.tick) + " " : ""}${chalk.green.bold(prefix)} ${message}`);
+      logger.log(message, prefix, icon ? 'success' : '', 'green');
    },
    warning: (message, prefix = 'WARNING:', icon = true) => {
-      console.log(`${icon ? chalk.yellow(figures.warning) + " " : ""}${chalk.yellow.bold(prefix)} ${message}`);
+      logger.log(message, prefix, icon ? 'warning' : '', 'yellow');
    },
    error: (message, prefix = 'ERROR:', icon = true) => {
-      console.log(`${icon ? chalk.red(figures.cross) + " " : ""}${chalk.red.bold(prefix)} ${message}`);
-   },
-   custom: (icon, color, label, message) => {
-      console.log(`${chalk[color](icon)} ${chalk[color].bold(`${label}:`)} ${message}`);
-   },
+      logger.log(message, prefix, icon ? 'error' : '', 'red');
+   }
 };