From 6aa3919640bef32d316147e1a1ce097b83564111 Mon Sep 17 00:00:00 2001 From: Ajit Kumar Date: Fri, 15 Mar 2024 10:00:18 +0530 Subject: [PATCH] v1.10.0 --- .vscode/plugins.json | 2 +- CHANGELOG.md | 4 +- config.xml | 2 +- package-lock.json | 80 +++++++++++++++++++++++++----------- package.json | 8 ++-- src/lib/run.js | 4 +- src/pages/plugin/plugin.js | 4 +- src/pages/plugins/plugins.js | 4 +- 8 files changed, 72 insertions(+), 36 deletions(-) diff --git a/.vscode/plugins.json b/.vscode/plugins.json index 626d8ad45..9d676fc05 100644 --- a/.vscode/plugins.json +++ b/.vscode/plugins.json @@ -1 +1 @@ -{"plugins":["cordova-plugin-buildinfo","cordova-plugin-device","cordova-plugin-file","cordova-plugin-ftp","cordova-plugin-iap","cordova-plugin-sdcard","cordova-plugin-server","cordova-plugin-sftp","cordova-plugin-system","cordova-clipboard","cordova-plugin-browser"]} \ No newline at end of file +{"plugins":["cordova-plugin-buildinfo","cordova-plugin-device","cordova-plugin-file","cordova-plugin-ftp","cordova-plugin-iap","cordova-plugin-sdcard","cordova-plugin-server","cordova-plugin-sftp","cordova-clipboard","cordova-plugin-browser","cordova-plugin-system"]} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 12ed6ce80..dba60b29f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,8 +6,10 @@ - [x] **Ace editor** | 937 - Updated Ace editor to version 1.32.7 - Fixes - - [x] **UI** | 942 + - [x] **UI** | 944 - Fixed status and navigation text color not visible in light theme. + - [x] **Plugin** | 944 + - Fixed updates for plugin not showing up. - Fixes - [x] **Text selection** | 937 diff --git a/config.xml b/config.xml index b828d57a6..e2faee7d0 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - diff --git a/package-lock.json b/package-lock.json index 6ca7aa66b..471b410e3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "com.foxdebug.acode", - "version": "1.8.5", + "version": "1.10.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "com.foxdebug.acode", - "version": "1.8.5", + "version": "1.10.0", "license": "MIT", "dependencies": { "@deadlyjack/ajax": "^1.2.6", @@ -21,8 +21,7 @@ "html-tag-js": "^1.4.3", "js-base64": "^3.7.7", "jszip": "^3.10.1", - "marked": "5.0.5", - "marked-mangle": "^1.1.7", + "markdown-it": "^14.0.0", "mime-types": "^2.1.35", "minimatch": "^9.0.3", "mustache": "^4.2.0", @@ -60,7 +59,7 @@ "prettier": "^3.2.5", "prettier-plugin-java": "^2.6.0", "raw-loader": "^4.0.2", - "sass": "^1.71.1", + "sass": "^1.72.0", "sass-loader": "^14.1.1", "style-loader": "^3.3.4", "webpack": "^5.90.3", @@ -4950,6 +4949,17 @@ "node": ">=10.13.0" } }, + "node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, "node_modules/env-paths": { "version": "2.2.1", "license": "MIT", @@ -6993,6 +7003,14 @@ "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", "dev": true }, + "node_modules/linkify-it": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz", + "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==", + "dependencies": { + "uc.micro": "^2.0.0" + } + }, "node_modules/loader-runner": { "version": "4.3.0", "dev": true, @@ -7140,22 +7158,20 @@ "node": ">=12" } }, - "node_modules/marked": { - "version": "5.0.5", - "license": "MIT", - "bin": { - "marked": "bin/marked.js" + "node_modules/markdown-it": { + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.0.0.tgz", + "integrity": "sha512-seFjF0FIcPt4P9U39Bq1JYblX0KZCjDLFFQPHpL5AzHpqPEKtosxmdq/LTVZnjfH7tjt9BxStm+wXcDBNuYmzw==", + "dependencies": { + "argparse": "^2.0.1", + "entities": "^4.4.0", + "linkify-it": "^5.0.0", + "mdurl": "^2.0.0", + "punycode.js": "^2.3.1", + "uc.micro": "^2.0.0" }, - "engines": { - "node": ">= 18" - } - }, - "node_modules/marked-mangle": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/marked-mangle/-/marked-mangle-1.1.7.tgz", - "integrity": "sha512-bLsXKovJEEs/Dl++TBPmjX8ALFmrH5G0doTs+BdDOloBKWYRf3acyJghce78SnwInDkNPJ6crubr4MnFG7urOA==", - "peerDependencies": { - "marked": ">=4 <13" + "bin": { + "markdown-it": "bin/markdown-it.mjs" } }, "node_modules/md5-file": { @@ -7168,6 +7184,11 @@ "node": ">=10.13.0" } }, + "node_modules/mdurl": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz", + "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==" + }, "node_modules/media-typer": { "version": "0.3.0", "license": "MIT", @@ -8583,6 +8604,14 @@ "node": ">=6" } }, + "node_modules/punycode.js": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz", + "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==", + "engines": { + "node": ">=6" + } + }, "node_modules/q": { "version": "1.5.1", "license": "MIT", @@ -9144,9 +9173,9 @@ "license": "MIT" }, "node_modules/sass": { - "version": "1.71.1", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.71.1.tgz", - "integrity": "sha512-wovtnV2PxzteLlfNzbgm1tFXPLoZILYAMJtvoXXkD7/+1uP41eKkIt1ypWq5/q2uT94qHjXehEYfmjKOvjL9sg==", + "version": "1.72.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.72.0.tgz", + "integrity": "sha512-Gpczt3WA56Ly0Mn8Sl21Vj94s1axi9hDIzDFn9Ph9x3C3p4nNyvsqJoQyVXKou6cBlfFWEgRW4rT8Tb4i3XnVA==", "dev": true, "dependencies": { "chokidar": ">=3.0.0 <4.0.0", @@ -9943,6 +9972,11 @@ "is-typedarray": "^1.0.0" } }, + "node_modules/uc.micro": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz", + "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==" + }, "node_modules/undici-types": { "version": "5.26.5", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", diff --git a/package.json b/package.json index e4d945a07..bfb062270 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,8 @@ { "name": "com.foxdebug.acode", "displayName": "Acode", - "version": "1.8.5", + "version": "1.10.0", "description": "Acode is a code editor for android", - "main": "index.js", "scripts": { "lang": "node ./utils/lang.js", "build": "sh utils/scripts/build.sh", @@ -75,7 +74,7 @@ "prettier": "^3.2.5", "prettier-plugin-java": "^2.6.0", "raw-loader": "^4.0.2", - "sass": "^1.71.1", + "sass": "^1.72.0", "sass-loader": "^14.1.1", "style-loader": "^3.3.4", "webpack": "^5.90.3", @@ -94,8 +93,7 @@ "html-tag-js": "^1.4.3", "js-base64": "^3.7.7", "jszip": "^3.10.1", - "marked": "5.0.5", - "marked-mangle": "^1.1.7", + "markdown-it": "^14.0.0", "mime-types": "^2.1.35", "minimatch": "^9.0.3", "mustache": "^4.2.0", diff --git a/src/lib/run.js b/src/lib/run.js index 77ae6c191..433c917bc 100644 --- a/src/lib/run.js +++ b/src/lib/run.js @@ -1,6 +1,6 @@ import Url from 'utils/Url'; import mimeType from 'mime-types'; -import { marked } from 'marked'; +import markdownIt from 'markdown-it'; import mustache from 'mustache'; import $_console from 'views/console.hbs'; import $_markdown from 'views/markdown.hbs'; @@ -274,7 +274,7 @@ async function run( case '.md': if (file) { - const html = marked.parse(file.session.getValue()); + const html = markdownIt().render(file.session.getValue()); const doc = mustache.render($_markdown, { html, filename, diff --git a/src/pages/plugin/plugin.js b/src/pages/plugin/plugin.js index 547ec99e3..0cf5adab4 100644 --- a/src/pages/plugin/plugin.js +++ b/src/pages/plugin/plugin.js @@ -1,6 +1,6 @@ import './plugin.scss'; import Url from 'utils/Url'; -import { marked } from 'marked'; +import markdownIt from 'markdown-it'; import ajax from '@deadlyjack/ajax'; import view from './plugin.view.js'; import Page from "components/page"; @@ -261,7 +261,7 @@ export default async function PluginInclude(id, installed, onInstall, onUninstal const pluginSettings = settings.uiSettings[`plugin-${plugin.id}`]; $page.body = view({ ...plugin, - body: marked(plugin.description), + body: markdownIt().render(plugin.description), purchased, installed, update, diff --git a/src/pages/plugins/plugins.js b/src/pages/plugins/plugins.js index e640f3a2a..e4f5eb3c0 100644 --- a/src/pages/plugins/plugins.js +++ b/src/pages/plugins/plugins.js @@ -87,7 +87,9 @@ export default function PluginsInclude(updates) { $page.get('.options').style.display = 'none'; $page.settitle(strings.update); getInstalledPlugins(updates) - .then(render); + .then(() => { + render('installed'); + }); return; }