@qooxdoo/framework 7.7.0 → 7.7.2

package/lib/compiler/index.js

@@ -125,7 +125,7 @@ if (typeof global !== "undefined") {
   "qx.promise.warnings": true,
   "qx.promise.longStackTraces": true,
   "qx.compiler": true,
-  "qx.compiler.version": "7.7.0",
+  "qx.compiler.version": "7.7.2",
   "qx.version": null,
   "qx.compiler.targetType": "source",
   "qx.compiler.outputDir": "compiled/node/build/",
@@ -5130,16 +5130,18 @@ try {
                 break;
               }
             }
+
             // Try looking in the class itself
             if (!fn && mixedInAt.prototype[methodName]) {
-              fn = mixedInAt.prototype[methodName].base;
-              // if fn.self is set fn is an overloaded mixin method from
-              // another mixin. In this case fn.base contains the original
-              // class method.
-              if (fn && fn.self) {
+              fn = mixedInAt.prototype[methodName];
+              for (let i = 0; i < mixedInAt.$$flatIncludes.length; i++) {
+                if (!mixedInAt.$$flatIncludes[i].$$members[methodName]) {
+                  continue;
+                }
                 fn = fn.base;
               }
             }
+
             // Try looking in the superclass
             if (!fn && mixedInAt.superclass) {
               fn = mixedInAt.superclass.prototype[methodName];
@@ -8501,7 +8503,7 @@ try {
           // Validate keys
           var allowed = config.type === "static" ? this.__P_142_11 : this.__P_142_10;
           for (var key in config) {
-            if (!allowed[key]) {
+            if (!(key in allowed)) {
               throw new Error('The configuration key "' + key + '" in class "' + name + '" is not allowed!');
             }
             if (config[key] == null) {
@@ -13961,7 +13963,7 @@ try {
         if (!(options.self || options.args || options.delay != null || options.periodical != null || options.attempt || options.always)) {
           return func;
         }
-        return function (event) {
+        let result = function (event) {
           // Convert (and copy) incoming arguments
           var args = qx.lang.Array.fromArguments(arguments);
 
@@ -13992,6 +13994,7 @@ try {
             return func.apply(options.self || this, args);
           }
         };
+        return result;
       },
       /**
        * Returns a function whose "this" is altered.
@@ -32836,7 +32839,7 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
        * @return {String}
        */
       getCompilerVersion() {
-        return "7.7.0";
+        return "7.7.2";
       },
       /**
        * Returns the qooxdoo version used in the application in the current or given
@@ -41772,14 +41775,11 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
           await scanImpl(dir);
         }
         for (let filename of classFiles) {
-          if (this.argv.verbose) {
-            qx.tool.compiler.Console.info(`Processing ${filename} ...`);
-          }
           await metaDb.addFile(filename, !!this.argv.clean);
         }
         await metaDb.reparseAll();
         await metaDb.save();
-        this.fireDataEvent("writtenMetaData", metaDb);
+        await this.fireDataEventAsync("writtenMetaData", metaDb);
 
         // Do the inital write
         let tsWriter = null;
@@ -41789,7 +41789,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
           if (this.__P_8_6) {
             tsWriter.setOutputTo(this.__P_8_6);
           } else {
-            tsWriter.setOutputTo(path.join("compiled", "qooxdoo.d.ts"));
+            tsWriter.setOutputTo(path.join(this.__P_8_4, "..", "qooxdoo.d.ts"));
           }
           await tsWriter.process();
         }
@@ -41845,7 +41845,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
        * @return {qx.tool.compiler.makers.Maker}
        */
       async createMakersFromConfig(data) {
-        var _data$meta, _data$meta2;
+        var _data$meta, _data$meta2, _data$meta4;
         const Console = qx.tool.compiler.Console.getInstance();
         var t = this;
         if (data.babelOptions) {
@@ -41861,9 +41861,10 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
         }
         if (qx.lang.Type.isBoolean(data === null || data === void 0 || (_data$meta = data.meta) === null || _data$meta === void 0 ? void 0 : _data$meta.typescript)) {
           this.__P_8_5 = data.meta.typescript;
-        } else if (qx.lang.Type.isString(data === null || data === void 0 ? void 0 : data.typescript)) {
+        } else if (qx.lang.Type.isString(data === null || data === void 0 || (_data$meta2 = data.meta) === null || _data$meta2 === void 0 ? void 0 : _data$meta2.typescript)) {
+          var _data$meta3;
           this.__P_8_5 = true;
-          this.__P_8_6 = data.typescript;
+          this.__P_8_6 = path.relative(process.cwd(), path.resolve(data === null || data === void 0 || (_data$meta3 = data.meta) === null || _data$meta3 === void 0 ? void 0 : _data$meta3.typescript));
         }
         if (qx.lang.Type.isBoolean(this.argv.typescript)) {
           this.__P_8_5 = this.argv.typescript;
@@ -42020,7 +42021,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
          */
         let targetOutputPaths = {};
         let makers = [];
-        this.__P_8_4 = (_data$meta2 = data.meta) === null || _data$meta2 === void 0 ? void 0 : _data$meta2.output;
+        this.__P_8_4 = (_data$meta4 = data.meta) === null || _data$meta4 === void 0 ? void 0 : _data$meta4.output;
         if (!this.__P_8_4) {
           this.__P_8_4 = path.relative(process.cwd(), path.resolve(targetConfigs[0].outputPath, "../meta"));
         }
@@ -42893,8 +42894,8 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
         var appRootDir = this.getApplicationRoot(application);
         let mapTo = this.getPathMapping(path.join(appRootDir, this.getOutputDir(), "transpiled/"));
         appMeta.setSourceUri(mapTo ? mapTo : targetUri + "transpiled/");
-        mapTo = this.getPathMapping(path.join(appRootDir, this.getOutputDir(), "resource/"));
-        appMeta.setResourceUri(mapTo ? mapTo : targetUri + "resource/");
+        mapTo = this.getPathMapping(path.join(appRootDir, this.getOutputDir(), "resource"));
+        appMeta.setResourceUri(mapTo ? mapTo : targetUri + "resource");
         const requiredLibs = application.getRequiredLibraries();
         await qx.tool.utils.Utils.makeDirs(appRootDir);
         appMeta.setEnvironment({
@@ -44110,7 +44111,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
         "require": true
       },
       "qx.Promise": {},
-      "qx.util.ResourceManager": {},
+      "qx.tool.utils.Utils": {},
       "qx.lang.String": {},
       "qx.tool.compiler.jsdoc.Parser": {},
       "qx.lang.Type": {}
@@ -44140,7 +44141,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
    *
    * *********************************************************************** */
 
-  var path = require("path");
+  var path = require("upath");
   var fs = require("fs");
   const {
     promisify
@@ -44187,7 +44188,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
         this.__P_43_2 = new qx.Promise();
         this.__P_43_1.on("close", () => this.__P_43_2.resolve());
         this.write(`// Generated declaration file at ${time}\n`);
-        let str = qx.util.ResourceManager.getInstance().toUri("qx/tool/cli/templates/TypeScriptWriter-base_declaration.d.ts");
+        let str = path.join(qx.tool.utils.Utils.getTemplateDir(), "TypeScriptWriter-base_declaration.d.ts");
         let baseDeclaration = await fs.promises.readFile(str, "utf8");
         this.write(baseDeclaration + "\n");
       },
@@ -48484,8 +48485,9 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
             t.__P_21_29 = true;
             t.__P_21_24 = true;
           }
-          t.__P_21_26.functionName = FUNCTION_NAMES[keyName] || keyName;
-          if (FUNCTION_NAMES[keyName] !== undefined) {
+          var isSpecialFunctionName = Object.keys(FUNCTION_NAMES).includes(keyName);
+          t.__P_21_26.functionName = isSpecialFunctionName ? FUNCTION_NAMES[keyName] : keyName;
+          if (isSpecialFunctionName) {
             makeMeta(keyName, null, functionNode);
           }
           enterFunction(path, functionNode);
@@ -48525,7 +48527,8 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
             }
             var keyName = getKeyName(prop.key);
             checkValidTopLevel(path);
-            if (FUNCTION_NAMES[keyName] !== undefined) {
+            var isSpecialFunctionName = Object.keys(FUNCTION_NAMES).includes(keyName);
+            if (isSpecialFunctionName) {
               let val = path.node.value;
               val.leadingComments = (path.node.leadingComments || []).concat(val.leadingComments || []);
               handleTopLevelMethods(path, keyName, val);
@@ -66920,6 +66923,30 @@ 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/arrows/down-invert.gif": [
       7,
       4,
@@ -66992,30 +67019,6 @@ qx.$$packageData['0'] = {
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/checkbox/checked-disabled.png": [
-      6,
-      6,
-      "png",
-      "qx"
-    ],
-    "qx/decoration/Simple/checkbox/undetermined.png": [
-      6,
-      2,
-      "png",
-      "qx"
-    ],
-    "qx/decoration/Simple/checkbox/undetermined-disabled.png": [
-      6,
-      2,
-      "png",
-      "qx"
-    ],
-    "qx/decoration/Simple/checkbox/checked.png": [
-      6,
-      6,
-      "png",
-      "qx"
-    ],
     "qx/decoration/Simple/colorselector/brightness-field.png": [
       19,
       256,
@@ -67028,18 +67031,18 @@ qx.$$packageData['0'] = {
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/colorselector/huesaturation-handle.gif": [
-      11,
-      11,
-      "gif",
-      "qx"
-    ],
     "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/cursors/alias.gif": [
       19,
       15,
@@ -67052,39 +67055,15 @@ qx.$$packageData['0'] = {
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/cursors/nodrop.gif": [
-      20,
-      20,
-      "gif",
-      "qx"
-    ],
     "qx/decoration/Simple/cursors/move.gif": [
       13,
       9,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/menu/checkbox.gif": [
-      16,
-      7,
-      "gif",
-      "qx"
-    ],
-    "qx/decoration/Simple/menu/checkbox-invert.gif": [
-      16,
-      7,
-      "gif",
-      "qx"
-    ],
-    "qx/decoration/Simple/menu/radiobutton-invert.gif": [
-      16,
-      5,
-      "gif",
-      "qx"
-    ],
-    "qx/decoration/Simple/menu/radiobutton.gif": [
-      16,
-      5,
+    "qx/decoration/Simple/cursors/nodrop.gif": [
+      20,
+      20,
       "gif",
       "qx"
     ],
@@ -67100,6 +67079,24 @@ qx.$$packageData['0'] = {
       "png",
       "qx"
     ],
+    "qx/decoration/Simple/tabview/close.gif": [
+      10,
+      9,
+      "gif",
+      "qx"
+    ],
+    "qx/decoration/Simple/tree/minus.gif": [
+      19,
+      16,
+      "gif",
+      "qx"
+    ],
+    "qx/decoration/Simple/tree/plus.gif": [
+      19,
+      16,
+      "gif",
+      "qx"
+    ],
     "qx/decoration/Simple/table/ascending-invert.png": [
       10,
       10,
@@ -67118,18 +67115,18 @@ qx.$$packageData['0'] = {
       "png",
       "qx"
     ],
-    "qx/decoration/Simple/table/boolean-true.png": [
-      11,
-      11,
-      "png",
-      "qx"
-    ],
     "qx/decoration/Simple/table/descending-invert.png": [
       10,
       10,
       "png",
       "qx"
     ],
+    "qx/decoration/Simple/table/boolean-true.png": [
+      11,
+      11,
+      "png",
+      "qx"
+    ],
     "qx/decoration/Simple/table/descending.png": [
       10,
       10,
@@ -67142,141 +67139,147 @@ qx.$$packageData['0'] = {
       "png",
       "qx"
     ],
-    "qx/decoration/Simple/tabview/close.gif": [
-      10,
-      9,
+    "qx/decoration/Simple/menu/checkbox-invert.gif": [
+      16,
+      7,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/tree/minus.gif": [
-      19,
+    "qx/decoration/Simple/menu/checkbox.gif": [
       16,
+      7,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/tree/plus.gif": [
-      19,
+    "qx/decoration/Simple/menu/radiobutton-invert.gif": [
       16,
+      5,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/cross_minus.gif": [
-      19,
+    "qx/decoration/Simple/menu/radiobutton.gif": [
       16,
+      5,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/cross_plus.gif": [
-      19,
-      16,
+    "qx/decoration/Simple/window/close-white.gif": [
+      10,
+      9,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/end.gif": [
-      19,
-      16,
+    "qx/decoration/Simple/window/close.gif": [
+      10,
+      9,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/end_minus.gif": [
-      19,
-      16,
+    "qx/decoration/Simple/window/maximize-white.gif": [
+      9,
+      9,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/cross.gif": [
-      19,
-      16,
+    "qx/decoration/Simple/window/maximize.gif": [
+      9,
+      9,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/end_plus.gif": [
-      19,
-      16,
+    "qx/decoration/Simple/window/minimize-white.gif": [
+      9,
+      9,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/line.gif": [
-      19,
-      16,
+    "qx/decoration/Simple/window/minimize.gif": [
+      9,
+      9,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/only_minus.gif": [
-      19,
-      16,
+    "qx/decoration/Simple/window/restore-white.gif": [
+      8,
+      9,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/only_plus.gif": [
+    "qx/decoration/Simple/window/restore.gif": [
+      8,
+      9,
+      "gif",
+      "qx"
+    ],
+    "qx/decoration/Simple/treevirtual/cross.gif": [
       19,
       16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/start.gif": [
+    "qx/decoration/Simple/treevirtual/cross_minus.gif": [
       19,
       16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/start_minus.gif": [
+    "qx/decoration/Simple/treevirtual/cross_plus.gif": [
       19,
       16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/start_plus.gif": [
+    "qx/decoration/Simple/treevirtual/end.gif": [
       19,
       16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/window/close.gif": [
-      10,
-      9,
+    "qx/decoration/Simple/treevirtual/end_minus.gif": [
+      19,
+      16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/window/maximize-white.gif": [
-      9,
-      9,
+    "qx/decoration/Simple/treevirtual/end_plus.gif": [
+      19,
+      16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/window/close-white.gif": [
-      10,
-      9,
+    "qx/decoration/Simple/treevirtual/line.gif": [
+      19,
+      16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/window/maximize.gif": [
-      9,
-      9,
+    "qx/decoration/Simple/treevirtual/only_minus.gif": [
+      19,
+      16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/window/minimize-white.gif": [
-      9,
-      9,
+    "qx/decoration/Simple/treevirtual/only_plus.gif": [
+      19,
+      16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/window/minimize.gif": [
-      9,
-      9,
+    "qx/decoration/Simple/treevirtual/start.gif": [
+      19,
+      16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/window/restore-white.gif": [
-      8,
-      9,
+    "qx/decoration/Simple/treevirtual/start_minus.gif": [
+      19,
+      16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/window/restore.gif": [
-      8,
-      9,
+    "qx/decoration/Simple/treevirtual/start_plus.gif": [
+      19,
+      16,
       "gif",
       "qx"
     ],
@@ -67322,13 +67325,13 @@ qx.$$packageData['0'] = {
       "json",
       "qx"
     ],
-    "qx/tool/schema/Manifest-2-0-0.json": [
+    "qx/tool/schema/qooxdoo-1-0-0.json": [
       null,
       null,
       "json",
       "qx"
     ],
-    "qx/tool/schema/qooxdoo-1-0-0.json": [
+    "qx/tool/schema/Manifest-2-0-0.json": [
       null,
       null,
       "json",
@@ -67340,22 +67343,16 @@ qx.$$packageData['0'] = {
       "",
       "qx"
     ],
-    "qx/tool/cli/templates/TypeScriptWriter-base_declaration.d.ts": [
-      null,
-      null,
-      "ts",
-      "qx"
-    ],
     "qx/tool/cli/templates/template_vars.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/website/layouts/default.dot": [
+    "qx/tool/cli/templates/TypeScriptWriter-base_declaration.d.ts": [
       null,
       null,
-      "dot",
+      "ts",
       "qx"
     ],
     "qx/tool/website/build/404.html": [
@@ -67382,6 +67379,12 @@ qx.$$packageData['0'] = {
       "css",
       "qx"
     ],
+    "qx/tool/website/layouts/default.dot": [
+      null,
+      null,
+      "dot",
+      "qx"
+    ],
     "qx/tool/website/sass/qooxdoo.scss": [
       null,
       null,
@@ -67466,13 +67469,13 @@ qx.$$packageData['0'] = {
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/class/mixin.tmpl.js": [
+    "qx/tool/cli/templates/class/singleton.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/class/singleton.tmpl.js": [
+    "qx/tool/cli/templates/class/mixin.tmpl.js": [
       null,
       null,
       "js",
@@ -67646,18 +67649,18 @@ qx.$$packageData['0'] = {
       "js",
       "qx"
     ],
-    "qx/tool/website/src/assets/favicon.png": [
-      32,
-      32,
-      "png",
-      "qx"
-    ],
     "qx/tool/website/src/assets/fontawesome-all.js": [
       null,
       null,
       "js",
       "qx"
     ],
+    "qx/tool/website/src/assets/favicon.png": [
+      32,
+      32,
+      "png",
+      "qx"
+    ],
     "qx/tool/website/src/assets/jquery.js": [
       null,
       null,
@@ -67670,18 +67673,18 @@ qx.$$packageData['0'] = {
       "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,
@@ -67724,49 +67727,49 @@ qx.$$packageData['0'] = {
       "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/Manifest.tmpl.json": [
+    "qx/tool/cli/templates/skeleton/desktop/compile.tmpl.json": [
       null,
       null,
       "json",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/compile.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/Manifest.tmpl.json": [
       null,
       null,
       "json",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/Manifest.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/readme.tmpl.md": [
       null,
       null,
       "md",
@@ -67808,49 +67811,49 @@ 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/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/desktop/source/boot/index.tmpl.html": [
+    "qx/tool/cli/templates/skeleton/mobile/source/boot/nojs.tmpl.html": [
       null,
       null,
       "html",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/boot/nojs.tmpl.html": [
+    "qx/tool/cli/templates/skeleton/mobile/source/boot/index.tmpl.html": [
       null,
       null,
       "html",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/source/translation/readme.txt": [
+    "qx/tool/cli/templates/skeleton/desktop/source/translation/readme.txt": [
       null,
       null,
       "txt",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/translation/readme.txt": [
+    "qx/tool/cli/templates/skeleton/mobile/source/translation/readme.txt": [
       null,
       null,
       "txt",
@@ -67868,34 +67871,28 @@ qx.$$packageData['0'] = {
       "txt",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/source/resource/custom/app.png": [
+    "qx/tool/cli/templates/skeleton/desktop/source/resource/custom/app.png": [
       180,
       180,
       "png",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/source/resource/custom/favicon.png": [
+    "qx/tool/cli/templates/skeleton/desktop/source/resource/custom/favicon.png": [
       32,
       32,
       "png",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/source/resource/custom/js_256x256.png": [
+    "qx/tool/cli/templates/skeleton/desktop/source/resource/custom/js_256x256.png": [
       256,
       256,
       "png",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/source/class/custom/Application.tmpl.js": [
-      null,
-      null,
-      "js",
-      "qx"
-    ],
-    "qx/tool/cli/templates/skeleton/mobile/source/class/custom/__init__.tmpl.js": [
-      null,
-      null,
-      "js",
+    "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": [
@@ -67904,58 +67901,58 @@ qx.$$packageData['0'] = {
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/__init__.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/mobile/source/class/custom/Application.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/server/source/class/custom/Application.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/__init__.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/server/source/class/custom/__init__.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/mobile/source/class/custom/__init__.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/server/source/resource/custom/.gitignore.tmpl": [
-      null,
-      null,
-      "tmpl",
-      "qx"
-    ],
-    "qx/tool/cli/templates/skeleton/desktop/source/resource/custom/app.png": [
+    "qx/tool/cli/templates/skeleton/mobile/source/resource/custom/app.png": [
       180,
       180,
       "png",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/resource/custom/favicon.png": [
+    "qx/tool/cli/templates/skeleton/mobile/source/resource/custom/favicon.png": [
       32,
       32,
       "png",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/resource/custom/js_256x256.png": [
+    "qx/tool/cli/templates/skeleton/mobile/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/tool/cli/templates/skeleton/server/source/class/custom/Application.tmpl.js": [
+      null,
+      null,
+      "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/source/resource/custom/test.png": [
-      32,
-      32,
-      "png",
+    "qx/tool/cli/templates/skeleton/server/source/class/custom/__init__.tmpl.js": [
+      null,
+      null,
+      "js",
+      "qx"
+    ],
+    "qx/tool/cli/templates/skeleton/server/source/resource/custom/.gitignore.tmpl": [
+      null,
+      null,
+      "tmpl",
       "qx"
     ],
     "qx/tool/cli/templates/skeleton/package/source/class/custom/Button.tmpl.js": [
@@ -67970,82 +67967,88 @@ qx.$$packageData['0'] = {
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/source/resource/custom/css/.gitignore.tmpl": [
+    "qx/tool/cli/templates/skeleton/package/source/resource/custom/test.png": [
+      32,
+      32,
+      "png",
+      "qx"
+    ],
+    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/test/DemoTest.tmpl.js": [
       null,
       null,
-      "tmpl",
+      "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/source/class/custom/page/Login.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/Overview.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/class/custom/page/__init__.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/theme/Decoration.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/source/theme/custom/scss/custom.scss": [
+    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/theme/Theme.tmpl.js": [
       null,
       null,
-      "scss",
+      "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/source/theme/custom/scss/_styles.scss": [
+    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/theme/Font.tmpl.js": [
       null,
       null,
-      "scss",
+      "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/test/DemoTest.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/mobile/source/class/custom/page/Login.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/theme/Appearance.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/mobile/source/class/custom/page/Overview.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/theme/Color.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/mobile/source/class/custom/page/__init__.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/theme/Decoration.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/mobile/source/resource/custom/css/.gitignore.tmpl": [
       null,
       null,
-      "js",
+      "tmpl",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/theme/Font.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/server/source/class/custom/test/DemoTest.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/theme/Theme.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/mobile/source/theme/custom/scss/custom.scss": [
       null,
       null,
-      "js",
+      "scss",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/server/source/class/custom/test/DemoTest.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/mobile/source/theme/custom/scss/_styles.scss": [
       null,
       null,
-      "js",
+      "scss",
       "qx"
     ],
     "qx/tool/cli/templates/skeleton/package/source/class/custom/demo/Application.tmpl.js": [
@@ -68054,19 +68057,19 @@ qx.$$packageData['0'] = {
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/source/class/custom/test/DemoTest.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/package/source/class/custom/theme/Appearance.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/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/package/source/class/custom/theme/Color.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/package/source/class/custom/theme/Font.tmpl.js": [
       null,
       null,
       "js",
@@ -68078,13 +68081,13 @@ qx.$$packageData['0'] = {
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/source/class/custom/theme/Font.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/Theme.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/package/source/class/custom/test/DemoTest.tmpl.js": [
       null,
       null,
       "js",