893 does not work with tb 115

gulp/gulpfile.app.mjs

@@ -89,8 +89,7 @@ function packageLicense() {
  *   a stream to be consumed by gulp
  */
 function packageCodeMirror() {
-  return common.packageCodeMirror(
-    `${BUILD_DIR_APP}/libs/CodeMirror`);
+  return common.packageCodeMirror(BUILD_DIR_APP_LIBS);
 }
 
 /**

gulp/gulpfile.common.mjs

@@ -15,17 +15,21 @@ import logger from 'gulplog';
 import { readdir, unlink, rmdir, readFile, writeFile } from 'fs/promises';
 import { createWriteStream, existsSync } from 'fs';
 
+import { rollup } from 'rollup';
+import { nodeResolve } from '@rollup/plugin-node-resolve';
+
 import path from 'path';
 import yazl from 'yazl';
 
 const JSON_INDENTATION = 2;
 
 const BASE_DIR_BOOTSTRAP = "./node_modules/bootstrap/dist";
-const BASE_DIR_CODEMIRROR = "./node_modules/codemirror";
 
 const BASE_DIR_COMMON = "./src/common";
 const BASE_DIR_BUILD = "./build";
 
+const FILE_CODEMIRROR = "./CodeMirror/codemirror.mjs";
+
 const DIR_LIBSIEVE = "./libSieve";
 const DIR_MANAGESIEVEUI = "./managesieve.ui";
 
@@ -74,27 +78,27 @@ async function clean() {
 }
 
 /**
- * Copies the codemirror sources into the build directory.
+ * Calls rollup to bundle and deploy the codemirror sources into the build directory.
  *
  * @param {string} destination
  *   where to place the codemirror sources
  *
  * @returns {Stream}
  *   a stream to be consumed by gulp
  */
-function packageCodeMirror(destination) {
+async function packageCodeMirror(destination) {
 
-  return gulp.src([
-    BASE_DIR_CODEMIRROR + "/addon/edit/**",
-    BASE_DIR_CODEMIRROR + "/addon/search/**",
-    BASE_DIR_CODEMIRROR + "/lib/**",
-    BASE_DIR_CODEMIRROR + "/mode/sieve/**",
-    BASE_DIR_CODEMIRROR + "/theme/eclipse.css",
-    BASE_DIR_CODEMIRROR + "/theme/material-darker.css",
-    BASE_DIR_CODEMIRROR + "/LICENSE",
-    BASE_DIR_CODEMIRROR + "/package.json"
-  ], { base: BASE_DIR_CODEMIRROR }).pipe(
-    gulp.dest(destination));
+  const input = {
+    input : path.join(BASE_DIR_COMMON, FILE_CODEMIRROR),
+    plugins : [nodeResolve()]
+  };
+
+  const output = {
+    file: path.join(destination, FILE_CODEMIRROR),
+    format : "es"
+  };
+
+  await (await rollup(input)).write(output);
 }
 
 /**

gulp/gulpfile.testing.mjs

@@ -16,7 +16,7 @@ import app from "./gulpfile.app.mjs";
 import wx from "./gulpfile.wx.mjs";
 import path from 'path';
 
-const BUILD_DIR_TEST = path.join(common.BASE_DIR_BUILD, "test/");
+const BUILD_DIR_TEST = path.join(common.BASE_DIR_BUILD, "test/unittests/");
 
 /**
  * Packs the unit test for the standalone application.
@@ -78,7 +78,7 @@ async function packageWxTests() {
  */
 async function packageTestSuite() {
 
-  const BASE_PATH = "./tests";
+  const BASE_PATH = "./tests/unittests";
 
   await gulp.src([
     BASE_PATH + "/**"

gulp/gulpfile.web.mjs

@@ -15,6 +15,7 @@ import common from "./gulpfile.common.mjs";
 import path from 'path';
 
 const BUILD_DIR_WEB = path.join(common.BASE_DIR_BUILD, "web/");
+const BUILD_DIR_WEB_LIBS = path.join(BUILD_DIR_WEB, '/static/libs');
 
 const BASE_DIR_WEB = "./src/web/";
 const BASE_DIR_WX = "./src/wx/";
@@ -42,8 +43,7 @@ function packageLicense() {
  */
 function packageCodeMirror() {
 
-  return common.packageCodeMirror(
-    path.join(BUILD_DIR_WEB, "/static/libs/CodeMirror"));
+  return common.packageCodeMirror(BUILD_DIR_WEB_LIBS);
 }
 
 /**

gulp/gulpfile.wx.mjs

@@ -108,8 +108,7 @@ function packageLicense() {
  *   a stream to be consumed by gulp
  */
 function packageCodeMirror() {
-  return common.packageCodeMirror(
-    `${BUILD_DIR_WX}/libs/CodeMirror`);
+  return common.packageCodeMirror(BUILD_DIR_WX_LIBS);
 }
 
 /**