Merge branch 'Acode-Foundation:main' into main

Author: hyperz111

.babelrc

@@ -6,7 +6,8 @@
         "useBuiltIns": "entry",
         "corejs": "3.22"
       }
-    ]
+    ],
+    "@babel/preset-typescript"
   ],
   "plugins": [
     "html-tag-js/jsx/jsx-to-tag.js",

.vscode/settings.json

@@ -372,5 +372,8 @@
     "wxss",
     "xquery",
     "Zeek"
-  ]
-}
+  ],
+  "[javascript]": {
+    "editor.defaultFormatter": "biomejs.biome"
+  }
+}

bun.lock

@@ -13,6 +13,7 @@
     "lint": "biome lint --write",
     "format": "biome format --write",
     "check": "biome check --write",
+    "typecheck": "tsc --noEmit",
     "updateAce": "node ./utils/updateAce.js"
   },
   "keywords": [
@@ -36,12 +37,12 @@
       "cordova-plugin-buildinfo": {},
       "cordova-plugin-browser": {},
       "cordova-plugin-sftp": {},
-      "cordova-plugin-system": {},
       "com.foxdebug.acode.rk.exec.proot": {},
       "com.foxdebug.acode.rk.exec.terminal": {},
       "com.foxdebug.acode.rk.customtabs": {},
       "com.foxdebug.acode.rk.plugin.plugincontext": {},
-      "com.foxdebug.acode.rk.auth": {}
+      "com.foxdebug.acode.rk.auth": {},
+      "cordova-plugin-system": {}
     },
     "platforms": [
       "android"
@@ -56,15 +57,18 @@
   },
   "homepage": "https://github.com/deadlyjack/acode#readme",
   "devDependencies": {
-    "@babel/core": "^7.28.0",
-    "@babel/plugin-transform-runtime": "^7.28.0",
-    "@babel/preset-env": "^7.28.0",
-    "@babel/runtime": "^7.28.2",
-    "@babel/runtime-corejs3": "^7.28.2",
+    "@babel/core": "^7.28.5",
+    "@babel/plugin-transform-runtime": "^7.28.5",
+    "@babel/preset-env": "^7.28.5",
+    "@babel/preset-typescript": "^7.28.5",
+    "@babel/runtime": "^7.28.4",
+    "@babel/runtime-corejs3": "^7.28.4",
     "@biomejs/biome": "2.1.4",
+    "@rspack/cli": "^1.7.0",
+    "@rspack/core": "^1.7.0",
     "@types/ace": "^0.0.52",
     "@types/url-parse": "^1.4.11",
-    "autoprefixer": "^10.4.21",
+    "autoprefixer": "^10.4.22",
     "babel-loader": "^10.0.0",
     "com.foxdebug.acode.rk.auth": "file:src/plugins/auth",
     "com.foxdebug.acode.rk.customtabs": "file:src/plugins/custom-tabs",
@@ -76,8 +80,8 @@
     "cordova-plugin-advanced-http": "^3.3.1",
     "cordova-plugin-browser": "file:src/plugins/browser",
     "cordova-plugin-buildinfo": "file:src/plugins/cordova-plugin-buildinfo",
-    "cordova-plugin-device": "^2.0.3",
-    "cordova-plugin-file": "^8.0.1",
+    "cordova-plugin-device": "^2.1.0",
+    "cordova-plugin-file": "^8.1.3",
     "cordova-plugin-ftp": "file:src/plugins/ftp",
     "cordova-plugin-iap": "file:src/plugins/iap",
     "cordova-plugin-sdcard": "file:src/plugins/sdcard",
@@ -86,21 +90,52 @@
     "cordova-plugin-system": "file:src/plugins/system",
     "cordova-plugin-websocket": "file:src/plugins/websocket",
     "css-loader": "^7.1.2",
-    "mini-css-extract-plugin": "^2.9.3",
+    "mini-css-extract-plugin": "^2.9.4",
     "path-browserify": "^1.0.1",
-    "postcss-loader": "^8.1.1",
-    "prettier": "^3.6.2",
-    "prettier-plugin-java": "^2.7.4",
+    "postcss-loader": "^8.2.0",
+    "prettier": "^3.7.4",
+    "prettier-plugin-java": "^2.7.7",
     "raw-loader": "^4.0.2",
-    "sass": "^1.90.0",
-    "sass-loader": "^16.0.5",
+    "sass": "^1.94.2",
+    "sass-loader": "^16.0.6",
     "style-loader": "^4.0.0",
     "terminal": "^0.1.4",
+    "ts-loader": "^9.5.4",
+    "typescript": "^5.9.3",
+    "vscode-languageserver-types": "^3.17.5",
     "webpack": "^5.105.0",
     "webpack-cli": "^6.0.1"
   },
   "dependencies": {
+    "@codemirror/autocomplete": "^6.20.0",
+    "@codemirror/commands": "^6.10.0",
+    "@codemirror/lang-cpp": "^6.0.3",
+    "@codemirror/lang-css": "^6.3.1",
+    "@codemirror/lang-go": "^6.0.1",
+    "@codemirror/lang-html": "^6.4.11",
+    "@codemirror/lang-java": "^6.0.2",
+    "@codemirror/lang-javascript": "^6.2.4",
+    "@codemirror/lang-json": "^6.0.2",
+    "@codemirror/lang-markdown": "^6.5.0",
+    "@codemirror/lang-php": "^6.0.2",
+    "@codemirror/lang-python": "^6.2.1",
+    "@codemirror/lang-rust": "^6.0.2",
+    "@codemirror/lang-sass": "^6.0.2",
+    "@codemirror/lang-vue": "^0.1.3",
+    "@codemirror/lang-xml": "^6.1.0",
+    "@codemirror/lang-yaml": "^6.1.2",
+    "@codemirror/language": "^6.11.3",
+    "@codemirror/language-data": "^6.5.2",
+    "@codemirror/legacy-modes": "^6.5.2",
+    "@codemirror/lint": "^6.9.2",
+    "@codemirror/lsp-client": "^6.2.1",
+    "@codemirror/search": "^6.5.11",
+    "@codemirror/state": "^6.5.2",
+    "@codemirror/theme-one-dark": "^6.1.3",
+    "@codemirror/view": "^6.38.8",
     "@deadlyjack/ajax": "^1.2.6",
+    "@emmetio/codemirror6-plugin": "^0.4.0",
+    "@lezer/highlight": "^1.2.3",
     "@ungap/custom-elements": "^1.3.0",
     "@xterm/addon-attach": "^0.11.0",
     "@xterm/addon-fit": "^0.10.0",
@@ -112,15 +147,17 @@
     "@xterm/xterm": "^5.5.0",
     "acorn": "^8.15.0",
     "autosize": "^6.0.1",
+    "codemirror": "^6.0.2",
     "cordova": "13.0.0",
-    "core-js": "^3.45.0",
+    "core-js": "^3.47.0",
     "crypto-js": "^4.2.0",
     "dayjs": "^1.11.19",
-    "dompurify": "^3.2.6",
+    "dompurify": "^3.3.0",
     "escape-string-regexp": "^5.0.0",
-    "filesize": "^11.0.2",
-    "html-tag-js": "^2.4.15",
-    "js-base64": "^3.7.7",
+    "esprima": "^4.0.1",
+    "filesize": "^11.0.13",
+    "html-tag-js": "^2.4.16",
+    "js-base64": "^3.7.8",
     "jszip": "^3.10.1",
     "markdown-it": "^14.1.1",
     "markdown-it-anchor": "^9.2.0",

package-lock.json

@@ -1,4 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources xmlns:tools="http://schemas.android.com/tools">
   <color name="cdv_splashscreen_background">#3a3e54</color>
-</resources>
+  <color name="teardrop">#FFFFFF</color>
+</resources>

package.json

@@ -4,10 +4,14 @@
         <item name="windowSplashScreenBackground">@color/ic_splash_background</item>
         <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
         <item name="windowSplashScreenAnimationDuration">200</item>
-        <item name="postSplashScreenTheme">@style/Theme.AppCompat.DayNight.NoActionBar</item>
+        <item name="postSplashScreenTheme">@style/Theme.App.Activity</item>
         <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
     </style>
     <style name="Theme.App.Activity" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <item name="colorAccent">@color/teardrop</item>
+        <item name="android:colorAccent">@color/teardrop</item>
+        <item name="colorControlActivated">@color/teardrop</item>
+        <item name="android:colorControlActivated">@color/teardrop</item>
         <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
     </style>
 </resources>

res/android/values/colors.xml

@@ -0,0 +1,147 @@
+const path = require('path');
+const { rspack } = require('@rspack/core');
+
+module.exports = (env, options) => {
+  const { mode = 'development' } = options;
+  const prod = mode === 'production';
+
+  const rules = [
+    // TypeScript/TSX files - Custom JSX loader + SWC
+    {
+      test: /\.tsx?$/,
+      exclude: /node_modules/,
+      use: [
+        {
+          loader: 'builtin:swc-loader',
+          options: {
+            jsc: {
+              parser: {
+                syntax: 'typescript',
+                tsx: false,
+              },
+              transform: {
+                // react: {
+                //   pragma: 'tag',
+                //   pragmaFrag: 'Array',
+                //   throwIfNamespace: false,
+                //   development: false,
+                //   useBuiltins: false,
+                //   runtime: 'classic',
+                // },
+              },
+              target: 'es2015',
+            },
+          },
+        },
+        path.resolve(__dirname, 'utils/custom-loaders/html-tag-jsx-loader.js'),
+      ],
+    },
+    // JavaScript files
+    {
+      test: /\.m?js$/,
+      oneOf: [
+        // Node modules - use builtin:swc-loader only
+        {
+          include: /node_modules/,
+          use: [
+            {
+              loader: 'builtin:swc-loader',
+              options: {
+                jsc: {
+                  parser: {
+                    syntax: 'ecmascript',
+                  },
+                  target: 'es2015',
+                },
+              },
+            },
+          ],
+        },
+        // Source JS files - Custom JSX loader + SWC (JSX will be removed first)
+        {
+          use: [
+            {
+              loader: 'builtin:swc-loader',
+              options: {
+                jsc: {
+                  parser: {
+                    syntax: 'ecmascript',
+                    jsx: false,
+                  },
+                  target: 'es2015',
+                },
+              },
+            },
+            path.resolve(__dirname, 'utils/custom-loaders/html-tag-jsx-loader.js'),
+          ],
+        },
+      ],
+    },
+    // Handlebars and Markdown files
+    {
+      test: /\.(hbs|md)$/,
+      type: 'asset/source',
+    },
+    // Module CSS/SCSS (with .m prefix)
+    {
+      test: /\.m\.(sa|sc|c)ss$/,
+      use: [
+        'raw-loader',
+        'postcss-loader',
+        'sass-loader',
+      ],
+      type: 'javascript/auto',
+    },
+    // Asset files
+    {
+      test: /\.(png|svg|jpg|jpeg|ico|ttf|webp|eot|woff|webm|mp4|wav)(\?.*)?$/,
+      type: 'asset/resource',
+    },
+    // Regular CSS/SCSS files
+    {
+      test: /(?<!\.m)\.(sa|sc|c)ss$/,
+      use: [
+        rspack.CssExtractRspackPlugin.loader,
+        'css-loader',
+        'postcss-loader',
+        'sass-loader',
+      ],
+      type: 'javascript/auto',
+    },
+  ];
+
+  const main = {
+    mode,
+    entry: {
+      main: './src/main.js',
+      console: './src/lib/console.js',
+      searchInFilesWorker: './src/sidebarApps/searchInFiles/worker.js',
+    },
+    output: {
+      path: path.resolve(__dirname, 'www/build/'),
+      filename: '[name].js',
+      chunkFilename: '[name].chunk.js',
+      assetModuleFilename: '[name][ext]',
+      publicPath: '/build/',
+      clean: true,
+    },
+    module: {
+      rules,
+    },
+    resolve: {
+      extensions: ['.ts', '.tsx', '.js', '.mjs', '.json'],
+      fallback: {
+        path: require.resolve('path-browserify'),
+        crypto: false,
+      },
+      modules: ['node_modules', 'src'],
+    },
+    plugins: [
+      new rspack.CssExtractRspackPlugin({
+        filename: '[name].css',
+      }),
+    ],
+  };
+
+  return [main];
+};