@akanjs/cli 0.9.16 → 0.9.18

package/cjs/index.js

@@ -801,15 +801,17 @@ var makeDockerfile = (type, config, props) => {
     const command = config.command ?? ["node", "main.js"];
     const content = `${imageScript}
 RUN ln -sf /usr/share/zoneinfo/Asia/Seoul /etc/localtime
-RUN apt-get update && apt-get upgrade -y 
-RUN apt-get install -y git redis build-essential python3 ca-certificates fonts-liberation libappindicator3-1 libasound2 libatk-bridge2.0-0 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgbm1 libgcc1 libglib2.0-0 libgtk-3-0 libnspr4 libnss3 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 lsb-release wget xdg-utils udev ffmpeg && rm -rf /var/lib/apt/lists/*
+RUN apt update && apt upgrade -y 
+RUN apt install -y git redis build-essential python3 ca-certificates fonts-liberation libappindicator3-1 libasound2 libatk-bridge2.0-0 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgbm1 libgcc1 libglib2.0-0 libgtk-3-0 libnspr4 libnss3 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 lsb-release wget xdg-utils udev ffmpeg
 ARG TARGETARCH
-RUN if [ "$TARGETARCH" = "amd64" ]; then       wget https://fastdl.mongodb.org/tools/db/mongodb-database-tools-debian92-x86_64-100.3.1.deb &&       apt-get install -y ./mongodb-database-tools-*.deb &&       rm -f mongodb-database-tools-*.deb;     fi
+RUN if [ "$TARGETARCH" = "amd64" ]; then       wget https://fastdl.mongodb.org/tools/db/mongodb-database-tools-debian92-x86_64-100.3.1.deb &&       apt install -y ./mongodb-database-tools-*.deb &&       rm -f mongodb-database-tools-*.deb;     fi
 ${preRunScripts.join("\n")}
+RUN rm -rf /var/lib/apt/lists/*
 RUN mkdir -p /workspace
 WORKDIR /workspace
 COPY ./package.json ./package.json
 RUN npx pnpm i --prod
+${postRunScripts.join("\n")}
 COPY . .
 ENV PORT=8080
 ENV NODE_OPTIONS=--max_old_space_size=8192
@@ -818,7 +820,6 @@ ENV NEXT_PUBLIC_SERVE_DOMAIN=${serveDomain}
 ENV NEXT_PUBLIC_APP_NAME=${name}
 ENV NEXT_PUBLIC_ENV=${env}
 ENV NEXT_PUBLIC_OPERATION_MODE=cloud
-${postRunScripts.join("\n")}
 CMD [${command.map((c) => `"${c}"`).join(",")}]`;
     return {
       content,
@@ -4048,7 +4049,7 @@ var ApplicationRunner = class {
     const { env } = await this.#prepareCommand(app, "build", "frontend");
     const akanConfig = await app.getConfig("build");
     await app.spawn("npx", ["next", "build", "--no-lint"], { env, ...spawnOptions });
-    const buildResult = await esbuild2.build({
+    const buildResult = process.env.USE_AKANJS_PKGS === "true" ? await esbuild2.build({
       entryPoints: [`${app.cwdPath}/next.config.ts`],
       outdir: `${app.dist.cwdPath}/frontend`,
       bundle: true,
@@ -4057,7 +4058,11 @@ var ApplicationRunner = class {
       format: "esm",
       write: false,
       logLevel: "warning"
-    });
+    }) : {
+      outputFiles: [
+        { path: `${app.dist.cwdPath}/frontend/next.config.ts`, text: app.readFile("next.config.ts") }
+      ]
+    };
     const rootPackageJson = app.workspace.readJson("package.json");
     const dependencies = extractDependencies(buildResult.outputFiles, rootPackageJson, ["next", "react", "react-dom"]);
     buildResult.outputFiles.map((file) => app.dist.writeFile(file.path, file.text));

package/esm/index.js

@@ -781,15 +781,17 @@ var makeDockerfile = (type, config, props) => {
     const command = config.command ?? ["node", "main.js"];
     const content = `${imageScript}
 RUN ln -sf /usr/share/zoneinfo/Asia/Seoul /etc/localtime
-RUN apt-get update && apt-get upgrade -y 
-RUN apt-get install -y git redis build-essential python3 ca-certificates fonts-liberation libappindicator3-1 libasound2 libatk-bridge2.0-0 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgbm1 libgcc1 libglib2.0-0 libgtk-3-0 libnspr4 libnss3 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 lsb-release wget xdg-utils udev ffmpeg && rm -rf /var/lib/apt/lists/*
+RUN apt update && apt upgrade -y 
+RUN apt install -y git redis build-essential python3 ca-certificates fonts-liberation libappindicator3-1 libasound2 libatk-bridge2.0-0 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgbm1 libgcc1 libglib2.0-0 libgtk-3-0 libnspr4 libnss3 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 lsb-release wget xdg-utils udev ffmpeg
 ARG TARGETARCH
-RUN if [ "$TARGETARCH" = "amd64" ]; then       wget https://fastdl.mongodb.org/tools/db/mongodb-database-tools-debian92-x86_64-100.3.1.deb &&       apt-get install -y ./mongodb-database-tools-*.deb &&       rm -f mongodb-database-tools-*.deb;     fi
+RUN if [ "$TARGETARCH" = "amd64" ]; then       wget https://fastdl.mongodb.org/tools/db/mongodb-database-tools-debian92-x86_64-100.3.1.deb &&       apt install -y ./mongodb-database-tools-*.deb &&       rm -f mongodb-database-tools-*.deb;     fi
 ${preRunScripts.join("\n")}
+RUN rm -rf /var/lib/apt/lists/*
 RUN mkdir -p /workspace
 WORKDIR /workspace
 COPY ./package.json ./package.json
 RUN npx pnpm i --prod
+${postRunScripts.join("\n")}
 COPY . .
 ENV PORT=8080
 ENV NODE_OPTIONS=--max_old_space_size=8192
@@ -798,7 +800,6 @@ ENV NEXT_PUBLIC_SERVE_DOMAIN=${serveDomain}
 ENV NEXT_PUBLIC_APP_NAME=${name}
 ENV NEXT_PUBLIC_ENV=${env}
 ENV NEXT_PUBLIC_OPERATION_MODE=cloud
-${postRunScripts.join("\n")}
 CMD [${command.map((c) => `"${c}"`).join(",")}]`;
     return {
       content,
@@ -4030,7 +4031,7 @@ var ApplicationRunner = class {
     const { env } = await this.#prepareCommand(app, "build", "frontend");
     const akanConfig = await app.getConfig("build");
     await app.spawn("npx", ["next", "build", "--no-lint"], { env, ...spawnOptions });
-    const buildResult = await esbuild2.build({
+    const buildResult = process.env.USE_AKANJS_PKGS === "true" ? await esbuild2.build({
       entryPoints: [`${app.cwdPath}/next.config.ts`],
       outdir: `${app.dist.cwdPath}/frontend`,
       bundle: true,
@@ -4039,7 +4040,11 @@ var ApplicationRunner = class {
       format: "esm",
       write: false,
       logLevel: "warning"
-    });
+    }) : {
+      outputFiles: [
+        { path: `${app.dist.cwdPath}/frontend/next.config.ts`, text: app.readFile("next.config.ts") }
+      ]
+    };
     const rootPackageJson = app.workspace.readJson("package.json");
     const dependencies = extractDependencies(buildResult.outputFiles, rootPackageJson, ["next", "react", "react-dom"]);
     buildResult.outputFiles.map((file) => app.dist.writeFile(file.path, file.text));

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "sourceType": "module",
   "name": "@akanjs/cli",
-  "version": "0.9.16",
+  "version": "0.9.18",
   "bin": {
     "akan": "esm/index.js"
   },