@qooxdoo/framework 7.3.3 → 7.4.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.3.3",
+  "qx.version": "7.4.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.3.3",
+  "qx.compiler.version": "7.4.1",
   "qx.headless": true,
   "qx.compiler.applicationType": "node",
   "qx.compiler.applicationName": "compiler"
@@ -35509,7 +35509,7 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
           });
         }
 
-        config.targetType = parsedArgs.target || config.defaultTarget || "source";
+        let targetType = this._compilerApi.getCommand().getTargetType();
 
         if (!config.locales) {
           config.locales = [];
@@ -35527,7 +35527,7 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
 
 
         if (config.targets) {
-          const target = config.targets.find(target => target.type === config.targetType);
+          const target = config.targets.find(target => target.type === targetType);
           target.environment = target.environment || {};
           qx.lang.Object.mergeWith(target.environment, parsedArgs.environment, true);
         }
@@ -36534,7 +36534,7 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
        * @return {String}
        */
       getCompilerVersion() {
-        return "7.3.3";
+        return "7.4.1";
       },
 
       /**
@@ -37412,6 +37412,14 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
         } catch (e) {
           throw new qx.tool.utils.Utils.UserError(e.message);
         }
+      },
+
+      /**
+       * Returns the calculated target type
+       * @returns {String}
+       */
+      getTargetType() {
+        return this.argv.target || this.getCompilerApi().getConfiguration().defaultTarget || "source";
       }
 
     }
@@ -39094,6 +39102,12 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
   const child_process = require("child_process");
 
   const psTree = require("ps-tree");
+  /**
+   * @ignore(process)
+   */
+
+  /* global process */
+
   /**
    * Utility methods
    */
@@ -45245,6 +45259,16 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
           if (dir && !dirs.includes(dir)) {
             dirs.push(dir);
           }
+
+          let localModules = application.getLocalModules();
+
+          for (let requireName in localModules) {
+            let dir = localModules[requireName];
+
+            if (dir && !dirs.includes(dir)) {
+              dirs.push(dir);
+            }
+          }
         });
 
         if (this.isDebug()) {
@@ -45345,12 +45369,19 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
               data.dependsOn = {};
               var deps = data.application.getDependencies();
               deps.forEach(function (classname) {
-                var info = db.classInfo[classname];
-                var lib = analyser.findLibrary(info.libraryName);
-                var parts = [lib.getRootDir(), lib.getSourcePath()].concat(classname.split("."));
-                var filename = path.resolve.apply(path, parts) + ".js";
+                let info = db.classInfo[classname];
+                let lib = analyser.findLibrary(info.libraryName);
+                let parts = [lib.getRootDir(), lib.getSourcePath()].concat(classname.split("."));
+                let filename = path.resolve.apply(path, parts) + ".js";
                 data.dependsOn[filename] = true;
               });
+              let localModules = data.application.getLocalModules();
+
+              for (let requireName in localModules) {
+                let filename = path.resolve(localModules[requireName]);
+                data.dependsOn[filename] = true;
+              }
+
               var filename = path.resolve(data.application.getLoaderTemplate());
               promises.push(qx.tool.utils.files.Utils.correctCase(filename).then(filename => data.dependsOn[filename] = true));
             });
@@ -45842,7 +45873,6 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
       "qx.tool.compiler.Console": {
         "defer": "runtime"
       },
-      "qx.tool.cli.Cli": {},
       "qx.tool.utils.Utils": {},
       "qx.Promise": {},
       "qx.tool.utils.files.Utils": {},
@@ -46177,8 +46207,7 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
       __P_8_0: null,
       __P_8_1: null,
       __P_8_2: null,
