@tmbr/bundler 1.5.0 → 1.5.2

package/cli.js

@@ -1,14 +1,15 @@
 #!/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 styles = require('esbuild-sass-plugin').sassPlugin;
 const qrcode = require('qrcode-terminal');
-const chalk = require('chalk');
-const bs = require('browser-sync').create();
+const server = require('browser-sync').create();
 
-const cwd = process.cwd();
-const package = require(`${cwd}/package.json`);
+const dir = process.cwd();
+const package = require(`${dir}/package.json`);
 const command = process.argv[2];
 
 if (!['build', 'watch'].includes(command)) {
@@ -16,16 +17,15 @@ if (!['build', 'watch'].includes(command)) {
   process.exit();
 }
 
-exec(`rm -rf ${cwd}/build/*`);
+exec(`rm -rf ${dir}/build/*`);
 
 function ok() {
-  command === 'watch' && console.clear();
-
-  const host = bs.getOption('proxy').get('target');
-  const port = bs.getOption('port');
+  const host = server.getOption('proxy').get('target');
+  const port = server.getOption('port');
   const proxying = `${host}:${port}`;
-  const external = bs.getOption('urls').get('external');
+  const external = server.getOption('urls').get('external');
 
+  console.clear();
   external && qrcode.generate(external, {small: true}, console.log);
   console.log(`Proxying: ${chalk.green(proxying)}`);
   console.log(`External: ${chalk.cyan(external || 'offline')}\n`);
@@ -38,12 +38,12 @@ function entryPoints(suffix = '') {
   }
 
   const entries = Object.entries({
-    admin: path.resolve(cwd, './src/admin'),
-    main: path.resolve(cwd, './src'),
+    admin: path.resolve(dir, './src/admin'),
+    main: path.resolve(dir, './src'),
   });
 
   return entries.reduce((result, [name, path]) => {
-    result[`${name}${suffix}`] = path;
+    if (fs.existsSync(path)) result[`${name}${suffix}`] = path;
     return result;
   }, {});
 }
@@ -51,7 +51,7 @@ function entryPoints(suffix = '') {
 const assets = (options = {}) => ({
   name: 'assets',
   setup(build) {
-    build.onResolve({filter: /..\/(fonts|images)\//}, args => ({
+    build.onResolve({filter: /..\/(assets|fonts|images)\//}, args => ({
       path: args.path,
       external: true
     }))
@@ -69,7 +69,7 @@ const errors = (options = {}) => ({
 
 const defaults = {
   watch: command === 'watch',
-  outdir: path.resolve(cwd, 'build'),
+  outdir: path.resolve(dir, 'build'),
   bundle: true,
   minify: true,
   sourcemap: false,
@@ -124,5 +124,5 @@ if (command === 'watch') {
     files
   };
 
-  bs.init(options, ok);
+  server.init(options, ok);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tmbr/bundler",
   "author": "TMBR (https://wearetmbr.com/)",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "license": "MIT",
   "repository": "https://github.com/TMBR/tmbr-bundler",
   "description": "WordPress development toolkit built on esbuild and browser-sync",
@@ -13,7 +13,6 @@
     "chalk": "^4.1.2",
     "esbuild": "^0.15.5",
     "esbuild-sass-plugin": "^2.3.2",
-    "html-entities": "^2.3.3",
     "qrcode-terminal": "^0.12.0"
   }
 }