@akanjs/config 0.9.57 → 0.9.58-canary.1

package/capacitor.base.config.d.ts

@@ -1,2 +1,2 @@
 import type { CapacitorConfig } from "@capacitor/cli";
-export declare const withBase: (applyConfig: (config: CapacitorConfig) => CapacitorConfig) => CapacitorConfig;
+export declare const withBase: (configImp: (config: CapacitorConfig) => CapacitorConfig, appData?: any) => CapacitorConfig;

package/cjs/capacitor.base.config.js

@@ -44,26 +44,32 @@ const getLocalIP = () => {
   }
   return "127.0.0.1";
 };
-const withBase = (applyConfig) => {
-  const appName = process.env.NEXT_PUBLIC_APP_NAME ?? "seon";
-  if (!appName)
-    throw new Error("appName is not defined, please run with akan command");
+const withBase = (configImp, appData) => {
   const ip = getLocalIP();
+  const appInfo = appData;
   const baseConfig = {
-    //! appId 바꿔야됨.
-    appId: `com.${appName}.${process.env.NEXT_PUBLIC_ENV}`,
-    appName,
-    webDir: `../../dist/apps/${appName}/csr`,
-    // bundledWebRuntime: false, !not used
+    appId: `com.${appInfo.name}.${process.env.NEXT_PUBLIC_ENV}`,
+    appName: appInfo.akanConfig.mobile.appName,
+    webDir: `../../dist/apps/${appInfo.name}/csr`,
     server: process.env.APP_OPERATION_MODE !== "release" ? {
       androidScheme: "http",
       url: `http://${ip}:4201`,
       cleartext: true,
       allowNavigation: [`http://${ip}:8080/*`]
-    } : void 0,
+    } : {
+      allowNavigation: ["*"]
+    },
     plugins: {
-      CapacitorCookies: { enabled: true }
+      CapacitorCookies: { enabled: true },
+      ...appInfo.akanConfig.mobile.plugins
+    },
+    ...appInfo.akanConfig.mobile,
+    android: {
+      ...appInfo.akanConfig.mobile.android
+    },
+    ios: {
+      ...appInfo.akanConfig.mobile.ios
     }
   };
-  return applyConfig(baseConfig);
+  return baseConfig;
 };

package/cjs/src/akanConfig.js

@@ -27,9 +27,12 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var akanConfig_exports = {};
 __export(akanConfig_exports, {
+  decreaseBuildNum: () => decreaseBuildNum,
   getAppConfig: () => getAppConfig,
+  getCapacitorConfig: () => getCapacitorConfig,
   getLibConfig: () => getLibConfig,
   getNextConfig: () => getNextConfig,
+  increaseBuildNum: () => increaseBuildNum,
   makeAppConfig: () => makeAppConfig,
   makeDockerfile: () => makeDockerfile,
   makeLibConfig: () => makeLibConfig
@@ -41,7 +44,6 @@ var import_path = __toESM(require("path"));
 var import_nextConfig = require("./nextConfig");
 var import_types = require("./types");
 const import_meta = {};
-const jiti = (0, import_jiti.createJiti)(import_meta.url);
 const makeAppConfig = (config, props) => {
   const { name, repoName } = props;
   return {
@@ -63,10 +65,12 @@ const makeAppConfig = (config, props) => {
       explicitDependencies: config.frontend?.explicitDependencies ?? []
     },
     mobile: {
+      ...config.mobile,
       appName: config.mobile?.appName ?? name,
-      bundleId: config.mobile?.bundleId ?? `com.${repoName}.${name}`,
-      version: config.mobile?.version,
-      buildNum: config.mobile?.buildNum
+      appId: config.mobile?.appId ?? `com.${repoName}.app`,
+      version: config.mobile?.version ?? "0.0.1",
+      buildNum: config.mobile?.buildNum ?? 1,
+      plugins: config.mobile?.plugins
     }
   };
 };
@@ -74,6 +78,11 @@ const getAppConfig = async (appRoot, props) => {
   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}`);
+  const jiti = (0, import_jiti.createJiti)(import_meta.url, {
+    fsCache: false,
+    requireCache: false,
+    interopDefault: true
+  });
   const configImp = (await jiti.import(akanConfigPath)).default;
   const config = typeof configImp === "function" ? configImp(props) : configImp;
   return makeAppConfig(config, props);
@@ -94,6 +103,9 @@ const getLibConfig = async (libRoot, props) => {
   const akanConfigPath = import_path.default.join(libRoot, "akan.config.ts");
   if (!import_fs.default.existsSync(akanConfigPath))
     throw new Error(`library akan.config.ts is not found ${libRoot}`);
+  const jiti = (0, import_jiti.createJiti)(import_meta.url, {
+    cache: false
+  });
   const configImp = (await jiti.import(akanConfigPath)).default;
   const config = typeof configImp === "function" ? configImp(props) : configImp;
   return makeLibConfig(config, props);
@@ -111,6 +123,18 @@ const getNextConfig = (configImp, appData) => {
   const akanConfig = makeAppConfig(config, props);
   return akanConfig.frontend.nextConfig;
 };
+const getCapacitorConfig = (configImp, appInfo) => {
+  const props = {
+    type: "app",
+    name: appInfo.name,
+    repoName: appInfo.repoName,
+    serveDomain: appInfo.serveDomain,
+    env: process.env.NEXT_PUBLIC_ENV ?? "debug"
+  };
+  const config = typeof configImp === "function" ? configImp(props) : configImp;
+  const akanConfig = makeAppConfig(config, props);
+  return akanConfig;
+};
 const getDockerRunScripts = (runs) => {
   return runs.map((run) => {
     if (typeof run === "string")
@@ -195,3 +219,23 @@ CMD [${command.map((c) => `"${c}"`).join(",")}]`;
     };
   }
 };
