@akanjs/cli 0.0.84 → 0.0.86

package/index.js

@@ -614,6 +614,14 @@ var withBase = (appName, config, libs, routes = []) => {
         config2.resolve.alias["@akanjs/config"] = import_path.default.resolve(__dirname, "../../../../pkgs/@akanjs/config");
       return config2;
     },
+    turbopack: {
+      resolveAlias: {
+        // canvas: false,
+        // encoding: false,
+        ...process.env.USE_AKANJS_PKGS === "true" ? { "@akanjs/config": import_path.default.resolve(__dirname, "../../../../pkgs/@akanjs/config") } : {},
+        ...config.turbopack?.resolveAlias ?? {}
+      }
+    },
     redirects() {
       return routes.map(({ basePath: basePath2, domains }) => [
         { basePath: basePath2, domain: `${basePath2}-debug.${devDomain}` },
@@ -755,7 +763,7 @@ var getLibConfig = async (libRoot, props) => {
   return makeLibConfig(config, props);
 };
 
-// pkgs/@akanjs/config/index.ts
+// pkgs/@akanjs/config/src/types.ts
 var getDefaultFileScan = () => ({
   constants: {
     databases: [],
@@ -1042,7 +1050,7 @@ var Executor = class {
     return this;
   }
   writeJson(filePath, content) {
-    this.writeFile(filePath, JSON.stringify(content, null, 2));
+    this.writeFile(filePath, JSON.stringify(content, null, 2) + "\n");
     return this;
   }
   getLocalFile(filePath) {
@@ -4025,15 +4033,27 @@ var PackageRunner = class {
     if (pkg.name === "@akanjs/config") {
       buildResult = await esbuild2.build({
         write: false,
-        entryPoints: [`${pkg.cwdPath}/index.ts`],
-        bundle: true,
+        entryPoints: [`${pkg.cwdPath}/**/*.ts`],
+        bundle: false,
         packages: "external",
         format: "cjs",
         outdir: distPkg.cwdPath,
         logLevel: "error",
+        outExtension: { ".js": pkgJson.type === "module" ? ".cjs" : ".js" },
         plugins: [(0, import_esbuild_plugin_d.dtsPlugin)({ tsconfig: `${pkg.cwdPath}/tsconfig.json` })]
       });
-      await pkg.workspace.exec(`rsync -aq ${pkg.cwdPath}/src/ ${distPkg.cwdPath}/src/`);
+      await esbuild2.build({
+        write: true,
+        entryPoints: [`${pkg.cwdPath}/**/*.ts`, `${pkg.cwdPath}/**/*.css`, `${pkg.cwdPath}/**/*.js`],
+        bundle: false,
+        packages: "external",
+        format: "esm",
+        outdir: distPkg.cwdPath,
+        logLevel: "error",
+        outExtension: { ".js": pkgJson.type === "module" ? ".js" : ".mjs" },
+        // copy css files
+        loader: { ".css": "copy", ".js": "copy" }
+      });
     } else if (pkg.name === "@akanjs/cli") {
       buildResult = await esbuild2.build({
         write: false,
@@ -4100,7 +4120,7 @@ var PackageRunner = class {
       main: "./index.js",
       engines: { node: ">=22" },
       dependencies,
-      ...["@akanjs/config", "@akanjs/cli"].includes(pkg.name) ? {} : {
+      ...["@akanjs/cli"].includes(pkg.name) ? {} : {
         exports: {
           ".": {
             require: pkgJson.type === "module" ? "./index.cjs" : "./index.js",

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "commonjs",
   "name": "@akanjs/cli",
-  "version": "0.0.84",
+  "version": "0.0.86",
   "bin": {
     "akan": "index.js"
   },
@@ -48,4 +48,4 @@
     "vite-plugin-node-polyfills": "^0.23.0",
     "vite-tsconfig-paths": "^5.1.4"
   }
-}
+}

package/pkgs/@akanjs/config/index.d.ts

@@ -1,132 +1,3 @@
-import { NextConfig } from "next";
 export * from "./src/akanConfig";
 export * from "./src/nextConfig";
-export interface RunnerProps {
-    appName: string;
-    repoName: string;
-    serveDomain: string;
-    env: "testing" | "debug" | "develop" | "main";
-    command?: string;
-}
-export type Arch = "amd64" | "arm64";
-export type ExplicitDependencies = string[] | {
-    [key in Arch]: string[];
-};
-export interface AppConfigResult {
-    rootLib?: string;
-    libs: string[];
-    backend: {
-        dockerfile: string;
-        explicitDependencies: ExplicitDependencies;
-    };
-    frontend: {
-        dockerfile: string;
-        nextConfig: NextConfig | (() => Promise<NextConfig> | NextConfig);
-        routes?: {
-            basePath?: string;
-            domains: {
-                main?: string[];
-                develop?: string[];
-                debug?: string[];
-            };
-        }[];
-        explicitDependencies: ExplicitDependencies;
-    };
-}
-export interface LibConfigResult {
-    rootLib?: string;
-    libs: string[];
-    backend: {
-        explicitDependencies: ExplicitDependencies;
-    };
-    frontend: {
-        explicitDependencies: ExplicitDependencies;
-    };
-}
-export type DeepPartial<T> = {
-    [P in keyof T]?: T[P] extends any[] ? T[P] : T[P] extends object ? DeepPartial<T[P]> : T[P];
-};
-export type AppConfig = DeepPartial<AppConfigResult> | ((props: RunnerProps) => DeepPartial<AppConfigResult>);
-export type LibConfig = DeepPartial<LibConfigResult> | ((props: RunnerProps) => DeepPartial<LibConfigResult>);
-export interface AkanConfigFile {
-    default: NextConfig;
-}
-export interface FileConventionScanResult {
-    constants: {
-        databases: string[];
-        scalars: string[];
-    };
-    dictionary: {
-        databases: string[];
-        services: string[];
-        scalars: string[];
-    };
-    documents: {
-        databases: string[];
-        scalars: string[];
-    };
-    services: {
-        databases: string[];
-        services: string[];
-        scalars: string[];
-    };
-    signal: {
-        databases: string[];
-        services: string[];
-        scalars: string[];
-    };
-    store: {
-        databases: string[];
-        services: string[];
-        scalars: string[];
-    };
-    components: {
-        databases: string[];
-        services: string[];
-        scalars: string[];
-    };
-}
-export declare const getDefaultFileScan: () => FileConventionScanResult;
-export interface AppScanResult {
-    name: string;
-    type: "app" | "lib";
-    akanConfig: AppConfigResult;
-    files: FileConventionScanResult;
-    libDeps: string[];
-    pkgDeps: string[];
-    dependencies: string[];
-    libs: {
-        [key: string]: LibScanResult;
-    };
-}
-export interface LibScanResult {
-    name: string;
-    type: "app" | "lib";
-    akanConfig: LibConfigResult;
-    files: FileConventionScanResult;
-    libDeps: string[];
-    pkgDeps: string[];
-    dependencies: string[];
-    libs: {
-        [key: string]: LibScanResult;
-    };
-}
-export interface PkgScanResult {
-    name: string;
-    pkgDeps: string[];
-    dependencies: string[];
-}
-export interface WorkspaceScanResult {
-    appNames: string[];
-    libNames: string[];
-    pkgNames: string[];
-    apps: {
-        [key: string]: AppScanResult;
-    };
-    libs: {
-        [key: string]: LibScanResult;
-    };
-    pkgs: {
-        [key: string]: PkgScanResult;
-    };
-}
+export * from "./src/types";

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

@@ -0,0 +1,130 @@
+import type { NextConfig } from "next";
+export interface RunnerProps {
+    appName: string;
+    repoName: string;
+    serveDomain: string;
+    env: "testing" | "debug" | "develop" | "main";
+    command?: string;
+}
+export type Arch = "amd64" | "arm64";
+export type ExplicitDependencies = string[] | {
+    [key in Arch]: string[];
+};
+export interface AppConfigResult {
+    rootLib?: string;
+    libs: string[];
+    backend: {
+        dockerfile: string;
+        explicitDependencies: ExplicitDependencies;
+    };
+    frontend: {
+        dockerfile: string;
+        nextConfig: NextConfig | (() => Promise<NextConfig> | NextConfig);
+        routes?: {
+            basePath?: string;
+            domains: {
+                main?: string[];
+                develop?: string[];
+                debug?: string[];
+            };
+        }[];
+        explicitDependencies: ExplicitDependencies;
+    };
+}
+export interface LibConfigResult {
+    rootLib?: string;
+    libs: string[];
+    backend: {
+        explicitDependencies: ExplicitDependencies;
+    };
+    frontend: {
+        explicitDependencies: ExplicitDependencies;
+    };
+}
+export type DeepPartial<T> = {
+    [P in keyof T]?: T[P] extends any[] ? T[P] : T[P] extends object ? DeepPartial<T[P]> : T[P];
+};
+export type AppConfig = DeepPartial<AppConfigResult> | ((props: RunnerProps) => DeepPartial<AppConfigResult>);
+export type LibConfig = DeepPartial<LibConfigResult> | ((props: RunnerProps) => DeepPartial<LibConfigResult>);
+export interface AkanConfigFile {
+    default: NextConfig;
+}
+export interface FileConventionScanResult {
+    constants: {
+        databases: string[];
+        scalars: string[];
+    };
+    dictionary: {
+        databases: string[];
+        services: string[];
+        scalars: string[];
+    };
+    documents: {
+        databases: string[];
+        scalars: string[];
+    };
+    services: {
+        databases: string[];
+        services: string[];
+        scalars: string[];
+    };
+    signal: {
+        databases: string[];
+        services: string[];
+        scalars: string[];
+    };
+    store: {
+        databases: string[];
+        services: string[];
+        scalars: string[];
+    };
+    components: {
+        databases: string[];
+        services: string[];
+        scalars: string[];
+    };
+}
+export declare const getDefaultFileScan: () => FileConventionScanResult;
+export interface AppScanResult {
+    name: string;
+    type: "app" | "lib";
+    akanConfig: AppConfigResult;
+    files: FileConventionScanResult;
+    libDeps: string[];
+    pkgDeps: string[];
+    dependencies: string[];
+    libs: {
+        [key: string]: LibScanResult;
+    };
+}
+export interface LibScanResult {
+    name: string;
+    type: "app" | "lib";
+    akanConfig: LibConfigResult;
+    files: FileConventionScanResult;
+    libDeps: string[];
+    pkgDeps: string[];
+    dependencies: string[];
+    libs: {
+        [key: string]: LibScanResult;
+    };
+}
+export interface PkgScanResult {
+    name: string;
+    pkgDeps: string[];
+    dependencies: string[];
+}
+export interface WorkspaceScanResult {
+    appNames: string[];
+    libNames: string[];
+    pkgNames: string[];
+    apps: {
+        [key: string]: AppScanResult;
+    };
+    libs: {
+        [key: string]: LibScanResult;
+    };
+    pkgs: {
+        [key: string]: PkgScanResult;
+    };
+}

package/src/templates/app/app/[lang]/(__appName__)/styles.css.template

@@ -1,5 +1,5 @@
 @import "tailwindcss";
-@import "@akanjs/config/src/styles.css";
+@import "@akanjs/config/styles.css";
 
 @plugin "daisyui" {
   logs: false;

package/src/templates/app/capacitor.config.ts.template

@@ -1,5 +1,5 @@
 //! will be replaced with akan.config.ts
-import { withBase } from "@akanjs/config/src/capacitor.base.config";
+import { withBase } from "@akanjs/config/capacitor.base.config";
 
 export default withBase((config) => {
   return {

package/src/templates/app/playwright.config.ts.template

@@ -1,5 +1,5 @@
 //! will be replaced with akan.config.ts
-import { withBase } from "@akanjs/test/src/playwright.config.base";
+import { withBase } from "@akanjs/test/playwright.config.base";
 
 const config = withBase(__filename);
 

package/src/templates/app/postcss.config.js.template

@@ -1,6 +1,6 @@
 //! will be replaced with akan.config.ts
 const akanjsPrefix = process.env.USE_AKANJS_PKGS === "true" ? "../../pkgs/" : "";
-const { withBase } = require(`${akanjsPrefix}@akanjs/config/src/postcss.config.base`);
+const { withBase } = require(`${akanjsPrefix}@akanjs/config/postcss.config.base`);
 
 /**
  * @type {import('postcss-load-config').Config}