@qooxdoo/framework 7.4.2 → 7.5.1

package/lib/compiler/index.js

@@ -96,7 +96,7 @@ if (typeof global !== "undefined") {
   "qx.application": "qx.tool.cli.Application",
   "qx.revision": "",
   "qx.theme": "qx.theme.Simple",
-  "qx.version": "7.4.2",
+  "qx.version": "7.5.1",
   "qx.compiler.targetType": "source",
   "qx.compiler.outputDir": "compiled/node/build/",
   "true": true,
@@ -128,7 +128,7 @@ if (typeof global !== "undefined") {
   "qx.promise.warnings": true,
   "qx.promise.longStackTraces": true,
   "qx.compiler": true,
-  "qx.compiler.version": "7.4.2",
+  "qx.compiler.version": "7.5.1",
   "qx.headless": true,
   "qx.compiler.applicationType": "node",
   "qx.compiler.applicationName": "compiler"
@@ -8164,7 +8164,7 @@ try {
        *
        * @param clazz {Class} class to look for the interface
        * @param iface {Interface} interface to look for
-       * @return {Class | null} the class which directly implements the given interface
+       * @return {Class|null} the class which directly implements the given interface
        */
       getByInterface(clazz, iface) {
         var list, i, l;
@@ -8727,7 +8727,7 @@ try {
        *
        * @param clazz {Class} class to look for the property
        * @param name {String} name of the property
-       * @return {Class | null} The class which includes the property
+       * @return {Class|null} The class which includes the property
        */
       getByProperty(clazz, name) {
         while (clazz) {
@@ -8790,7 +8790,7 @@ try {
        *
        * @param clazz {Class} class to look for the mixin
        * @param mixin {Mixin} mixin to look for
-       * @return {Class | null} The class which directly includes the given mixin
+       * @return {Class|null} The class which directly includes the given mixin
        */
       getByMixin(clazz, mixin) {
         var list, i, l;
@@ -8855,7 +8855,7 @@ try {
        * @signature function(clazz, iface)
        * @param clazz {Class} class to look for the interface
        * @param iface {Interface} interface to look for
-       * @return {Class | null} the class which directly implements the given interface
+       * @return {Class|null} the class which directly implements the given interface
        */
       getByInterface: qx.util.OOUtil.getByInterface,
 
@@ -13278,7 +13278,7 @@ try {
        * @param type {String} Event type
        * @param capture {Boolean ? false} Whether the listener is for the
        *       capturing phase of the bubbling phase.
-       * @return {Array | null} Array of registered event handlers. May return
+       * @return {Array|null} Array of registered event handlers. May return
        *       null when no listener were found.
        */
       getListeners(target, type, capture) {
@@ -14621,7 +14621,7 @@ try {
        * numeric values only.
        *
        * @param arr {Number[]} Array to process
-       * @return {Number | null} The highest of all values or undefined if array is empty.
+       * @return {Number|null} The highest of all values or undefined if array is empty.
        */
       max(arr) {
         var i,
@@ -14642,7 +14642,7 @@ try {
        * numeric values only.
        *
        * @param arr {Number[]} Array to process
-       * @return {Number | null} The lowest of all values or undefined if array is empty.
+       * @return {Number|null} The lowest of all values or undefined if array is empty.
        */
       min(arr) {
         var i,
@@ -27807,7 +27807,7 @@ try {
        * @param targetProperties {String[]} Array containing the names of the properties
        * @param index {Number?} The array index of the last property to be considered.
        * Default: The last item's index
-       * @return {qx.core.Object | null} The object on which the last property
+       * @return {qx.core.Object|null} The object on which the last property
        *   should be set.
        */
       __P_74_13(targetObject, targetProperties, index) {
@@ -31564,7 +31564,7 @@ try {
        * Returns the highest value in the given array.
        * Supports numeric values only.
        *
-       * @return {Number | null} The highest of all values or undefined if the
+       * @return {Number|null} The highest of all values or undefined if the
        *   array is empty.
        */
       max() {
@@ -31583,7 +31583,7 @@ try {
        * Returns the lowest value in the array. Supports
        * numeric values only.
        *
-       * @return {Number | null} The lowest of all values or undefined
+       * @return {Number|null} The lowest of all values or undefined
        *   if the array is empty.
        */
       min() {
@@ -31658,7 +31658,7 @@ try {
        *   <li><code>index</code>: the index of the current item</li>
        *   <li><code>array</code>: The native array instance, NOT the data array instance.</li>
        * @param self {var?undefined} The context of the callback.
-       * @return {var | undefined} The found item.
+       * @return {var|undefined} The found item.
        */
       find(callback, self) {
         return this.__P_73_0.find(callback, self);
@@ -34730,11 +34730,15 @@ try {
        * during startup of the application
        */
       async main() {
+        process.exitCode = 0;
+
         try {
           await new qx.tool.cli.Cli().run();
         } catch (e) {
           qx.tool.compiler.Console.error("Error: " + (e.stack || e.message));
-          process.exit(1);
+          process.exitCode = 1;
+        } finally {
+          process.exit();
         }
       }
 
@@ -35063,15 +35067,20 @@ try {
 
   qx.Class.define("qx.tool.cli.Cli", {
     extend: qx.core.Object,
+    properties: {
+      command: {
+        apply: "__P_3_0"
+      }
+    },
 
     construct() {
       qx.core.Object.constructor.call(this);
 
-      if (qx.tool.cli.Cli.__P_3_0) {
+      if (qx.tool.cli.Cli.__P_3_1) {
         throw new Error("qx.tool.cli.Cli has already been initialized!");
       }
 
-      qx.tool.cli.Cli.__P_3_0 = this; // include & register log appender
+      qx.tool.cli.Cli.__P_3_1 = this; // include & register log appender
 
       qx.log.appender.NodeConsole;
     },
@@ -35093,20 +35102,23 @@ try {
       _compileJsonFilename: null,
 
       /** @type {Object} Parsed arguments */
-      _parsedArgs: null,
-
-      /** @type {Promise} Promise that resolves to the _parsedArgs, but only when completely finished parsing them */
-      __P_3_1: null,
+      __P_3_2: null,
 
       /** @type {Boolean} Whether libraries have had their `.load()` method called yet */
-      __P_3_2: false,
+      __P_3_3: false,
+
+      __P_3_0(command) {
+        command.setCompilerApi(this._compilerApi);
+
+        this._compilerApi.setCommand(command);
+      },
 
       /**
        * Creates an instance of yargs, with minimal options
        *
        * @return {yargs}
        */
-      __P_3_3() {
+      __P_3_4() {
         return this.yargs = require("yargs").locale("en").version().strict(false).showHelpOnFail().help(false).option("force", {
           describe: "Override warnings",
           type: "boolean",
@@ -35140,7 +35152,7 @@ try {
        * Initialises this.argv with the bare minimum required to load the config files and begin
        * processing
        */
-      async __P_3_4() {
+      async __P_3_5() {
         var title = "qooxdoo command line interface";
         title = "\n" + title + "\n" + "=".repeat(title.length);
         title += `
@@ -35152,7 +35164,7 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
 
       Type qx <command> --help for options and subcommands.`;
 
-        let yargs = this.__P_3_3().usage(title);
+        let yargs = this.__P_3_4().usage(title);
 
         this.argv = yargs.argv; // Logging - needs to be unified..
 
@@ -35171,8 +35183,8 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
       /**
        * Reloads this.argv with the full set of arguments
        */
-      async __P_3_5() {
-        let yargs = this.__P_3_3().help(true).option("set", {
+      async __P_3_6() {
+        let yargs = this.__P_3_4().help(true).option("set", {
           describe: "sets an environment value for the compiler",
           nargs: 1,
           requiresArg: true,
@@ -35200,7 +35212,7 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
         qx.tool.cli.Cli.addYargsCommands(yargs, ["Add", "Clean", "Compile", "Config", "Deploy", "Es6ify", "Package", "Pkg", // alias for Package
         "Create", "Lint", "Run", "Test", "Serve", "Migrate"], "qx.tool.cli.commands");
         this.argv = await yargs.demandCommand().strict().argv;
-        await this.__P_3_6();
+        await this.__P_3_7();
       },
 
       /**
@@ -35208,7 +35220,7 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
        * The commands can overload special arg arguments here.
        * e.g. Deploy will will overload the target.
        */
-      __P_3_7() {
+      __P_3_8() {
         let cmd = this._compilerApi.getCommand();
 
         if (cmd) {
@@ -35221,12 +35233,12 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
        * to delay the calling of `load()` until after we know that the command has been selected
        * by Yargs
        */
-      async __P_3_6() {
-        if (this.__P_3_2) {
+      async __P_3_7() {
+        if (this.__P_3_3) {
           return;
         }
 
-        this.__P_3_2 = true;
+        this.__P_3_3 = true;
 
         for (let i = 0, arr = this._compilerApi.getLibraryApis(); i < arr.length; i++) {
           let libraryApi = arr[i];
@@ -35245,21 +35257,10 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
        */
       async processCommand(command) {
         qx.tool.compiler.Console.getInstance().setVerbose(this.argv.verbose);
-        command.setCompilerApi(this._compilerApi);
-
-        this._compilerApi.setCommand(command);
-
-        await this.__P_3_6();
-
-        try {
-          const res = await command.process();
-          await this._compilerApi.afterProcessFinished(command, res);
-          return res;
-        } catch (e) {
-          qx.tool.compiler.Console.error("Error: " + (e.stack || e.message));
-          process.exit(1);
-          return null;
-        }
+        await this.__P_3_7();
+        const res = await command.process();
+        await this._compilerApi.afterProcessFinished(command, res);
+        return res;
       },
 
       /**
@@ -35267,8 +35268,8 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
        *
        * @return {Object}
        */
-      async getParsedArgs() {
-        return await this.__P_3_1;
+      getParsedArgs() {
+        return this.__P_3_2;
       },
 
       /**
@@ -35290,15 +35291,15 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
         var args = qx.lang.Array.clone(process.argv);
         args.shift();
         process.title = args.join(" ");
-        this.__P_3_1 = this.__P_3_8();
-        await this.__P_3_1;
+        await this.__P_3_9();
+        return this.processCommand(this.getCommand());
       },
 
       /**
        * Does the work of parsing command line arguments and loading `compile.js[on]`
        */
-      async __P_3_8() {
-        await this.__P_3_4();
+      async __P_3_9() {
+        await this.__P_3_5();
         /*
          * Detect and load compile.json and compile.js
          */
@@ -35336,7 +35337,7 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
         let CompilerApi = qx.tool.cli.api.CompilerApi;
 
         if (await fs.existsAsync(compileJsFilename)) {
-          let compileJs = await this.__P_3_9(compileJsFilename);
+          let compileJs = await this.__P_3_10(compileJsFilename);
           this._compileJsFilename = compileJsFilename;
 
           if (compileJs.CompilerApi) {
@@ -35463,7 +35464,7 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
             let LibraryApi = qx.tool.cli.api.LibraryApi;
 
             if (await fs.existsAsync(libCompileJsFilename)) {
-              let compileJs = await this.__P_3_9(libCompileJsFilename);
+              let compileJs = await this.__P_3_10(libCompileJsFilename);
 
               if (compileJs.LibraryApi) {
                 LibraryApi = compileJs.LibraryApi;
@@ -35483,9 +35484,9 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
          */
 
 
-        await this.__P_3_5();
+        await this.__P_3_6();
 
-        this.__P_3_7();
+        this.__P_3_8();
 
         let parsedArgs = {
           target: this.argv.target,
@@ -35552,8 +35553,8 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
           config.serve.listenPort = config.serve.listenPort || this.argv.listenPort;
         }
 
-        this._parsedArgs = await compilerApi.getConfiguration();
-        return this._parsedArgs;
+        this.__P_3_2 = await compilerApi.getConfiguration();
+        return this.__P_3_2;
       },
 
       /**
@@ -35562,7 +35563,7 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
        * @param aPath {String} the file to load
        * @return {Object} the module
        */
-      async __P_3_9(aPath) {
+      async __P_3_10(aPath) {
         try {
           let module = require(path.resolve(aPath));
 
@@ -35635,7 +35636,7 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
       compileJsFilename: "compile.js",
 
       /** {CompileJs} singleton instance */
-      __P_3_0: null,
+      __P_3_1: null,
 
       /**
        * Returns the singleton instance, throws an error if it has not been created
@@ -35643,11 +35644,11 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
        * @return {qx.tool.cli.Cli}
        */
       getInstance() {
-        if (!qx.tool.cli.Cli.__P_3_0) {
+        if (!qx.tool.cli.Cli.__P_3_1) {
           throw new Error("CompileJs has not been initialized yet!");
         }
 
-        return qx.tool.cli.Cli.__P_3_0;
+        return qx.tool.cli.Cli.__P_3_1;
       },
 
       /**
@@ -35672,7 +35673,7 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
 
           if (data) {
             if (data.handler === undefined) {
-              data.handler = argv => qx.tool.cli.Cli.getInstance().processCommand(new Clazz(argv));
+              data.handler = argv => qx.tool.cli.Cli.getInstance().setCommand(new Clazz(argv));
             }
 
             yargs.command(data);
@@ -36534,7 +36535,7 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
        * @return {String}
        */
       getCompilerVersion() {
-        return "7.4.2";
+        return "7.5.1";
       },
 
       /**
@@ -38947,8 +38948,11 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
         if (!(await compileConfigModel.exists())) {
           qx.tool.compiler.Console.info(">>> Cannot install application " + (manifestApp.name || manifestApp["class"]) + " because compile.json does not exist (you must manually add it)");
           return false;
-        }
+        } // relaod config. We need a fresh model here because data will be verified.
+        // The original model is enriched during parsing so validate will fail.
+
 
+        compileConfigModel.setLoaded(false);
         await compileConfigModel.load();
         let app = compileConfigModel.getValue("applications").find(app => {
           if (manifestApp.name && app.name) {
@@ -45107,6 +45111,7 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
   
      Authors:
        * John Spackman (john.spackman@zenesis.com, @johnspackman)
+       * Henner Kollmann (Henner.Kollmann@gmx.de, @hkollmann)
   
   ************************************************************************ */
   const fs = require("fs");
@@ -45302,20 +45307,24 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
             qx.tool.compiler.Console.debug(`DEBUG: confirmed=${JSON.stringify(confirmed, 2)}`);
           }
 
-          var watcher = this._watcher = chokidar.watch(confirmed, {//ignored: /(^|[\/\\])\../
-          });
-          watcher.on("change", filename => this.__P_5_13("change", filename));
-          watcher.on("add", filename => this.__P_5_13("add", filename));
-          watcher.on("unlink", filename => this.__P_5_13("unlink", filename));
-          watcher.on("ready", () => {
-            this.__P_5_7 = true;
-
-            this.__P_5_14();
-          });
-          watcher.on("error", err => {
-            qx.tool.compiler.Console.print(err.code == "ENOSPC" ? "qx.tool.cli.watch.enospcError" : "qx.tool.cli.watch.watchError", err);
+          this.__P_5_13().then(() => {
+            var watcher = this._watcher = chokidar.watch(confirmed, {//ignored: /(^|[\/\\])\../
+            });
+            watcher.on("change", filename => this.__P_5_14("change", filename));
+            watcher.on("add", filename => this.__P_5_14("add", filename));
+            watcher.on("unlink", filename => this.__P_5_14("unlink", filename));
+            watcher.on("ready", () => {
+              qx.tool.compiler.Console.log(`Start watching ...`);
+              this.__P_5_7 = true;
+            });
+            watcher.on("error", err => {
+              qx.tool.compiler.Console.print(err.code == "ENOSPC" ? "qx.tool.cli.watch.enospcError" : "qx.tool.cli.watch.watchError", err);
+            });
           });
         });
+        process.on("beforeExit", this.__P_5_15.bind(this));
+        process.on("exit", this.__P_5_15.bind(this));
+        return this.__P_5_5;
       },
 
       async stop() {
@@ -45328,9 +45337,9 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
         }
       },
 
-      __P_5_14() {
+      __P_5_13() {
         if (this.__P_5_8) {
-          this.__P_5_15 = true;
+          this.__P_5_16 = true;
           return this.__P_5_8;
         }
 
@@ -45401,20 +45410,21 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
         }
 
         const runIt = () => make().then(() => {
-          if (this.__P_5_15) {
-            delete this.__P_5_15;
+          if (this.__P_5_16) {
+            delete this.__P_5_16;
             return runIt();
           }
 
           return null;
         });
 
-        return this.__P_5_8 = runIt();
+        this.__P_5_8 = runIt();
+        return this.__P_5_8;
       },
 
-      __P_5_16() {
+      __P_5_17() {
         if (this.__P_5_8) {
-          this.__P_5_15 = true;
+          this.__P_5_16 = true;
           return this.__P_5_8;
         }
 
@@ -45422,11 +45432,11 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
           clearTimeout(this.__P_5_11);
         }
 
-        this.__P_5_11 = setTimeout(() => this.__P_5_14());
+        this.__P_5_11 = setTimeout(() => this.__P_5_13());
         return null;
       },
 
-      __P_5_13(type, filename) {
+      __P_5_14(type, filename) {
         const Console = qx.tool.compiler.Console;
 
         if (!this.__P_5_7) {
@@ -45520,7 +45530,7 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
           if (outOfDate) {
             this.__P_5_10 = true;
 
-            this.__P_5_16();
+            this.__P_5_17();
           }
         };
 
@@ -45567,7 +45577,7 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
         return null;
       },
 
-      __P_5_17() {
+      __P_5_15() {
         this.__P_5_5.resolve();
       }
 
@@ -46461,7 +46471,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
           });
           let arr = [this._compileJsFilename, this._compileJsonFilename].filter(str => Boolean(str));
           watch.setConfigFilenames(arr);
-          return await watch.start();
+          return watch.start();
         }));
       },
 
@@ -51957,7 +51967,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
           }
 
           if (sectionName === "members" || sectionName === "statics") {
-            if (node.type == "ObjectMethod" || node.value.type === "FunctionExpression") {
+            if (node.type == "ObjectMethod" || node.value.type === "FunctionExpression" || node.value.type === "MemberExpression") {
               meta.type = "function";
             } else {
               meta.type = "variable";
@@ -55221,7 +55231,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
         });
       },
 
-      async __P_44_3(commonjsModules, references, localModules, ws) {
+      __P_44_3(commonjsModules, references, localModules, ws) {
         const babelify = require("babelify");
 
         const preset = require("@babel/preset-env");
@@ -55233,7 +55243,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
 
 
         builtins.process = builtins._process;
-        return new Promise(async resolve => {
+        return new Promise((resolve, reject) => {
           let b = browserify([], {
             builtins: builtins,
             ignoreMissing: true,
@@ -55280,16 +55290,28 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
             sourceMaps: false,
             global: true
           });
-          b.bundle((e, output) => {
+          b.bundle(function (e, output) {
             if (e) {
-              // We've already handled the case of missing module. This is something else.
-              qx.tool.compiler.Console.error(`Unable to browserify - this is probably because a module is being require()'d which is not compatible with Browserify: ${e.message}`); // Do not throw an error here, otherwise a problem in the users code will kill the watch with pages of error
-
-              resolve(null);
+              // THIS IS A HACK!
+              // In case of error dependency walker never returns from
+              // ```if (self.inputPending > 0) return setTimeout(resolve);```
+              // because inputPending is not decremented anymore.
+              // so set it to 0 here.
+              let d = b.pipeline.get("deps");
+              d.get(0).inputPending = 0;
+              qx.tool.compiler.Console.error(`Unable to browserify - this is probably because a module is being require()'d which is not compatible with Browserify:\n${e.message}`);
+              setTimeout(() => {
+                this.emit("end");
+              });
               return;
-            }
+            } // in case of end event output can not be writen.
+            // so catch the error and ignore it
+
+
+            try {
+              ws.write(output);
+            } catch (err) {}
 
-            ws.write(output);
             resolve(null);
           });
         });
@@ -55416,6 +55438,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
       "qx.core.Object": {
         "require": true
       },
+      "qx.tool.compiler.Console": {},
       "qx.tool.utils.Utils": {},
       "qx.lang.Type": {}
     }
@@ -55457,7 +55480,10 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
     promisify
   } = require("util");
 
+  const process = require("process");
+
   const readFile = promisify(fs.readFile);
+  const readDir = promisify(fs.readdir);
   var log = qx.tool.utils.LogManager.createLog("cldr");
   qx.Class.define("qx.tool.compiler.app.Cldr", {
     extend: qx.core.Object,
@@ -55485,8 +55511,21 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
         }
 
         log.debug("Loading CLDR " + cldrPath);
-        return readFile(path.join(cldrPath, data_path, locale + ".xml"), {
+        const fullDir = path.join(cldrPath, data_path);
+        return readDir(fullDir).then(names => new Promise((resolve, reject) => {
+          const searchedName = locale.toLowerCase() + ".xml";
+          const realName = names.find(name => name.toLowerCase() === searchedName);
+
+          if (realName) {
+            resolve(realName);
+          } else {
+            reject(new Error('Cannot find XML file for locale "' + locale + '" in CLDR folder'));
+          }
+        })).then(fileName => readFile(path.join(fullDir, fileName), {
           encoding: "utf-8"
+        })).catch(err => {
+          qx.tool.compiler.Console.error(err);
+          process.exit(1);
         }).then(data => qx.tool.utils.Utils.promisifyThis(parser.parseString, parser, data)).then(src => {
           function find(arr, name, value, cb) {
             if (!arr) {
@@ -55692,28 +55731,24 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
               cldr["cldr_day_stand-alone_narrow_wed"] = find(row.dayWidth[0].day, "type", "wed", getText); // "W";
             });
             var monthContext = get("months[0].monthContext", cal);
-            find(monthContext, "type", "format", function (row) {
-              find(row.monthWidth, "type", "abbreviated", function (row) {
-                for (var i = 0; i < row.month.length; i++) {
-                  var m = row.month[i];
-                  cldr["cldr_month_format_abbreviated_" + m["$"].type] = getText(m);
-                }
-              });
-            });
-            find(monthContext, "type", "format", function (row) {
-              find(row.monthWidth, "type", "wide", function (row) {
-                for (var i = 0; i < row.month.length; i++) {
-                  var m = row.month[i];
-                  cldr["cldr_month_format_wide_" + m["$"].type] = getText(m);
-                }
-              });
-            });
-            find(monthContext, "type", "stand-alone", function (row) {
-              for (var i = 0; i < row.monthWidth[0].month.length; i++) {
-                var m = row.monthWidth[0].month[i];
-                cldr["cldr_month_stand-alone_narrow_" + m["$"].type] = getText(m);
+
+            const parseMonth = (months, cldrProperty) => {
+              if (!months) {
+                return;
               }
-            });
+
+              months.forEach(month => {
+                cldr[cldrProperty + "_" + month["$"].type] = getText(month);
+              });
+            };
+
+            const parseMonthContext = sectionNameInLocaleFile => {
+              find(monthContext, "type", "format", row => find(row.monthWidth, "type", sectionNameInLocaleFile, row => parseMonth(row.month, "cldr_month_format_" + sectionNameInLocaleFile)));
+            };
+
+            parseMonthContext("abbreviated");
+            parseMonthContext("wide");
+            find(monthContext, "type", "stand-alone", row => parseMonth(row.monthWidth[0].month, "cldr_month_stand-alone_narrow"));
 
             function getTimeFormatPattern(row) {
               return row.timeFormat.pattern;
@@ -63123,7 +63158,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
           helperFilePath = path.dirname(helperFilePath);
         }
 
-        let config = await qx.tool.cli.Cli.getInstance().getParsedArgs();
+        let config = qx.tool.cli.Cli.getInstance().getParsedArgs();
         let lintOptions = config.eslintConfig || {};
         lintOptions.extends = lintOptions.extends || ["@qooxdoo/qx/browser"];
         lintOptions.globals = Object.assign(lintOptions.globals || {}, await this.__P_11_1(config));
@@ -63487,12 +63522,12 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
 
         if (!config.run) {
           qx.tool.compiler.Console.print("qx.tool.cli.run.noRunConfig");
-          process.exit(-1);
+          process.exit(1);
         }
 
         if (!config.run.application) {
           qx.tool.compiler.Console.print("qx.tool.cli.run.noAppName");
-          process.exit(-1);
+          process.exit(1);
         }
 
         let maker = null;
@@ -63503,12 +63538,12 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
           if (apps.length) {
             if (maker) {
               qx.tool.compiler.Console.print("qx.tool.cli.run.tooManyMakers");
-              process.exit(-1);
+              process.exit(1);
             }
 
             if (apps.length != 1) {
               qx.tool.compiler.Console.print("qx.tool.cli.run.tooManyApplications");
-              process.exit(-1);
+              process.exit(1);
             }
 
             maker = tmp;
@@ -63518,12 +63553,12 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
 
         if (!app) {
           qx.tool.compiler.Console.print("qx.tool.cli.run.noAppName");
-          process.exit(-1);
+          process.exit(1);
         }
 
         if (app.getType() != "node") {
           qx.tool.compiler.Console.print("qx.tool.cli.run.mustBeNode");
-          process.exit(-1);
+          process.exit(1);
         }
 
         let target = maker.getTarget();
@@ -63710,28 +63745,27 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
       afterStart: "qx.event.type.Event"
     },
     members: {
-      /** @type {qx.tool.utils.Website} the Website instance */
-      _website: null,
-
       /*
        * @Override
        */
       async process() {
         this.argv.watch = true;
         this.argv["machine-readable"] = false;
-        this.argv["feedback"] = false;
-        await qx.tool.cli.commands.Serve.superclass.prototype.process.call(this); // build website if it hasn't been built yet.
+        this.argv["feedback"] = false; // build website if it hasn't been built yet.
 
-        const website = this._website = new qx.tool.utils.Website();
+        const website = new qx.tool.utils.Website();
 
         if (!(await fs.existsAsync(website.getTargetDir()))) {
           qx.tool.compiler.Console.info(">>> Building startpage...");
-          await this._website.rebuildAll();
+          await website.rebuildAll();
         } else if (this.argv.rebuildStartpage) {
-          this._website.startWatcher();
+          website.startWatcher();
         }
 
-        await this.runWebServer();
+        this.addListenerOnce("made", () => {
+          this.runWebServer();
+        });
+        return qx.tool.cli.commands.Serve.superclass.prototype.process.call(this);
       },
 
       /**
@@ -63830,25 +63864,23 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
           });
         }
 
-        this.addListenerOnce("made", e => {
-          let server = http.createServer(app);
-          this.fireDataEvent("beforeStart", {
-            server: server,
-            application: app,
-            outputdir: defaultMaker.getTarget().getOutputDir()
-          });
-          server.on("error", e => {
-            if (e.code === "EADDRINUSE") {
-              qx.tool.compiler.Console.print("qx.tool.cli.serve.webAddrInUse", config.serve.listenPort);
-              process.exit(-1);
-            } else {
-              qx.tool.compiler.Console.log("Error when starting web server: " + e);
-            }
-          });
-          server.listen(config.serve.listenPort, () => {
-            qx.tool.compiler.Console.print("qx.tool.cli.serve.webStarted", "http://localhost:" + config.serve.listenPort);
-            this.fireEvent("afterStart");
-          });
+        let server = http.createServer(app);
+        this.fireDataEvent("beforeStart", {
+          server: server,
+          application: app,
+          outputdir: defaultMaker.getTarget().getOutputDir()
+        });
+        server.on("error", e => {
+          if (e.code === "EADDRINUSE") {
+            qx.tool.compiler.Console.print("qx.tool.cli.serve.webAddrInUse", config.serve.listenPort);
+            process.exit(1);
+          } else {
+            qx.tool.compiler.Console.log("Error when starting web server: " + e);
+          }
+        });
+        server.listen(config.serve.listenPort, () => {
+          qx.tool.compiler.Console.print("qx.tool.cli.serve.webStarted", "http://localhost:" + config.serve.listenPort);
+          this.fireEvent("afterStart");
         });
       },
 
@@ -64475,7 +64507,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
           if (!this.hasListener("runTests") && this.__P_15_0.length === 0 && (!this.getCompilerApi() || typeof this.getCompilerApi().beforeTests != "function")) {
             qx.tool.compiler.Console.error(`No tests are registered! You need to either register tests, or install a testrunner.
              See documentation at https://qooxdoo.org/docs/#/development/testing/`);
-            process.exit(-1);
+            process.exit(1);
           }
         });
         this.addListener("afterStart", async () => {
@@ -64490,6 +64522,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
             qx.tool.compiler.Console.info(`Running ${test.getName()}`);
             await test.execute();
           } // for bash exitcode is not allowed to be more then 255!
+          // We must exit the process here because serve runs infinite!
 
 
           process.exit(Math.min(255, this.getExitCode()));
@@ -64502,7 +64535,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
           // compile only
           await qx.tool.cli.commands.Compile.prototype.process.call(this); // since the server is not started, manually fire the event necessary for firing the "runTests" event
 
-          this.fireEvent("afterStart");
+          await this.fireDataEventAsync("afterStart");
         }
       },
 
@@ -64873,7 +64906,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
 
 
         this.debug(script_list);
-        manifestModel.setValue("externalResources.script", script_list).save();
+        await manifestModel.setValue("externalResources.script", script_list).save();
       }
 
     }
@@ -64943,9 +64976,9 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
       "qx.tool.cli.commands.Package": {
         "require": true
       },
+      "qx.tool.compiler.Console": {},
       "qx.tool.utils.Utils": {},
       "qx.tool.cli.ConfigDb": {},
-      "qx.tool.compiler.Console": {},
       "qx.tool.config.Registry": {},
       "qx.tool.config.Abstract": {},
       "qx.tool.config.Manifest": {},
@@ -65032,6 +65065,10 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
               describe: "Set commit/release message"
             },
             dryrun: {
+              type: "boolean",
+              describe: "Deprecated. Use --dry-run"
+            },
+            "dry-run": {
               type: "boolean",
               alias: "d",
               describe: "Show result only, do not publish to GitHub"
@@ -65087,7 +65124,13 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
       async process() {
         await qx.tool.cli.commands.package.Publish.superclass.prototype.process.call(this); // init
 
-        const argv = this.argv; // qooxdoo version
+        const argv = this.argv;
+
+        if (argv.dryrun) {
+          qx.tool.compiler.Console.info('The "--dryrun" option is deprecated. Please use "--dry-run" instead.');
+          argv.dryRun = true;
+        } // qooxdoo version
+
 
         let qxVersion = await this.getQxVersion();
 
@@ -65312,7 +65355,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
         for (let manifestModel of manifestModels) {
           manifestModel.setValue("requires.@qooxdoo/framework", semver_range).setValue("info.version", new_version);
 
-          if (argv.dryrun) {
+          if (argv.dryRun) {
             if (!argv.quiet) {
               qx.tool.compiler.Console.info(`Dry run: Not committing ${manifestModel.getRelativeDataPath()} with the following content:`);
               qx.tool.compiler.Console.info(JSON.stringify(manifestModel.getData(), null, 2));
@@ -65329,7 +65372,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
           let data = await qx.tool.utils.Json.loadJsonAsync(package_json_path);
           data.version = new_version;
 
-          if (this.argv.dryrun) {
+          if (this.argv.dryRun) {
             qx.tool.compiler.Console.info("Dry run: Not changing package.json version...");
           } else {
             await qx.tool.utils.Json.saveJsonAsync(package_json_path, data);
@@ -65345,7 +65388,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
           argv: this.argv
         });
 
-        if (argv.dryrun) {
+        if (argv.dryRun) {
           qx.tool.compiler.Console.info(`Dry run: not creating tag and release '${tag}' of ${repo_name}...`);
           return;
         } // commit message
@@ -65468,7 +65511,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
 
           const registryModel = qx.tool.config.Registry.getInstance();
 
-          if (argv.dryrun) {
+          if (argv.dryRun) {
             qx.tool.compiler.Console.info(`Dry run: not creating index file ${registryModel.getRelativeDataPath()} with the following content:`);
             qx.tool.compiler.Console.info(data);
           } else {
@@ -72183,48 +72226,6 @@ qx.$$packageData['0'] = {
     }
   },
   "resources": {
-    "qx/decoration/Simple/checkbox/checked-disabled.png": [
-      6,
-      6,
-      "png",
-      "qx"
-    ],
-    "qx/decoration/Simple/checkbox/checked.png": [
-      6,
-      6,
-      "png",
-      "qx"
-    ],
-    "qx/decoration/Simple/checkbox/undetermined-disabled.png": [
-      6,
-      2,
-      "png",
-      "qx"
-    ],
-    "qx/decoration/Simple/checkbox/undetermined.png": [
-      6,
-      2,
-      "png",
-      "qx"
-    ],
-    "qx/decoration/Simple/colorselector/brightness-field.png": [
-      19,
-      256,
-      "png",
-      "qx"
-    ],
-    "qx/decoration/Simple/colorselector/brightness-handle.gif": [
-      35,
-      11,
-      "gif",
-      "qx"
-    ],
-    "qx/decoration/Simple/colorselector/huesaturation-field.jpg": [
-      256,
-      256,
-      "jpg",
-      "qx"
-    ],
     "qx/decoration/Simple/arrows/down-invert.gif": [
       7,
       4,
@@ -72237,9 +72238,9 @@ qx.$$packageData['0'] = {
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/colorselector/huesaturation-handle.gif": [
-      11,
-      11,
+    "qx/decoration/Simple/arrows/forward.gif": [
+      8,
+      7,
       "gif",
       "qx"
     ],
@@ -72249,12 +72250,6 @@ qx.$$packageData['0'] = {
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/arrows/forward.gif": [
-      8,
-      7,
-      "gif",
-      "qx"
-    ],
     "qx/decoration/Simple/arrows/left-invert.gif": [
       4,
       7,
@@ -72291,43 +72286,79 @@ qx.$$packageData['0'] = {
       "gif",
       "qx"
     ],
+    "qx/decoration/Simple/arrows/up-small.gif": [
+      5,
+      3,
+      "gif",
+      "qx"
+    ],
+    "qx/decoration/Simple/checkbox/checked-disabled.png": [
+      6,
+      6,
+      "png",
+      "qx"
+    ],
     "qx/decoration/Simple/arrows/up.gif": [
       7,
       4,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/arrows/up-small.gif": [
-      5,
-      3,
-      "gif",
+    "qx/decoration/Simple/checkbox/checked.png": [
+      6,
+      6,
+      "png",
       "qx"
     ],
-    "qx/decoration/Simple/menu/checkbox-invert.gif": [
-      16,
-      7,
+    "qx/decoration/Simple/checkbox/undetermined-disabled.png": [
+      6,
+      2,
+      "png",
+      "qx"
+    ],
+    "qx/decoration/Simple/checkbox/undetermined.png": [
+      6,
+      2,
+      "png",
+      "qx"
+    ],
+    "qx/decoration/Simple/colorselector/brightness-field.png": [
+      19,
+      256,
+      "png",
+      "qx"
+    ],
+    "qx/decoration/Simple/colorselector/brightness-handle.gif": [
+      35,
+      11,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/menu/checkbox.gif": [
-      16,
-      7,
+    "qx/decoration/Simple/colorselector/huesaturation-field.jpg": [
+      256,
+      256,
+      "jpg",
+      "qx"
+    ],
+    "qx/decoration/Simple/colorselector/huesaturation-handle.gif": [
+      11,
+      11,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/menu/radiobutton-invert.gif": [
-      16,
-      5,
+    "qx/decoration/Simple/cursors/alias.gif": [
+      19,
+      15,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/menu/radiobutton.gif": [
-      16,
-      5,
+    "qx/decoration/Simple/cursors/move.gif": [
+      13,
+      9,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/cursors/alias.gif": [
+    "qx/decoration/Simple/cursors/copy.gif": [
       19,
       15,
       "gif",
@@ -72339,9 +72370,27 @@ qx.$$packageData['0'] = {
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/cursors/copy.gif": [
-      19,
-      15,
+    "qx/decoration/Simple/menu/checkbox-invert.gif": [
+      16,
+      7,
+      "gif",
+      "qx"
+    ],
+    "qx/decoration/Simple/menu/checkbox.gif": [
+      16,
+      7,
+      "gif",
+      "qx"
+    ],
+    "qx/decoration/Simple/menu/radiobutton-invert.gif": [
+      16,
+      5,
+      "gif",
+      "qx"
+    ],
+    "qx/decoration/Simple/menu/radiobutton.gif": [
+      16,
+      5,
       "gif",
       "qx"
     ],
@@ -72351,12 +72400,6 @@ qx.$$packageData['0'] = {
       "png",
       "qx"
     ],
-    "qx/decoration/Simple/cursors/move.gif": [
-      13,
-      9,
-      "gif",
-      "qx"
-    ],
     "qx/decoration/Simple/splitpane/knob-vertical.png": [
       8,
       1,
@@ -72369,12 +72412,6 @@ qx.$$packageData['0'] = {
       "png",
       "qx"
     ],
-    "qx/decoration/Simple/table/ascending-invert.png": [
-      10,
-      10,
-      "png",
-      "qx"
-    ],
     "qx/decoration/Simple/table/boolean-false.png": [
       11,
       11,
@@ -72387,6 +72424,12 @@ qx.$$packageData['0'] = {
       "png",
       "qx"
     ],
+    "qx/decoration/Simple/table/ascending-invert.png": [
+      10,
+      10,
+      "png",
+      "qx"
+    ],
     "qx/decoration/Simple/table/descending-invert.png": [
       10,
       10,
@@ -72405,99 +72448,93 @@ qx.$$packageData['0'] = {
       "png",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/cross.gif": [
-      19,
-      16,
-      "gif",
-      "qx"
-    ],
     "qx/decoration/Simple/tabview/close.gif": [
       10,
       9,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/cross_plus.gif": [
+    "qx/decoration/Simple/tree/minus.gif": [
       19,
       16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/end.gif": [
+    "qx/decoration/Simple/tree/plus.gif": [
       19,
       16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/end_minus.gif": [
+    "qx/decoration/Simple/treevirtual/cross.gif": [
       19,
       16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/end_plus.gif": [
+    "qx/decoration/Simple/treevirtual/cross_plus.gif": [
       19,
       16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/line.gif": [
+    "qx/decoration/Simple/treevirtual/end.gif": [
       19,
       16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/only_minus.gif": [
+    "qx/decoration/Simple/treevirtual/cross_minus.gif": [
       19,
       16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/only_plus.gif": [
+    "qx/decoration/Simple/treevirtual/end_minus.gif": [
       19,
       16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/start.gif": [
+    "qx/decoration/Simple/treevirtual/end_plus.gif": [
       19,
       16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/cross_minus.gif": [
+    "qx/decoration/Simple/treevirtual/line.gif": [
       19,
       16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/start_minus.gif": [
+    "qx/decoration/Simple/treevirtual/only_plus.gif": [
       19,
       16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/start_plus.gif": [
+    "qx/decoration/Simple/treevirtual/only_minus.gif": [
       19,
       16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/tree/minus.gif": [
+    "qx/decoration/Simple/treevirtual/start.gif": [
       19,
       16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/tree/plus.gif": [
+    "qx/decoration/Simple/treevirtual/start_minus.gif": [
       19,
       16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/window/close-white.gif": [
-      10,
-      9,
+    "qx/decoration/Simple/treevirtual/start_plus.gif": [
+      19,
+      16,
       "gif",
       "qx"
     ],
@@ -72507,19 +72544,19 @@ qx.$$packageData['0'] = {
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/window/maximize.gif": [
+    "qx/decoration/Simple/window/maximize-white.gif": [
       9,
       9,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/window/maximize-white.gif": [
-      9,
+    "qx/decoration/Simple/window/close-white.gif": [
+      10,
       9,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/window/minimize.gif": [
+    "qx/decoration/Simple/window/maximize.gif": [
       9,
       9,
       "gif",
@@ -72531,8 +72568,8 @@ qx.$$packageData['0'] = {
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/window/restore-white.gif": [
-      8,
+    "qx/decoration/Simple/window/minimize.gif": [
+      9,
       9,
       "gif",
       "qx"
@@ -72543,6 +72580,12 @@ qx.$$packageData['0'] = {
       "gif",
       "qx"
     ],
+    "qx/decoration/Simple/window/restore-white.gif": [
+      8,
+      9,
+      "gif",
+      "qx"
+    ],
     "qx/static/blank.png": [
       1,
       1,
@@ -72579,7 +72622,7 @@ qx.$$packageData['0'] = {
       "json",
       "qx"
     ],
-    "qx/tool/schema/qooxdoo-1-0-0.json": [
+    "qx/tool/schema/Manifest-2-0-0.json": [
       null,
       null,
       "json",
@@ -72591,7 +72634,7 @@ qx.$$packageData['0'] = {
       "json",
       "qx"
     ],
-    "qx/tool/schema/Manifest-2-0-0.json": [
+    "qx/tool/schema/qooxdoo-1-0-0.json": [
       null,
       null,
       "json",
@@ -72621,13 +72664,13 @@ qx.$$packageData['0'] = {
       "html",
       "qx"
     ],
-    "qx/tool/website/build/about.html": [
+    "qx/tool/website/build/index.html": [
       null,
       null,
       "html",
       "qx"
     ],
-    "qx/tool/website/build/index.html": [
+    "qx/tool/website/build/about.html": [
       null,
       null,
       "html",
@@ -72639,12 +72682,6 @@ qx.$$packageData['0'] = {
       "css",
       "qx"
     ],
-    "qx/tool/website/layouts/default.dot": [
-      null,
-      null,
-      "dot",
-      "qx"
-    ],
     "qx/tool/website/partials/footer.html": [
       null,
       null,
@@ -72663,34 +72700,34 @@ qx.$$packageData['0'] = {
       "html",
       "qx"
     ],
-    "qx/tool/website/partials/icon-github.svg": [
-      16,
-      16,
-      "svg",
-      "qx"
-    ],
-    "qx/tool/website/partials/icon-github.html": [
+    "qx/tool/website/partials/icon-twitter.html": [
       null,
       null,
       "html",
       "qx"
     ],
-    "qx/tool/website/partials/icon-twitter.html": [
+    "qx/tool/website/partials/icon-github.html": [
       null,
       null,
       "html",
       "qx"
     ],
+    "qx/tool/website/partials/icon-github.svg": [
+      16,
+      16,
+      "svg",
+      "qx"
+    ],
     "qx/tool/website/partials/icon-twitter.svg": [
       16,
       16,
       "svg",
       "qx"
     ],
-    "qx/tool/website/sass/qooxdoo.scss": [
+    "qx/tool/website/layouts/default.dot": [
       null,
       null,
-      "scss",
+      "dot",
       "qx"
     ],
     "qx/tool/website/src/404.html": [
@@ -72711,6 +72748,12 @@ qx.$$packageData['0'] = {
       "html",
       "qx"
     ],
+    "qx/tool/website/sass/qooxdoo.scss": [
+      null,
+      null,
+      "scss",
+      "qx"
+    ],
     "qx/tool/cli/templates/loader/loader-browser.tmpl.js": [
       null,
       null,
@@ -72735,18 +72778,6 @@ qx.$$packageData['0'] = {
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/class/header.tmpl.js": [
-      null,
-      null,
-      "js",
-      "qx"
-    ],
-    "qx/tool/cli/templates/class/interface.tmpl.js": [
-      null,
-      null,
-      "js",
-      "qx"
-    ],
     "qx/tool/cli/templates/class/singleton.tmpl.js": [
       null,
       null,
@@ -72759,25 +72790,13 @@ qx.$$packageData['0'] = {
       "js",
       "qx"
     ],
-    "qx/tool/website/build/diagnostics/dependson.html": [
-      null,
-      null,
-      "html",
-      "qx"
-    ],
-    "qx/tool/website/build/diagnostics/dependson.js": [
+    "qx/tool/cli/templates/class/header.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/website/build/diagnostics/requiredby.html": [
-      null,
-      null,
-      "html",
-      "qx"
-    ],
-    "qx/tool/website/build/diagnostics/requiredby.js": [
+    "qx/tool/cli/templates/class/interface.tmpl.js": [
       null,
       null,
       "js",
@@ -72795,12 +72814,6 @@ qx.$$packageData['0'] = {
       "js",
       "qx"
     ],
-    "qx/tool/website/build/assets/bootstrap.min.css": [
-      null,
-      null,
-      "css",
-      "qx"
-    ],
     "qx/tool/website/build/assets/bootstrap.css": [
       null,
       null,
@@ -72813,10 +72826,10 @@ qx.$$packageData['0'] = {
       "map",
       "qx"
     ],
-    "qx/tool/website/build/assets/buttons.js": [
+    "qx/tool/website/build/assets/bootstrap.min.css": [
       null,
       null,
-      "js",
+      "css",
       "qx"
     ],
     "qx/tool/website/build/assets/favicon.png": [
@@ -72831,13 +72844,13 @@ qx.$$packageData['0'] = {
       "js",
       "qx"
     ],
-    "qx/tool/website/build/assets/qx-api.png": [
-      1144,
-      640,
-      "png",
+    "qx/tool/website/build/assets/jquery.js": [
+      null,
+      null,
+      "js",
       "qx"
     ],
-    "qx/tool/website/build/assets/jquery.js": [
+    "qx/tool/website/build/assets/buttons.js": [
       null,
       null,
       "js",
@@ -72849,15 +72862,15 @@ qx.$$packageData['0'] = {
       "svg",
       "qx"
     ],
-    "qx/tool/website/build/assets/qx-ide.png": [
-      3183,
-      1752,
+    "qx/tool/website/build/assets/qx-api.png": [
+      1144,
+      640,
       "png",
       "qx"
     ],
-    "qx/tool/website/build/assets/qx-oo.png": [
-      870,
-      502,
+    "qx/tool/website/build/assets/qx-ide.png": [
+      3183,
+      1752,
       "png",
       "qx"
     ],
@@ -72867,31 +72880,37 @@ qx.$$packageData['0'] = {
       "svg",
       "qx"
     ],
-    "qx/tool/website/build/scripts/serve.js": [
+    "qx/tool/website/build/assets/qx-oo.png": [
+      870,
+      502,
+      "png",
+      "qx"
+    ],
+    "qx/tool/website/build/diagnostics/dependson.html": [
       null,
       null,
-      "js",
+      "html",
       "qx"
     ],
-    "qx/tool/website/src/diagnostics/dependson.html": [
+    "qx/tool/website/build/diagnostics/requiredby.js": [
       null,
       null,
-      "html",
+      "js",
       "qx"
     ],
-    "qx/tool/website/src/diagnostics/dependson.js": [
+    "qx/tool/website/build/diagnostics/dependson.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/website/src/diagnostics/requiredby.html": [
+    "qx/tool/website/build/diagnostics/requiredby.html": [
       null,
       null,
       "html",
       "qx"
     ],
-    "qx/tool/website/src/diagnostics/requiredby.js": [
+    "qx/tool/website/build/scripts/serve.js": [
       null,
       null,
       "js",
@@ -72909,66 +72928,66 @@ qx.$$packageData['0'] = {
       "js",
       "qx"
     ],
-    "qx/tool/website/src/assets/bootstrap.min.css.map": [
+    "qx/tool/website/src/assets/bootstrap.css": [
       null,
       null,
-      "map",
+      "css",
       "qx"
     ],
-    "qx/tool/website/src/assets/bootstrap.css": [
+    "qx/tool/website/src/assets/bootstrap.min.css": [
       null,
       null,
       "css",
       "qx"
     ],
-    "qx/tool/website/src/assets/buttons.js": [
+    "qx/tool/website/src/assets/bootstrap.min.css.map": [
       null,
       null,
-      "js",
+      "map",
       "qx"
     ],
-    "qx/tool/website/src/assets/bootstrap.min.css": [
+    "qx/tool/website/src/assets/buttons.js": [
       null,
       null,
-      "css",
-      "qx"
-    ],
-    "qx/tool/website/src/assets/favicon.png": [
-      32,
-      32,
-      "png",
+      "js",
       "qx"
     ],
-    "qx/tool/website/src/assets/jquery.js": [
+    "qx/tool/website/src/assets/fontawesome-all.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/website/src/assets/fontawesome-all.js": [
+    "qx/tool/website/src/assets/jquery.js": [
       null,
       null,
       "js",
       "qx"
     ],
+    "qx/tool/website/src/assets/favicon.png": [
+      32,
+      32,
+      "png",
+      "qx"
+    ],
     "qx/tool/website/src/assets/logo.svg": [
       512,
       145,
       "svg",
       "qx"
     ],
-    "qx/tool/website/src/assets/qx-api.png": [
-      1144,
-      640,
-      "png",
-      "qx"
-    ],
     "qx/tool/website/src/assets/qx-ide.png": [
       3183,
       1752,
       "png",
       "qx"
     ],
+    "qx/tool/website/src/assets/qx-api.png": [
+      1144,
+      640,
+      "png",
+      "qx"
+    ],
     "qx/tool/website/src/assets/qx-oo.png": [
       870,
       502,
@@ -72981,58 +73000,82 @@ qx.$$packageData['0'] = {
       "svg",
       "qx"
     ],
+    "qx/tool/website/src/diagnostics/dependson.html": [
+      null,
+      null,
+      "html",
+      "qx"
+    ],
+    "qx/tool/website/src/diagnostics/requiredby.js": [
+      null,
+      null,
+      "js",
+      "qx"
+    ],
+    "qx/tool/website/src/diagnostics/requiredby.html": [
+      null,
+      null,
+      "html",
+      "qx"
+    ],
+    "qx/tool/website/src/diagnostics/dependson.js": [
+      null,
+      null,
+      "js",
+      "qx"
+    ],
     "qx/tool/website/src/scripts/serve.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/.gitignore.tmpl": [
+    "qx/tool/cli/templates/skeleton/desktop/.gitignore.tmpl": [
       null,
       null,
       "tmpl",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/compile.tmpl.json": [
+    "qx/tool/cli/templates/skeleton/desktop/compile.tmpl.json": [
       null,
       null,
       "json",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/Manifest.tmpl.json": [
+    "qx/tool/cli/templates/skeleton/desktop/Manifest.tmpl.json": [
       null,
       null,
       "json",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/readme.tmpl.md": [
+    "qx/tool/cli/templates/skeleton/desktop/readme.tmpl.md": [
       null,
       null,
       "md",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/.gitignore.tmpl": [
+    "qx/tool/cli/templates/skeleton/mobile/.gitignore.tmpl": [
       null,
       null,
       "tmpl",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/compile.tmpl.json": [
+    "qx/tool/cli/templates/skeleton/mobile/compile.tmpl.json": [
       null,
       null,
       "json",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/readme.tmpl.md": [
+    "qx/tool/cli/templates/skeleton/mobile/Manifest.tmpl.json": [
       null,
       null,
-      "md",
+      "json",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/Manifest.tmpl.json": [
+    "qx/tool/cli/templates/skeleton/mobile/readme.tmpl.md": [
       null,
       null,
-      "json",
+      "md",
       "qx"
     ],
     "qx/tool/cli/templates/skeleton/package/.gitignore.tmpl": [
@@ -73047,16 +73090,16 @@ qx.$$packageData['0'] = {
       "json",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/readme.tmpl.md": [
+    "qx/tool/cli/templates/skeleton/package/Manifest.tmpl.json": [
       null,
       null,
-      "md",
+      "json",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/Manifest.tmpl.json": [
+    "qx/tool/cli/templates/skeleton/package/readme.tmpl.md": [
       null,
       null,
-      "json",
+      "md",
       "qx"
     ],
     "qx/tool/cli/templates/skeleton/server/.gitignore.tmpl": [
@@ -73083,43 +73126,43 @@ qx.$$packageData['0'] = {
       "txt",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/source/boot/index.tmpl.html": [
+    "qx/tool/cli/templates/skeleton/desktop/source/boot/index.tmpl.html": [
       null,
       null,
       "html",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/source/boot/nojs.tmpl.html": [
+    "qx/tool/cli/templates/skeleton/desktop/source/boot/nojs.tmpl.html": [
       null,
       null,
       "html",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/source/translation/readme.txt": [
+    "qx/tool/cli/templates/skeleton/mobile/source/boot/index.tmpl.html": [
       null,
       null,
-      "txt",
+      "html",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/source/translation/readme.txt": [
+    "qx/tool/cli/templates/skeleton/mobile/source/boot/nojs.tmpl.html": [
       null,
       null,
-      "txt",
+      "html",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/boot/index.tmpl.html": [
+    "qx/tool/cli/templates/skeleton/desktop/source/translation/readme.txt": [
       null,
       null,
-      "html",
+      "txt",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/boot/nojs.tmpl.html": [
+    "qx/tool/cli/templates/skeleton/mobile/source/translation/readme.txt": [
       null,
       null,
-      "html",
+      "txt",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/translation/readme.txt": [
+    "qx/tool/cli/templates/skeleton/package/source/translation/readme.txt": [
       null,
       null,
       "txt",
@@ -73131,43 +73174,67 @@ qx.$$packageData['0'] = {
       "txt",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/source/class/custom/Application.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/desktop/source/resource/custom/app.png": [
+      180,
+      180,
+      "png",
+      "qx"
+    ],
+    "qx/tool/cli/templates/skeleton/desktop/source/resource/custom/favicon.png": [
+      32,
+      32,
+      "png",
+      "qx"
+    ],
+    "qx/tool/cli/templates/skeleton/desktop/source/resource/custom/js_256x256.png": [
+      256,
+      256,
+      "png",
+      "qx"
+    ],
+    "qx/tool/cli/templates/skeleton/desktop/source/resource/custom/test.png": [
+      32,
+      32,
+      "png",
+      "qx"
+    ],
+    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/Application.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/source/class/custom/__init__.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/__init__.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/source/resource/custom/favicon.png": [
-      32,
-      32,
-      "png",
-      "qx"
-    ],
     "qx/tool/cli/templates/skeleton/mobile/source/resource/custom/app.png": [
       180,
       180,
       "png",
       "qx"
     ],
+    "qx/tool/cli/templates/skeleton/mobile/source/resource/custom/favicon.png": [
+      32,
+      32,
+      "png",
+      "qx"
+    ],
     "qx/tool/cli/templates/skeleton/mobile/source/resource/custom/js_256x256.png": [
       256,
       256,
       "png",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/source/class/custom/Button.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/mobile/source/class/custom/Application.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/source/class/custom/__init__.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/mobile/source/class/custom/__init__.tmpl.js": [
       null,
       null,
       "js",
@@ -73179,42 +73246,18 @@ qx.$$packageData['0'] = {
       "png",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/Application.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/package/source/class/custom/Button.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/__init__.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/package/source/class/custom/__init__.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/resource/custom/app.png": [
-      180,
-      180,
-      "png",
-      "qx"
-    ],
-    "qx/tool/cli/templates/skeleton/desktop/source/resource/custom/js_256x256.png": [
-      256,
-      256,
-      "png",
-      "qx"
-    ],
-    "qx/tool/cli/templates/skeleton/desktop/source/resource/custom/favicon.png": [
-      32,
-      32,
-      "png",
-      "qx"
-    ],
-    "qx/tool/cli/templates/skeleton/desktop/source/resource/custom/test.png": [
-      32,
-      32,
-      "png",
-      "qx"
-    ],
     "qx/tool/cli/templates/skeleton/server/source/class/custom/Application.tmpl.js": [
       null,
       null,
@@ -73233,67 +73276,61 @@ qx.$$packageData['0'] = {
       "tmpl",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/source/class/custom/page/Login.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/test/DemoTest.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/source/class/custom/page/Overview.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/theme/Appearance.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/source/class/custom/page/__init__.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/theme/Color.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/source/resource/custom/css/.gitignore.tmpl": [
-      null,
-      null,
-      "tmpl",
-      "qx"
-    ],
-    "qx/tool/cli/templates/skeleton/package/source/class/custom/demo/Application.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/theme/Decoration.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/source/class/custom/test/DemoTest.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/theme/Theme.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/source/class/custom/theme/Appearance.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/theme/Font.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/source/class/custom/theme/Color.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/mobile/source/resource/custom/css/.gitignore.tmpl": [
       null,
       null,
-      "js",
+      "tmpl",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/source/class/custom/theme/Theme.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/mobile/source/class/custom/page/Login.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/source/class/custom/theme/Decoration.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/mobile/source/class/custom/page/Overview.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/source/class/custom/theme/Font.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/mobile/source/class/custom/page/__init__.tmpl.js": [
       null,
       null,
       "js",
@@ -73311,37 +73348,43 @@ qx.$$packageData['0'] = {
       "scss",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/test/DemoTest.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/package/source/class/custom/demo/Application.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/theme/Color.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/package/source/class/custom/test/DemoTest.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/theme/Appearance.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/package/source/class/custom/theme/Color.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/theme/Decoration.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/package/source/class/custom/theme/Appearance.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/theme/Font.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/package/source/class/custom/theme/Font.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/theme/Theme.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/package/source/class/custom/theme/Theme.tmpl.js": [
+      null,
+      null,
+      "js",
+      "qx"
+    ],
+    "qx/tool/cli/templates/skeleton/package/source/class/custom/theme/Decoration.tmpl.js": [
       null,
       null,
       "js",