akanjs 2.0.0-beta.1 → 2.0.0-beta.2

package/cli/index.js

@@ -9971,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) {

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "2.0.0-beta.1",
+  "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",