Merge branch 'main' into ajit/fix-fetch-auth-config

Author: UnschooledGamer

.devcontainer/Dockerfile

@@ -1,22 +1,19 @@
-# Acode Development Container - Standalone Docker Build
-# 
-# This Dockerfile is for MANUAL Docker builds (docker build/run).
-# Usage:
-#   docker build -t acode-dev .devcontainer/
+# Acode Development Container
+#
+# Devcontainer usage: automatic via devcontainer.json
+# Standalone usage:
+#   docker build --target standalone -t acode-dev .devcontainer/
 #   docker run -it -v $(pwd):/workspaces/acode acode-dev
 
-FROM mcr.microsoft.com/devcontainers/java:1-21-bullseye
+FROM mcr.microsoft.com/devcontainers/java:1-21-bullseye AS base
 
 ARG ANDROID_PLATFORM=36
 ARG ANDROID_BUILD_TOOLS=36.0.0
 ARG CMDLINE_TOOLS_VERSION=11076708
 ARG NODE_VERSION=22
 ARG GRADLE_VERSION=8.11
 
-ENV ANDROID_HOME=/opt/android-sdk
-ENV ANDROID_SDK_ROOT=/opt/android-sdk
 ENV GRADLE_HOME=/opt/gradle
-ENV PATH="${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/platform-tools:${GRADLE_HOME}/bin"
 
 # removes broken yarn repo present in base image
 RUN rm -f /etc/apt/sources.list.d/yarn.list
@@ -33,17 +30,26 @@ RUN wget -q "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-
     && rm /tmp/gradle.zip \
     && ln -s /opt/gradle-${GRADLE_VERSION} ${GRADLE_HOME}
 
-# Install fnm and Node.js
-# Not required, mostly. When dev containers are used. 
-# ENV FNM_DIR=/usr/local/fnm
-# ENV PATH="${FNM_DIR}:${PATH}"
-# RUN curl -fsSL https://fnm.vercel.app/install | bash -s -- --install-dir "${FNM_DIR}" --skip-shell \
-#    && eval "$(${FNM_DIR}/fnm env)" \
-#    && fnm install ${NODE_VERSION} \
-#    && fnm default ${NODE_VERSION} \
-#    && npm install -g pnpm
+ENV PATH="${PATH}:${GRADLE_HOME}/bin"
+
+WORKDIR /workspaces/acode
+
+LABEL org.opencontainers.image.authors="Acode Foundation <https://github.com/Acode-Foundation/Acode>"
+LABEL description="Development environment for building Acode - Code Editor for Android"
+
 
-# ENV PATH="${FNM_DIR}/aliases/default/bin:${PATH}"
+# Devcontainer stage
+# Android SDK and Node handled by devcontainer features.
+FROM base AS devcontainer
+
+
+# Standalone stage 
+# Includes Android SDK and Node/pnpm for plain docker build/run usage.
+FROM base AS standalone
+
+ENV ANDROID_HOME=/usr/local/lib/android
+ENV ANDROID_SDK_ROOT=/usr/local/lib/android
+ENV PATH="${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/build-tools/${ANDROID_BUILD_TOOLS}"
 
 # Install Android SDK
 RUN mkdir -p ${ANDROID_HOME}/cmdline-tools \
@@ -59,7 +65,12 @@ RUN mkdir -p ${ANDROID_HOME}/cmdline-tools \
         "platforms;android-${ANDROID_PLATFORM}" \
         "build-tools;${ANDROID_BUILD_TOOLS}"
 
-WORKDIR /workspaces/acode
+# Install fnm and Node.js
+ENV FNM_DIR=/usr/local/fnm
+RUN curl -fsSL https://fnm.vercel.app/install | bash -s -- --install-dir "${FNM_DIR}" --skip-shell \
+    && eval "$(${FNM_DIR}/fnm env)" \
+    && fnm install ${NODE_VERSION} \
+    && fnm default ${NODE_VERSION} \
+    && npm install -g pnpm
 
-LABEL maintainer="Acode Foundation"
-LABEL description="Development environment for building Acode - Code Editor for Android"
+ENV PATH="${FNM_DIR}/aliases/default/bin:${PATH}"

.devcontainer/devcontainer.json

