Merge remote-tracking branch 'origin/main' into renovate/codemirror-5.x

# Conflicts:
#	package-lock.json
#	package.json

build.gradle

@@ -42,15 +42,19 @@ allprojects {
 
 version = distVersion()
 
+configurations {
+  lessCss
+}
+
 dependencies {
   implementation 'org.commonmark:commonmark:0.24.0'
   implementation 'org.commonmark:commonmark-ext-autolink:0.24.0'
   implementation 'org.commonmark:commonmark-ext-gfm-strikethrough:0.24.0'
   implementation 'org.commonmark:commonmark-ext-gfm-tables:0.24.0'
-  implementation 'org.jsoup:jsoup:1.18.3'
+  implementation 'org.jsoup:jsoup:1.19.1'
   implementation 'rome:rome:1.0'
 
-  implementation('org.lesscss:lesscss:1.7.0.1.1') {
+  lessCss('org.lesscss:lesscss:1.7.0.1.1') {
     exclude group: 'org.mozilla', module: 'rhino'
     exclude group: 'org.slf4j', module: 'slf4j-api'
     exclude group: 'org.slf4j', module: 'slf4j-simple'
@@ -319,3 +323,52 @@ tasks.register('distTar', Tar) {
   destinationDirectory = file(outputDir)
   archiveFileName = outputFile
 }
+
+// Task to patch the lesscss JAR file
+// This task modifies the lessc-rhino-1.7.0.js file in the JAR to comment out an annoying console.log statement (“done”)
+def patchLessCssJar = tasks.register('patchLessCssJar') {
+  def name = 'lesscss-1.7.0.1.1'
+  def targetFile = 'META-INF/lessc-rhino-1.7.0.js' // File to patch
+  def tempDir = file("${buildDir}/${name}") // Temporary directory for extraction
+  def patchedJar = file("${buildDir}/${name}-patched.jar") // Output patched JAR
+
+  outputs.file patchedJar
+
+  doLast {
+    if (tempDir.exists()) {
+      tempDir.deleteDir()
+    }
+    tempDir.mkdirs()
+
+    def jarFile = configurations.lessCss.find {
+      it.name.contains(name)
+    }
+
+    println "Patching $jarFile…"
+    ant.unzip(src: jarFile, dest: tempDir)
+
+    def targetFilePath = new File(tempDir, targetFile)
+    def content = targetFilePath.text
+    content = content.replace('console.log("done")', '// console.log("done")')
+    targetFilePath.text = content
+
+    ant.zip(destfile: patchedJar) {
+      fileset(dir: tempDir)
+    }
+  }
+}
+
+// Ensure the patchLessCssJar task runs before the classes task
+tasks.named('build').configure {
+  dependsOn patchLessCssJar
+}
+
+// Exclude the original lesscss JAR from the runtime classpath
+// and include the patched JAR instead
+configurations.runtimeClasspath {
+  exclude group: 'org.lesscss', module: 'lesscss'
+
+  dependencies {
+    runtimeOnly(patchLessCssJar.map { it.outputs.files })
+  }
+}

code/Global/Global.js

@@ -22,8 +22,9 @@
 String.ELLIPSIS = '…';
 
 app.addRepository(app.dir + '/../lib/jdom-1.0.jar');
-app.addRepository(app.dir + '/../lib/jsoup-1.18.3.jar');
-app.addRepository(app.dir + '/../lib/lesscss-1.7.0.1.1.jar');
+app.addRepository(app.dir + '/../lib/jsoup-1.19.1.jar');
+// See the patchLessCssJar task in build.gradle
+app.addRepository(app.dir + '/../lib/lesscss-1.7.0.1.1-patched.jar');
 app.addRepository(app.dir + '/../lib/rome-1.0.jar');
 
 app.addRepository('modules/core/Global.js');

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

package-lock.json

@@ -9,7 +9,7 @@
       "version": "1.6.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "alpinejs": "3.14.8",
+        "alpinejs": "3.14.9",
         "codemirror": "5.65.19",
         "jquery": "3.7.1",
         "jquery-collagePlus": "github:antville/jquery-collagePlus#0.3.4",
@@ -20,7 +20,7 @@
         "browserify": "17.0.1",
         "generate-license-file": "3.7.0",
         "jsdoc": "4.0.4",
-        "less": "4.2.2",
+        "less": "4.3.0",
         "less-plugin-clean-css": "1.6.0",
         "npm-run-all2": "7.0.2",
         "onchange": "7.1.0",
@@ -772,9 +772,10 @@
       }
     },
     "node_modules/alpinejs": {
-      "version": "3.14.8",
-      "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.14.8.tgz",
-      "integrity": "sha512-wT2fuP2DXpGk/jKaglwy7S/IJpm1FD+b7U6zUrhwErjoq5h27S4dxkJEXVvhbdwyPv9U+3OkUuNLkZT4h2Kfrg==",
+      "version": "3.14.9",
+      "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.14.9.tgz",
+      "integrity": "sha512-gqSOhTEyryU9FhviNqiHBHzgjkvtukq9tevew29fTj+ofZtfsYriw4zPirHHOAy9bw8QoL3WGhyk7QqCh5AYlw==",
+      "license": "MIT",
       "dependencies": {
         "@vue/reactivity": "~3.1.1"
       }
@@ -3081,9 +3082,9 @@
       }
     },
     "node_modules/less": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/less/-/less-4.2.2.tgz",
-      "integrity": "sha512-tkuLHQlvWUTeQ3doAqnHbNn8T6WX1KA8yvbKG9x4VtKtIjHsVKQZCH11zRgAfbDAXC2UNIg/K9BYAAcEzUIrNg==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/less/-/less-4.3.0.tgz",
+      "integrity": "sha512-X9RyH9fvemArzfdP8Pi3irr7lor2Ok4rOttDXBhlwDg+wKQsXOXgHWduAJE1EsF7JJx0w0bcO6BC6tCKKYnXKA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -3095,7 +3096,7 @@
         "lessc": "bin/lessc"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=14"
       },
       "optionalDependencies": {
         "errno": "^0.1.1",

package.json

@@ -31,7 +31,7 @@
   "author": "The Antville People",
   "license": "Apache-2.0",
   "dependencies": {
-    "alpinejs": "3.14.8",
+    "alpinejs": "3.14.9",
     "codemirror": "5.65.19",
     "jquery": "3.7.1",
     "jquery-collagePlus": "github:antville/jquery-collagePlus#0.3.4",
@@ -42,7 +42,7 @@
     "browserify": "17.0.1",
     "generate-license-file": "3.7.0",
     "jsdoc": "4.0.4",
-    "less": "4.2.2",
+    "less": "4.3.0",
     "less-plugin-clean-css": "1.6.0",
     "npm-run-all2": "7.0.2",
     "onchange": "7.1.0",