@tmbr/bundler 1.10.0 → 1.11.0

package/cli.js

@@ -1,16 +1,17 @@
 #!/usr/bin/env node
-const esbuild = require('esbuild');
-const fs = require('fs');
-const path = require('path');
-const exec = require('child_process').execSync;
-const chalk = require('chalk');
-const server = require('browser-sync').create();
-const styles = require('esbuild-sass-plugin').sassPlugin;
-const silent = require('sass').Logger.silent;
+import esbuild from 'esbuild';
+import fs from 'fs';
+import path from 'path';
+import chalk from 'chalk';
+import readline from 'readline';
+import { create } from 'browser-sync';
+import { execSync as exec } from 'child_process';
+import { sassPlugin as styles } from 'esbuild-sass-plugin';
+import * as sass from 'sass';
 
 const cwd = process.cwd();
 const src = path.resolve(cwd, 'src');
-const package = require(`${cwd}/package.json`);
+const server = create();
 const command = process.argv[2];
 
 if (!['build', 'watch'].includes(command)) {
@@ -30,14 +31,18 @@ const logger = (options = {}) => ({
     });
 
     context.onEnd(result => {
-      if (result.warnings.length || result.errors.length) return console.log('\007');
+
+      if (result.warnings.length || result.errors.length) {
+        console.log('\x07');
+        return
+      }
 
       const css = `${path}/${slug}.css`;
       const js = `${path}/${slug}.js`;
 
       console.log(`  ${chalk.green('✓')} ${css} ${Math.round(fs.statSync(css).size / 1000)} KB`);
       console.log(`  ${chalk.green('✓')} ${js} ${Math.round(fs.statSync(js).size / 1000)} KB`);
-      console.log()
+      console.log();
     });
   }
 });
@@ -55,7 +60,7 @@ const buildOptions = {
   treeShaking: true,
   legalComments: 'none',
   plugins: [
-    styles({sourceMap: false, logger: silent}),
+    styles({sourceMap: false, logger: sass.Logger.silent}),
     logger()
   ]
 };
@@ -71,7 +76,7 @@ const watchOptions = Object.assign({}, buildOptions, {
 });
 
 const serveOptions = {
-  proxy: `${package.name}.test`,
+  proxy: `${process.env.npm_package_name}.test`,
   files: ['assets/**', 'build/*', '**/*.php'],
   host: 'localhost',
   open: false,
@@ -125,8 +130,7 @@ async function main() {
   server.init(serveOptions, () => {
     builder.watch();
     watcher.watch();
-
-    require('readline').emitKeypressEvents(process.stdin);
+    readline.emitKeypressEvents(process.stdin);
 
     process.stdin.setRawMode(true);
     process.stdin.on('keypress', (_, key) => {
@@ -136,17 +140,18 @@ async function main() {
   });
 }
 
-function extend(options, config) {
-  if (!config) return options;
-  return typeof config === 'function' ? config(options) : Object.assign(options, config);
-}
-
 if (fs.existsSync(process.argv[3])) {
-  const test = require(`${cwd}/${process.argv[3]}`);
-  console.log(extend(watchOptions, test.watch));
-  console.log(extend(buildOptions, test.build));
-  console.log(extend(serveOptions, test.serve));
-  process.exit();
-}
 
-main();
+  function extend(options, config) {
+    if (typeof config === 'undefined') return;
+    Object.assign(options, typeof config === 'function' ? config(options) : config);
+  }
+
+  import(`${cwd}/${process.argv[3]}`).then(settings => {
+    extend(watchOptions, settings.watch);
+    extend(buildOptions, settings.build);
+    extend(serveOptions, settings.serve);
+    main();
+  });
+
+} else { main(); }

package/package.json

@@ -1,15 +1,16 @@
 {
   "name": "@tmbr/bundler",
-  "version": "1.10.0",
+  "type": "module",
+  "version": "1.11.0",
   "repository": "github:TMBR/tmbr-bundler",
   "bin": {
     "bundler": "cli.js",
     "tmbr-bundler": "cli.js"
   },
   "dependencies": {
-    "browser-sync": "^2.28.3",
-    "chalk": "^4.1.2",
-    "esbuild": "^0.17.11",
-    "esbuild-sass-plugin": "^2.6.0"
+    "browser-sync": "^3.0.2",
+    "chalk": "^5.3.0",
+    "esbuild": "^0.19.11",
+    "esbuild-sass-plugin": "^2.16.1"
   }
 }