+const increaseBuildNum = async (appRoot, props) => {
+  const appConfig = await getAppConfig(appRoot, props);
+  const akanConfigPath = import_path.default.join(appRoot, "akan.config.ts");
+  const akanConfig = import_fs.default.readFileSync(akanConfigPath, "utf8");
+  const akanConfigContent = akanConfig.replace(
+    `buildNum: ${appConfig.mobile.buildNum}`,
+    `buildNum: ${appConfig.mobile.buildNum + 1}`
+  );
+  import_fs.default.writeFileSync(akanConfigPath, akanConfigContent);
+};
+const decreaseBuildNum = async (appRoot, props) => {
+  const appConfig = await getAppConfig(appRoot, props);
+  const akanConfigPath = import_path.default.join(appRoot, "akan.config.ts");
+  const akanConfig = import_fs.default.readFileSync(akanConfigPath, "utf8");
+  const akanConfigContent = akanConfig.replace(
+    `buildNum: ${appConfig.mobile.buildNum}`,
+    `buildNum: ${appConfig.mobile.buildNum - 1}`
+  );
+  import_fs.default.writeFileSync(akanConfigPath, akanConfigContent);
+};

package/cjs/src/nextConfig.js

@@ -67,7 +67,7 @@ const withBase = (appName, config, libs, routes = []) => {
     ...commandType !== "start" || process.env.USE_PWA === "true" ? [withPWA] : []
   )({
     ...config,
-    eslint: { ...config.eslint, ignoreDuringBuilds: true },
+    // eslint: { ...config.eslint, ignoreDuringBuilds: true },
     env: {
       ...config.env,
       basePaths: [...new Set(routes.map(({ basePath }) => basePath))].join(",")
@@ -99,8 +99,6 @@ const withBase = (appName, config, libs, routes = []) => {
     },
     webpack: (config2) => {
       const watchOptions = config2.watchOptions;
-      config2.resolve.alias.canvas = false;
-      config2.resolve.alias.encoding = false;
       const ignored = watchOptions?.ignored ? typeof watchOptions.ignored === "string" ? [watchOptions.ignored] : Array.isArray(watchOptions.ignored) ? watchOptions.ignored.filter((ignore) => typeof ignore === "string") : [] : [];
       config2.watchOptions = {
         ...config2.watchOptions ?? {},
@@ -109,10 +107,11 @@ const withBase = (appName, config, libs, routes = []) => {
       return config2;
     },
     turbopack: {
+      ...config.turbopack ?? {},
       resolveAlias: {
         // canvas: false,
         // encoding: false,
-        // ...(process.env.USE_AKANJS_PKGS === "true" ? { "@akanjs/config": "../../pkgs/@akanjs/config" } : {}),
+        ...process.env.USE_AKANJS_PKGS === "true" ? { "@akanjs/config": "../../pkgs/@akanjs/config" } : {},
         ...config.turbopack?.resolveAlias ?? {}
       }
     },
@@ -156,7 +155,7 @@ const withBase = (appName, config, libs, routes = []) => {
 };
 const defaultNextConfigFile = `import "tsconfig-paths/register.js";
 
-import { getNextConfig } from "@akanjs/config";
+import { getNextConfig } from "${process.env.USE_AKANJS_PKGS === "true" ? "../../pkgs/@akanjs/config" : "@akanjs/config"}";
 
 import appInfo from "./akan.app.json";
 import config from "./akan.config";

package/esm/capacitor.base.config.js

@@ -12,28 +12,34 @@ const getLocalIP = () => {
   }
   return "127.0.0.1";
 };
-const withBase = (applyConfig) => {
-  const appName = process.env.NEXT_PUBLIC_APP_NAME ?? "seon";
-  if (!appName)
-    throw new Error("appName is not defined, please run with akan command");
+const withBase = (configImp, appData) => {
   const ip = getLocalIP();
+  const appInfo = appData;
   const baseConfig = {
-    //! appId 바꿔야됨.
-    appId: `com.${appName}.${process.env.NEXT_PUBLIC_ENV}`,
-    appName,
-    webDir: `../../dist/apps/${appName}/csr`,
-    // bundledWebRuntime: false, !not used
+    appId: `com.${appInfo.name}.${process.env.NEXT_PUBLIC_ENV}`,
+    appName: appInfo.akanConfig.mobile.appName,
+    webDir: `../../dist/apps/${appInfo.name}/csr`,
     server: process.env.APP_OPERATION_MODE !== "release" ? {
       androidScheme: "http",
       url: `http://${ip}:4201`,
       cleartext: true,
       allowNavigation: [`http://${ip}:8080/*`]
-    } : void 0,
+    } : {
+      allowNavigation: ["*"]
+    },
     plugins: {
-      CapacitorCookies: { enabled: true }
+      CapacitorCookies: { enabled: true },
+      ...appInfo.akanConfig.mobile.plugins
+    },
+    ...appInfo.akanConfig.mobile,
+    android: {
+      ...appInfo.akanConfig.mobile.android
+    },
+    ios: {
+      ...appInfo.akanConfig.mobile.ios
     }
   };
-  return applyConfig(baseConfig);
+  return baseConfig;
 };
 export {
   withBase

package/esm/src/akanConfig.js

@@ -5,7 +5,6 @@ import { withBase } from "./nextConfig";
 import {
   archs
 } from "./types";
-const jiti = createJiti(import.meta.url);
 const makeAppConfig = (config, props) => {
   const { name, repoName } = props;
   return {
@@ -27,10 +26,12 @@ const makeAppConfig = (config, props) => {
       explicitDependencies: config.frontend?.explicitDependencies ?? []
     },
     mobile: {
+      ...config.mobile,
       appName: config.mobile?.appName ?? name,
-      bundleId: config.mobile?.bundleId ?? `com.${repoName}.${name}`,
-      version: config.mobile?.version,
-      buildNum: config.mobile?.buildNum
+      appId: config.mobile?.appId ?? `com.${repoName}.app`,
+      version: config.mobile?.version ?? "0.0.1",
+      buildNum: config.mobile?.buildNum ?? 1,
+      plugins: config.mobile?.plugins
     }
   };
 };
@@ -38,6 +39,11 @@ const getAppConfig = async (appRoot, props) => {
   const akanConfigPath = path.join(appRoot, "akan.config.ts");
   if (!fs.existsSync(akanConfigPath))
     throw new Error(`application akan.config.ts is not found ${appRoot}`);
+  const jiti = createJiti(import.meta.url, {
+    fsCache: false,
+    requireCache: false,
+    interopDefault: true
+  });
   const configImp = (await jiti.import(akanConfigPath)).default;
   const config = typeof configImp === "function" ? configImp(props) : configImp;
   return makeAppConfig(config, props);
@@ -58,6 +64,9 @@ const getLibConfig = async (libRoot, props) => {
   const akanConfigPath = path.join(libRoot, "akan.config.ts");
   if (!fs.existsSync(akanConfigPath))
     throw new Error(`library akan.config.ts is not found ${libRoot}`);
+  const jiti = createJiti(import.meta.url, {
+    cache: false
+  });
   const configImp = (await jiti.import(akanConfigPath)).default;
   const config = typeof configImp === "function" ? configImp(props) : configImp;
   return makeLibConfig(config, props);
@@ -75,6 +84,18 @@ const getNextConfig = (configImp, appData) => {
   const akanConfig = makeAppConfig(config, props);
   return akanConfig.frontend.nextConfig;
 };
+const getCapacitorConfig = (configImp, appInfo) => {
+  const props = {
+    type: "app",
+    name: appInfo.name,
+    repoName: appInfo.repoName,
+    serveDomain: appInfo.serveDomain,
+    env: process.env.NEXT_PUBLIC_ENV ?? "debug"
+  };
+  const config = typeof configImp === "function" ? configImp(props) : configImp;
+  const akanConfig = makeAppConfig(config, props);
+  return akanConfig;
+};
 const getDockerRunScripts = (runs) => {
   return runs.map((run) => {
     if (typeof run === "string")
@@ -159,10 +180,33 @@ CMD [${command.map((c) => `"${c}"`).join(",")}]`;
     };
   }
 };
+const increaseBuildNum = async (appRoot, props) => {
+  const appConfig = await getAppConfig(appRoot, props);
+  const akanConfigPath = path.join(appRoot, "akan.config.ts");
+  const akanConfig = fs.readFileSync(akanConfigPath, "utf8");
+  const akanConfigContent = akanConfig.replace(
+    `buildNum: ${appConfig.mobile.buildNum}`,
+    `buildNum: ${appConfig.mobile.buildNum + 1}`
+  );
+  fs.writeFileSync(akanConfigPath, akanConfigContent);
+};
+const decreaseBuildNum = async (appRoot, props) => {
+  const appConfig = await getAppConfig(appRoot, props);
+  const akanConfigPath = path.join(appRoot, "akan.config.ts");
+  const akanConfig = fs.readFileSync(akanConfigPath, "utf8");
+  const akanConfigContent = akanConfig.replace(
+    `buildNum: ${appConfig.mobile.buildNum}`,
+    `buildNum: ${appConfig.mobile.buildNum - 1}`
+  );
+  fs.writeFileSync(akanConfigPath, akanConfigContent);
+};
 export {
+  decreaseBuildNum,
   getAppConfig,
+  getCapacitorConfig,
   getLibConfig,
   getNextConfig,
+  increaseBuildNum,
   makeAppConfig,
   makeDockerfile,
   makeLibConfig

package/esm/src/nextConfig.js

@@ -33,7 +33,7 @@ const withBase = (appName, config, libs, routes = []) => {
     ...commandType !== "start" || process.env.USE_PWA === "true" ? [withPWA] : []
   )({
     ...config,
-    eslint: { ...config.eslint, ignoreDuringBuilds: true },
+    // eslint: { ...config.eslint, ignoreDuringBuilds: true },
     env: {
       ...config.env,
       basePaths: [...new Set(routes.map(({ basePath }) => basePath))].join(",")
@@ -65,8 +65,6 @@ const withBase = (appName, config, libs, routes = []) => {
     },
     webpack: (config2) => {
       const watchOptions = config2.watchOptions;
-      config2.resolve.alias.canvas = false;
-      config2.resolve.alias.encoding = false;
       const ignored = watchOptions?.ignored ? typeof watchOptions.ignored === "string" ? [watchOptions.ignored] : Array.isArray(watchOptions.ignored) ? watchOptions.ignored.filter((ignore) => typeof ignore === "string") : [] : [];
       config2.watchOptions = {
         ...config2.watchOptions ?? {},
@@ -75,10 +73,11 @@ const withBase = (appName, config, libs, routes = []) => {
       return config2;
     },
     turbopack: {
+      ...config.turbopack ?? {},
       resolveAlias: {
         // canvas: false,
         // encoding: false,
-        // ...(process.env.USE_AKANJS_PKGS === "true" ? { "@akanjs/config": "../../pkgs/@akanjs/config" } : {}),
+        ...process.env.USE_AKANJS_PKGS === "true" ? { "@akanjs/config": "../../pkgs/@akanjs/config" } : {},
         ...config.turbopack?.resolveAlias ?? {}
       }
     },
@@ -122,7 +121,7 @@ const withBase = (appName, config, libs, routes = []) => {
 };
 const defaultNextConfigFile = `import "tsconfig-paths/register.js";
 
-import { getNextConfig } from "@akanjs/config";
+import { getNextConfig } from "${process.env.USE_AKANJS_PKGS === "true" ? "../../pkgs/@akanjs/config" : "@akanjs/config"}";
 
 import appInfo from "./akan.app.json";
 import config from "./akan.config";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/config",
-  "version": "0.9.57",
+  "version": "0.9.58-canary.1",
   "sourceType": "module",
   "module": {
     "access": "public"
@@ -12,12 +12,12 @@
   },
   "dependencies": {
     "@capacitor/cli": "^7.0.0",
-    "@next/bundle-analyzer": "^15.1.3",
+    "@next/bundle-analyzer": "^16.0.3",
     "@tailwindcss/postcss": "^4.1.11",
     "@types/node": "~22.10.4",
-    "@types/react": "19.1.1",
+    "@types/react": "19.2.0",
     "@types/webpack-env": "^1.18.8",
-    "daisyui": "^5.0.35",
+    "daisyui": "^5.5.5",
     "jest": "^29.7.0",
     "jiti": "^2.4.2",
     "kakao.maps.d.ts": "^0.1.40",

package/src/akanConfig.d.ts

@@ -1,8 +1,11 @@
 import type { NextConfig } from "next";
-import { type AppConfig, type AppConfigResult, type DeepPartial, type DockerConfig, type LibConfigResult, type RunnerProps } from "./types";
+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 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 | (() => Promise<NextConfig> | NextConfig);
+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>;

package/src/nextConfig.d.ts

@@ -11,4 +11,4 @@ export declare const withBase: (appName: string, config: NextConfig, libs: strin
         debug?: string[];
     };
 }[]) => NextConfigFn;
-export declare const defaultNextConfigFile = "import \"tsconfig-paths/register.js\";\n\nimport { getNextConfig } from \"@akanjs/config\";\n\nimport appInfo from \"./akan.app.json\";\nimport config from \"./akan.config\";\n\nexport default getNextConfig(config, appInfo);\n";
+export declare const defaultNextConfigFile: string;

package/src/types.d.ts

@@ -1,4 +1,6 @@
+import { CapacitorConfig } from "@capacitor/cli";
 import type { NextConfig } from "next";
+import { NextConfigFn } from "./nextConfig";
 export interface RunnerProps {
     type: "app" | "lib";
     name: string;
@@ -33,7 +35,7 @@ export interface AppConfigResult {
     };
     frontend: {
         docker: DockerConfig;
-        nextConfig: NextConfig | (() => Promise<NextConfig> | NextConfig);
+        nextConfig: NextConfig | NextConfigFn | ((baseConfig?: NextConfig) => Promise<NextConfig> | NextConfig | NextConfigFn);
         routes?: {
             basePath?: string;
             domains: {
@@ -44,11 +46,9 @@ export interface AppConfigResult {
         }[];
         explicitDependencies: ExplicitDependencies;
     };
-    mobile: {
-        appName: string;
-        bundleId: string;
-        version?: string;
-        buildNum?: number;
+    mobile: CapacitorConfig & {
+        version: string;
+        buildNum: number;
     };
 }
 export interface LibConfigResult {