makepack 1.7.14 → 1.7.15

package/src/actions/build/bundler.js

@@ -1,132 +1,132 @@
-import { rollup } from "rollup";
-import resolve from "@rollup/plugin-node-resolve";
-import commonjs from "@rollup/plugin-commonjs";
-import typescript from "@rollup/plugin-typescript";
-import path from "path";
-import dts from "rollup-plugin-dts";
-import json from '@rollup/plugin-json';
-import terser from "@rollup/plugin-terser";
-import { loadRollupConfig, loadViteConfig } from "../../helpers.js";
-
-async function bundler(args, spinner) {
-
-   const isTs = args.entry.endsWith('.ts') || args.entry.endsWith('.tsx')
-   const viteConfig = await loadViteConfig()
-   const rollupConfig = await loadRollupConfig()
-   const viteRollupConfig = viteConfig?.build?.rollupOptions || {}
-   Object.assign(rollupConfig || {}, viteRollupConfig);
-
-   const config = {
-      ...rollupConfig,
-      input: [args.entry],
-      external: (id) => {
-         if (rollupConfig && typeof rollupConfig.external === 'function') {
-            if (rollupConfig.external(id)) {
-               return true;
-            }
-         } else if (Array.isArray(rollupConfig && rollupConfig.external)) {
-            if (rollupConfig.external.includes(id)) {
-               return true;
-            }
-         }
-         return !id.startsWith('.') && !id.startsWith('/') && !/^[A-Za-z]:\\/.test(id);
-      },
-      plugins: [
-         json(),
-         resolve({
-            extensions: ['.js', '.ts', '.jsx', '.tsx', '.json', '.mjs', '.cjs'],
-            browser: false
-         }),
-         commonjs(),
-         typescript({
-            tsconfig: false,
-            target: "ES2017",
-            module: "ESNext",
-            jsx: "react-jsx",
-            moduleResolution: "node", // ✅ Correct and lowercase
-            esModuleInterop: true,
-            skipLibCheck: false,
-            strict: true,
-            importHelpers: true,
-            forceConsistentCasingInFileNames: true,
-            declaration: false,
-            emitDeclarationOnly: false,
-            rootDir: path.resolve(process.cwd(), args.rootdir),
-         }),
-         args.minify ? terser() : null,
-         ...rollupConfig?.plugins || [],
-      ]
-   };
-
-   const bundle = await rollup(config);
-   const esm = {
-      dir: args.outdir,
-      format: "esm",
-      sourcemap: args.sourcemap,
-      compact: true,
-      strict: true,
-      exports: "named"
-   };
-   if (!args.bundle) {
-      esm.preserveModules = true
-      esm.preserveModulesRoot = args.rootdir
-   }
-
-   let cjs = {
-      ...esm,
-      dir: args.outdir,
-      format: "cjs",
-      dynamicImportInCjs: true,
-      esModule: true,
-   }
-
-   let outputOptions = []
-
-   if (args.format === "both") {
-      outputOptions = [
-         { ...esm, entryFileNames: '[name].mjs' },
-         cjs,
-      ]
-   } else if (args.format === "esm") {
-      outputOptions = [esm];
-   } else if (args.format === "cjs") {
-      outputOptions = [cjs];
-   } else if (args.format === "iife") {
-      outputOptions = [{
-         ...esm,
-         format: "iife",
-         name: args.name || path.basename(args.entry, path.extname(args.entry)),
-         entryFileNames: '[name].js',
-      }];
-   } else if (args.format === "umd") {
-      outputOptions = [{
-         ...esm,
-         format: "umd",
-         name: args.name || path.basename(args.entry, path.extname(args.entry)),
-         entryFileNames: '[name].js',
-      }];
-   }
-
-   for (const output of outputOptions) {
-      await bundle.write(output);
-   }
-   await bundle.close();
-
-   // If TypeScript declaration files are requested, generate them
-   if (isTs && args.declaration) {
-      spinner.text = "Generating TypeScript declarations..."
-      const bundlets = await rollup({
-         ...config,
-         plugins: [dts()],
-      });
-      await bundlets.write({
-         format: "esm",
-         preserveModules: true,
-         preserveModulesRoot: args.rootdir,
-         dir: path.join(args.outdir),
-      });
-      await bundlets.close();
-   }
-}
-
+import { rollup } from "rollup";
+import resolve from "@rollup/plugin-node-resolve";
+import commonjs from "@rollup/plugin-commonjs";
+import typescript from "@rollup/plugin-typescript";
+import path from "path";
+import dts from "rollup-plugin-dts";
+import json from '@rollup/plugin-json';
+import terser from "@rollup/plugin-terser";
+import { loadRollupConfig, loadViteConfig } from "../../helpers.js";
+
+async function bundler(args, spinner) {
+
+   const isTs = args.entry.endsWith('.ts') || args.entry.endsWith('.tsx')
+   const viteConfig = await loadViteConfig()
+   const rollupConfig = await loadRollupConfig()
+   const viteRollupConfig = viteConfig?.build?.rollupOptions || {}
+   Object.assign(rollupConfig || {}, viteRollupConfig);
+
+   const config = {
+      ...rollupConfig,
+      input: [args.entry],
+      external: (id) => {
+         if (rollupConfig && typeof rollupConfig.external === 'function') {
+            if (rollupConfig.external(id)) {
+               return true;
+            }
+         } else if (Array.isArray(rollupConfig && rollupConfig.external)) {
+            if (rollupConfig.external.includes(id)) {
+               return true;
+            }
+         }
+         return !id.startsWith('.') && !id.startsWith('/') && !/^[A-Za-z]:\\/.test(id);
+      },
+      plugins: [
+         json(),
+         resolve({
+            extensions: ['.js', '.ts', '.jsx', '.tsx', '.json', '.mjs', '.cjs'],
+            browser: false
+         }),
+         commonjs(),
+         typescript({
+            tsconfig: false,
+            target: "ES2017",
+            module: "ESNext",
+            jsx: "react-jsx",
+            moduleResolution: "node", // ✅ Correct and lowercase
+            esModuleInterop: true,
+            skipLibCheck: false,
+            strict: true,
+            importHelpers: true,
+            forceConsistentCasingInFileNames: true,
+            declaration: false,
+            emitDeclarationOnly: false,
+            rootDir: path.resolve(process.cwd(), args.rootdir),
+         }),
+         args.minify ? terser() : null,
+         ...rollupConfig?.plugins || [],
+      ]
+   };
+
+   const bundle = await rollup(config);
+   const esm = {
+      dir: args.outdir,
+      format: "esm",
+      sourcemap: args.sourcemap,
+      compact: true,
+      strict: true,
+      exports: "named"
+   };
+   if (!args.bundle) {
+      esm.preserveModules = true
+      esm.preserveModulesRoot = args.rootdir
+   }
+
+   let cjs = {
+      ...esm,
+      dir: args.outdir,
+      format: "cjs",
+      dynamicImportInCjs: true,
+      esModule: true,
+   }
+
+   let outputOptions = []
+
+   if (args.format === "both") {
+      outputOptions = [
+         { ...esm, entryFileNames: '[name].mjs' },
+         cjs,
+      ]
+   } else if (args.format === "esm") {
+      outputOptions = [esm];
+   } else if (args.format === "cjs") {
+      outputOptions = [cjs];
+   } else if (args.format === "iife") {
+      outputOptions = [{
+         ...esm,
+         format: "iife",
+         name: args.name || path.basename(args.entry, path.extname(args.entry)),
+         entryFileNames: '[name].js',
+      }];
+   } else if (args.format === "umd") {
+      outputOptions = [{
+         ...esm,
+         format: "umd",
+         name: args.name || path.basename(args.entry, path.extname(args.entry)),
+         entryFileNames: '[name].js',
+      }];
+   }
+
+   for (const output of outputOptions) {
+      await bundle.write(output);
+   }
+   await bundle.close();
+
+   // If TypeScript declaration files are requested, generate them
+   if (isTs && args.declaration) {
+      spinner.text = "Generating TypeScript declarations..."
+      const bundlets = await rollup({
+         ...config,
+         plugins: [dts()],
+      });
+      await bundlets.write({
+         format: "esm",
+         preserveModules: true,
+         preserveModulesRoot: args.rootdir,
+         dir: path.join(args.outdir),
+      });
+      await bundlets.close();
+   }
+}
+
 export default bundler;

