arri 0.39.2 → 0.40.0

package/dist/cli.cjs

@@ -17,7 +17,7 @@ const globby = require('globby');
 const scule = require('scule');
 const ofetch = require('ofetch');
 const listhen = require('@joshmossas/listhen');
-const chokidar = require('chokidar');
+const watcher = require('@parcel/watcher');
 const Degit = require('degit');
 const enquirer = require('enquirer');
 require('h3');
@@ -43,7 +43,7 @@ const fs__default = /*#__PURE__*/_interopDefaultCompat(fs$1);
 const esbuild__namespace = /*#__PURE__*/_interopNamespaceCompat(esbuild);
 const path__default = /*#__PURE__*/_interopDefaultCompat(path);
 const prettier__default = /*#__PURE__*/_interopDefaultCompat(prettier);
-const chokidar__default = /*#__PURE__*/_interopDefaultCompat(chokidar);
+const watcher__default = /*#__PURE__*/_interopDefaultCompat(watcher);
 const Degit__default = /*#__PURE__*/_interopDefaultCompat(Degit);
 const enquirer__default = /*#__PURE__*/_interopDefaultCompat(enquirer);
 
@@ -186,7 +186,8 @@ async function transpileFiles(config) {
     bundle: false,
     format: "esm",
     target: "node20",
-    platform: "node"
+    platform: "node",
+    allowOverwrite: true
   });
 }
 
@@ -497,7 +498,7 @@ export default app.h3App;`;
     path__default.resolve(config.rootDir, ".output", OUT_SERVER_ENTRY),
     serverContent
   );
-  return await esbuild__namespace.context({
+  await esbuild__namespace.build({
     ...config.esbuild,
     entryPoints: [
       path__default.resolve(config.rootDir, config.buildDir, GEN_APP_FILE)
@@ -506,9 +507,10 @@ export default app.h3App;`;
     format: "esm",
     bundle: true,
     sourcemap: true,
-    target: "node18",
+    target: "node20",
     platform: "node",
-    packages: "external"
+    packages: "external",
+    allowOverwrite: true
   });
 }
 async function startDevServer(config) {
@@ -519,8 +521,7 @@ async function startDevServer(config) {
     createAppWithRoutesModule(config),
     transpileFiles(config)
   ]);
-  const bundleFiles = await bundleFilesContext(config);
-  await bundleFiles.rebuild();
+  await bundleFilesContext(config);
   const listener = await startListener(config, true);
   setTimeout(async () => {
     await generateClients(config);
@@ -531,35 +532,39 @@ async function startDevServer(config) {
   process.on("exit", async () => {
     await Promise.allSettled([
       listener.close(),
-      fileWatcher?.close(),
-      bundleFiles.dispose()
+      fileWatcher?.unsubscribe()
     ]);
   });
   process.on("SIGINT", cleanExit);
   process.on("SIGTERM", cleanExit);
   async function load(isRestart, reason) {
-    try {
-      if (fileWatcher) {
-        await fileWatcher.close();
+    if (fileWatcher) {
+      await fileWatcher.unsubscribe();
+    }
+    const srcDir = path__default.resolve(config.rootDir ?? "", config.srcDir);
+    if (config.esbuild.alias) {
+      for (const key of Object.keys(config.esbuild.alias)) {
+        config.esbuild.alias[key];
       }
-      const srcDir = path__default.resolve(config.rootDir ?? "", config.srcDir);
-      const dirsToWatch = [srcDir];
-      if (config.esbuild.alias) {
-        for (const key of Object.keys(config.esbuild.alias)) {
-          const alias = config.esbuild.alias[key];
-          if (alias) {
-            dirsToWatch.push(alias);
+    }
+    const buildDir = path__default.resolve(config.rootDir, config.buildDir);
+    const outDir = path__default.resolve(config.rootDir, ".output");
+    fileWatcher = await watcher__default.subscribe(
+      srcDir,
+      async (err, events) => {
+        if (err) {
+          logger.error(err);
+          return;
+        }
+        let doNothing = true;
+        for (const event of events) {
+          if (event.type === "create") {
+            continue;
           }
+          doNothing = false;
+          break;
         }
-      }
-      const buildDir = path__default.resolve(config.rootDir, config.buildDir);
-      const outDir = path__default.resolve(config.rootDir, ".output");
-      fileWatcher = chokidar__default.watch(dirsToWatch, {
-        ignored: [buildDir, outDir],
-        ignoreInitial: true
-      });
-      fileWatcher.on("all", async (event, file) => {
-        if (event === "add" || event === "addDir") {
+        if (doNothing) {
           return;
         }
         await createAppWithRoutesModule(config);
@@ -569,10 +574,10 @@ async function startDevServer(config) {
             "Change detected. Bundling files and restarting server...."
           );
           await transpileFiles(config);
-          await bundleFiles.rebuild();
+          await bundleFilesContext(config);
           bundleCreated = true;
-        } catch (err) {
-          logger.error("ERROR", err);
+        } catch (err2) {
+          logger.error("ERROR", err2);
           bundleCreated = false;
         }
         if (bundleCreated && config.generators.length) {
@@ -581,9 +586,11 @@ async function startDevServer(config) {
             bundleCreated = false;
           }, 1e3);
         }
-      });
-    } catch (err) {
-    }
+      },
+      {
+        ignore: [buildDir, outDir]
+      }
+    );
   }
   await load();
 }

package/dist/cli.mjs

@@ -16,7 +16,7 @@ import { globby } from 'globby';
 import { camelCase, kebabCase } from 'scule';
 import { ofetch } from 'ofetch';
 import { listenAndWatch } from '@joshmossas/listhen';
-import chokidar from 'chokidar';
+import watcher from '@parcel/watcher';
 import Degit from 'degit';
 import enquirer from 'enquirer';
 import 'h3';
@@ -162,7 +162,8 @@ async function transpileFiles(config) {
     bundle: false,
     format: "esm",
     target: "node20",
-    platform: "node"
+    platform: "node",
+    allowOverwrite: true
   });
 }
 
@@ -473,7 +474,7 @@ export default app.h3App;`;
     path.resolve(config.rootDir, ".output", OUT_SERVER_ENTRY),
     serverContent
   );
-  return await esbuild.context({
+  await esbuild.build({
     ...config.esbuild,
     entryPoints: [
       path.resolve(config.rootDir, config.buildDir, GEN_APP_FILE)
@@ -482,9 +483,10 @@ export default app.h3App;`;
     format: "esm",
     bundle: true,
     sourcemap: true,
-    target: "node18",
+    target: "node20",
     platform: "node",
-    packages: "external"
+    packages: "external",
+    allowOverwrite: true
   });
 }
 async function startDevServer(config) {
@@ -495,8 +497,7 @@ async function startDevServer(config) {
     createAppWithRoutesModule(config),
     transpileFiles(config)
   ]);
