@sequencemedia/gulp-cli 1.0.9 → 1.0.12

package/index.mjs

@@ -1,6 +1,5 @@
 
 import path from 'node:path'
-import log from 'gulplog'
 import yargs from 'yargs'
 import {
   hideBin
@@ -9,6 +8,7 @@ import Liftoff from '@sequencemedia/liftoff'
 import interpret from 'interpret'
 import v8flags from 'v8flags'
 
+import logger from './lib/logger.mjs'
 import ansi from './lib/ansi.mjs'
 import exit from './lib/exit.mjs'
 import tildify from './lib/tildify.mjs'
@@ -62,27 +62,24 @@ let {
     .options(cliOptions)
 )
 
-cli.on('require', (name) => {
-  // This is needed because interpret needs to stub the .mjs extension
-  // Without the .mjs require hook, rechoir blows up
-  // However, we don't want to show the mjs-stub loader in the logs
-  if (path.basename(name, '.js') !== 'mjs-stub') {
-    log.info('Loading external module', ansi.magenta(name))
-  }
-})
-
-cli.on('requireFail', (name, error) => {
-  log.warn(`${ansi.yellow('Failed to load external module')} ${ansi.magenta(name)}`)
-
-  if (error) {
-    log.warn(ansi.yellow(error.toString()))
-  }
-})
+cli
+  .on('require', (name) => {
+    // This is needed because interpret needs to stub the .mjs extension
+    // Without the .mjs require hook, rechoir blows up
+    // However, we don't want to show the mjs-stub loader in the logs
+    if (path.basename(name, '.js') !== 'mjs-stub') {
+      logger.info('Loading external module', ansi.magenta(name))
+    }
+  })
+  .on('requireFail', (name, error) => {
+    logger.warn(`${ansi.yellow('Failed to load external module')} ${ansi.magenta(name)}`)
 
-cli.on('respawn', (nodeFlags, { pid }) => {
-  log.info(`Node flags detected: ${ansi.magenta(nodeFlags.join(', '))}`)
-  log.info(`Respawned to PID: ${ansi.magenta(pid)}`)
-})
+    if (error) logger.warn(ansi.yellow(error.toString()))
+  })
+  .on('respawn', (nodeFlags, { pid }) => {
+    logger.info(`Node flags: ${ansi.magenta(nodeFlags.join(', '))}`)
+    logger.info(`Respawned to PID: ${ansi.magenta(pid)}`)
+  })
 
 function execute (envProps, cliProps, configProps) {
   /**
@@ -102,12 +99,12 @@ function execute (envProps, cliProps, configProps) {
   process.env.GULP_CWD = GULP_CWD
 
   if (!envProps.modulePath) {
-    log.error(`${ansi.red('Gulp not found')} in ${ansi.magenta(tildify(GULP_CWD))}`)
+    logger.error(`${ansi.red('Gulp not found')} in ${ansi.magenta(tildify(GULP_CWD))}`)
     exit(1)
   }
 
   if (!envProps.configPath) {
-    log.error(`${ansi.red('Gulpfile not found')} in ${ansi.magenta(tildify(GULP_CWD))}`)
+    logger.error(`${ansi.red('Gulpfile not found')} in ${ansi.magenta(tildify(GULP_CWD))}`)
     exit(1)
   }
 

package/lib/log/listen-for-gulp-events.mjs

@@ -1,30 +1,30 @@
-import log from 'gulplog'
 import prettyHrtime from 'pretty-hrtime'
 
-import ansi from '../ansi.mjs'
-import formatError from '../format-error.mjs'
+import logger from '#gulp-cli/lib/logger'
+import ansi from '#gulp-cli/lib/ansi'
+import formatError from '#gulp-cli/lib/format-error'
 
 const errors = new Set()
 
 function start (event) {
   const level = event.branch ? 'debug' : 'info'
-  log[level](`Starting '${ansi.cyan(event.name)}'...`)
+  logger[level](`Starting '${ansi.cyan(event.name)}'...`)
 }
 
 function stop (event) {
   const level = event.branch ? 'debug' : 'info'
-  log[level](`Finished '${ansi.cyan(event.name)}' after ${ansi.magenta(prettyHrtime(event.duration))}`)
+  logger[level](`Finished '${ansi.cyan(event.name)}' after ${ansi.magenta(prettyHrtime(event.duration))}`)
 }
 
 function error (event) {
   const level = event.branch ? 'debug' : 'error'
-  log[level](`'${ansi.cyan(event.name)}' ${ansi.red('errored after')} ${ansi.magenta(prettyHrtime(event.duration))}`)
+  logger[level](`'${ansi.cyan(event.name)}' ${ansi.red('errored after')} ${ansi.magenta(prettyHrtime(event.duration))}`)
 
   // Exit if we have logged this before
   if (errors.has(event.error)) return
 
   // If we haven't logged this before, log it and add it to the error list
-  log.error(formatError(event))
+  logger.error(formatError(event))
   errors.add(event.error)
 }
 

package/lib/log/listen-for-level-events.mjs

@@ -1,5 +1,5 @@
-import log from 'gulplog'
 import fancyLog from 'fancy-log'
+import logger from '#gulp-cli/lib/logger'
 
 const noop = () => {}
 
@@ -16,9 +16,9 @@ function stopListeningForLevelEvents () {
   levels
     .forEach((level) => {
       if (level === 'error') {
-        log.removeListener(level, noop).removeListener(level, fancyLog.error)
+        logger.removeListener(level, noop).removeListener(level, fancyLog.error)
       } else {
-        log.removeListener(level, fancyLog)
+        logger.removeListener(level, fancyLog)
       }
     })
 }
@@ -31,7 +31,7 @@ export default function listenForLevelEvents (cliProps) {
   // Silent?
   if (cliProps.tasksList || cliProps.tasksJson || cliProps.help || cliProps.version || cliProps.silent) {
     // Keep from crashing process when silent
-    log.on('error', noop)
+    logger.on('error', noop)
   } else {
     // Default level is 3 (info)
     const loglevel = cliProps.logLevel || 3
@@ -40,9 +40,9 @@ export default function listenForLevelEvents (cliProps) {
       .filter((level, i) => level && i < loglevel)
       .forEach((level) => {
         if (level === 'error') {
-          log.on(level, fancyLog.error)
+          logger.on(level, fancyLog.error)
         } else {
-          log.on(level, fancyLog)
+          logger.on(level, fancyLog)
         }
       })
   }

package/lib/log/listen-for-sync-events.mjs

@@ -1,5 +1,5 @@
-import log from 'gulplog'
-import ansi from '../ansi.mjs'
+import logger from '#gulp-cli/lib/logger'
+import ansi from '#gulp-cli/lib/ansi'
 
 const tasks = new Map()
 
@@ -9,13 +9,15 @@ function warn () {
 
     process.exitCode = 1
 
-    log.warn(
+    logger.warn(
       ansi.red('The following tasks did not complete:')
     )
-    log.warn(
+
+    logger.warn(
       ansi.cyan(taskNames)
     )
-    log.warn(
+
+    logger.warn(
       ansi.red('Did you forget to signal async completion?')
     )
   }

package/lib/log/tasks-json.mjs

@@ -2,7 +2,7 @@ import {
   writeFile
 } from 'node:fs/promises'
 
-import getDuplicate from '../get-duplicate.mjs'
+import getDuplicate from '#gulp-cli/lib/get-duplicate'
 
 export default function logTasksJson (tree, cliProps) {
   const dupe = getDuplicate(tree, cliProps)

package/lib/log/tasks.mjs

@@ -1,11 +1,11 @@
 import archy from 'archy'
-import log from 'gulplog'
 
 import sortBy from 'array-sort'
 import isObject from 'isobject'
 
-import ansi from '../ansi.mjs'
-import getDuplicate from '../get-duplicate.mjs'
+import logger from '#gulp-cli/lib/logger'
+import ansi from '#gulp-cli/lib/ansi'
+import getDuplicate from '#gulp-cli/lib/get-duplicate'
 
 function getLineInfoCollector (lineInfo) {
   return {
@@ -140,11 +140,11 @@ function logLines (lines, spacer, lineInfo) {
         line += ansi.white(info.name)
       }
 
-      log.info(line)
+      logger.info(line)
     })
 }
 
-// Wire up log tasks
+// Wire up logger tasks
 export default function logTasks (tree, cliProps, getTask) {
   if (cliProps.sortTasks) {
     tree.nodes = sortBy(tree.nodes, 'label')
@@ -158,6 +158,6 @@ export default function logTasks (tree, cliProps, getTask) {
   const spacer = getSpacerForLineIndents(dupe, lineInfo)
   const lines = getLinesContainingOnlyBranches(dupe)
 
-  log.info(dupe.label)
+  logger.info(dupe.label)
   logLines(lines, spacer, lineInfo)
 }

package/lib/logger.mjs

@@ -0,0 +1,3 @@
+import getLogger from '@sequencemedia/gulp-log'
+
+export default getLogger('gulp-cli')

package/lib/run-gulp-tasks.mjs

@@ -1,5 +1,4 @@
-import log from 'gulplog'
-
+import logger from './logger.mjs'
 import ansi from './ansi.mjs'
 import exit from './exit.mjs'
 import tildify from './tildify.mjs'
@@ -30,7 +29,7 @@ export default function runGulpTasks (gulp, cliProps, envProps, configProps) {
       configPath
     } = envProps
 
-    log.info(`Using gulpfile ${ansi.magenta(tildify(configPath))}`)
+    logger.info(`Using gulpfile ${ansi.magenta(tildify(configPath))}`)
 
     const method = getMethodFromCliProps(cliProps)
     const tasks = getTasksFromCliProps(cliProps)
@@ -39,8 +38,8 @@ export default function runGulpTasks (gulp, cliProps, envProps, configProps) {
       gulp[method](tasks)((e) => e && exit(1))
     )
   } catch ({ message }) {
-    log.error(ansi.red(message))
-    log.error('To list available tasks run: gulp --tasks')
+    logger.error(ansi.red(message))
+    logger.error('To list available tasks run: gulp --tasks')
     exit(1)
   }
 }

package/lib/run-verify.mjs

@@ -4,8 +4,7 @@ import {
   readFile
 } from 'node:fs/promises'
 
-import log from 'gulplog'
-
+import logger from './logger.mjs'
 import ansi from './ansi.mjs'
 import exit from './exit.mjs'
 import tildify from './tildify.mjs'
@@ -31,7 +30,7 @@ async function getPackageJson (packagePath) {
 export default async function runVerify (envProps, cliProps) {
   const packagePath = getPackagePath(envProps, cliProps)
 
-  log.info(`Verifying dependencies in ${ansi.magenta(tildify(packagePath))}`)
+  logger.info(`Verifying dependencies in ${ansi.magenta(tildify(packagePath))}`)
   try {
     const blacklistJson = await getBlacklist()
     const packageJson = await getPackageJson(packagePath)
@@ -39,18 +38,18 @@ export default async function runVerify (envProps, cliProps) {
 
     const dependencies = Object.entries(packageBlacklist)
     if (dependencies.length) {
-      log.warn(ansi.red('Blacklisted dependencies in this project:'))
+      logger.warn(ansi.red('Blacklisted dependencies in this project:'))
       dependencies
         .forEach(([name, reason]) => {
-          log.warn(`${ansi.bgred(name)}: ${reason}`)
+          logger.warn(`${ansi.bgred(name)}: ${reason}`)
         })
       exit(1)
     }
 
-    log.info(ansi.green('There are no blacklisted dependencies in this project'))
+    logger.info(ansi.green('There are no blacklisted dependencies in this project'))
     exit(0)
   } catch ({ message }) {
-    log.error(`${ansi.red('Failed to verify dependencies.')} Could not get blacklist - ${message}`)
+    logger.error(`${ansi.red('Failed to verify dependencies.')} Could not get blacklist - ${message}`)
     exit(1)
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sequencemedia/gulp-cli",
-  "version": "1.0.9",
+  "version": "1.0.12",
   "description": "The command line interface to Gulp",
   "keywords": [
     "build",
@@ -33,6 +33,7 @@
     "gulp": "bin/gulp.mjs"
   },
   "dependencies": {
+    "@sequencemedia/gulp-log": "^1.0.0",
     "@sequencemedia/liftoff": "1.0.0",
     "ansi-colors": "^4.1.3",
     "archy": "^1.0.0",
@@ -62,7 +63,6 @@
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.1.1",
-    "expect": "^29.5.0",
     "husky": "^8.0.3",
     "mocha": "^10.2.0",
     "rimraf": "^5.0.0",