@qooxdoo/framework 7.1.0 → 7.1.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.1.0",
+  "qx.version": "7.1.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.1.0",
+  "qx.compiler.version": "7.1.1",
   "qx.headless": true,
   "qx.compiler.applicationType": "node",
   "qx.compiler.applicationName": "compiler"
@@ -36437,7 +36437,7 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
        * @return {String}
        */
       getCompilerVersion() {
-        return "7.1.0";
+        return "7.1.1";
       },
 
       /**
@@ -38004,7 +38004,7 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
    * *********************************************************************** */
   const Ajv = require("ajv");
 
-  const betterAjvErrors = require("better-ajv-errors");
+  const betterAjvErrors = require("better-ajv-errors").default;
 
   const fs = qx.tool.utils.Promisify.fs;
   qx.Class.define("qx.tool.utils.Json", {
@@ -45729,6 +45729,7 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
         "require": true
       },
       "qx.tool.cli.ConfigDb": {},
+      "qx.tool.config.Compile": {},
       "qx.tool.compiler.Console": {
         "defer": "runtime"
       },
@@ -46079,7 +46080,10 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
 
         if (this.argv["feedback"] === null) {
           this.argv["feedback"] = configDb.db("qx.default.feedback", true);
-        }
+        } // Validate compile.json against the schema
+
+
+        await qx.tool.config.Compile.getInstance().load();
 
         if (this.argv.verbose) {
           console.log(`
@@ -46779,7 +46783,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
           appConfigs.forEach(appConfig => {
             var app = appConfig.app = new qx.tool.compiler.app.Application(appConfig["class"]);
             app.setTemplatePath(qx.tool.utils.Utils.getTemplateDir());
-            ["type", "theme", "name", "environment", "outputPath", "bootPath", "loaderTemplate", "publish", "deploy", "standalone"].forEach(name => {
+            ["type", "theme", "name", "environment", "outputPath", "bootPath", "loaderTemplate", "publish", "deploy", "standalone", "localModules"].forEach(name => {
               if (appConfig[name] !== undefined) {
                 var fname = "set" + qx.lang.String.firstUp(name);
                 app[fname](appConfig[name]);
@@ -46799,6 +46803,10 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
               app.setDescription(appConfig.description);
             }
 
+            if (appConfig.localModules) {
+              app.setLocalModules(appConfig.localModules);
+            }
+
             var parts = appConfig.parts || targetConfig.parts || data.parts;
 
             if (parts) {
@@ -47587,16 +47595,16 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
         let bootJs = new qx.tool.compiler.targets.meta.BootJs(appMeta);
         let bootPackage = appMeta.createPackage();
         appMeta.setBootMetaJs(bootJs);
-        bootPackage.addJavascriptMeta(new qx.tool.compiler.targets.meta.PolyfillJs(appMeta)); // Add browserified CommonJS modules, if any
+        bootPackage.addJavascriptMeta(new qx.tool.compiler.targets.meta.PolyfillJs(appMeta)); // Add browserified CommonJS modules, if any. The Browserify
+        // class will always bundle local modules specified for an
+        // application in compile.json, but will not bundle `require()`d
+        // modules that are Node modules.
 
-        if (appMeta.getEnvironmentValue("qx.compiler.applicationType") == "browser") {
-          bootPackage.addJavascriptMeta(new qx.tool.compiler.targets.meta.Browserify(appMeta));
-        }
+        bootPackage.addJavascriptMeta(new qx.tool.compiler.targets.meta.Browserify(appMeta));
         /*
          * Assemble the Parts
          */
 
-
         var partsData = application.getPartsDependencies();
         let matchBundle = qx.tool.compiler.app.Application.createWildcardMatchFunction(application.getBundleInclude(), application.getBundleExclude());
         let lastPackage = bootPackage;
@@ -50013,6 +50021,20 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
       writeIndexHtmlToRoot: {
         init: false,
         check: "Boolean"
+      },
+
+      /**
+       * Map specifying local modules to include in the build. Local modules are
+       * always included in the compiled output, regardless of application type
+       * (node, browser, etc.). Each member of the map has a key that is the
+       * name of the module to be `require`d in code. The value is the path to
+       * the module to be included. The path must begin with "./", and is
+       * relative to the directory containing compile.json. The module may be
+       * either a CommonJS module or an ES6 module.
+       */
+      localModules: {
+        init: null,
+        check: "Object"
       }
     },
     members: {
@@ -54932,7 +54954,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
 
   const path = require("upath");
   /**
-   * 
+   *
    */
 
 
@@ -54955,32 +54977,45 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
         let hasCommonjsModules = false;
         let commonjsModules = new Set();
         let references = {};
+        const localModules = this.__P_44_0.getApplication().getLocalModules() || {};
 
-        const db = this.__P_44_0.getAnalyser().getDatabase(); // Get a Set of unique `require`d CommonJS module names from all classes
+        const db = this.__P_44_0.getAnalyser().getDatabase(); // Only include discovered `require()`d Node modules if the
+        // target application type is browser.
 
 
-        for (let className in db.classInfo) {
-          let classInfo = db.classInfo[className];
+        if (this.__P_44_0.getEnvironmentValue("qx.compiler.applicationType") == "browser") {
+          // Get a Set of unique `require`d CommonJS module names from
+          // all classes
+          for (let className in db.classInfo) {
+            let classInfo = db.classInfo[className];
 
-          if (classInfo.commonjsModules) {
-            Object.keys(classInfo.commonjsModules).forEach(moduleName => {
-              // Add this module name to the set of module names
-              commonjsModules.add(moduleName); // Add the list of references from which this module was require()d
+            if (classInfo.commonjsModules) {
+              Object.keys(classInfo.commonjsModules).forEach(moduleName => {
+                // Ignore this found `require()` if its a local modules
+                if (moduleName in localModules) {
+                  return;
+                } // Add this module name to the set of module names
 
-              if (!references[moduleName]) {
-                references[moduleName] = new Set();
-              }
 
-              references[moduleName].add([...classInfo.commonjsModules[moduleName]]); // There is at least one module
+                commonjsModules.add(moduleName); // Add the list of references from which this module was require()d
 
-              hasCommonjsModules = true;
-            });
+                if (!references[moduleName]) {
+                  references[moduleName] = new Set();
+                }
+
+                references[moduleName].add([...classInfo.commonjsModules[moduleName]]); // There is at least one module
+
+                hasCommonjsModules = true;
+              });
+            }
           }
-        } // If there are any CommonJS modules required, browserify them
+        } // If there are any CommonJS modules required to be bundled, or
+        // any local modules specified for the application in
+        // compile.json, browserify them
 
 
-        if (hasCommonjsModules) {
-          await this.__P_44_1(commonjsModules, references, ws);
+        if (hasCommonjsModules || localModules) {
+          await this.__P_44_1(commonjsModules, references, localModules, ws);
         }
 
         await new Promise(resolve => {
@@ -54988,8 +55023,10 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
         });
       },
 
-      async __P_44_1(commonjsModules, references, ws) {
-        let b;
+      async __P_44_1(commonjsModules, references, localModules, ws) {
+        const babelify = require("babelify");
+
+        const preset = require("@babel/preset-env");
 
         const browserify = require("browserify");
 
@@ -55001,7 +55038,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
 
         commonjsModules = [...commonjsModules];
         return new Promise(resolve => {
-          b = browserify([], {
+          let b = browserify([], {
             builtins: builtins,
             ignoreMissing: true,
             insertGlobals: true,
@@ -55012,16 +55049,41 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
             let message = [];
             message.push(`ERROR: could not locate require()d module: "${id}"`);
             message.push("  required from:");
-            [...references[id]].forEach(refs => {
-              refs.forEach(ref => {
-                message.push(`    ${ref}`);
+
+            try {
+              [...references[id]].forEach(refs => {
+                refs.forEach(ref => {
+                  message.push(`    ${ref}`);
+                });
               });
-            });
+            } catch (e) {
+              message.push(`    <compile.json:application.localModules'>`);
+            }
+
             qx.tool.compiler.Console.error(message.join("\n"));
-          });
+          }); // Include any dynamically determined `require()`d modules
+
+
+          if (commonjsModules.length > 0) {
+            b.require(commonjsModules);
+          } // Include any local modules specified for the application
+          // in compile.json
+
+
+          if (localModules) {
+            for (let requireName in localModules) {
+              b.require(localModules[requireName], {
+                expose: requireName
+              });
+            }
+          } // Ensure ES6 local modules are converted to CommonJS format
 
