Update watchy/commander, 4.9.0

Author: caseywebdev

bin/test

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec node_modules/.bin/kiss-test 'src/**/*.test.js'
+exec node --test

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cogs",
-  "version": "4.8.12",
+  "version": "4.9.0",
   "type": "module",
   "author": "Casey Foster <c@sey.me>",
   "description": "The fast file transform pipeline.",
@@ -19,11 +19,8 @@
   },
   "dependencies": {
     "chalk": "5",
-    "commander": "13",
+    "commander": "14",
     "underscore": "1",
-    "watchy": "0.10"
-  },
-  "devDependencies": {
-    "kiss-test": "0.2"
+    "watchy": "0.11"
   }
 }

src/cli.js

@@ -2,7 +2,6 @@
 
 import fs from 'fs';
 import npath from 'path';
-import url from 'url';
 
 import chalk from 'chalk';
 import { program } from 'commander';
@@ -11,9 +10,11 @@ import _ from 'underscore';
 import formatSize from './format-size.js';
 import run from './run.js';
 
+const { URL } = globalThis;
+
 ['SIGTERM', 'SIGINT'].forEach(sig => process.once(sig, () => process.exit()));
 
-const { path: thisPath } = url.parse(import.meta.url);
+const { pathname: thisPath } = new URL(import.meta.url);
 const packagePath = `${npath.dirname(thisPath)}/../package.json`;
 const { version } = JSON.parse(fs.readFileSync(packagePath));
 
@@ -32,10 +33,6 @@ program
     'rebuild if [path] changes, can be specified multiple times',
     (path, paths = []) => [].concat(paths, path)
   )
-  .option(
-    '-p, --use-polling',
-    'use stat polling instead of fsevents when watching'
-  )
   .option('-s, --silent', 'do not output build information, only errors')
   .parse(process.argv);
 

src/cli.test.js

@@ -1,6 +1,7 @@
-import { strict as assert } from 'assert';
-import { spawn } from 'child_process';
-import { promises as fs } from 'fs';
+import { strict as assert } from 'node:assert';
+import { spawn } from 'node:child_process';
+import { promises as fs } from 'node:fs';
+import { test } from 'node:test';
 
 const deleteBuilt = async () => {
   try {
@@ -14,7 +15,8 @@ const deleteBuilt = async () => {
   }
 };
 
-export default async done => {
+test('basic build', async () => {
+  const { promise, resolve, reject } = Promise.withResolvers();
   await deleteBuilt();
   const ps = spawn('node', ['src/cli.js', '-c', 'test-fixtures/config.js'], {
     stdio: ['inherit', 'inherit', 'inherit']
@@ -43,9 +45,11 @@ export default async done => {
         '# start\nF\n# end\n'
       );
       await deleteBuilt();
-      done();
+      resolve();
     } catch (er) {
-      done(er);
+      reject(er);
     }
   });
-};
+
+  return promise;
+});

src/run.js

@@ -1,7 +1,7 @@
 import npath from 'path';
 
 import _ from 'underscore';
-import watchy from 'watchy';
+import { watch } from 'watchy';
 
 import buildConfig from './build-config.js';
 import bustCache from './bust-cache.js';
@@ -14,7 +14,6 @@ export default async ({
   onEnd = _.noop,
   onResult = _.noop,
   onStart = _.noop,
-  usePolling = false,
   watchPaths = []
 }) => {
   let building = false;
@@ -72,14 +71,12 @@ export default async ({
     timeoutId = setTimeout(tryBuild, debounce * 1000);
   };
 
-  const watcher = await watchy({
-    onError,
+  const closeWatcher = watch({
     onChange: handleChangedPath,
-    patterns: [].concat(configPath, watchPaths),
-    usePolling
+    patterns: [].concat(configPath, watchPaths)
   });
 
   await tryBuild();
 
-  return watcher;
+  return closeWatcher;
 };