@akanjs/cli 0.0.45 → 0.0.47

package/index.js

@@ -1878,10 +1878,9 @@ CMD ["npm", "start"]`,
   });
 
   // pkgs/@akanjs/devkit/src/extractDeps.ts
-  var fs11, NODE_NATIVE_MODULE_SET, extractDependencies;
+  var NODE_NATIVE_MODULE_SET, extractDependencies;
   var init_extractDeps = __esm({
     "pkgs/@akanjs/devkit/src/extractDeps.ts"() {
-      fs11 = __toESM(__require("fs"));
       NODE_NATIVE_MODULE_SET = /* @__PURE__ */ new Set([
         "assert",
         "async_hooks",
@@ -1924,10 +1923,9 @@ CMD ["npm", "start"]`,
         "worker_threads",
         "zlib"
       ]);
-      extractDependencies = (bundlePath, pacakgeJson, defaultDependencies = []) => {
+      extractDependencies = (filepaths, pacakgeJson, defaultDependencies = []) => {
         if (!pacakgeJson.dependencies)
           throw new Error("No dependencies found in package.json");
-        const code = fs11.readFileSync(bundlePath, "utf8");
         const dependencies = new Set(defaultDependencies);
         const existingDependencies = /* @__PURE__ */ new Set([
           ...Object.keys(pacakgeJson.dependencies ?? {}),
@@ -1938,15 +1936,17 @@ CMD ["npm", "start"]`,
           ...pacakgeJson.devDependencies ?? {}
         };
         const requireRegex = /require\s*\(\s*['"`]([^'"`]+)['"`]\s*\)/g;
-        let requireMatch;
-        while ((requireMatch = requireRegex.exec(code)) !== null) {
-          const moduleName = requireMatch[1];
-          const moduleNameParts = moduleName.split("/");
-          const subModuleLength = moduleNameParts.length;
-          for (let i = 0; i < subModuleLength; i++) {
-            const libName = moduleNameParts.slice(0, i + 1).join("/");
-            if (!NODE_NATIVE_MODULE_SET.has(libName) && existingDependencies.has(libName))
-              dependencies.add(libName);
+        for (const { text } of filepaths) {
+          let requireMatch;
+          while ((requireMatch = requireRegex.exec(text)) !== null) {
+            const moduleName = requireMatch[1];
+            const moduleNameParts = moduleName.split("/");
+            const subModuleLength = moduleNameParts.length;
+            for (let i = 0; i < subModuleLength; i++) {
+              const libName = moduleNameParts.slice(0, i + 1).join("/");
+              if (!NODE_NATIVE_MODULE_SET.has(libName) && existingDependencies.has(libName))
+                dependencies.add(libName);
+            }
           }
         }
         return Object.fromEntries(
@@ -3450,8 +3450,8 @@ page.tsx_end
         async buildBackend(app, distApp) {
           await this.#prepareCommand(app, distApp, "serve", "backend");
           const akanConfig = await app.getConfig("build");
-          await esbuild.build({
-            write: true,
+          const buildResult = await esbuild.build({
+            write: false,
             entryPoints: [`${app.cwdPath}/main.ts`],
             bundle: true,
             packages: "external",
@@ -3460,7 +3460,8 @@ page.tsx_end
             logLevel: "warning"
           });
           const rootPackageJson = app.workspace.readJson("package.json");
-          const dependencies = extractDependencies(import_path4.default.join(distApp.cwdPath, "backend", "main.js"), rootPackageJson);
+          const dependencies = extractDependencies(buildResult.outputFiles, rootPackageJson);
+          buildResult.outputFiles.map((file) => distApp.writeFile(file.path, file.text));
           const appPackageJson = {
             name: `${app.name}/backend`,
             description: `${app.name} backend`,
@@ -3491,7 +3492,7 @@ page.tsx_end
           const { env } = await this.#prepareCommand(app, distApp, "build", "frontend");
           const akanConfig = await app.getConfig("build");
           await app.spawn("npx", ["next", "build", "--no-lint"], { env });
-          await esbuild.build({
+          const buildResult = await esbuild.build({
             entryPoints: [`${app.cwdPath}/next.config.ts`],
             outdir: `${distApp.cwdPath}/frontend`,
             bundle: true,
@@ -3503,11 +3504,9 @@ page.tsx_end
             footer: { js: "module.exports = module.exports.default;" }
           });
           const rootPackageJson = app.workspace.readJson("package.json");
-          const dependencies = extractDependencies(
-            import_path4.default.join(distApp.cwdPath, "frontend", "next.config.js"),
-            rootPackageJson,
-            ["next", "react", "react-dom"]
-          );
+          const dependencies = buildResult.outputFiles ? extractDependencies(buildResult.outputFiles, rootPackageJson, ["next", "react", "react-dom"]) : {};
+          if (buildResult.outputFiles)
+            buildResult.outputFiles.map((file) => distApp.writeFile(file.path, file.text));
           const appPackageJson = {
             name: `${app.name}/frontend`,
             description: `${app.name} frontend`,
@@ -4187,26 +4186,27 @@ page.tsx_end
           const rootPackageJson = pkg.workspace.readJson("package.json");
           await pkg.workspace.exec(`rm -rf dist/${pkg.name}`);
           await import_promises3.default.rm(`dist/pkgs/${pkg.name}`, { force: true, recursive: true });
+          let buildResult;
           if (pkg.name === "@akanjs/config") {
-            await esbuild2.build({
-              write: true,
+            buildResult = await esbuild2.build({
+              write: false,
               entryPoints: [`${pkg.cwdPath}/index.ts`],
               bundle: true,
               packages: "external",
               format: "cjs",
               outdir: distPkg.cwdPath,
-              logLevel: "warning",
+              logLevel: "error",
               plugins: [(0, import_esbuild_plugin_d.dtsPlugin)({ tsconfig: `${pkg.cwdPath}/tsconfig.json` })]
             });
             await pkg.workspace.exec(`rsync -aq ${pkg.cwdPath}/src/ ${distPkg.cwdPath}/src/`);
           } else if (pkg.name === "@akanjs/cli") {
-            await esbuild2.build({
-              write: true,
+            buildResult = await esbuild2.build({
+              write: false,
               entryPoints: [`${pkg.cwdPath}/index.ts`],
               bundle: true,
               packages: "external",
               outdir: distPkg.cwdPath,
-              logLevel: "warning",
+              logLevel: "error",
               plugins: [(0, import_esbuild_plugin_d.dtsPlugin)({ tsconfig: `${pkg.cwdPath}/tsconfig.json` })]
             });
             await esbuild2.build({
@@ -4223,20 +4223,23 @@ page.tsx_end
               `rsync -aq --exclude="*.ts" --exclude="*.tsx" ${pkg.cwdPath}/src/templates/ ${distPkg.cwdPath}/src/templates/`
             );
           } else {
-            await esbuild2.build({
-              write: true,
-              entryPoints: [`${pkg.cwdPath}/index.ts`],
-              bundle: true,
+            buildResult = await esbuild2.build({
+              write: false,
+              entryPoints: [`${pkg.cwdPath}/index.ts`, `${pkg.cwdPath}/src/**/*.ts`, `${pkg.cwdPath}/src/**/*.tsx`],
+              bundle: false,
               packages: "external",
               format: "cjs",
+              // external: ["@akanjs/*"],
               outdir: distPkg.cwdPath,
-              logLevel: "warning",
+              logLevel: "error",
               plugins: [(0, import_esbuild_plugin_d.dtsPlugin)({ tsconfig: `${pkg.cwdPath}/tsconfig.json` })]
             });
           }
           const pkgJson = pkg.readJson("package.json");
-          const dependencies = extractDependencies(`${distPkg.cwdPath}/index.js`, rootPackageJson);
+          const dependencies = buildResult.outputFiles ? extractDependencies(buildResult.outputFiles, rootPackageJson) : {};
           const pkgPackageJson = { ...pkgJson, main: "./index.js", engines: { node: ">=22" }, dependencies };
+          if (buildResult.outputFiles)
+            buildResult.outputFiles.map((file) => distPkg.writeFile(file.path, file.text));
           distPkg.writeJson("package.json", pkgPackageJson);
         }
       };

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "commonjs",
   "name": "@akanjs/cli",
-  "version": "0.0.45",
+  "version": "0.0.47",
   "bin": {
     "akan": "index.js"
   },