-          b.require(commonjsModules);
 
+          b.transform(babelify, {
+            presets: [preset],
+            sourceMaps: false,
+            global: true
+          });
           b.bundle((e, output) => {
             if (e) {
               // We've already handled the case of missing module. This is something else.
@@ -62389,6 +62451,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
     construct(filename) {
       qx.core.Object.constructor.call(this);
       this.__filename = filename;
+      this.__P_24_0 = ["addListener", "addListenerOnce"];
     },
 
     properties: {
@@ -62407,20 +62470,21 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
     },
     members: {
       __filename: null,
+      __P_24_0: null,
 
       async transform() {
         let src = await fs.promises.readFile(this.__filename, "utf8");
         let babelConfig = {};
         let options = qx.lang.Object.clone(babelConfig.options || {}, true);
         options.modules = false;
-        let plugins = [require("@babel/plugin-syntax-jsx"), this.__P_24_0()];
+        let plugins = [require("@babel/plugin-syntax-jsx"), this.__P_24_1()];
 
         if (this.getArrowFunctions() != "never") {
-          plugins.push(this.__P_24_1());
+          plugins.push(this.__P_24_2());
         }
 
-        plugins.push(this.__P_24_2());
         plugins.push(this.__P_24_3());
+        plugins.push(this.__P_24_4());
         var config = {
           ast: true,
           babelrc: false,
@@ -62484,7 +62548,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
        * ```
        * @returns
        */
-      __P_24_0() {
+      __P_24_1() {
         return {
           visitor: {
             ObjectExpression(path) {
@@ -62512,7 +62576,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
         };
       },
 
-      __P_24_4(argNode) {
+      __P_24_5(argNode) {
         let body = argNode.body;
 
         if (body.body.length == 1 && body.body[0].type == "ReturnStatement") {
@@ -62531,10 +62595,11 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
        * Tries to convert functions into arrow functions
        * @returns
        */
-      __P_24_1() {
+      __P_24_2() {
         let t = this;
         const isTest = this.__filename.indexOf("/test/") > -1;
         let arrowFunctions = this.getArrowFunctions();
+        let knownApiFunctions = this.__P_24_0;
         return {
           visitor: {
             CallExpression(path) {
@@ -62542,11 +62607,11 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
                 let callee = collapseMemberExpression(path.node.callee);
 
                 if (arrowFunctions == "careful") {
-                  if (!callee.endsWith(".addListener")) {
+                  if (!knownApiFunctions.some(fName => callee.endsWith("." + fName))) {
                     return;
                   }
 
-                  if (path.node.arguments.length != 3 || path.node.arguments[0].type != "StringLiteral" || path.node.arguments[1].type != "ArrowFunctionExpression" || path.node.arguments[2].type != "ThisExpression") {
+                  if (path.node.arguments.length != 3 || path.node.arguments[0].type != "StringLiteral" || path.node.arguments[1].type != "FunctionExpression" || path.node.arguments[2].type != "ThisExpression") {
                     return;
                   }
                 } else if (arrowFunctions == "aggressive") {
@@ -62562,7 +62627,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
                 let argNode = path.node.arguments[i];
 
                 if (argNode.type == "FunctionExpression") {
-                  path.node.arguments[i] = t.__P_24_4(argNode);
+                  path.node.arguments[i] = t.__P_24_5(argNode);
                 }
               }
             }
@@ -62576,11 +62641,12 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
        * and can be removed
        * @returns
        */
-      __P_24_2() {
+      __P_24_3() {
+        let knownApiFunctions = this.__P_24_0;
         return {
           visitor: {
             CallExpression(path) {
-              if (path.node.callee.type == "MemberExpression" && path.node.callee.object.type == "ThisExpression" && path.node.callee.property.type == "Identifier" && path.node.callee.property.name == "addListener" && path.node.arguments.length == 3 && path.node.arguments[0].type == "StringLiteral" && path.node.arguments[1].type == "ArrowFunctionExpression" && path.node.arguments[2].type == "ThisExpression") {
+              if (path.node.callee.type == "MemberExpression" && path.node.callee.property.type == "Identifier" && knownApiFunctions.includes(path.node.callee.property.name) && path.node.arguments.length == 3 && path.node.arguments[0].type == "StringLiteral" && path.node.arguments[1].type == "ArrowFunctionExpression" && path.node.arguments[2].type == "ThisExpression") {
                 qx.lang.Array.removeAt(path.node.arguments, 2);
               }
             }
@@ -62593,7 +62659,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
        * Translates `this.base(arguments...)` into `super`
        * @returns
        */
-      __P_24_3() {
+      __P_24_4() {
         let methodNameStack = [];
 
         function peekMethodName() {
@@ -62758,7 +62824,17 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
     },
     members: {
       async process() {
-        await this.__P_11_0();
+        let files = this.argv.files || [];
+
+        if (files.length === 0) {
+          files.push("source/class/**/*.js");
+        }
+
+        for (let i = 0; i < files.length; i++) {
+          files[i] = path.join(process.cwd(), files[i]);
+        }
+
+        await this.__P_11_0(files);
         let helperFilePath = require.main.path;
 
         while (true) {
@@ -62791,15 +62867,6 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
           useEslintrc: this.argv.useEslintrc,
           fix: this.argv.fix
         });
-        let files = this.argv.files || [];
-
-        if (files.length === 0) {
-          files.push("source/class/**/*.js");
-        }
-
-        for (let i = 0; i < files.length; i++) {
-          files[i] = path.join(process.cwd(), files[i]);
-        }
 
         if (this.argv.printConfig) {
           const fileConfig = await linter.calculateConfigForFile(files[0]);
@@ -62881,17 +62948,16 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
        * @return {Promise<void>}
        * @private
        */
-      async __P_11_0() {
+      async __P_11_0(files) {
         const fixParams = this.argv.fixJsdocParams;
 
         if (fixParams && fixParams !== "off") {
-          let replaceInFiles = [];
           const regex = fixParams === "type-first" ? /@param\s+([\w$]+)\s+({[\w|[\]{}<>?. ]+})/g : /@param\s+({[\w|[\]{}<>?. ]+})\s+([\w$]+)/g;
-          replaceInFiles.push({
-            files: "source/class/**/*.js",
+          let replaceInFiles = {
+            files: files,
             from: regex,
             to: "@param $2 $1"
-          });
+          };
           await replaceInFile(replaceInFiles);
         }
       }
@@ -71815,39 +71881,39 @@ qx.$$packageData['0'] = {
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/arrows/left-invert.gif": [
+    "qx/decoration/Simple/arrows/left.gif": [
       4,
       7,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/arrows/left.gif": [
+    "qx/decoration/Simple/arrows/left-invert.gif": [
       4,
       7,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/arrows/rewind.gif": [
-      8,
+    "qx/decoration/Simple/arrows/right.gif": [
+      4,
       7,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/arrows/right-invert.gif": [
-      4,
+    "qx/decoration/Simple/arrows/up-invert.gif": [
       7,
+      4,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/arrows/right.gif": [
-      4,
+    "qx/decoration/Simple/arrows/rewind.gif": [
+      8,
       7,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/arrows/up-invert.gif": [
-      7,
+    "qx/decoration/Simple/arrows/right-invert.gif": [
       4,
+      7,
       "gif",
       "qx"
     ],
@@ -71863,30 +71929,6 @@ qx.$$packageData['0'] = {
       "gif",
       "qx"
     ],
-    "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,
@@ -71911,6 +71953,30 @@ qx.$$packageData['0'] = {
       "gif",
       "qx"
     ],
+    "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/cursors/alias.gif": [
       19,
       15,
@@ -71935,49 +72001,19 @@ qx.$$packageData['0'] = {
       "gif",
       "qx"
     ],
-    "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"
-    ],
-    "qx/decoration/Simple/splitpane/knob-horizontal.png": [
-      1,
-      8,
-      "png",
-      "qx"
-    ],
-    "qx/decoration/Simple/splitpane/knob-vertical.png": [
-      8,
-      1,
+    "qx/decoration/Simple/table/ascending-invert.png": [
+      10,
+      10,
       "png",
       "qx"
     ],
-    "qx/decoration/Simple/table/ascending-invert.png": [
+    "qx/decoration/Simple/table/ascending.png": [
       10,
       10,
       "png",
       "qx"
     ],
-    "qx/decoration/Simple/table/ascending.png": [
+    "qx/decoration/Simple/table/descending-invert.png": [
       10,
       10,
       "png",
@@ -71995,12 +72031,6 @@ qx.$$packageData['0'] = {
       "png",
       "qx"
     ],
-    "qx/decoration/Simple/table/descending-invert.png": [
-      10,
-      10,
-      "png",
-      "qx"
-    ],
     "qx/decoration/Simple/table/descending.png": [
       10,
       10,
@@ -72013,10 +72043,16 @@ qx.$$packageData['0'] = {
       "png",
       "qx"
     ],
-    "qx/decoration/Simple/tabview/close.gif": [
-      10,
-      9,
-      "gif",
+    "qx/decoration/Simple/splitpane/knob-horizontal.png": [
+      1,
+      8,
+      "png",
+      "qx"
+    ],
+    "qx/decoration/Simple/splitpane/knob-vertical.png": [
+      8,
+      1,
+      "png",
       "qx"
     ],
     "qx/decoration/Simple/tree/minus.gif": [
@@ -72031,6 +72067,12 @@ qx.$$packageData['0'] = {
       "gif",
       "qx"
     ],
+    "qx/decoration/Simple/tabview/close.gif": [
+      10,
+      9,
+      "gif",
+      "qx"
+    ],
     "qx/decoration/Simple/window/close-white.gif": [
       10,
       9,
@@ -72055,13 +72097,13 @@ qx.$$packageData['0'] = {
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/window/minimize.gif": [
+    "qx/decoration/Simple/window/minimize-white.gif": [
       9,
       9,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/window/minimize-white.gif": [
+    "qx/decoration/Simple/window/minimize.gif": [
       9,
       9,
       "gif",
@@ -72097,31 +72139,31 @@ qx.$$packageData['0'] = {
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/end.gif": [
+    "qx/decoration/Simple/treevirtual/end_minus.gif": [
       19,
       16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/end_minus.gif": [
+    "qx/decoration/Simple/treevirtual/end.gif": [
       19,
       16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/end_plus.gif": [
+    "qx/decoration/Simple/treevirtual/only_minus.gif": [
       19,
       16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/line.gif": [
+    "qx/decoration/Simple/treevirtual/end_plus.gif": [
       19,
       16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/only_minus.gif": [
+    "qx/decoration/Simple/treevirtual/line.gif": [
       19,
       16,
       "gif",
@@ -72151,6 +72193,30 @@ qx.$$packageData['0'] = {
       "gif",
       "qx"
     ],
+    "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.gif": [
+      16,
+      5,
+      "gif",
+      "qx"
+    ],
+    "qx/decoration/Simple/menu/radiobutton-invert.gif": [
+      16,
+      5,
+      "gif",
+      "qx"
+    ],
     "qx/static/blank.png": [
       1,
       1,
@@ -72181,13 +72247,13 @@ qx.$$packageData['0'] = {
       "",
       "qx"
     ],
-    "qx/tool/schema/compile-1-0-0.json": [
+    "qx/tool/schema/Manifest-1-0-0.json": [
       null,
       null,
       "json",
       "qx"
     ],
-    "qx/tool/schema/Manifest-1-0-0.json": [
+    "qx/tool/schema/compile-1-0-0.json": [
       null,
       null,
       "json",
@@ -72211,19 +72277,31 @@ qx.$$packageData['0'] = {
       "",
       "qx"
     ],
-    "qx/tool/website/build/404.html": [
+    "qx/tool/cli/templates/template_vars.js": [
       null,
       null,
-      "html",
+      "js",
       "qx"
     ],
-    "qx/tool/website/build/about.html": [
+    "qx/tool/cli/templates/TypeScriptWriter-base_declaration.txt": [
+      null,
+      null,
+      "txt",
+      "qx"
+    ],
+    "qx/tool/website/layouts/default.dot": [
+      null,
+      null,
+      "dot",
+      "qx"
+    ],
+    "qx/tool/website/build/404.html": [
       null,
       null,
       "html",
       "qx"
     ],
-    "qx/tool/website/build/index.html": [
+    "qx/tool/website/build/about.html": [
       null,
       null,
       "html",
@@ -72235,19 +72313,19 @@ qx.$$packageData['0'] = {
       "css",
       "qx"
     ],
-    "qx/tool/website/layouts/default.dot": [
+    "qx/tool/website/build/index.html": [
       null,
       null,
-      "dot",
+      "html",
       "qx"
     ],
-    "qx/tool/website/partials/footer.html": [
+    "qx/tool/website/sass/qooxdoo.scss": [
       null,
       null,
-      "html",
+      "scss",
       "qx"
     ],
-    "qx/tool/website/partials/head.html": [
+    "qx/tool/website/partials/footer.html": [
       null,
       null,
       "html",
@@ -72259,7 +72337,7 @@ qx.$$packageData['0'] = {
       "html",
       "qx"
     ],
-    "qx/tool/website/partials/icon-github.html": [
+    "qx/tool/website/partials/head.html": [
       null,
       null,
       "html",
@@ -72271,6 +72349,12 @@ qx.$$packageData['0'] = {
       "svg",
       "qx"
     ],
+    "qx/tool/website/partials/icon-github.html": [
+      null,
+      null,
+      "html",
+      "qx"
+    ],
     "qx/tool/website/partials/icon-twitter.html": [
       null,
       null,
@@ -72301,58 +72385,112 @@ qx.$$packageData['0'] = {
       "html",
       "qx"
     ],
-    "qx/tool/website/sass/qooxdoo.scss": [
+    "qx/tool/cli/templates/class/default.tmpl.js": [
       null,
       null,
-      "scss",
+      "js",
       "qx"
     ],
-    "qx/tool/cli/templates/TypeScriptWriter-base_declaration.txt": [
+    "qx/tool/cli/templates/class/header.tmpl.js": [
       null,
       null,
-      "txt",
+      "js",
       "qx"
     ],
-    "qx/tool/cli/templates/template_vars.js": [
+    "qx/tool/cli/templates/class/interface.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/website/build/assets/abel.css": [
+    "qx/tool/cli/templates/class/singleton.tmpl.js": [
       null,
       null,
-      "css",
+      "js",
       "qx"
     ],
-    "qx/tool/website/build/assets/bluebird.min.js": [
+    "qx/tool/cli/templates/class/mixin.tmpl.js": [
+      null,
+      null,
+      "js",
+      "qx"
+    ],
+    "qx/tool/cli/templates/loader/loader-browser.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
+    "qx/tool/cli/templates/loader/loader-rhino.tmpl.js": [
+      null,
+      null,
+      "js",
+      "qx"
+    ],
+    "qx/tool/cli/templates/loader/loader-node.tmpl.js": [
+      null,
+      null,
+      "js",
+      "qx"
+    ],
+    "qx/tool/website/build/diagnostics/dependson.html": [
+      null,
+      null,
+      "html",
+      "qx"
+    ],
+    "qx/tool/website/build/diagnostics/requiredby.html": [
+      null,
+      null,
+      "html",
+      "qx"
+    ],
+    "qx/tool/website/build/diagnostics/dependson.js": [
+      null,
+      null,
+      "js",
+      "qx"
+    ],
+    "qx/tool/website/build/diagnostics/requiredby.js": [
+      null,
+      null,
+      "js",
+      "qx"
+    ],
+    "qx/tool/website/build/assets/abel.css": [
+      null,
+      null,
+      "css",
+      "qx"
+    ],
     "qx/tool/website/build/assets/bootstrap.css": [
       null,
       null,
       "css",
       "qx"
     ],
-    "qx/tool/website/build/assets/buttons.js": [
+    "qx/tool/website/build/assets/bluebird.min.js": [
       null,
       null,
       "js",
       "qx"
     ],
+    "qx/tool/website/build/assets/bootstrap.min.css.map": [
+      null,
+      null,
+      "map",
+      "qx"
+    ],
     "qx/tool/website/build/assets/bootstrap.min.css": [
       null,
       null,
       "css",
       "qx"
     ],
-    "qx/tool/website/build/assets/bootstrap.min.css.map": [
+    "qx/tool/website/build/assets/buttons.js": [
       null,
       null,
-      "map",
+      "js",
       "qx"
     ],
     "qx/tool/website/build/assets/fontawesome-all.js": [
@@ -72367,70 +72505,52 @@ qx.$$packageData['0'] = {
       "png",
       "qx"
     ],
-    "qx/tool/website/build/assets/jquery.js": [
-      null,
-      null,
-      "js",
-      "qx"
-    ],
     "qx/tool/website/build/assets/logo.svg": [
       512,
       145,
       "svg",
       "qx"
     ],
+    "qx/tool/website/build/assets/jquery.js": [
+      null,
+      null,
+      "js",
+      "qx"
+    ],
     "qx/tool/website/build/assets/qx-api.png": [
       1144,
       640,
       "png",
       "qx"
     ],
-    "qx/tool/website/build/assets/qx-ide.png": [
-      3183,
-      1752,
-      "png",
-      "qx"
-    ],
     "qx/tool/website/build/assets/qx-oo.png": [
       870,
       502,
       "png",
       "qx"
     ],
+    "qx/tool/website/build/assets/qx-ide.png": [
+      3183,
+      1752,
+      "png",
+      "qx"
+    ],
     "qx/tool/website/build/assets/qx-white.svg": [
       64,
       65,
       "svg",
       "qx"
     ],
-    "qx/tool/website/build/diagnostics/requiredby.html": [
-      null,
-      null,
-      "html",
-      "qx"
-    ],
-    "qx/tool/website/build/diagnostics/dependson.js": [
-      null,
-      null,
-      "js",
-      "qx"
-    ],
-    "qx/tool/website/build/diagnostics/dependson.html": [
-      null,
-      null,
-      "html",
-      "qx"
-    ],
-    "qx/tool/website/build/diagnostics/requiredby.js": [
+    "qx/tool/website/build/scripts/serve.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/website/build/scripts/serve.js": [
+    "qx/tool/website/src/assets/bootstrap.css": [
       null,
       null,
-      "js",
+      "css",
       "qx"
     ],
     "qx/tool/website/src/assets/abel.css": [
@@ -72445,7 +72565,7 @@ qx.$$packageData['0'] = {
       "js",
       "qx"
     ],
-    "qx/tool/website/src/assets/bootstrap.css": [
+    "qx/tool/website/src/assets/bootstrap.min.css": [
       null,
       null,
       "css",
@@ -72463,12 +72583,6 @@ qx.$$packageData['0'] = {
       "js",
       "qx"
     ],
-    "qx/tool/website/src/assets/bootstrap.min.css": [
-      null,
-      null,
-      "css",
-      "qx"
-    ],
     "qx/tool/website/src/assets/favicon.png": [
       32,
       32,
@@ -72487,6 +72601,12 @@ qx.$$packageData['0'] = {
       "js",
       "qx"
     ],
+    "qx/tool/website/src/assets/logo.svg": [
+      512,
+      145,
+      "svg",
+      "qx"
+    ],
     "qx/tool/website/src/assets/qx-api.png": [
       1144,
       640,
@@ -72499,10 +72619,10 @@ qx.$$packageData['0'] = {
       "png",
       "qx"
     ],
-    "qx/tool/website/src/assets/logo.svg": [
-      512,
-      145,
-      "svg",
+    "qx/tool/website/src/assets/qx-oo.png": [
+      870,
+      502,
+      "png",
       "qx"
     ],
     "qx/tool/website/src/assets/qx-white.svg": [
@@ -72511,24 +72631,12 @@ qx.$$packageData['0'] = {
       "svg",
       "qx"
     ],
-    "qx/tool/website/src/assets/qx-oo.png": [
-      870,
-      502,
-      "png",
-      "qx"
-    ],
     "qx/tool/website/src/diagnostics/dependson.html": [
       null,
       null,
       "html",
       "qx"
     ],
-    "qx/tool/website/src/diagnostics/dependson.js": [
-      null,
-      null,
-      "js",
-      "qx"
-    ],
     "qx/tool/website/src/diagnostics/requiredby.html": [
       null,
       null,
@@ -72541,58 +72649,40 @@ qx.$$packageData['0'] = {
       "js",
       "qx"
     ],
-    "qx/tool/website/src/scripts/serve.js": [
-      null,
-      null,
-      "js",
-      "qx"
-    ],
-    "qx/tool/cli/templates/class/default.tmpl.js": [
-      null,
-      null,
-      "js",
-      "qx"
-    ],
-    "qx/tool/cli/templates/class/header.tmpl.js": [
-      null,
-      null,
-      "js",
-      "qx"
-    ],
-    "qx/tool/cli/templates/class/interface.tmpl.js": [
+    "qx/tool/website/src/diagnostics/dependson.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/class/mixin.tmpl.js": [
+    "qx/tool/website/src/scripts/serve.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/class/singleton.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/package/.gitignore.tmpl": [
       null,
       null,
-      "js",
+      "tmpl",
       "qx"
     ],
-    "qx/tool/cli/templates/loader/loader-browser.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/package/compile.tmpl.json": [
       null,
       null,
-      "js",
+      "json",
       "qx"
     ],
-    "qx/tool/cli/templates/loader/loader-node.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/package/Manifest.tmpl.json": [
       null,
       null,
-      "js",
+      "json",
       "qx"
     ],
-    "qx/tool/cli/templates/loader/loader-rhino.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/package/readme.tmpl.md": [
       null,
       null,
-      "js",
+      "md",
       "qx"
     ],
     "qx/tool/cli/templates/skeleton/mobile/.gitignore.tmpl": [
@@ -72601,13 +72691,13 @@ qx.$$packageData['0'] = {
       "tmpl",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/Manifest.tmpl.json": [
+    "qx/tool/cli/templates/skeleton/mobile/compile.tmpl.json": [
       null,
       null,
       "json",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/compile.tmpl.json": [
+    "qx/tool/cli/templates/skeleton/mobile/Manifest.tmpl.json": [
       null,
       null,
       "json",
@@ -72619,91 +72709,85 @@ qx.$$packageData['0'] = {
       "md",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/.gitignore.tmpl": [
+    "qx/tool/cli/templates/skeleton/server/.gitignore.tmpl": [
       null,
       null,
       "tmpl",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/compile.tmpl.json": [
+    "qx/tool/cli/templates/skeleton/server/compile.tmpl.json": [
       null,
       null,
       "json",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/Manifest.tmpl.json": [
+    "qx/tool/cli/templates/skeleton/server/Manifest.tmpl.json": [
       null,
       null,
       "json",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/readme.tmpl.md": [
+    "qx/tool/cli/templates/skeleton/server/readme.tmpl.txt": [
       null,
       null,
-      "md",
+      "txt",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/.gitignore.tmpl": [
+    "qx/tool/cli/templates/skeleton/desktop/.gitignore.tmpl": [
       null,
       null,
       "tmpl",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/compile.tmpl.json": [
+    "qx/tool/cli/templates/skeleton/desktop/compile.tmpl.json": [
       null,
       null,
       "json",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/Manifest.tmpl.json": [
+    "qx/tool/cli/templates/skeleton/desktop/Manifest.tmpl.json": [
       null,
       null,
       "json",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/readme.tmpl.md": [
+    "qx/tool/cli/templates/skeleton/desktop/readme.tmpl.md": [
       null,
       null,
       "md",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/server/.gitignore.tmpl": [
+    "qx/tool/cli/templates/skeleton/package/source/translation/readme.txt": [
       null,
       null,
-      "tmpl",
+      "txt",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/server/compile.tmpl.json": [
+    "qx/tool/cli/templates/skeleton/mobile/source/boot/nojs.tmpl.html": [
       null,
       null,
-      "json",
+      "html",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/server/Manifest.tmpl.json": [
+    "qx/tool/cli/templates/skeleton/mobile/source/boot/index.tmpl.html": [
       null,
       null,
-      "json",
+      "html",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/server/readme.tmpl.txt": [
+    "qx/tool/cli/templates/skeleton/mobile/source/translation/readme.txt": [
       null,
       null,
       "txt",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/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/server/source/translation/readme.txt": [
       null,
       null,
-      "html",
+      "txt",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/source/translation/readme.txt": [
+    "qx/tool/cli/templates/skeleton/desktop/source/translation/readme.txt": [
       null,
       null,
       "txt",
@@ -72721,22 +72805,34 @@ qx.$$packageData['0'] = {
       "html",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/translation/readme.txt": [
+    "qx/tool/cli/templates/skeleton/package/source/class/custom/Button.tmpl.js": [
       null,
       null,
-      "txt",
+      "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/source/translation/readme.txt": [
+    "qx/tool/cli/templates/skeleton/package/source/class/custom/__init__.tmpl.js": [
       null,
       null,
-      "txt",
+      "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/server/source/translation/readme.txt": [
+    "qx/tool/cli/templates/skeleton/package/source/resource/custom/test.png": [
+      32,
+      32,
+      "png",
+      "qx"
+    ],
+    "qx/tool/cli/templates/skeleton/server/source/class/custom/Application.tmpl.js": [
       null,
       null,
-      "txt",
+      "js",
+      "qx"
+    ],
+    "qx/tool/cli/templates/skeleton/server/source/class/custom/__init__.tmpl.js": [
+      null,
+      null,
+      "js",
       "qx"
     ],
     "qx/tool/cli/templates/skeleton/mobile/source/class/custom/Application.tmpl.js": [
@@ -72757,28 +72853,22 @@ qx.$$packageData['0'] = {
       "png",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/source/resource/custom/js_256x256.png": [
-      256,
-      256,
-      "png",
-      "qx"
-    ],
     "qx/tool/cli/templates/skeleton/mobile/source/resource/custom/favicon.png": [
       32,
       32,
       "png",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/Application.tmpl.js": [
-      null,
-      null,
-      "js",
+    "qx/tool/cli/templates/skeleton/mobile/source/resource/custom/js_256x256.png": [
+      256,
+      256,
+      "png",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/__init__.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/server/source/resource/custom/.gitignore.tmpl": [
       null,
       null,
-      "js",
+      "tmpl",
       "qx"
     ],
     "qx/tool/cli/templates/skeleton/desktop/source/resource/custom/app.png": [
@@ -72787,175 +72877,151 @@ qx.$$packageData['0'] = {
       "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": [
+    "qx/tool/cli/templates/skeleton/desktop/source/resource/custom/favicon.png": [
       32,
       32,
       "png",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/source/class/custom/Button.tmpl.js": [
-      null,
-      null,
-      "js",
-      "qx"
-    ],
-    "qx/tool/cli/templates/skeleton/package/source/class/custom/__init__.tmpl.js": [
-      null,
-      null,
-      "js",
-      "qx"
-    ],
-    "qx/tool/cli/templates/skeleton/package/source/resource/custom/test.png": [
+    "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": [
+    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/Application.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/server/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/server/source/resource/custom/.gitignore.tmpl": [
-      null,
-      null,
-      "tmpl",
-      "qx"
-    ],
-    "qx/tool/cli/templates/skeleton/mobile/source/class/custom/page/Login.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/package/source/class/custom/demo/Application.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/source/class/custom/page/Overview.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/package/source/class/custom/test/DemoTest.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/source/class/custom/page/__init__.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/package/source/class/custom/theme/Appearance.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/source/theme/custom/scss/custom.scss": [
+    "qx/tool/cli/templates/skeleton/package/source/class/custom/theme/Color.tmpl.js": [
       null,
       null,
-      "scss",
+      "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/source/theme/custom/scss/_styles.scss": [
+    "qx/tool/cli/templates/skeleton/package/source/class/custom/theme/Decoration.tmpl.js": [
       null,
       null,
-      "scss",
+      "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/source/resource/custom/css/.gitignore.tmpl": [
+    "qx/tool/cli/templates/skeleton/package/source/class/custom/theme/Font.tmpl.js": [
       null,
       null,
-      "tmpl",
+      "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/test/DemoTest.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/package/source/class/custom/theme/Theme.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/theme/custom/scss/custom.scss": [
       null,
       null,
-      "js",
+      "scss",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/theme/Color.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/mobile/source/theme/custom/scss/_styles.scss": [
       null,
       null,
-      "js",
+      "scss",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/theme/Decoration.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/Font.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/Theme.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/demo/Application.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/mobile/source/class/custom/page/__init__.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/source/class/custom/test/DemoTest.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/Appearance.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/theme/Appearance.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/source/class/custom/theme/Color.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/theme/Color.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/source/class/custom/theme/Decoration.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/theme/Font.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/Theme.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/theme/Theme.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/server/source/class/custom/test/DemoTest.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/test/DemoTest.tmpl.js": [
       null,
       null,
       "js",