@akanjs/config 0.9.59 → 0.9.60-canary.1

package/cjs/src/akanConfig.js

@@ -44,10 +44,9 @@ var import_path = __toESM(require("path"));
 var import_nextConfig = require("./nextConfig");
 var import_types = require("./types");
 const import_meta = {};
-const makeAppConfig = (config, props) => {
+const makeAppConfig = (config, props, optimizeLibs) => {
   const { name, repoName } = props;
   return {
-    libs: config.libs ?? [],
     backend: {
       docker: makeDockerfile("backend", config.backend?.docker ?? {}, props),
       explicitDependencies: config.backend?.explicitDependencies ?? []
@@ -57,7 +56,7 @@ const makeAppConfig = (config, props) => {
       nextConfig: (0, import_nextConfig.withBase)(
         name,
         config.frontend?.nextConfig ? typeof config.frontend.nextConfig === "function" ? config.frontend.nextConfig() : config.frontend.nextConfig : {},
-        config.libs ?? [],
+        optimizeLibs,
         config.frontend?.routes
       ),
       routes: config.frontend?.routes,
@@ -73,7 +72,7 @@ const makeAppConfig = (config, props) => {
     }
   };
 };
-const getAppConfig = async (appRoot, props) => {
+const getAppConfig = async (appRoot, props, tsconfig) => {
   const akanConfigPath = import_path.default.join(appRoot, "akan.config.ts");
   if (!import_fs.default.existsSync(akanConfigPath))
     throw new Error(`application akan.config.ts is not found ${appRoot}`);
@@ -84,11 +83,13 @@ const getAppConfig = async (appRoot, props) => {
   });
   const configImp = (await jiti.import(akanConfigPath)).default;
   const config = typeof configImp === "function" ? configImp(props) : configImp;
-  return makeAppConfig(config, props);
+  const optimizeLibs = Object.entries(tsconfig.compilerOptions.paths ?? {}).filter(
+    ([key, resolves]) => key.startsWith("@") && resolves.at(0)?.startsWith("libs/") && resolves.at(0)?.endsWith("/index.ts")
+  ).map(([key]) => key.slice(1));
+  return makeAppConfig(config, props, optimizeLibs);
 };
 const makeLibConfig = (config, props) => {
   return {
-    libs: config.libs ?? [],
     backend: {
       explicitDependencies: config.backend?.explicitDependencies ?? []
     },
@@ -118,7 +119,7 @@ const getNextConfig = (configImp, appData) => {
     env: process.env.NEXT_PUBLIC_ENV ?? "debug"
   };
   const config = typeof configImp === "function" ? configImp(props) : configImp;
-  const akanConfig = makeAppConfig(config, props);
+  const akanConfig = makeAppConfig(config, props, appInfo.libDeps);
   return akanConfig.frontend.nextConfig;
 };
 const getCapacitorConfig = (configImp, appInfo) => {
@@ -130,7 +131,7 @@ const getCapacitorConfig = (configImp, appInfo) => {
     env: process.env.NEXT_PUBLIC_ENV ?? "debug"
   };
   const config = typeof configImp === "function" ? configImp(props) : configImp;
-  const akanConfig = makeAppConfig(config, props);
+  const akanConfig = makeAppConfig(config, props, appInfo.libDeps);
   return akanConfig;
 };
 const getDockerRunScripts = (runs) => {
@@ -217,8 +218,8 @@ CMD [${command.map((c) => `"${c}"`).join(",")}]`;
     };
   }
 };
-const increaseBuildNum = async (appRoot, props) => {
-  const appConfig = await getAppConfig(appRoot, props);
+const increaseBuildNum = async (appRoot, props, tsconfig) => {
+  const appConfig = await getAppConfig(appRoot, props, tsconfig);
   const akanConfigPath = import_path.default.join(appRoot, "akan.config.ts");
   const akanConfig = import_fs.default.readFileSync(akanConfigPath, "utf8");
   const akanConfigContent = akanConfig.replace(
@@ -227,8 +228,8 @@ const increaseBuildNum = async (appRoot, props) => {
   );
   import_fs.default.writeFileSync(akanConfigPath, akanConfigContent);
 };
-const decreaseBuildNum = async (appRoot, props) => {
-  const appConfig = await getAppConfig(appRoot, props);
+const decreaseBuildNum = async (appRoot, props, tsconfig) => {
+  const appConfig = await getAppConfig(appRoot, props, tsconfig);
   const akanConfigPath = import_path.default.join(appRoot, "akan.config.ts");
   const akanConfig = import_fs.default.readFileSync(akanConfigPath, "utf8");
   const akanConfigContent = akanConfig.replace(

package/cjs/src/nextConfig.js

@@ -53,7 +53,7 @@ const composePlugins = (...plugins) => {
 };
 const commandType = process.env.AKAN_COMMAND_TYPE?.includes("start") ? "start" : process.env.AKAN_COMMAND_TYPE?.includes("build") ? "build" : "deploy";
 const devDomain = process.env.NEXT_PUBLIC_SERVE_DOMAIN ?? "akanjs.com";
-const withBase = (appName, config, libs, routes = []) => {
+const withBase = (appName, config, optimizeLibs, routes = []) => {
   const withPWA = (0, import_next_pwa.default)({
     dest: "public",
     register: true,
@@ -77,8 +77,7 @@ const withBase = (appName, config, libs, routes = []) => {
     experimental: {
       ...config.experimental ?? {},
       optimizePackageImports: [
-        ...[appName, ...libs].map((lib) => [`@${lib}/ui`, `@${lib}/next`, `@${lib}/common`, `@${lib}/client`]).flat(),
-        "@contract",
+        ...[appName, ...optimizeLibs].map((lib) => [`@${lib}/ui`, `@${lib}/next`, `@${lib}/common`, `@${lib}/client`]).flat(),
         "@akanjs/next",
         "@akanjs/common",
         "@akanjs/ui"

package/esm/src/akanConfig.js

@@ -5,10 +5,9 @@ import { withBase } from "./nextConfig";
 import {
   archs
 } from "./types";
-const makeAppConfig = (config, props) => {
+const makeAppConfig = (config, props, optimizeLibs) => {
   const { name, repoName } = props;
   return {
-    libs: config.libs ?? [],
     backend: {
       docker: makeDockerfile("backend", config.backend?.docker ?? {}, props),
       explicitDependencies: config.backend?.explicitDependencies ?? []
@@ -18,7 +17,7 @@ const makeAppConfig = (config, props) => {
       nextConfig: withBase(
         name,
         config.frontend?.nextConfig ? typeof config.frontend.nextConfig === "function" ? config.frontend.nextConfig() : config.frontend.nextConfig : {},
-        config.libs ?? [],
+        optimizeLibs,
         config.frontend?.routes
       ),
       routes: config.frontend?.routes,
@@ -34,7 +33,7 @@ const makeAppConfig = (config, props) => {
     }
   };
 };
-const getAppConfig = async (appRoot, props) => {
+const getAppConfig = async (appRoot, props, tsconfig) => {
   const akanConfigPath = path.join(appRoot, "akan.config.ts");
   if (!fs.existsSync(akanConfigPath))
     throw new Error(`application akan.config.ts is not found ${appRoot}`);
@@ -45,11 +44,13 @@ const getAppConfig = async (appRoot, props) => {
   });
   const configImp = (await jiti.import(akanConfigPath)).default;
   const config = typeof configImp === "function" ? configImp(props) : configImp;
-  return makeAppConfig(config, props);
+  const optimizeLibs = Object.entries(tsconfig.compilerOptions.paths ?? {}).filter(
+    ([key, resolves]) => key.startsWith("@") && resolves.at(0)?.startsWith("libs/") && resolves.at(0)?.endsWith("/index.ts")
+  ).map(([key]) => key.slice(1));
+  return makeAppConfig(config, props, optimizeLibs);
 };
 const makeLibConfig = (config, props) => {
   return {
-    libs: config.libs ?? [],
     backend: {
       explicitDependencies: config.backend?.explicitDependencies ?? []
     },
@@ -79,7 +80,7 @@ const getNextConfig = (configImp, appData) => {
     env: process.env.NEXT_PUBLIC_ENV ?? "debug"
   };
   const config = typeof configImp === "function" ? configImp(props) : configImp;
-  const akanConfig = makeAppConfig(config, props);
+  const akanConfig = makeAppConfig(config, props, appInfo.libDeps);
   return akanConfig.frontend.nextConfig;
 };
 const getCapacitorConfig = (configImp, appInfo) => {
@@ -91,7 +92,7 @@ const getCapacitorConfig = (configImp, appInfo) => {
     env: process.env.NEXT_PUBLIC_ENV ?? "debug"
   };
   const config = typeof configImp === "function" ? configImp(props) : configImp;
-  const akanConfig = makeAppConfig(config, props);
+  const akanConfig = makeAppConfig(config, props, appInfo.libDeps);
   return akanConfig;
 };
 const getDockerRunScripts = (runs) => {
@@ -178,8 +179,8 @@ CMD [${command.map((c) => `"${c}"`).join(",")}]`;
     };
   }
 };
-const increaseBuildNum = async (appRoot, props) => {
-  const appConfig = await getAppConfig(appRoot, props);
+const increaseBuildNum = async (appRoot, props, tsconfig) => {
+  const appConfig = await getAppConfig(appRoot, props, tsconfig);
   const akanConfigPath = path.join(appRoot, "akan.config.ts");
   const akanConfig = fs.readFileSync(akanConfigPath, "utf8");
   const akanConfigContent = akanConfig.replace(
@@ -188,8 +189,8 @@ const increaseBuildNum = async (appRoot, props) => {
   );
   fs.writeFileSync(akanConfigPath, akanConfigContent);
 };
-const decreaseBuildNum = async (appRoot, props) => {
-  const appConfig = await getAppConfig(appRoot, props);
+const decreaseBuildNum = async (appRoot, props, tsconfig) => {
+  const appConfig = await getAppConfig(appRoot, props, tsconfig);
   const akanConfigPath = path.join(appRoot, "akan.config.ts");
   const akanConfig = fs.readFileSync(akanConfigPath, "utf8");
   const akanConfigContent = akanConfig.replace(

package/esm/src/nextConfig.js

@@ -19,7 +19,7 @@ const composePlugins = (...plugins) => {
 };
 const commandType = process.env.AKAN_COMMAND_TYPE?.includes("start") ? "start" : process.env.AKAN_COMMAND_TYPE?.includes("build") ? "build" : "deploy";
 const devDomain = process.env.NEXT_PUBLIC_SERVE_DOMAIN ?? "akanjs.com";
-const withBase = (appName, config, libs, routes = []) => {
+const withBase = (appName, config, optimizeLibs, routes = []) => {
   const withPWA = pwa({
     dest: "public",
     register: true,
@@ -43,8 +43,7 @@ const withBase = (appName, config, libs, routes = []) => {
     experimental: {
       ...config.experimental ?? {},
       optimizePackageImports: [
-        ...[appName, ...libs].map((lib) => [`@${lib}/ui`, `@${lib}/next`, `@${lib}/common`, `@${lib}/client`]).flat(),
-        "@contract",
+        ...[appName, ...optimizeLibs].map((lib) => [`@${lib}/ui`, `@${lib}/next`, `@${lib}/common`, `@${lib}/client`]).flat(),
         "@akanjs/next",
         "@akanjs/common",
         "@akanjs/ui"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/config",
-  "version": "0.9.59",
+  "version": "0.9.60-canary.1",
   "sourceType": "module",
   "module": {
     "access": "public"

package/src/akanConfig.d.ts

@@ -1,11 +1,27 @@
 import type { NextConfig } from "next";
 import { type AppConfig, type AppConfigResult, type AppScanResult, type DeepPartial, type DockerConfig, type LibConfigResult, type RunnerProps } from "./types";
-export declare const makeAppConfig: (config: DeepPartial<AppConfigResult>, props: RunnerProps) => AppConfigResult;
-export declare const getAppConfig: (appRoot: string, props: RunnerProps) => Promise<AppConfigResult>;
+export declare const makeAppConfig: (config: DeepPartial<AppConfigResult>, props: RunnerProps, optimizeLibs: string[]) => AppConfigResult;
+export declare const getAppConfig: (appRoot: string, props: RunnerProps, tsconfig: {
+    compilerOptions: {
+        paths?: Record<string, string[]>;
+    };
+}) => Promise<AppConfigResult>;
 export declare const makeLibConfig: (config: DeepPartial<LibConfigResult>, props: RunnerProps) => LibConfigResult;
 export declare const getLibConfig: (libRoot: string, props: RunnerProps) => Promise<LibConfigResult>;
 export declare const getNextConfig: (configImp: AppConfig, appData: any) => NextConfig | import("./nextConfig").NextConfigFn | ((baseConfig?: NextConfig) => Promise<NextConfig> | NextConfig | import("./nextConfig").NextConfigFn);
 export declare const getCapacitorConfig: (configImp: AppConfig, appInfo: AppScanResult) => AppConfigResult;
 export declare const makeDockerfile: (type: "backend" | "frontend", config: DeepPartial<DockerConfig>, props: RunnerProps) => DockerConfig;
-export declare const increaseBuildNum: (appRoot: string, props: RunnerProps) => Promise<void>;
-export declare const decreaseBuildNum: (appRoot: string, props: RunnerProps) => Promise<void>;
+export declare const increaseBuildNum: (appRoot: string, props: RunnerProps, tsconfig: {
+    compilerOptions: {
+        paths?: {
+            [key: string]: string[];
+        };
+    };
+}) => Promise<void>;
+export declare const decreaseBuildNum: (appRoot: string, props: RunnerProps, tsconfig: {
+    compilerOptions: {
+        paths?: {
+            [key: string]: string[];
+        };
+    };
+}) => Promise<void>;

package/src/nextConfig.d.ts

@@ -3,7 +3,7 @@ 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);
-export declare const withBase: (appName: string, config: NextConfig, libs: string[], routes?: {
+export declare const withBase: (appName: string, config: NextConfig, optimizeLibs: string[], routes?: {
     basePath?: string;
     domains: {
         main?: string[];

package/src/types.d.ts

@@ -27,7 +27,6 @@ export interface DockerConfig {
     command: string[];
 }
 export interface AppConfigResult {
-    libs: string[];
     backend: {
         docker: DockerConfig;
         explicitDependencies: ExplicitDependencies;
@@ -51,7 +50,6 @@ export interface AppConfigResult {
     };
 }
 export interface LibConfigResult {
-    libs: string[];
     backend: {
         explicitDependencies: ExplicitDependencies;
     };