-      __P_8_3: null,
-      __P_8_4: false,
+      __P_8_3: false,
 
       /*
        * @Override
@@ -46281,7 +46310,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
         this.addListener("writtenApplications", e => {
           if (this.argv.verbose) {
             qx.tool.compiler.Console.log("\nCompleted all applications, libraries used are:");
-            Object.values(this.__P_8_3).forEach(lib => qx.tool.compiler.Console.log(`   ${lib.getNamespace()} (${lib.getRootDir()})`));
+            Object.values(this.__P_8_2).forEach(lib => qx.tool.compiler.Console.log(`   ${lib.getNamespace()} (${lib.getRootDir()})`));
           }
         });
         await this._loadConfigAndStartMaking();
@@ -46295,7 +46324,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
             success = false;
           }
 
-          if (!this.argv.deploying && !this.argv["machine-readable"] && this.argv["feedback"] && this.__P_8_4 && this.argv.target === "build") {
+          if (!this.argv.deploying && !this.argv["machine-readable"] && this.argv["feedback"] && this.__P_8_3 && this.argv.target === "build") {
             qx.tool.compiler.Console.warn("   *******************************************************************************************\n   **                                                                                       **\n   **  Your compilation will include temporary files that are only necessary during         **\n   **  development; these files speed up the compilation, but take up space that you would  **\n   **  probably not want to put on a production server.                                     **\n   **                                                                                       **\n   **  When you are ready to deploy, try running `qx deploy` to get a minimised version     **\n   **                                                                                       **\n   *******************************************************************************************");
           }
 
@@ -46309,12 +46338,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
        * @return {Boolean} true if all makers succeeded
        */
       async _loadConfigAndStartMaking() {
-        var config = this.__P_8_2 = await qx.tool.cli.Cli.getInstance().getParsedArgs();
-
-        if (!config) {
-          throw new qx.tool.utils.Utils.UserError("Error: Cannot find any configuration");
-        }
-
+        var config = this.getCompilerApi().getConfiguration();
         var makers = this.__P_8_1 = await this.createMakersFromConfig(config);
 
         if (!makers || !makers.length) {
@@ -46335,7 +46359,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
           analyser.setWritePoLineNumbers(cfg.db("qx.translation.strictPoCompatibility", false));
 
           if (!(await fs.existsAsync(maker.getOutputDir()))) {
-            this.__P_8_4 = true;
+            this.__P_8_3 = true;
           }
 
           if (this.argv["clean"]) {
@@ -46491,7 +46515,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
         let targetConfigs = [];
         let defaultTargetConfig = null;
         data.targets.forEach(targetConfig => {
-          if (targetConfig.type === data.targetType) {
+          if (targetConfig.type === this.getTargetType()) {
             if (!targetConfig["application-names"] && !targetConfig["application-types"]) {
               if (defaultTargetConfig) {
                 qx.tool.compiler.Console.print("qx.tool.cli.compile.multipleDefaultTargets");
@@ -46564,7 +46588,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
           targetConfigs.push(defaultTargetConfig);
         }
 
-        let libraries = this.__P_8_3 = {};
+        let libraries = this.__P_8_2 = {};
         await qx.Promise.all(data.libraries.map(async libPath => {
           var library = await qx.tool.compiler.app.Library.createLibrary(libPath);
           libraries[library.getNamespace()] = library;
@@ -46583,7 +46607,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
           Console.log("Qooxdoo found in " + qxLib.getRootDir());
         }
 
-        let errors = await this.__P_8_5(Object.values(libraries), data.packages);
+        let errors = await this.__P_8_4(Object.values(libraries), data.packages);
 
         if (errors.length > 0) {
           if (this.argv.warnAsError) {
@@ -46913,7 +46937,10 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
               app.setDescription(appConfig.description);
             }
 
-            if (appConfig.localModules) {
+            appConfig.localModules = appConfig.localModules || {};
+            qx.lang.Object.mergeWith(appConfig.localModules, data.localModules || {}, false);
+
+            if (!qx.lang.Object.isEmpty(appConfig.localModules)) {
               app.setLocalModules(appConfig.localModules);
             }
 
@@ -47015,7 +47042,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
        * @return {Promise<Array>} Array of error messages
        * @private
        */
-      async __P_8_5(libs, packages) {
+      async __P_8_4(libs, packages) {
         const Console = qx.tool.compiler.Console.getInstance();
         let errors = []; // check all requires
 
@@ -47215,20 +47242,13 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
         });
       },
 
-      /**
-       * Returns the configuration object being compiled
-       */
-      _getConfig() {
-        return this.__P_8_2;
-      },
-
       /**
        * Returns a list of libraries which are used
        *
        * @return {Library[]}
        */
       getLibraries() {
-        return this.__P_8_3;
+        return this.__P_8_2;
       }
 
     },
@@ -49621,6 +49641,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
       "qx.tool.compiler.ClassFile": {},
       "qx.tool.config.Utils": {},
       "qx.tool.utils.Utils": {},
+      "qx.tool.utils.files.Utils": {},
       "qx.tool.compiler.Console": {},
       "qx.tool.compiler.targets.TypeScriptWriter": {}
     }
@@ -49813,19 +49834,27 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
         //  multiple times
 
         let compiledClasses = this.getRecentlyCompiledClasses(true);
-
-        var appsThisTime = this.__P_32_0.filter(app => {
+        let db = analyser.getDatabase();
+        var appsThisTime = await this.__P_32_0.filter(async app => {
           let loadDeps = app.getDependencies();
 
           if (!loadDeps || !loadDeps.length) {
             return true;
           }
 
-          return loadDeps.some(name => Boolean(compiledClasses[name]));
-        });
+          let res = loadDeps.some(name => Boolean(compiledClasses[name]));
+          let localModules = app.getLocalModules();
 
+          for (let requireName in localModules) {
+            var _db$modulesInfo;
+
+            let stat = await qx.tool.utils.files.Utils.safeStat(localModules[requireName]);
+            res || (res = stat.mtime.getTime() > ((db === null || db === void 0 ? void 0 : (_db$modulesInfo = db.modulesInfo) === null || _db$modulesInfo === void 0 ? void 0 : _db$modulesInfo.localModules[requireName]) || 0));
+          }
+
+          return res;
+        });
         let allAppInfos = [];
-        let db = analyser.getDatabase();
 
         for (let i = 0; i < appsThisTime.length; i++) {
           let application = appsThisTime[i];
@@ -51082,8 +51111,6 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
 
   var async = require("async");
 
-  var pathModule = require("upath");
-
   var log = qx.tool.utils.LogManager.createLog("analyser");
   /**
    * Helper method that collapses the MemberExpression into a string
@@ -52775,7 +52802,10 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
                     if (typeof arg.value != "string") {
                       t.addMarker("compiler.requireLiteralArguments", path.node.loc, arg.value);
                     } else {
-                      qx.tool.compiler.Console.log(`${t.__P_22_1}:${path.node.loc.start.line}:` + ` automatically detected \'require(${arg.value})\``);
+                      if (qx.tool.compiler.Console.getInstance().getVerbose()) {
+                        qx.tool.compiler.Console.log(`${t.__P_22_1}:${path.node.loc.start.line}:` + ` automatically detected \'require(${arg.value})\``);
+                      }
+
                       t.addCommonjsModule(arg.value, t.__P_22_1, path.node.loc.start.line); // Don't show "unresolved" error for `require` since the
                       // browserified code defines it as a global
 
@@ -55026,9 +55056,6 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
 (function () {
   var $$dbClassInfo = {
     "dependsOn": {
-      "qx.tool.utils.Promisify": {
-        "require": true
-      },
       "qx.Class": {
         "usage": "dynamic",
         "require": true
@@ -55037,6 +55064,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
         "construct": true,
         "require": true
       },
+      "qx.tool.utils.files.Utils": {},
       "qx.tool.compiler.Console": {}
     }
   };
@@ -55063,9 +55091,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
    *      * Derrell Lipman (@derrell)
    *
    * ************************************************************************/
-  const fs = qx.tool.utils.Promisify.fs;
-
-  const path = require("upath");
+  const hash = require("object-hash");
   /**
    *
    */
@@ -55076,60 +55102,118 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
 
     construct(appMeta) {
       qx.tool.compiler.targets.meta.AbstractJavascriptMeta.constructor.call(this, appMeta, `${appMeta.getApplicationRoot()}commonjs-browserify.js`);
-      this.__P_44_0 = appMeta;
       this.setNeedsWriteToDisk(true);
     },
 
     members: {
       __P_44_0: null,
+      __P_44_1: null,
 
-      /**
-       * @Override
-       */
-      async writeSourceCodeToStream(ws) {
-        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(); // Only include discovered `require()`d Node modules if the
-        // target application type is browser.
-
+      __P_44_2() {
+        if (this.__P_44_0 === null) {
+          let commonjsModules = new Set();
+          let references = {};
+          const db = this.getAppMeta().getAnalyser().getDatabase();
+          const localModules = this.getAppMeta().getApplication().getLocalModules() || {}; // Get a Set of unique `require`d CommonJS module names from
+          // all classes
 
-        if (this.__P_44_0.getEnvironmentValue("qx.compiler.applicationType") == "browser") {
-          // Get a Set of unique `require`d CommonJS module names from classes needed by the application
-          let classnames = this.__P_44_0.getApplication().getDependencies();
-
-          for (let className of classnames) {
+          for (let className in db.classInfo) {
             let classInfo = db.classInfo[className];
 
             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 (!(moduleName in localModules)) {
+                  // 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
 
 
-                commonjsModules.add(moduleName); // Add the list of references from which this module was require()d
-
                 if (!references[moduleName]) {
                   references[moduleName] = new Set();
                 }
 
-                references[moduleName].add([...classInfo.commonjsModules[moduleName]]); // There is at least one module
-
-                hasCommonjsModules = true;
+                references[moduleName].add([...classInfo.commonjsModules[moduleName]]);
               });
             }
           }
-        } // If there are any CommonJS modules required to be bundled, or
+
+          this.__P_44_0 = [...commonjsModules];
+          this.__P_44_1 = references;
+        }
+
+        return {
+          commonjsModules: this.__P_44_0,
+          references: this.__P_44_1
+        };
+      },
+
+      /**
+       * @Override
+       */
+      async writeToDisk() {
+        var _db$modulesInfo2;
+
+        const localModules = this.getAppMeta().getApplication().getLocalModules();
+        let db = this.getAppMeta().getAnalyser().getDatabase();
+
+        const {
+          commonjsModules
+        } = this.__P_44_2();
+
+        let modules = [];
+        let modulesInfo = {};
+        let doIt = !!!(await qx.tool.utils.files.Utils.safeStat(this.getFilename())); // Include any dynamically determined `require()`d modules
+
+        if (commonjsModules.length > 0) {
+          modules.push(commonjsModules);
+        } // Include any local modules specified for the application
+        // in compile.json
+
+
+        if (localModules) {
+          modulesInfo.localModules = {};
+
+          for (let requireName in localModules) {
+            var _db$modulesInfo;
+
+            modules.push(requireName);
+            let stat = await qx.tool.utils.files.Utils.safeStat(localModules[requireName]);
+            modulesInfo.localModules[requireName] = stat.mtime.getTime();
+            doIt || (doIt = modulesInfo.localModules[requireName] > ((db === null || db === void 0 ? void 0 : (_db$modulesInfo = db.modulesInfo) === null || _db$modulesInfo === void 0 ? void 0 : _db$modulesInfo.localModules[requireName]) || 0));
+          }
+        }
+
+        modulesInfo.modulesHash = hash(modules);
+        doIt || (doIt = modulesInfo.modulesHash !== ((db === null || db === void 0 ? void 0 : (_db$modulesInfo2 = db.modulesInfo) === null || _db$modulesInfo2 === void 0 ? void 0 : _db$modulesInfo2.modulesHash) || ""));
+
+        if (doIt) {
+          db.modulesInfo = modulesInfo;
+          await this.getAppMeta().getAnalyser().saveDatabase();
+        }
+
+        this.setNeedsWriteToDisk(doIt);
+        return qx.tool.compiler.targets.meta.Browserify.superclass.prototype.writeToDisk.call(this);
+      },
+
+      /**
+       * @Override
+       */
+      async writeSourceCodeToStream(ws) {
+        // If there are any CommonJS modules required to be bundled, or
         // any local modules specified for the application in
         // compile.json, browserify them
+        if (this.getAppMeta().getEnvironmentValue("qx.compiler.applicationType") == "browser") {
+          const localModules = this.getAppMeta().getApplication().getLocalModules();
 
+          const {
+            commonjsModules,
+            references
+          } = this.__P_44_2();
 
-        if (hasCommonjsModules || localModules) {
-          await this.__P_44_1(commonjsModules, references, localModules, ws);
+          if (commonjsModules.length > 0 || localModules) {
+            await this.__P_44_3(commonjsModules, references, localModules, ws);
+          }
         }
 
         await new Promise(resolve => {
@@ -55137,7 +55221,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
         });
       },
 
-      async __P_44_1(commonjsModules, references, localModules, ws) {
+      async __P_44_3(commonjsModules, references, localModules, ws) {
         const babelify = require("babelify");
 
         const preset = require("@babel/preset-env");
@@ -55148,10 +55232,8 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
         // Make them equivalent.
 
 
-        builtins.process = builtins._process; // Convert the Set of CommonJS module names to an array
-
-        commonjsModules = [...commonjsModules];
-        return new Promise(resolve => {
+        builtins.process = builtins._process;
+        return new Promise(async resolve => {
           let b = browserify([], {
             builtins: builtins,
             ignoreMissing: true,
@@ -55162,19 +55244,16 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
           b._mdeps.on("missing", (id, parent) => {
             let message = [];
             message.push(`ERROR: could not locate require()d module: "${id}"`);
+            message.push("  required from:");
 
-            if (references[id]) {
-              message.push("  required from:");
-
-              try {
-                [...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'>`);
-              }
+              });
+            } catch (e) {
+              message.push(`    <compile.json:application.localModules'>`);
             }
 
             qx.tool.compiler.Console.error(message.join("\n"));
@@ -63404,8 +63483,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
         this.argv["machine-readable"] = false;
         this.argv["feedback"] = false;
         await qx.tool.cli.commands.Run.superclass.prototype.process.call(this);
-
-        let config = this._getConfig();
+        let config = this.getCompilerApi().getConfiguration();
 
         if (!config.run) {
           qx.tool.compiler.Console.print("qx.tool.cli.run.noRunConfig");
@@ -63699,8 +63777,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
           this.__P_14_0 = defaultMaker === null;
         }
 
-        var config = this._getConfig();
-
+        let config = this.getCompilerApi().getConfiguration();
         const app = express();
         app.use((req, res, next) => {
           res.set({
@@ -72118,25 +72195,25 @@ qx.$$packageData['0'] = {
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/arrows/forward.gif": [
-      8,
+    "qx/decoration/Simple/arrows/down.gif": [
       7,
+      4,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/arrows/down.gif": [
+    "qx/decoration/Simple/arrows/forward.gif": [
+      8,
       7,
-      4,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/arrows/left.gif": [
+    "qx/decoration/Simple/arrows/left-invert.gif": [
       4,
       7,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/arrows/left-invert.gif": [
+    "qx/decoration/Simple/arrows/left.gif": [
       4,
       7,
       "gif",
@@ -72148,13 +72225,13 @@ qx.$$packageData['0'] = {
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/arrows/right.gif": [
+    "qx/decoration/Simple/arrows/right-invert.gif": [
       4,
       7,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/arrows/right-invert.gif": [
+    "qx/decoration/Simple/arrows/right.gif": [
       4,
       7,
       "gif",
@@ -72178,76 +72255,70 @@ qx.$$packageData['0'] = {
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/cursors/alias.gif": [
-      19,
-      15,
-      "gif",
-      "qx"
-    ],
-    "qx/decoration/Simple/cursors/move.gif": [
-      13,
-      9,
-      "gif",
-      "qx"
-    ],
-    "qx/decoration/Simple/cursors/copy.gif": [
-      19,
-      15,
-      "gif",
-      "qx"
-    ],
-    "qx/decoration/Simple/cursors/nodrop.gif": [
-      20,
-      20,
-      "gif",
-      "qx"
-    ],
-    "qx/decoration/Simple/checkbox/checked.png": [
+    "qx/decoration/Simple/checkbox/checked-disabled.png": [
       6,
       6,
       "png",
       "qx"
     ],
-    "qx/decoration/Simple/checkbox/checked-disabled.png": [
+    "qx/decoration/Simple/checkbox/checked.png": [
       6,
       6,
       "png",
       "qx"
     ],
-    "qx/decoration/Simple/checkbox/undetermined.png": [
+    "qx/decoration/Simple/checkbox/undetermined-disabled.png": [
       6,
       2,
       "png",
       "qx"
     ],
-    "qx/decoration/Simple/checkbox/undetermined-disabled.png": [
+    "qx/decoration/Simple/checkbox/undetermined.png": [
       6,
       2,
       "png",
       "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/colorselector/brightness-field.png": [
       19,
       256,
       "png",
       "qx"
     ],
-    "qx/decoration/Simple/colorselector/huesaturation-field.jpg": [
-      256,
-      256,
-      "jpg",
-      "qx"
-    ],
     "qx/decoration/Simple/colorselector/brightness-handle.gif": [
       35,
       11,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/menu/checkbox-invert.gif": [
-      16,
-      7,
-      "gif",
+    "qx/decoration/Simple/colorselector/huesaturation-field.jpg": [
+      256,
+      256,
+      "jpg",
       "qx"
     ],
     "qx/decoration/Simple/colorselector/huesaturation-handle.gif": [
@@ -72256,43 +72327,37 @@ qx.$$packageData['0'] = {
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/menu/checkbox.gif": [
-      16,
-      7,
+    "qx/decoration/Simple/cursors/alias.gif": [
+      19,
+      15,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/menu/radiobutton-invert.gif": [
-      16,
-      5,
+    "qx/decoration/Simple/cursors/copy.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/splitpane/knob-vertical.png": [
-      8,
-      1,
-      "png",
-      "qx"
-    ],
-    "qx/decoration/Simple/splitpane/knob-horizontal.png": [
-      1,
-      8,
-      "png",
+    "qx/decoration/Simple/cursors/nodrop.gif": [
+      20,
+      20,
+      "gif",
       "qx"
     ],
-    "qx/decoration/Simple/table/ascending.png": [
+    "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",
@@ -72316,19 +72381,37 @@ qx.$$packageData['0'] = {
       "png",
       "qx"
     ],
+    "qx/decoration/Simple/table/descending.png": [
+      10,
+      10,
+      "png",
+      "qx"
+    ],
     "qx/decoration/Simple/table/select-column-order.png": [
       10,
       9,
       "png",
       "qx"
     ],
-    "qx/decoration/Simple/table/descending.png": [
-      10,
-      10,
+    "qx/decoration/Simple/splitpane/knob-horizontal.png": [
+      1,
+      8,
       "png",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/cross.gif": [
+    "qx/decoration/Simple/splitpane/knob-vertical.png": [
+      8,
+      1,
+      "png",
+      "qx"
+    ],
+    "qx/decoration/Simple/tree/minus.gif": [
+      19,
+      16,
+      "gif",
+      "qx"
+    ],
+    "qx/decoration/Simple/tree/plus.gif": [
       19,
       16,
       "gif",
@@ -72340,13 +72423,13 @@ qx.$$packageData['0'] = {
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/cross_minus.gif": [
+    "qx/decoration/Simple/treevirtual/cross.gif": [
       19,
       16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/end.gif": [
+    "qx/decoration/Simple/treevirtual/cross_minus.gif": [
       19,
       16,
       "gif",
@@ -72358,7 +72441,7 @@ qx.$$packageData['0'] = {
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/end_plus.gif": [
+    "qx/decoration/Simple/treevirtual/end.gif": [
       19,
       16,
       "gif",
@@ -72370,13 +72453,13 @@ qx.$$packageData['0'] = {
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/line.gif": [
+    "qx/decoration/Simple/treevirtual/end_plus.gif": [
       19,
       16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/only_plus.gif": [
+    "qx/decoration/Simple/treevirtual/line.gif": [
       19,
       16,
       "gif",
@@ -72388,13 +72471,19 @@ qx.$$packageData['0'] = {
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/start_minus.gif": [
+    "qx/decoration/Simple/treevirtual/start.gif": [
       19,
       16,
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/treevirtual/start.gif": [
+    "qx/decoration/Simple/treevirtual/only_plus.gif": [
+      19,
+      16,
+      "gif",
+      "qx"
+    ],
+    "qx/decoration/Simple/treevirtual/start_minus.gif": [
       19,
       16,
       "gif",
@@ -72418,25 +72507,25 @@ 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": [
+    "qx/decoration/Simple/window/maximize.gif": [
       9,
       9,
       "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",
@@ -72454,18 +72543,6 @@ qx.$$packageData['0'] = {
       "gif",
       "qx"
     ],
-    "qx/decoration/Simple/tree/minus.gif": [
-      19,
-      16,
-      "gif",
-      "qx"
-    ],
-    "qx/decoration/Simple/tree/plus.gif": [
-      19,
-      16,
-      "gif",
-      "qx"
-    ],
     "qx/static/blank.png": [
       1,
       1,
@@ -72496,6 +72573,12 @@ qx.$$packageData['0'] = {
       "",
       "qx"
     ],
+    "qx/tool/website/.gitignore": [
+      null,
+      null,
+      "",
+      "qx"
+    ],
     "qx/tool/schema/compile-1-0-0.json": [
       null,
       null,
@@ -72520,12 +72603,6 @@ qx.$$packageData['0'] = {
       "json",
       "qx"
     ],
-    "qx/tool/website/.gitignore": [
-      null,
-      null,
-      "",
-      "qx"
-    ],
     "qx/tool/cli/templates/template_vars.js": [
       null,
       null,
@@ -72544,12 +72621,6 @@ qx.$$packageData['0'] = {
       "dot",
       "qx"
     ],
-    "qx/tool/website/sass/qooxdoo.scss": [
-      null,
-      null,
-      "scss",
-      "qx"
-    ],
     "qx/tool/website/build/404.html": [
       null,
       null,
@@ -72634,6 +72705,30 @@ 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,
+      "js",
+      "qx"
+    ],
+    "qx/tool/cli/templates/loader/loader-node.tmpl.js": [
+      null,
+      null,
+      "js",
+      "qx"
+    ],
+    "qx/tool/cli/templates/loader/loader-rhino.tmpl.js": [
+      null,
+      null,
+      "js",
+      "qx"
+    ],
     "qx/tool/cli/templates/class/default.tmpl.js": [
       null,
       null,
@@ -72646,13 +72741,13 @@ qx.$$packageData['0'] = {
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/class/interface.tmpl.js": [
+    "qx/tool/cli/templates/class/mixin.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/class/mixin.tmpl.js": [
+    "qx/tool/cli/templates/class/interface.tmpl.js": [
       null,
       null,
       "js",
@@ -72664,24 +72759,30 @@ qx.$$packageData['0'] = {
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/loader/loader-browser.tmpl.js": [
+    "qx/tool/website/build/diagnostics/dependson.html": [
       null,
       null,
-      "js",
+      "html",
       "qx"
     ],
-    "qx/tool/cli/templates/loader/loader-node.tmpl.js": [
+    "qx/tool/website/build/diagnostics/dependson.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/loader/loader-rhino.tmpl.js": [
+    "qx/tool/website/build/diagnostics/requiredby.js": [
       null,
       null,
       "js",
       "qx"
     ],
+    "qx/tool/website/build/diagnostics/requiredby.html": [
+      null,
+      null,
+      "html",
+      "qx"
+    ],
     "qx/tool/website/build/assets/abel.css": [
       null,
       null,
@@ -72694,28 +72795,28 @@ qx.$$packageData['0'] = {
       "js",
       "qx"
     ],
-    "qx/tool/website/build/assets/bootstrap.css": [
+    "qx/tool/website/build/assets/bootstrap.min.css": [
       null,
       null,
       "css",
       "qx"
     ],
-    "qx/tool/website/build/assets/bootstrap.min.css": [
+    "qx/tool/website/build/assets/bootstrap.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/buttons.js": [
+    "qx/tool/website/build/assets/bootstrap.min.css.map": [
       null,
       null,
-      "js",
+      "map",
       "qx"
     ],
     "qx/tool/website/build/assets/favicon.png": [
@@ -72724,13 +72825,13 @@ qx.$$packageData['0'] = {
       "png",
       "qx"
     ],
-    "qx/tool/website/build/assets/fontawesome-all.js": [
+    "qx/tool/website/build/assets/jquery.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/website/build/assets/jquery.js": [
+    "qx/tool/website/build/assets/fontawesome-all.js": [
       null,
       null,
       "js",
@@ -72754,43 +72855,43 @@ qx.$$packageData['0'] = {
       "png",
       "qx"
     ],
-    "qx/tool/website/build/assets/qx-white.svg": [
-      64,
-      65,
-      "svg",
-      "qx"
-    ],
     "qx/tool/website/build/assets/qx-oo.png": [
       870,
       502,
       "png",
       "qx"
     ],
-    "qx/tool/website/build/diagnostics/dependson.html": [
+    "qx/tool/website/build/assets/qx-white.svg": [
+      64,
+      65,
+      "svg",
+      "qx"
+    ],
+    "qx/tool/website/build/scripts/serve.js": [
       null,
       null,
-      "html",
+      "js",
       "qx"
     ],
-    "qx/tool/website/build/diagnostics/dependson.js": [
+    "qx/tool/website/src/diagnostics/dependson.html": [
       null,
       null,
-      "js",
+      "html",
       "qx"
     ],
-    "qx/tool/website/build/diagnostics/requiredby.html": [
+    "qx/tool/website/src/diagnostics/requiredby.html": [
       null,
       null,
       "html",
       "qx"
     ],
-    "qx/tool/website/build/diagnostics/requiredby.js": [
+    "qx/tool/website/src/diagnostics/dependson.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/website/build/scripts/serve.js": [
+    "qx/tool/website/src/diagnostics/requiredby.js": [
       null,
       null,
       "js",
@@ -72814,22 +72915,16 @@ qx.$$packageData['0'] = {
       "css",
       "qx"
     ],
-    "qx/tool/website/src/assets/bootstrap.min.css": [
-      null,
-      null,
-      "css",
-      "qx"
-    ],
     "qx/tool/website/src/assets/bootstrap.min.css.map": [
       null,
       null,
       "map",
       "qx"
     ],
-    "qx/tool/website/src/assets/buttons.js": [
+    "qx/tool/website/src/assets/bootstrap.min.css": [
       null,
       null,
-      "js",
+      "css",
       "qx"
     ],
     "qx/tool/website/src/assets/favicon.png": [
@@ -72838,13 +72933,13 @@ qx.$$packageData['0'] = {
       "png",
       "qx"
     ],
-    "qx/tool/website/src/assets/fontawesome-all.js": [
+    "qx/tool/website/src/assets/buttons.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/website/src/assets/jquery.js": [
+    "qx/tool/website/src/assets/fontawesome-all.js": [
       null,
       null,
       "js",
@@ -72856,6 +72951,12 @@ qx.$$packageData['0'] = {
       "svg",
       "qx"
     ],
+    "qx/tool/website/src/assets/jquery.js": [
+      null,
+      null,
+      "js",
+      "qx"
+    ],
     "qx/tool/website/src/assets/qx-api.png": [
       1144,
       640,
@@ -72886,30 +72987,6 @@ qx.$$packageData['0'] = {
       "js",
       "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,
-      "html",
-      "qx"
-    ],
-    "qx/tool/website/src/diagnostics/requiredby.js": [
-      null,
-      null,
-      "js",
-      "qx"
-    ],
     "qx/tool/cli/templates/skeleton/desktop/.gitignore.tmpl": [
       null,
       null,
@@ -72958,52 +73035,52 @@ qx.$$packageData['0'] = {
       "md",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/.gitignore.tmpl": [
+    "qx/tool/cli/templates/skeleton/server/.gitignore.tmpl": [
       null,
       null,
       "tmpl",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/Manifest.tmpl.json": [
+    "qx/tool/cli/templates/skeleton/server/compile.tmpl.json": [
       null,
       null,
       "json",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/readme.tmpl.md": [
+    "qx/tool/cli/templates/skeleton/server/Manifest.tmpl.json": [
       null,
       null,
-      "md",
+      "json",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/compile.tmpl.json": [
+    "qx/tool/cli/templates/skeleton/server/readme.tmpl.txt": [
       null,
       null,
-      "json",
+      "txt",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/server/.gitignore.tmpl": [
+    "qx/tool/cli/templates/skeleton/package/.gitignore.tmpl": [
       null,
       null,
       "tmpl",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/server/Manifest.tmpl.json": [
+    "qx/tool/cli/templates/skeleton/package/compile.tmpl.json": [
       null,
       null,
       "json",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/server/compile.tmpl.json": [
+    "qx/tool/cli/templates/skeleton/package/Manifest.tmpl.json": [
       null,
       null,
       "json",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/server/readme.tmpl.txt": [
+    "qx/tool/cli/templates/skeleton/package/readme.tmpl.md": [
       null,
       null,
-      "txt",
+      "md",
       "qx"
     ],
     "qx/tool/cli/templates/skeleton/desktop/source/boot/index.tmpl.html": [
@@ -73018,10 +73095,10 @@ qx.$$packageData['0'] = {
       "html",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/mobile/source/boot/nojs.tmpl.html": [
+    "qx/tool/cli/templates/skeleton/desktop/source/translation/readme.txt": [
       null,
       null,
-      "html",
+      "txt",
       "qx"
     ],
     "qx/tool/cli/templates/skeleton/mobile/source/boot/index.tmpl.html": [
@@ -73030,10 +73107,10 @@ qx.$$packageData['0'] = {
       "html",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/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/mobile/source/translation/readme.txt": [
@@ -73054,6 +73131,18 @@ qx.$$packageData['0'] = {
       "txt",
       "qx"
     ],
+    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/Application.tmpl.js": [
+      null,
+      null,
+      "js",
+      "qx"
+    ],
+    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/__init__.tmpl.js": [
+      null,
+      null,
+      "js",
+      "qx"
+    ],
     "qx/tool/cli/templates/skeleton/desktop/source/resource/custom/app.png": [
       180,
       180,
@@ -73078,24 +73167,12 @@ qx.$$packageData['0'] = {
       "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/Application.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/__init__.tmpl.js": [
-      null,
-      null,
-      "js",
-      "qx"
-    ],
     "qx/tool/cli/templates/skeleton/mobile/source/class/custom/__init__.tmpl.js": [
       null,
       null,
@@ -73120,40 +73197,40 @@ qx.$$packageData['0'] = {
       "png",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/source/class/custom/Button.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/server/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/server/source/class/custom/__init__.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "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": [
+    "qx/tool/cli/templates/skeleton/server/source/resource/custom/.gitignore.tmpl": [
       null,
       null,
-      "js",
+      "tmpl",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/server/source/class/custom/__init__.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/package/source/class/custom/Button.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/server/source/resource/custom/.gitignore.tmpl": [
+    "qx/tool/cli/templates/skeleton/package/source/resource/custom/test.png": [
+      32,
+      32,
+      "png",
+      "qx"
+    ],
+    "qx/tool/cli/templates/skeleton/package/source/class/custom/__init__.tmpl.js": [
       null,
       null,
-      "tmpl",
+      "js",
       "qx"
     ],
     "qx/tool/cli/templates/skeleton/desktop/source/class/custom/test/DemoTest.tmpl.js": [
@@ -73180,13 +73257,13 @@ qx.$$packageData['0'] = {
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/theme/Font.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/theme/Theme.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/theme/Theme.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/desktop/source/class/custom/theme/Font.tmpl.js": [
       null,
       null,
       "js",
@@ -73216,7 +73293,7 @@ qx.$$packageData['0'] = {
       "tmpl",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/source/class/custom/demo/Application.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/server/source/class/custom/test/DemoTest.tmpl.js": [
       null,
       null,
       "js",
@@ -73234,25 +73311,25 @@ qx.$$packageData['0'] = {
       "scss",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/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/package/source/class/custom/theme/Appearance.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/package/source/class/custom/test/DemoTest.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/Appearance.tmpl.js": [
       null,
       null,
       "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/Color.tmpl.js": [
       null,
       null,
       "js",
@@ -73264,13 +73341,13 @@ qx.$$packageData['0'] = {
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/package/source/class/custom/theme/Theme.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/package/source/class/custom/theme/Font.tmpl.js": [
       null,
       null,
       "js",
       "qx"
     ],
-    "qx/tool/cli/templates/skeleton/server/source/class/custom/test/DemoTest.tmpl.js": [
+    "qx/tool/cli/templates/skeleton/package/source/class/custom/theme/Theme.tmpl.js": [
       null,
       null,
       "js",