package/src/actions/build/index.js

@@ -1,75 +1,75 @@
-import fs from 'fs-extra'
-import path from 'path'
-import ora from 'ora'
-import { concolor, logger } from '../../helpers.js'
-import bundler from './bundler.js'
-
-const build = async (args) => {
-   /* args 
-   --format=both 
-   --bundle=true, 
-   --minify=false, 
-   --sourcemap=true, 
-   --declaration=true,
-   */
-
-   let printBool = (f) => typeof args[f] === 'string' ? (args[f] === 'true') : args[f];
-
-   const outdir = path.join(process.cwd(), '.mpack');
-   const rootdir = path.join(process.cwd(), 'src');
-
-   let entry = '';
-   let entryts = path.join(rootdir, 'index.ts');
-   let entryjs = path.join(rootdir, 'index.js');
-   let entrytsx = path.join(rootdir, 'index.tsx');
-   let entryjsx = path.join(rootdir, 'index.jsx');
-
-   if (fs.existsSync(entryts)) {
-      entry = "index.ts";
-   } else if (fs.existsSync(entryjs)) {
-      entry = "index.js";
-   } else if (fs.existsSync(entrytsx)) {
-      entry = "index.tsx";
-   } else if (fs.existsSync(entryjsx)) {
-      entry = "index.jsx";
-   } else {
-      throw new Error("No entry file found in src directory. Please provide an index.ts or index.js file.");
-   }
-
-   args = {
-      format: args.format || "both",
-      bundle: printBool('bundle'),
-      minify: printBool('minify'),
-      sourcemap: printBool('sourcemap'),
-      declaration: printBool('declaration'),
-      outdir,
-      rootdir,
-      entry: path.join(rootdir, entry),
-   }
-
-   if (fs.existsSync(outdir)) {
-      fs.rmSync(outdir, { recursive: true, force: true });
-   }
-   fs.mkdirSync(outdir)
-   const spinner = ora("✨ Bundling your package..\n").start();
-   await bundler(args, spinner);
-   spinner.text = "Copying package.json and readme.md files..."
-   const pkgPath = path.join(process.cwd(), 'package.json');
-   if (fs.existsSync(pkgPath)) {
-      const pkgjson = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
-      delete pkgjson.scripts
-      delete pkgjson.type
-      fs.writeFileSync(path.join(outdir, 'package.json'), JSON.stringify(pkgjson, null, 2));
-   } else {
-      logger.error("package.json not found!");
-      return;
-   }
-
-   fs.copyFileSync(path.join(process.cwd(), '/readme.md'), path.join(outdir, `/readme.md`))
-   spinner.succeed(concolor.bold(concolor.green(`Build successfully completed\n`)));
-   console.log(concolor.bold(`To publish your package to npm run:`));
-   console.log(`${concolor.yellow(`\`npm run release\``)} Or navigate to \`.mpack\` and run: ${concolor.yellow(`\`npm publish\`\n`)}`);
-   spinner.stop();
-}
-
+import fs from 'fs-extra'
+import path from 'path'
+import ora from 'ora'
+import { concolor, logger } from '../../helpers.js'
+import bundler from './bundler.js'
+
+const build = async (args) => {
+   /* args 
+   --format=both 
+   --bundle=true, 
+   --minify=false, 
+   --sourcemap=true, 
+   --declaration=true,
+   */
+
+   let printBool = (f) => typeof args[f] === 'string' ? (args[f] === 'true') : args[f];
+
+   const outdir = path.join(process.cwd(), '.mpack');
+   const rootdir = path.join(process.cwd(), 'src');
+
+   let entry = '';
+   let entryts = path.join(rootdir, 'index.ts');
+   let entryjs = path.join(rootdir, 'index.js');
+   let entrytsx = path.join(rootdir, 'index.tsx');
+   let entryjsx = path.join(rootdir, 'index.jsx');
+
+   if (fs.existsSync(entryts)) {
+      entry = "index.ts";
+   } else if (fs.existsSync(entryjs)) {
+      entry = "index.js";
+   } else if (fs.existsSync(entrytsx)) {
+      entry = "index.tsx";
+   } else if (fs.existsSync(entryjsx)) {
+      entry = "index.jsx";
+   } else {
+      throw new Error("No entry file found in src directory. Please provide an index.ts or index.js file.");
+   }
+
+   args = {
+      format: args.format || "both",
+      bundle: printBool('bundle'),
+      minify: printBool('minify'),
+      sourcemap: printBool('sourcemap'),
+      declaration: printBool('declaration'),
+      outdir,
+      rootdir,
+      entry: path.join(rootdir, entry),
+   }
+
+   if (fs.existsSync(outdir)) {
+      fs.rmSync(outdir, { recursive: true, force: true });
+   }
+   fs.mkdirSync(outdir)
+   const spinner = ora("✨ Bundling your package..\n").start();
+   await bundler(args, spinner);
+   spinner.text = "Copying package.json and readme.md files..."
+   const pkgPath = path.join(process.cwd(), 'package.json');
+   if (fs.existsSync(pkgPath)) {
+      const pkgjson = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+      delete pkgjson.scripts
+      delete pkgjson.type
+      fs.writeFileSync(path.join(outdir, 'package.json'), JSON.stringify(pkgjson, null, 2));
+   } else {
+      logger.error("package.json not found!");
+      return;
+   }
+
+   fs.copyFileSync(path.join(process.cwd(), '/readme.md'), path.join(outdir, `/readme.md`))
+   spinner.succeed(concolor.bold(concolor.green(`Build successfully completed\n`)));
+   console.log(concolor.bold(`To publish your package to npm run:`));
+   console.log(`${concolor.yellow(`\`npm run release\``)} Or navigate to \`.mpack\` and run: ${concolor.yellow(`\`npm publish\`\n`)}`);
+   spinner.stop();
+}
+
 export default build

package/src/actions/create/files/gitignore.js

@@ -1,10 +1,10 @@
-
-export default async () => {
-   return {
-      content: `
-      node_modules
-      .mpack
-      `,
-      filename: ".gitignore"
-   }
+
+export default async () => {
+   return {
+      content: `
+      node_modules
+      .mpack
+      `,
+      filename: ".gitignore"
+   }
 }

package/src/actions/create/files/main.js

@@ -1,37 +1,37 @@
-export default async ({ template }) => {
-
-   let ext = 'jsx'
-   if (template === 'react with typescript') {
-      ext = 'tsx'
-   } else if (template === 'typescript') {
-      ext = 'ts'
-   }
-   else if (template === 'javascript') {
-      ext = 'js'
-   }
-
-   const content = `import React from 'react';
-import { createRoot } from 'react-dom/client';
-import ${ext.includes("sx") ? "Count" : "sum"} from './src/index.${ext}';
-
-const Main = () => {
-  return (
-    <div>
-      <h1>Welcome to makepack CLI!</h1>
-      <p>Edit <code>index.${ext}</code> and save to reload.</p>
-      ${ext.includes("sx") ? "<Count />" : "<p>The sum is: {sum(5, 5)}</p>"}
-    </div>
-  );
-};
-
-const rootEle = document.getElementById('root')
-if (rootEle) {
-  const root = createRoot(rootEle);
-  root.render(<Main />);
-}
-  `
-   return {
-      content,
-      filename: `main.${ext.includes('ts') ? "tsx" : 'jsx'}`
-   }
+export default async ({ template }) => {
+
+   let ext = 'jsx'
+   if (template === 'react with typescript') {
+      ext = 'tsx'
+   } else if (template === 'typescript') {
+      ext = 'ts'
+   }
+   else if (template === 'javascript') {
+      ext = 'js'
+   }
+
+   const content = `import React from 'react';
+import { createRoot } from 'react-dom/client';
+import ${ext.includes("sx") ? "Count" : "sum"} from './src/index.${ext}';
+
+const Main = () => {
+  return (
+    <div>
+      <h1>Welcome to makepack CLI!</h1>
+      <p>Edit <code>index.${ext}</code> and save to reload.</p>
+      ${ext.includes("sx") ? "<Count />" : "<p>The sum is: {sum(5, 5)}</p>"}
+    </div>
+  );
+};
+
+const rootEle = document.getElementById('root')
+if (rootEle) {
+  const root = createRoot(rootEle);
+  root.render(<Main />);
+}
+  `
+   return {
+      content,
+      filename: `main.${ext.includes('ts') ? "tsx" : 'jsx'}`
+   }
 }

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

@@ -1,50 +1,50 @@
-
-export default async (info) => {
-   let dependencies = {}
-   let devDependencies = {
-      "makepack": "latest",
-      "express": "latest"
-   }
-
-   if (info.template.includes("react")) {
-      devDependencies["react"] = "^19.0.0"
-      devDependencies["react-dom"] = "^19.0.0"
-   }
-
-   if (info.template.includes("typescript")) {
-      devDependencies["typescript"] = "^4.4.2"
-      devDependencies["@types/react"] = "^19.0.2"
-      devDependencies["@types/react-dom"] = "^19.0.2"
-      devDependencies["@types/express"] = "latest"
-   }
-
-   const json = {
-      name: info.pdir,
-      version: "1.0.0",
-      main: `./index.js`,
-      module: `./index.mjs`,
-      types: `./index.d.ts`,
-      description: "",
-      keywords: [],
-      sideEffects: false,
-      scripts: {
-         "start": "makepack start",
-         "build": "makepack build",
-         "release": "makepack release"
-      },
-      "exports": {
-         ".": {
-            "import": "./index.mjs",
-            "require": "./index.js",
-            "types": "./index.d.ts"
-         }
-      },
-      dependencies,
-      devDependencies
-   }
-
-   return {
-      content: JSON.stringify(json, null, 3),
-      filename: "package.json"
-   }
+
+export default async (info) => {
+   let dependencies = {}
+   let devDependencies = {
+      "makepack": "latest",
+      "express": "latest"
+   }
+
+   if (info.template.includes("react")) {
+      devDependencies["react"] = "^19.0.0"
+      devDependencies["react-dom"] = "^19.0.0"
+   }
+
+   if (info.template.includes("typescript")) {
+      devDependencies["typescript"] = "^4.4.2"
+      devDependencies["@types/react"] = "^19.0.2"
+      devDependencies["@types/react-dom"] = "^19.0.2"
+      devDependencies["@types/express"] = "latest"
+   }
+
+   const json = {
+      name: info.pdir,
+      version: "1.0.0",
+      main: `./index.js`,
+      module: `./index.mjs`,
+      types: `./index.d.ts`,
+      description: "",
+      keywords: [],
+      sideEffects: false,
+      scripts: {
+         "start": "makepack start",
+         "build": "makepack build",
+         "release": "makepack release"
+      },
+      "exports": {
+         ".": {
+            "import": "./index.mjs",
+            "require": "./index.js",
+            "types": "./index.d.ts"
+         }
+      },
+      dependencies,
+      devDependencies
+   }
+
+   return {
+      content: JSON.stringify(json, null, 3),
+      filename: "package.json"
+   }
 }

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

@@ -1,13 +1,13 @@
-export default async () => {
-  const content = `
-function sum(a, b) {
-  return a + b;
-}
-
-export default sum
-  `
-  return {
-    content,
-    filename: `src/index.js`
-  }
+export default async () => {
+  const content = `
+function sum(a, b) {
+  return a + b;
+}
+
+export default sum
+  `
+  return {
+    content,
+    filename: `src/index.js`
+  }
 }