@akanjs/config 0.9.14 → 0.9.16

package/cjs/src/akanConfig.js

@@ -35,6 +35,7 @@ __export(akanConfig_exports, {
   makeLibConfig: () => makeLibConfig
 });
 module.exports = __toCommonJS(akanConfig_exports);
+var import_config = require("@akanjs/config");
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_nextConfig = require("./nextConfig");
@@ -113,14 +114,16 @@ const getDockerRunScripts = (runs) => {
     if (typeof run === "string")
       return `RUN ${run}`;
     else
-      return Object.entries(run).map(([arch, script]) => `RUN if [ "$TARGETARCH" = "${arch}" ]; then ${script}; fi`).join("\n");
+      return Object.entries(run).map(
+        ([arch, script]) => `RUN if [ "$TARGETARCH" = "${arch}" ]; then   ${script}; fi`
+      ).join("\n");
   });
 };
-const getDockerImageScript = (image) => {
+const getDockerImageScript = (image, defaultImage) => {
   if (typeof image === "string")
     return `FROM ${image}`;
   else
-    return Object.entries(image).map(([arch, image2]) => `FROM ${image2} AS ${arch}`).join("\n");
+    return import_config.archs.map((arch) => `FROM ${image[arch] ?? defaultImage} AS ${arch}`).join("\n");
 };
 const makeDockerfile = (type, config, props) => {
   const { name, repoName, serveDomain, env } = props;
@@ -129,7 +132,7 @@ const makeDockerfile = (type, config, props) => {
   const preRunScripts = getDockerRunScripts(config.preRuns ?? []);
   const postRunScripts = getDockerRunScripts(config.postRuns ?? []);
   if (type === "backend") {
-    const imageScript = config.image ? getDockerImageScript(config.image) : "FROM node:22-slim";
+    const imageScript = config.image ? getDockerImageScript(config.image, "node:22-slim") : "FROM node:22-slim";
     const command = config.command ?? ["node", "main.js"];
     const content = `${imageScript}
 RUN ln -sf /usr/share/zoneinfo/Asia/Seoul /etc/localtime
@@ -143,7 +146,7 @@ WORKDIR /workspace
 COPY ./package.json ./package.json
 RUN npx pnpm i --prod
 COPY . .
-ENV PORT 8080
+ENV PORT=8080
 ENV NODE_OPTIONS=--max_old_space_size=8192
 ENV NEXT_PUBLIC_REPO_NAME=${repoName}
 ENV NEXT_PUBLIC_SERVE_DOMAIN=${serveDomain}
@@ -160,7 +163,7 @@ CMD [${command.map((c) => `"${c}"`).join(",")}]`;
       command
     };
   } else {
-    const imageScript = config.image ? getDockerImageScript(config.image) : "FROM node:22-alpine";
+    const imageScript = config.image ? getDockerImageScript(config.image, "node:22-alpine") : "FROM node:22-alpine";
     const command = config.command ?? ["npm", "start"];
     const content = `${imageScript}
 RUN ln -sf /usr/share/zoneinfo/Asia/Seoul /etc/localtime

package/cjs/src/types.js

@@ -17,9 +17,11 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var types_exports = {};
 __export(types_exports, {
+  archs: () => archs,
   getDefaultFileScan: () => getDefaultFileScan
 });
 module.exports = __toCommonJS(types_exports);
+const archs = ["amd64", "arm64"];
 const getDefaultFileScan = () => ({
   constants: {
     databases: [],

package/esm/src/akanConfig.js

@@ -1,3 +1,6 @@
+import {
+  archs
+} from "@akanjs/config";
 import fs from "fs";
 import path from "path";
 import { withBase } from "./nextConfig";
@@ -76,14 +79,16 @@ const getDockerRunScripts = (runs) => {
     if (typeof run === "string")
       return `RUN ${run}`;
     else
-      return Object.entries(run).map(([arch, script]) => `RUN if [ "$TARGETARCH" = "${arch}" ]; then ${script}; fi`).join("\n");
+      return Object.entries(run).map(
+        ([arch, script]) => `RUN if [ "$TARGETARCH" = "${arch}" ]; then   ${script}; fi`
+      ).join("\n");
   });
 };
-const getDockerImageScript = (image) => {
+const getDockerImageScript = (image, defaultImage) => {
   if (typeof image === "string")
     return `FROM ${image}`;
   else
-    return Object.entries(image).map(([arch, image2]) => `FROM ${image2} AS ${arch}`).join("\n");
+    return archs.map((arch) => `FROM ${image[arch] ?? defaultImage} AS ${arch}`).join("\n");
 };
 const makeDockerfile = (type, config, props) => {
   const { name, repoName, serveDomain, env } = props;
@@ -92,7 +97,7 @@ const makeDockerfile = (type, config, props) => {
   const preRunScripts = getDockerRunScripts(config.preRuns ?? []);
   const postRunScripts = getDockerRunScripts(config.postRuns ?? []);
   if (type === "backend") {
-    const imageScript = config.image ? getDockerImageScript(config.image) : "FROM node:22-slim";
+    const imageScript = config.image ? getDockerImageScript(config.image, "node:22-slim") : "FROM node:22-slim";
     const command = config.command ?? ["node", "main.js"];
     const content = `${imageScript}
 RUN ln -sf /usr/share/zoneinfo/Asia/Seoul /etc/localtime
@@ -106,7 +111,7 @@ WORKDIR /workspace
 COPY ./package.json ./package.json
 RUN npx pnpm i --prod
 COPY . .
-ENV PORT 8080
+ENV PORT=8080
 ENV NODE_OPTIONS=--max_old_space_size=8192
 ENV NEXT_PUBLIC_REPO_NAME=${repoName}
 ENV NEXT_PUBLIC_SERVE_DOMAIN=${serveDomain}
@@ -123,7 +128,7 @@ CMD [${command.map((c) => `"${c}"`).join(",")}]`;
       command
     };
   } else {
-    const imageScript = config.image ? getDockerImageScript(config.image) : "FROM node:22-alpine";
+    const imageScript = config.image ? getDockerImageScript(config.image, "node:22-alpine") : "FROM node:22-alpine";
     const command = config.command ?? ["npm", "start"];
     const content = `${imageScript}
 RUN ln -sf /usr/share/zoneinfo/Asia/Seoul /etc/localtime

package/esm/src/types.js

@@ -1,3 +1,4 @@
+const archs = ["amd64", "arm64"];
 const getDefaultFileScan = () => ({
   constants: {
     databases: [],
@@ -34,5 +35,6 @@ const getDefaultFileScan = () => ({
   }
 });
 export {
+  archs,
   getDefaultFileScan
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/config",
-  "version": "0.9.14",
+  "version": "0.9.16",
   "sourceType": "module",
   "module": {
     "access": "public"

package/src/akanConfig.d.ts

@@ -1,4 +1,4 @@
-import type { AppConfig, AppConfigResult, DeepPartial, DockerConfig, LibConfigResult, RunnerProps } from "@akanjs/config";
+import { type AppConfig, type AppConfigResult, type DeepPartial, type DockerConfig, type LibConfigResult, type RunnerProps } from "@akanjs/config";
 import type { NextConfig } from "next";
 export declare const makeAppConfig: (config: DeepPartial<AppConfigResult>, props: RunnerProps) => AppConfigResult;
 export declare const getAppConfig: (appRoot: string, props: RunnerProps) => Promise<AppConfigResult>;

package/src/types.d.ts

@@ -7,7 +7,8 @@ export interface RunnerProps {
     env: "testing" | "local" | "debug" | "develop" | "main";
     command?: string;
 }
-export type Arch = "amd64" | "arm64";
+export declare const archs: readonly ["amd64", "arm64"];
+export type Arch = (typeof archs)[number];
 export type ExplicitDependencies = string[] | {
     [key in Arch]: string[];
 };