akanjs 2.0.0-beta.0 → 2.0.0-beta.2

package/cli/index.js

@@ -867,7 +867,9 @@ import {
 import { readFileSync as readFileSync3 } from "fs";
 import { mkdir as mkdir2, readdir as readDirEntries, stat as stat2 } from "fs/promises";
 import path7 from "path";
+var {$ } = globalThis.Bun;
 import chalk4 from "chalk";
+import ts3 from "typescript";
 
 import fs from "fs";
 import path from "path";
@@ -1163,9 +1165,6 @@ var decreaseBuildNum = async (app) => {
   fs.writeFileSync(akanConfigPath, akanConfigContent);
 };
 
-var {$ } = globalThis.Bun;
-import ts3 from "typescript";
-
 import path2 from "path";
 var getDirname = (url) => path2.dirname(new URL(url).pathname);
 
@@ -9972,15 +9971,22 @@ class PackageRunner extends runner("package") {
     await pkg.dist.mkdir(pkg.dist.cwdPath);
     const scanner = await TypeScriptDependencyScanner.from(pkg);
     const { npmDeps, npmDevDeps, missingDeps } = await scanner.getPackageBuildDependencies(pkg.name);
-    if (missingDeps.length > 0)
-      throw new Error(`Missing dependency versions in root package.json: ${missingDeps.join(", ")}`);
-    await pkg.updatePackageJsonDependencies(npmDeps, npmDevDeps);
+    const packageRuntimeDependencies = { akanjs: ["daisyui"] };
+    const forcedRuntimeDeps = packageRuntimeDependencies[pkg.name] ?? [];
+    const packageRuntimeDeps = [...new Set([...npmDeps, ...forcedRuntimeDeps])];
+    const rootPackageJson = await pkg.workspace.getPackageJson();
+    const rootDeps = { ...rootPackageJson.dependencies, ...rootPackageJson.devDependencies };
+    const missingForcedDeps = forcedRuntimeDeps.filter((dep) => !rootDeps[dep]);
+    const allMissingDeps = [...new Set([...missingDeps, ...missingForcedDeps])].sort();
+    if (allMissingDeps.length > 0)
+      throw new Error(`Missing dependency versions in root package.json: ${allMissingDeps.join(", ")}`);
+    await pkg.updatePackageJsonDependencies(packageRuntimeDeps, npmDevDeps);
     const hasBuildFile = await Bun.file(`${pkg.cwdPath}/build.ts`).exists();
     if (hasBuildFile) {
       await pkg.workspace.spawn(process.execPath, [`${pkg.cwdPath}/build.ts`], { env: process.env, stdio: "inherit" });
     } else {
       await $2`cp -r ${pkg.cwdPath}/. ${pkg.dist.cwdPath}`;
-      await Promise.all([pkg.generateDistPackageJson(npmDeps, npmDevDeps), pkg.generateTsconfigJson()]);
+      await Promise.all([pkg.generateDistPackageJson(packageRuntimeDeps, npmDevDeps), pkg.generateTsconfigJson()]);
     }
   }
   async updateWorskpaceRootPackageJson(workspace, rootPackageJson) {
@@ -11362,8 +11368,7 @@ class WorkspaceScript extends script("workspace", [WorkspaceRunner, ApplicationS
 
 class WorkspaceCommand extends command("workspace", [WorkspaceScript], ({ public: target }) => ({
   createWorkspace: target({ desc: "Create a new Akan.js workspace", runsOnWorkspaceRoot: false }).arg("workspaceName", String, { desc: "what is the name of your organization?" }).option("app", String, {
-    desc: "what is the codename of your first application? (e.g. myapp)",
-    default: "app"
+    desc: "what is the codename of your first application? (e.g. myapp)"
   }).option("dir", String, {
     desc: "directory of workspace",
     default: process.env.USE_AKANJS_PKGS === "true" ? "local" : "."

package/cli/package/package.runner.ts

@@ -32,17 +32,24 @@ export class PackageRunner extends runner("package") {
     await pkg.dist.mkdir(pkg.dist.cwdPath);
     const scanner = await TypeScriptDependencyScanner.from(pkg);
     const { npmDeps, npmDevDeps, missingDeps } = await scanner.getPackageBuildDependencies(pkg.name);
-    if (missingDeps.length > 0)
-      throw new Error(`Missing dependency versions in root package.json: ${missingDeps.join(", ")}`);
+    const packageRuntimeDependencies: Record<string, string[]> = { akanjs: ["daisyui"] };
+    const forcedRuntimeDeps = packageRuntimeDependencies[pkg.name] ?? [];
+    const packageRuntimeDeps = [...new Set([...npmDeps, ...forcedRuntimeDeps])];
+    const rootPackageJson = await pkg.workspace.getPackageJson();
+    const rootDeps = { ...rootPackageJson.dependencies, ...rootPackageJson.devDependencies };
+    const missingForcedDeps = forcedRuntimeDeps.filter((dep) => !rootDeps[dep]);
+    const allMissingDeps = [...new Set([...missingDeps, ...missingForcedDeps])].sort();
+    if (allMissingDeps.length > 0)
+      throw new Error(`Missing dependency versions in root package.json: ${allMissingDeps.join(", ")}`);
 
-    await pkg.updatePackageJsonDependencies(npmDeps, npmDevDeps);
+    await pkg.updatePackageJsonDependencies(packageRuntimeDeps, npmDevDeps);
 
     const hasBuildFile = await Bun.file(`${pkg.cwdPath}/build.ts`).exists();
     if (hasBuildFile) {
       await pkg.workspace.spawn(process.execPath, [`${pkg.cwdPath}/build.ts`], { env: process.env, stdio: "inherit" });
     } else {
       await $`cp -r ${pkg.cwdPath}/. ${pkg.dist.cwdPath}`;
-      await Promise.all([pkg.generateDistPackageJson(npmDeps, npmDevDeps), pkg.generateTsconfigJson()]);
+      await Promise.all([pkg.generateDistPackageJson(packageRuntimeDeps, npmDevDeps), pkg.generateTsconfigJson()]);
     }
   }
 

package/cli/workspace/workspace.command.ts

@@ -7,7 +7,6 @@ export class WorkspaceCommand extends command("workspace", [WorkspaceScript], ({
     .arg("workspaceName", String, { desc: "what is the name of your organization?" })
     .option("app", String, {
       desc: "what is the codename of your first application? (e.g. myapp)",
-      default: "app",
     })
     .option("dir", String, {
       desc: "directory of workspace",

package/devkit/executors.ts

@@ -18,11 +18,10 @@ import {
   validatePageSourceFile,
   validateSubRoutePageKey,
 } from "akanjs/common";
-import chalk from "chalk";
-import { AkanAppConfig, AkanLibConfig, decreaseBuildNum, increaseBuildNum } from "./akanConfig";
-
 import { $ } from "bun";
+import chalk from "chalk";
 import ts from "typescript";
+import { AkanAppConfig, AkanLibConfig, decreaseBuildNum, increaseBuildNum } from "./akanConfig";
 import { FileSys } from "./fileSys";
 import { getDirname } from "./getDirname";
 import { Linter } from "./linter";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.2",
   "sourceType": "module",
   "type": "module",
   "bin": {
@@ -153,6 +153,7 @@
     "compare-versions": "^6.1.1",
     "cordova-plugin-purchase": "^13.16.0",
     "croner": "^10.0.1",
+    "daisyui": "^5.5.20",
     "dataloader": "^2.2.3",
     "dayjs": "^1.11.20",
     "file-saver": "^2.0.5",