makepack 1.5.24 → 1.6.1

package/src/actions/create/index.js

@@ -1,106 +1,104 @@
-import { execSync, 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"
-const cwd = process.cwd()
-const cwdFolder = cwd.split(path.sep).pop()
-
-const create = async () => {
-   const information = {
-      projectDirName: cwdFolder,
-      cwd: path.join(cwd, cwdFolder),
-      template: "typescript",
-      sourceDir: "src",
-      sourceEntry: "index.ts",
-   }
-
-   let { projectDirName } = await inquirer.prompt([
-      {
-         type: 'input',
-         name: 'projectDirName',
-         message: 'Enter the project name',
-         default: information.projectDir
-      }
-   ])
-
-   if (projectDirName !== cwdFolder) {
-      if (fs.existsSync(path.join(cwd, projectDirName))) {
-         const { proceed } = await inquirer.prompt([
-            {
-               type: "confirm",
-               name: 'proceed',
-               message: "The directory already exists, do you want to overwrite it?",
-               default: "No"
-            }
-         ])
-         if (!proceed) {
-            console.log('Project creation canceled.');
-            return
-         }
-      }
-   }
-
-   information.projectDirName = projectDirName
-   information.cwd = path.join(cwd, information.projectDirName)
-   let isCurrentDir = projectDirName !== cwdFolder
-
-   // template
-   const { template } = await inquirer.prompt([
-      {
-         type: 'list',
-         name: 'template',
-         message: 'Select a template',
-         choices: ['typescript', 'javascript', 'react with typescript', 'react with javascript'],
-         default: information.template
-      }
-   ])
-
-   information.template = template
-
-   logger.info("", "Creating project...", false)
-   const projectDir = path.join(cwd, information.projectDirName)
-
-   if (!fs.existsSync(projectDir)) {
-      fs.mkdirSync(projectDir)
-   }
-
-   if (!fs.existsSync(path.join(projectDir, information.sourceDir))) {
-      fs.mkdirSync(path.join(projectDir, information.sourceDir))
-   }
-
-   switch (information.template) {
-      case "react with typescript":
-         information.sourceEntry = "index.tsx"
-         break;
-      case "react with javascript":
-         information.sourceEntry = "index.jsx"
-         break;
-      case "javascript":
-         information.sourceEntry = "index.js"
-         break;
-   }
-
-   await makeFiles(information)
-
-   logger.info("", "Installing Dependencies", false)
-   execSync("npm install", {
-      cwd: information.cwd,
-   })
-
-   logger.info("Project setup complete!", "", false)
-   if (isCurrentDir) {
-      console.log(`Run the development server: \n${logger.info("", "npm start", false)}\nEnjoy your new project! 😊`);
-   } else {
-      console.log(`To start working with your project:\nNavigate to your project directory:\n${logger.info("", "cd " + information.projectDirName, false)} and Run the development server:\n${logger.info("", "npm start", false)}\nEnjoy your new project! 😊`);
-   }
-
-   figlet("Makepack CLI", function (err, data) {
-      if (!err) {
-         console.log(data);
-      }
-   });
-}
-
+import { execSync, 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()
+
+const valiateProjectName = (name) => {
+   if (!name) {
+      console.error("Project name cannot be empty.");
+      return false;
+   }
+   if (!/^[a-z0-9-]+$/.test(name)) {
+      console.error("Project name can only contain lowercase letters, numbers, and hyphens.");
+      return false;
+   }
+   if (name.length < 3) {
+      console.error("Project name must be at least 3 characters long.");
+      return false;
+   }
+   if (name.length > 50) {
+      console.error("Project name must be less than 50 characters long.");
+      return false;
+   }
+   return true;
+}
+
+const create = async () => {
+
+   let info = await inquirer.prompt([
+      {
+         type: 'input',
+         name: 'pdir',
+         message: 'Enter the project name',
+         default: cwdFolder
+      },
+      {
+         type: 'list',
+         name: 'template',
+         message: 'Select a template',
+         choices: ['typescript', 'javascript', 'react with typescript', 'react with javascript'],
+         default: "typescript"
+      }
+   ])
+
+   // check if the pdir is exists
+   let pdir = info.pdir.trim().replace(/\s+/g, '-').toLowerCase();
+   const isValidProjectName = valiateProjectName(pdir)
+   if (!isValidProjectName) return
+
+   if (pdir !== cwdFolder) {
+      if (fs.existsSync(path.join(cwd, pdir))) {
+         const { proceed } = await inquirer.prompt([
+            {
+               type: "confirm",
+               name: 'proceed',
+               message: "The directory already exists, do you want to overwrite it?",
+               default: "No"
+            }
+         ])
+         if (!proceed) {
+            console.log('Project creation canceled.');
+            return
+         }
+      }
+   }
+
+   const rootdir = path.join(cwd, pdir)
+   let isCurrentDir = pdir !== cwdFolder
+   logger.info("", "Creating project...", false)
+
+   if (!fs.existsSync(rootdir)) {
+      fs.mkdirSync(rootdir)
+   }
+
+   if (!fs.existsSync(path.join(rootdir, 'src'))) {
+      fs.mkdirSync(path.join(rootdir, 'src'))
+   }
+
+   await makeFiles(info)
+
+   logger.info("", "Installing Dependencies", false)
+   execSync("npm install", {
+      cwd: rootdir,
+   })
+
+   logger.success("Project setup complete!", "")
+   if (isCurrentDir) {
+      console.log(`Run the development server: ${chalk.blue("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! 😊`);
+   }
+
+   figlet("Makepack CLI", function (err, data) {
+      if (!err) {
+         console.log(data);
+      }
+   });
+}
+
 export default create

package/src/actions/create/makeFiles.js

@@ -1,64 +1,64 @@
-// import makepack from "./files/makepack.js";
-import packageJson from "./files/package-json.js";
-import gitignore from "./files/gitignore.js";
-import App from "./files/App.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 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 App(info),
-      await readmeMd(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))
-   }
-
-   for (let file of files) {
-      // check if the file exists
-      if (fs.existsSync(path.join(info.cwd, 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(info.cwd, file.filename))
-         }
-      }
-
-      fs.writeFileSync(path.join(info.cwd, 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 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)
+   ];
+
+   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/publish/index.js

@@ -1,21 +1,20 @@
-import path from 'path'
-import { execSync, logger } from '../../helpers.js'
-import makepackConfig from '../../makepack-config.js'
-import fs from 'fs-extra'
-
-const publish = async () => {
-   const { build } = await makepackConfig()
-   const buildDir = path.join(process.cwd(), build.outdir)
-   const exists = fs.existsSync(buildDir)
-   if (!exists) {
-      logger.error(`Build directory ${buildDir} does not exist. Please build the project first`)
-      process.exit(1)
-   }
-
-   logger.info(`Publishing 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 publish = 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(`Publishing the production build to the npm repository...`)
+   execSync(`npm publish`, {
+      cwd: buildDir
+   })
+}
+
 export default publish

package/src/actions/start/express.js

@@ -1,26 +1,43 @@
-import express from 'express';
-import { logger } from '../../helpers.js'
-import chalk from 'chalk';
-import makepackConfig from '../../makepack-config.js';
-import viteSetup from './vite.js';
-import userExpress from './user-express.js';
-
-const app = express();
-const server = async () => {
-   const config = await makepackConfig()
-   userExpress(app)
-   await viteSetup(app)
-   app.use((_req, res) => {
-      res.status(500).send('Internal Server Error');
-   });
-
-   app.listen(config.start.port, () => {
-      logger.success(`Server is running on ${chalk.blue(chalk.underline(`http://localhost:${config.start.port}`))}`);
-   });
-
-   process.on('SIGINT', async () => {
-      process.exit(0);
-   });
-}
-
+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 () => {
+
+   // get type from package.json
+   const pkg = path.join(process.cwd(), 'package.json');
+   let type = 'module';
+   if (fs.existsSync(pkg)) {
+      const pkgjson = JSON.parse(fs.readFileSync(pkg, 'utf-8'));
+      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);
+      }
+   }
+
+
+   await viteSetup(app)
+   app.use((_req, res) => {
+      res.status(500).send('Internal Server Error');
+   });
+
+   app.listen(port, () => {
+      logger.success(`Server is running on ${chalk.blue(chalk.underline(`http://localhost:${port}`))}`);
+   });
+}
+
 server()

package/src/actions/start/index.js

@@ -1,77 +1,118 @@
-import fs from 'fs-extra'
-import path from 'path'
-import { logger } from '../../helpers.js'
-import makepackConfig from '../../makepack-config.js';
-import esbuild from 'esbuild';
-import chokidar from 'chokidar';
-import { fileURLToPath } from 'url';
-import { spawn } from 'child_process';
-let __filename, __dirname;
-
-if (typeof import.meta.url !== 'undefined') {
-   __filename = fileURLToPath(import.meta.url);
-   __dirname = path.dirname(__filename);
-} else {
-   __filename = __filename;
-   __dirname = __dirname;
-}
-
-let server = null;
-function startServer() {
-   if (server) {
-      server.kill('SIGINT');
-      server = null;
-   }
-   server = spawn('node', [path.resolve(__dirname, 'express.js')], {});
-   server.stdout.on('data', (data) => {
-      console.log(data.toString().trim());
-   });
-   server.stderr.on('data', (data) => {
-      console.error(data.toString().trim());
-   });
-}
-
-const start = async () => {
-   const config = await makepackConfig()
-   const exists = fs.existsSync(path.join(process.cwd(), config.start.entry))
-   if (!exists) {
-      logger.error(`Entry file ${entry} does not exist. please check your config file`)
-      process.exit(1)
-   }
-
-   const expressjs = path.join(process.cwd(), 'express.js')
-   const expressts = path.join(process.cwd(), 'express.ts')
-
-   if (fs.existsSync(expressjs) || fs.existsSync(expressts)) {
-      let filename = fs.existsSync(expressjs) ? "express.js" : "express.ts";
-      let outfile = path.resolve(__dirname, 'user-express.js')
-
-      const ctx = await esbuild.context({
-         entryPoints: [filename],
-         outfile: path.resolve(__dirname, 'user-express.js'),
-         bundle: true,
-         format: 'esm',
-         platform: 'node',
-         packages: 'external',
-      })
-
-      ctx.watch()
-
-      const watcher = chokidar.watch(outfile, {
-         persistent: true,
-         ignoreInitial: true,
-      });
-
-      watcher.on('change', async () => {
-         startServer(config)
-      });
-
-      process.on('SIGINT', async () => {
-         watcher.close();
-         process.exit(0);
-      });
-   }
-   startServer(config)
-}
-
+import path from 'path'
+import fs from 'fs'
+import { spawn } from 'child_process'
+import esbuild from 'esbuild';
+import { fileURLToPath } from 'url';
+import chokidar from 'chokidar';
+
+let __filename, __dirname;
+
+if (typeof import.meta.url !== 'undefined') {
+   __filename = fileURLToPath(import.meta.url);
+   __dirname = path.dirname(__filename);
+} else {
+   __filename = __filename;
+   __dirname = __dirname;
+}
+
+
+const startServer = () => {
+   const mpack = path.join(process.cwd(), '.mpack')
+   const server = spawn('node', [path.resolve(mpack, 'index.js')], {
+      stdio: 'inherit',
+   });
+
+   server.on('error', (err) => {
+      console.error(`Error starting server: ${err.message}`);
+   });
+   return server;
+}
+
+const start = async (args) => {
+   let { port } = args
+
+   if (!port) {
+      port = 4000;
+   }
+   // create a folder call .mpack
+   const mpack = path.join(process.cwd(), '.mpack')
+   if (fs.existsSync(mpack)) {
+      fs.rmSync(mpack, { recursive: true, force: true });
+   }
+   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'))
+      if (pkgjson.type === 'commonjs') {
+         format = 'cjs'
+      }
+   }
+
+   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'),
+      bundle: true,
+      format,
+      platform: 'node',
+      packages: 'external',
+      define: {
+         'process.env.PORT': JSON.stringify(port),
+      },
+   })
+
+   let server = startServer();
+
+   const uxp = path.join(mpack, 'uxp.js')
+
+   if (fs.existsSync(uxp)) {
+      const watcher = chokidar.watch(uxp, {
+         persistent: true,
+         ignoreInitial: true,
+      });
+
+      watcher.on('change', async () => {
+         // restart the server and remove log Server exited with code
+         server.kill();
+         server = startServer();
+      });
+   }
+
+   process.on('SIGINT', () => {
+      console.log('Received SIGINT, killing server...');
+      server.kill('SIGINT');
+      process.exit(0);
+   });
+
+   process.on('SIGTERM', () => {
+      console.log('Received SIGTERM, killing server...');
+      server.kill('SIGTERM');
+      process.exit(0);
+   });
+
+}
+
+
 export default start