@akanjs/cli 0.0.72 → 0.0.74

package/index.js

@@ -82,9 +82,6 @@ var getCredentials = (app, environment) => {
   return secret[environment];
 };
 
-// pkgs/@akanjs/devkit/src/getDependencies.ts
-var import_devkit = require("@nx/devkit");
-
 // pkgs/@akanjs/devkit/src/uploadRelease.ts
 var import_axios = __toESM(require("axios"), 1);
 var import_form_data = __toESM(require("form-data"), 1);
@@ -1963,8 +1960,8 @@ var getArgumentValue = async (argMeta, value, workspace) => {
     throw new Error(`Invalid system type: ${argMeta.type}`);
 };
 var runCommands = async (...commands) => {
-  const hasPackageJson = import_fs10.default.existsSync("package.json");
-  const version = hasPackageJson ? JSON.parse(import_fs10.default.readFileSync("package.json", "utf8")).version : "0.0.1";
+  const hasPackageJson = import_fs10.default.existsSync(`${__dirname}/package.json`);
+  const version = hasPackageJson ? JSON.parse(import_fs10.default.readFileSync(`${__dirname}/package.json`, "utf8")).version : "0.0.1";
   import_commander.program.version(version).description("Akan CLI");
   for (const command of commands) {
     const targetMetas = getTargetMetas(command);
@@ -4163,14 +4160,16 @@ ${import_chalk.default.green("\u27A4")} Authentication Required`));
       const distPackageJson = workspace.readJson(`dist/pkgs/${library}/package.json`);
       const newDistPackageJson = {
         ...distPackageJson,
-        ...distPackageJson.dependencies ? {
-          dependencies: Object.fromEntries(
-            Object.entries(distPackageJson.dependencies).map(([key, value]) => [
-              key,
-              value.startsWith("^") ? value : `^${value}`
-            ])
-          )
-        } : {},
+        // ...(distPackageJson.dependencies
+        //   ? {
+        //       dependencies: Object.fromEntries(
+        //         Object.entries(distPackageJson.dependencies).map(([key, value]) => [
+        //           key,
+        //           value.startsWith("^") ? value : `^${value}`,
+        //         ])
+        //       ),
+        //     }
+        //   : {}),
         version: nextVersion
       };
       workspace.writeJson(`dist/pkgs/${library}/package.json`, newDistPackageJson);
@@ -4672,6 +4671,18 @@ var WorkspaceScript = class {
     const cwdPath = process.cwd();
     const workspaceRoot = import_path5.default.join(cwdPath, dirname, repoName);
     const workspace = new WorkspaceExecutor({ workspaceRoot, repoName });
+    await workspace.applyTemplate({
+      basePath: ".",
+      template: "workspaceRoot",
+      dict: {
+        repoName,
+        RepoName: capitalize(repoName),
+        appName,
+        AppName: capitalize(appName),
+        serveDomain: "localhost"
+      }
+    });
+    const rootPackageJson = workspace.readJson("package.json");
     const dependencies = [
       "@akanjs/base",
       "@akanjs/cli",
@@ -4692,26 +4703,17 @@ var WorkspaceScript = class {
     const devDependencies = ["@akanjs/test", "@akanjs/devkit"];
     const latestPublishedVersionOfBase = await (0, import_latest_version2.default)("@akanjs/base");
     const packageJson = {
-      name: repoName,
-      version: "0.0.1",
-      description: `${repoName} workspace`,
-      dependencies: Object.fromEntries(dependencies.map((dependency) => [dependency, latestPublishedVersionOfBase])),
-      devDependencies: Object.fromEntries(
-        devDependencies.map((dependency) => [dependency, latestPublishedVersionOfBase])
-      )
+      ...rootPackageJson,
+      dependencies: {
+        ...rootPackageJson.dependencies,
+        ...Object.fromEntries(dependencies.map((dependency) => [dependency, latestPublishedVersionOfBase]))
+      },
+      devDependencies: {
+        ...rootPackageJson.devDependencies,
+        ...Object.fromEntries(devDependencies.map((dependency) => [dependency, latestPublishedVersionOfBase]))
+      }
     };
     workspace.writeFile("package.json", packageJson);
-    await workspace.applyTemplate({
-      basePath: ".",
-      template: "workspaceRoot",
-      dict: {
-        repoName,
-        RepoName: capitalize(repoName),
-        appName,
-        AppName: capitalize(appName),
-        serveDomain: "localhost"
-      }
-    });
     workspace.log("Installing dependencies...");
     await workspace.spawn("pnpm", ["i"]);
     workspace.log("Initializing git repository and commit...");

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "commonjs",
   "name": "@akanjs/cli",
-  "version": "0.0.72",
+  "version": "0.0.74",
   "bin": {
     "akan": "index.js"
   },
@@ -22,7 +22,6 @@
     "@langchain/core": "^0.3.56",
     "@langchain/openai": "^0.5.10",
     "@next/bundle-analyzer": "^15.1.3",
-    "@nx/devkit": "^20.7.2",
     "@trapezedev/project": "^7.1.3",
     "@vitejs/plugin-react": "^4.4.1",
     "axios": "^1.7.9",
@@ -36,14 +35,14 @@
     "form-data": "^4.0.1",
     "js-yaml": "^4.1.0",
     "latest-version": "^9.0.0",
-    "next-pwa": "^5.6.0",
+    "next-pwa": "5.6.0",
     "open": "^10.1.1",
     "ora": "^3.4.0",
     "pluralize": "^8.0.0",
     "qrcode": "^1.5.4",
     "reflect-metadata": "^0.2.2",
     "tunnel-ssh": "^5.2.0",
-    "typescript": "^5.8.3",
+    "typescript": "5.8.3",
     "uuid": "^11.0.3",
     "vite": "^6.3.4",
     "vite-plugin-node-polyfills": "^0.23.0",

package/pkgs/@akanjs/config/src/nextConfig.d.ts

@@ -3,9 +3,6 @@ export type NextConfigFn = (phase: string, context?: any) => Promise<NextConfig>
 export type NextPlugin = (config: NextConfig) => NextConfig;
 export type NextPluginThatReturnsConfigFn = (config: NextConfig) => NextConfigFn;
 export declare const composePlugins: (...plugins: (NextPlugin | NextPluginThatReturnsConfigFn)[]) => ((baseConfig: NextConfig) => NextConfigFn);
-/**
- * @type { (config: import('@nx/next/plugins/with-nx').WithNxOptions) = import('@nx/next/plugins/with-nx').WithNxOptions }
- **/
 export declare const withBase: (appName: string, config: NextConfig, libs: string[], routes?: {
     basePath?: string;
     domains: {

package/pkgs/@akanjs/devkit/src/index.d.ts

@@ -1,7 +1,6 @@
 export * from "./baseDevEnv";
 export * from "./createTunnel";
 export * from "./getCredentials";
-export * from "./getDependencies";
 export * from "./uploadRelease";
 export * from "./getModelFileData";
 export * from "./getRelatedCnsts";

package/src/templates/workspaceRoot/eslint.config.ts.template

@@ -1,136 +1,3 @@
-/* eslint-disable */
-import { FlatCompat } from "@eslint/eslintrc";
-import js from "@eslint/js";
-import typescriptEslint from "@typescript-eslint/eslint-plugin";
-import tsParser from "@typescript-eslint/parser";
-import simpleImportSort from "eslint-plugin-simple-import-sort";
-import unusedImports from "eslint-plugin-unused-imports";
+import { eslintConfig } from "@akanjs/lint";
 
-import akanjsLint from "@akanjs/lint";
-
-const compat = new FlatCompat({
-  baseDirectory: __dirname,
-  recommendedConfig: js.configs.recommended,
-  allConfig: js.configs.all,
-});
-
-export default [
-  {
-    ignores: [
-      "**/node_modules/**/*",
-      "**/photoshop/**/*",
-      "**/public/**/*",
-      "**/ios/**/*",
-      "**/android/**/*",
-      "**/*.js",
-      "**/*.jsx",
-      "**/.next/**/*",
-      "**/typechain-types/**/*",
-      "**/script*.ts",
-      "data/**/*",
-      "dist/**/*",
-      "releases/**/*",
-    ],
-  },
-  ...compat.extends(
-    "next",
-    "next/core-web-vitals",
-    "eslint:recommended",
-    "plugin:@typescript-eslint/recommended-type-checked",
-    "plugin:@typescript-eslint/strict-type-checked",
-    "plugin:@typescript-eslint/stylistic-type-checked"
-    // "plugin:tailwindcss/recommended"
-  ),
-  {
-    plugins: {
-      "@akanjs/lint": akanjsLint,
-      "unused-imports": unusedImports,
-      "simple-import-sort": simpleImportSort,
-      "@typescript-eslint": typescriptEslint,
-    },
-
-    languageOptions: {
-      parser: tsParser,
-      ecmaVersion: 6,
-      sourceType: "module",
-
-      parserOptions: {
-        project: true,
-        projectService: true,
-      },
-    },
-
-    settings: {
-      "import/parsers": {
-        "@typescript-eslint/parser": [".ts", ".tsx"],
-      },
-
-      "import/resolver": {
-        typescript: "./tsconfig.json",
-      },
-    },
-  },
-  {
-    files: ["**/*.ts", "**/*.tsx"],
-    ignores: ["**/*.js", "**/*.jsx"],
-
-    rules: {
-      "no-console": "error",
-      "@akanjs/lint/useClientByFile": "error",
-      "@akanjs/lint/noImportClientFunctions": "error",
-      "@akanjs/lint/nonScalarPropsRestricted": "error",
-      "@akanjs/lint/noImportExternalLibrary": "error",
-      "@typescript-eslint/no-inferrable-types": "off",
-      "@typescript-eslint/restrict-template-expressions": "off",
-      "@typescript-eslint/consistent-indexed-object-style": "off",
-      "@typescript-eslint/no-extraneous-class": "off",
-      "@typescript-eslint/no-unsafe-enum-comparison": "off",
-      "@typescript-eslint/prefer-promise-reject-errors": "off",
-
-      "@typescript-eslint/no-misused-promises": [
-        "error",
-        {
-          checksVoidReturn: false,
-        },
-      ],
-
-      "tailwindcss/no-custom-classname": "off",
-      "react/display-name": "off",
-      "react-hooks/exhaustive-deps": "off",
-      "@next/next/no-html-link-for-pages": "off",
-      "jsx-a11y/alt-text": [0],
-      "unused-imports/no-unused-imports": "warn",
-      "no-unused-vars": "off",
-      "simple-import-sort/imports": "warn",
-      "simple-import-sort/exports": "off",
-      "import/first": "warn",
-      "import/newline-after-import": "warn",
-    },
-  },
-  {
-    files: ["**/*.ts", "**/*.tsx"],
-    rules: {},
-  },
-  ...compat.extends("plugin:@typescript-eslint/recommended").map((config) => ({
-    ...config,
-    files: ["**/*.ts", "**/*.tsx"],
-  })),
-  //   ...fixupConfigRules(compat.extends("plugin:import/recommended")).map((config) => ({
-  //     ...config,
-  //     files: ["**/*.ts", "**/*.tsx"],
-  //   })),
-  {
-    files: ["**/*.ts", "**/*.tsx"],
-
-    rules: {
-      "import/no-duplicates": "warn",
-      "import/no-unresolved": "off",
-      "import/named": "off",
-      "import/namespace": "off",
-      "@typescript-eslint/no-explicit-any": "off",
-      "@typescript-eslint/no-unused-vars": "off",
-      "@typescript-eslint/no-misused-spread": "off",
-      "react-hooks/rules-of-hooks": "off",
-    },
-  },
-];
+export default eslintConfig;

package/src/templates/workspaceRoot/package.json.template

@@ -0,0 +1,16 @@
+{
+  "name": "<%= repoName %>",
+  "description": "<%= repoName %> workspace"
+  "version": "0.0.1",
+  "dependencies": {
+    "next": "15.3.2",
+    "tailwindcss": "^4.1.7",
+    "daisyui": "^5.0.35"
+  },
+  "devDependencies": {
+    "eslint": "^9.19.0",
+    "jest": "^29.7.0",
+    "jiti": "^2.4.2",
+    "prettier": "^3.5.3"
+  }
+}

package/pkgs/@akanjs/devkit/src/getDependencies.d.ts

@@ -1,4 +0,0 @@
-export declare const getDependencies: (projectName: string) => Promise<{
-    libDeps: string[];
-    npmDeps: string[];
-}>;