-  const bundleFiles = await bundleFilesContext(config);
-  await bundleFiles.rebuild();
+  await bundleFilesContext(config);
   const listener = await startListener(config, true);
   setTimeout(async () => {
     await generateClients(config);
@@ -507,35 +508,39 @@ async function startDevServer(config) {
   process.on("exit", async () => {
     await Promise.allSettled([
       listener.close(),
-      fileWatcher?.close(),
-      bundleFiles.dispose()
+      fileWatcher?.unsubscribe()
     ]);
   });
   process.on("SIGINT", cleanExit);
   process.on("SIGTERM", cleanExit);
   async function load(isRestart, reason) {
-    try {
-      if (fileWatcher) {
-        await fileWatcher.close();
+    if (fileWatcher) {
+      await fileWatcher.unsubscribe();
+    }
+    const srcDir = path.resolve(config.rootDir ?? "", config.srcDir);
+    if (config.esbuild.alias) {
+      for (const key of Object.keys(config.esbuild.alias)) {
+        config.esbuild.alias[key];
       }
-      const srcDir = path.resolve(config.rootDir ?? "", config.srcDir);
-      const dirsToWatch = [srcDir];
-      if (config.esbuild.alias) {
-        for (const key of Object.keys(config.esbuild.alias)) {
-          const alias = config.esbuild.alias[key];
-          if (alias) {
-            dirsToWatch.push(alias);
+    }
+    const buildDir = path.resolve(config.rootDir, config.buildDir);
+    const outDir = path.resolve(config.rootDir, ".output");
+    fileWatcher = await watcher.subscribe(
+      srcDir,
+      async (err, events) => {
+        if (err) {
+          logger.error(err);
+          return;
+        }
+        let doNothing = true;
+        for (const event of events) {
+          if (event.type === "create") {
+            continue;
           }
+          doNothing = false;
+          break;
         }
-      }
-      const buildDir = path.resolve(config.rootDir, config.buildDir);
-      const outDir = path.resolve(config.rootDir, ".output");
-      fileWatcher = chokidar.watch(dirsToWatch, {
-        ignored: [buildDir, outDir],
-        ignoreInitial: true
-      });
-      fileWatcher.on("all", async (event, file) => {
-        if (event === "add" || event === "addDir") {
+        if (doNothing) {
           return;
         }
         await createAppWithRoutesModule(config);
@@ -545,10 +550,10 @@ async function startDevServer(config) {
             "Change detected. Bundling files and restarting server...."
           );
           await transpileFiles(config);
-          await bundleFiles.rebuild();
+          await bundleFilesContext(config);
           bundleCreated = true;
-        } catch (err) {
-          logger.error("ERROR", err);
+        } catch (err2) {
+          logger.error("ERROR", err2);
           bundleCreated = false;
         }
         if (bundleCreated && config.generators.length) {
@@ -557,9 +562,11 @@ async function startDevServer(config) {
             bundleCreated = false;
           }, 1e3);
         }
-      });
-    } catch (err) {
-    }
+      },
+      {
+        ignore: [buildDir, outDir]
+      }
+    );
   }
   await load();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arri",
-  "version": "0.39.2",
+  "version": "0.40.0",
   "type": "module",
   "license": "MIT",
   "author": {
@@ -25,9 +25,9 @@
     "arri": "./dist/cli.mjs"
   },
   "dependencies": {
-    "@joshmossas/listhen": "1.8.0",
+    "@joshmossas/listhen": "1.10.0",
+    "@parcel/watcher": "^2.4.1",
     "c12": "^1.10.0",
-    "chokidar": "^3.6.0",
     "citty": "^0.1.6",
     "consola": "^3.2.3",
     "crossws": "^0.2.4",
@@ -44,13 +44,13 @@
     "prettier": "^3.2.5",
     "scule": "^1.3.0",
     "uncrypto": "^0.1.3",
-    "arri-codegen-ts": "0.39.2",
-    "arri-codegen-utils": "0.39.2",
-    "arri-codegen-dart": "0.39.2",
-    "arri-validate": "0.39.2"
+    "arri-codegen-dart": "0.40.0",
+    "arri-codegen-utils": "0.40.0",
+    "arri-validate": "0.40.0",
+    "arri-codegen-ts": "0.40.0"
   },
   "devDependencies": {
     "@types/degit": "^2.8.6",
-    "bun-types": "^1.1.2"
+    "bun-types": "^1.1.4"
   }
 }