@@ -1,22 +1,25 @@
 {
   "name": "Acode Development",
   "build": {
-    "dockerfile": "Dockerfile"
+    "dockerfile": "Dockerfile",
+    "target": "devcontainer"
   },
 
   "containerEnv": {
     "JAVA_HOME": "/usr/local/openjdk-21"
   },
   "remoteEnv": {
-    "JAVA_HOME": "/usr/local/openjdk-21"
+    "JAVA_HOME": "/usr/local/openjdk-21",
+    "ANDROID_SDK_ROOT": "${containerEnv:ANDROID_HOME}",
+    "PATH": "${containerEnv:PATH}:${containerEnv:ANDROID_HOME}/build-tools/36.0.0"
   },
 
   "features": {
     "ghcr.io/nordcominc/devcontainer-features/android-sdk:1": {
       "platform": "36",
       "build_tools": "36.0.0"
     },
-    "ghcr.io/devcontainers/features/node:1": {
+    "ghcr.io/devcontainers/features/node:2.0": {
       "nodeGypDependencies": false,
       "installYarnUsingApt": false,
       "version": "lts",

CONTRIBUTING.md

@@ -6,7 +6,7 @@ Thank you for your interest in contributing to Acode! This guide will help you g
 
 ### Option 1: DevContainer (Recommended)
 
-1. Install the [Dev Containers extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) in VS Code or other editors that support DevContainers.
+1. Install the [Dev Containers extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) in VS Code or other editors that support [DevContainers](https://containers.dev/).
 
 2. Clone and open the repository:
    ```bash
@@ -28,6 +28,9 @@ Thank you for your interest in contributing to Acode! This guide will help you g
 
 ### Option 2: Docker CLI (For Any Editor)
 
+> [!NOTE]
+> If you try to use Podman, Kindly note that it would not work properly until https://github.com/containers/buildah/pull/5845 is merged/implemented in Podman.
+
 If your editor doesn't support DevContainers, you can use Docker directly:
 
 ```bash
@@ -36,7 +39,7 @@ git clone https://github.com/Acode-Foundation/Acode.git
 cd Acode
 
 # Build the Docker image from our Dockerfile
-docker build -t acode-dev .devcontainer/
+docker build --target standalone -t acode-dev .devcontainer/
 
 # Run the container with your code mounted
 docker run -it --rm \

src/components/terminal/terminalManager.js

@@ -442,12 +442,12 @@ class TerminalManager {
 			const installResult = await Terminal.install(
 				(message) => {
 					// Remove stdout/stderr prefix for
-					const cleanMessage = message.replace(/^(stdout|stderr)\s+/, "");
+					const cleanMessage = this.formatInstallLog(message);
 					installTerminal.component.write(`${cleanMessage}\r\n`);
 				},
-				(error) => {
+				(...errorParts) => {
 					// Remove stdout/stderr prefix
-					const cleanError = error.replace(/^(stdout|stderr)\s+/, "");
+					const cleanError = this.formatInstallLog(errorParts);
 					installTerminal.component.write(
 						`\x1b[31mError: ${cleanError}\x1b[0m\r\n`,
 					);
@@ -458,21 +458,34 @@ class TerminalManager {
 			if (installResult === true) {
 				return { success: true };
 			} else {
+				const error =
+					Terminal.lastInstallError ||
+					"Terminal installation failed - process did not exit with code 0";
 				return {
 					success: false,
-					error:
-						"Terminal installation failed - process did not exit with code 0",
+					error,
 				};
 			}
 		} catch (error) {
 			console.error("Terminal installation failed:", error);
 			return {
 				success: false,
-				error: `Terminal installation failed: ${error.message}`,
+				error: `Terminal installation failed: ${this.formatInstallLog(error)}`,
 			};
 		}
 	}
 
+	formatInstallLog(value) {
+		const values = Array.isArray(value) ? value : [value];
+		const message = values
+			.filter((entry) => entry != null)
+			.map((entry) => Terminal.formatError(entry))
+			.filter(Boolean)
+			.join(" ");
+
+		return message.replace(/^(stdout|stderr)\s+/, "") || "Unknown error";
+	}
+
 	/**
 	 * Create a terminal for showing installation progress
 	 * @returns {Promise<object>} Installation terminal instance

src/lang/id-id.json

@@ -726,8 +726,8 @@
 	"close other tabs": "Tutup Lainnya",
 	"auto close tags": "Penutup tag otomatis",
 	"settings-info-editor-auto-close-tags": "Menyisipkan tag penutup di berkas HTML, XML, Vue, Angular, dan templat PHP secara otomatis.",
-	"ui zoom": "UI zoom",
-	"settings-info-app-ui-zoom": "Scale text across the Acode interface.",
+	"ui zoom": "Pembesaran UI",
+	"settings-info-app-ui-zoom": "Skalakan teks di seluruh antarmuka Acode."
 	"plugin-not-supported": "Plugin not supported",
 	"plugin-not-supported-info": "The plugin was created for older version of Acode."
-}
+}

src/lang/zh-cn.json

@@ -723,10 +723,10 @@
 	"close tabs to right": "关闭右侧标签页",
 	"close tabs to left": "关闭左侧标签页",
 	"close other tabs": "关闭其他标签页",
-	"auto close tags": "Auto close tags",
-	"settings-info-editor-auto-close-tags": "Automatically insert closing tags in HTML, XML, Vue, Angular, and PHP template files.",
-	"ui zoom": "UI zoom",
-	"settings-info-app-ui-zoom": "Scale text across the Acode interface.",
-	"plugin-not-supported": "Plugin not supported",
+	"auto close tags": "自动补全闭合标签",
+	"settings-info-editor-auto-close-tags": "在 HTML、XML、Vue、Angular 和 PHP 模板文件中自动插入闭合标签。",
+	"ui zoom": "UI 缩放",
+	"settings-info-app-ui-zoom": "缩放所有 Acode 界面文字。"
+  "plugin-not-supported": "Plugin not supported",
 	"plugin-not-supported-info": "The plugin was created for older version of Acode."
-}
+}

src/lang/zh-hant.json

@@ -723,10 +723,10 @@
 	"close tabs to right": "關閉右側標籤頁",
 	"close tabs to left": "關閉左側標籤頁",
 	"close other tabs": "關閉其他標籤頁",
-	"auto close tags": "Auto close tags",
-	"settings-info-editor-auto-close-tags": "Automatically insert closing tags in HTML, XML, Vue, Angular, and PHP template files.",
-	"ui zoom": "UI zoom",
-	"settings-info-app-ui-zoom": "Scale text across the Acode interface.",
-	"plugin-not-supported": "Plugin not supported",
+	"auto close tags": "自動補全閉合標籤",
+	"settings-info-editor-auto-close-tags": "在 HTML、XML、Vue、Angular 和 PHP 模板文件中自動插入閉合標籤。",
+	"ui zoom": "UI 縮放",
+	"settings-info-app-ui-zoom": "縮放所有 Acode 介面文字。"
+  "plugin-not-supported": "Plugin not supported",
 	"plugin-not-supported-info": "The plugin was created for older version of Acode."
-}
+}