@qooxdoo/framework 7.1.0 → 7.2.1

package/source/class/qx/tool/compiler/targets/Target.js

@@ -432,11 +432,13 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
         new qx.tool.compiler.targets.meta.PolyfillJs(appMeta)
       );
 
-      // Add browserified CommonJS modules, if any
-      if (appMeta.getEnvironmentValue("qx.compiler.applicationType") == "browser") {
-        bootPackage.addJavascriptMeta(
-          new qx.tool.compiler.targets.meta.Browserify(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.
+      bootPackage.addJavascriptMeta(
+        new qx.tool.compiler.targets.meta.Browserify(appMeta)
+      );
 
       /*
        * Assemble the Parts

package/source/class/qx/tool/compiler/targets/meta/AbstractJavascriptMeta.js

@@ -22,7 +22,7 @@
 
 const fs = qx.tool.utils.Promisify.fs;
 const path = require("upath");
-const sourceMap = require("source-map");
+const sourceMap = require("source-map-js");
 
 /**
  * An AbstractJavascriptMeta provides an abstraction of some source code, and might be

package/source/class/qx/tool/compiler/targets/meta/Browserify.js

@@ -24,7 +24,7 @@ const fs = qx.tool.utils.Promisify.fs;
 const path = require("upath");
 
 /**
- * 
+ *
  */
 qx.Class.define("qx.tool.compiler.targets.meta.Browserify", {
   extend: qx.tool.compiler.targets.meta.AbstractJavascriptMeta,
@@ -36,7 +36,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.Browserify", {
   },
 
   members: {
-    __appMeta : null,
+    __appMeta: null,
 
     /**
      * @Override
@@ -45,37 +45,50 @@ qx.Class.define("qx.tool.compiler.targets.meta.Browserify", {
       let hasCommonjsModules = false;
       let commonjsModules = new Set();
       let references = {};
+      const localModules =
+        this.__appMeta.getApplication().getLocalModules() || {};
       const db = this.__appMeta.getAnalyser().getDatabase();
 
-      // 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 =>
-            {
+      // Only include discovered `require()`d Node modules if the
+      // target application type is browser.
+      if (
+        this.__appMeta.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 => {
+              // Ignore this found `require()` if its a local modules
+              if (moduleName in localModules) {
+                return;
+              }
+
               // 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 (! references[moduleName]) {
+              if (!references[moduleName]) {
                 references[moduleName] = new Set();
               }
-              references[moduleName].add([ ...classInfo.commonjsModules[moduleName] ]);
+              references[moduleName].add([
+                ...classInfo.commonjsModules[moduleName]
+              ]);
 
               // There is at least one module
               hasCommonjsModules = true;
             });
+          }
         }
       }
 
-      // If there are any CommonJS modules required, browserify them
-      if (hasCommonjsModules) {
-        await this.__browserify(
-          commonjsModules,
-          references,
-          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 (hasCommonjsModules || localModules) {
+        await this.__browserify(commonjsModules, references, localModules, ws);
       }
 
       await new Promise(resolve => {
@@ -83,8 +96,9 @@ qx.Class.define("qx.tool.compiler.targets.meta.Browserify", {
       });
     },
 
-    async __browserify(commonjsModules, references, ws) {
-      let b;
+    async __browserify(commonjsModules, references, localModules, ws) {
+      const babelify = require("babelify");
+      const preset = require("@babel/preset-env");
       const browserify = require("browserify");
       const builtins = require("browserify/lib/builtins.js");
 
@@ -95,42 +109,64 @@ qx.Class.define("qx.tool.compiler.targets.meta.Browserify", {
       // Convert the Set of CommonJS module names to an array
       commonjsModules = [...commonjsModules];
 
-      return new Promise(resolve =>
-        {
-          b = browserify(
-            [],
-            {
-              builtins      : builtins,
-              ignoreMissing : true,
-              insertGlobals : true,
-              detectGlobals : true
-            });
-          b._mdeps.on("missing", (id, parent) => {
-              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}`);
-                  });
-              });
+      return new Promise(resolve => {
+        let b = browserify([], {
+          builtins: builtins,
+          ignoreMissing: true,
+          insertGlobals: true,
+          detectGlobals: true
+        });
+
+        b._mdeps.on("missing", (id, parent) => {
+          let message = [];
+
+          message.push(`ERROR: could not locate require()d module: "${id}"`);
+          message.push("  required from:");
 
-              qx.tool.compiler.Console.error(message.join("\n"));
+          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);
-          b.bundle((e, output) => {
-            if (e) {
-              // We've already handled the case of missing module. This is something else.
-              qx.tool.compiler.Console.error(`Failed: ${e}`);
-              throw(e);
-            }
-
-            ws.write(output);
-            resolve(null);
-          });
+        }
+
+        // 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.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.
+            qx.tool.compiler.Console.error(`Failed: ${e}`);
+            throw e;
+          }
+
+          ws.write(output);
+          resolve(null);
+        });
+      });
     },
 
     /**

package/source/class/qx/tool/compiler/targets/meta/Uglify.js

@@ -124,10 +124,18 @@ qx.Class.define("qx.tool.compiler.targets.meta.Uglify", {
         throw new Error("UglifyJS failed to minimise: " + (err.message || err));
       }
       await fs.writeFileAsync(outJsFilename, result.code, { encoding: "utf8" });
-      await fs.writeFileAsync(outJsFilename + ".map", result.map, { encoding: "utf8"  });
+      await fs.writeFileAsync(outJsFilename + ".map", result.map, {
+        encoding: "utf8"
+      });
       if (this._appMeta.getTarget().isSaveUnminified()) {
-        await fs.writeFileAsync(outJsFilename + ".unminified", inSourceCode, { encoding: "utf8" });
-        await fs.writeFileAsync(outJsFilename + ".unminified.map", JSON.stringify(inSourceMap, null, 2), { encoding: "utf8" });
+        await fs.writeFileAsync(outJsFilename + ".unminified", inSourceCode, {
+          encoding: "utf8"
+        });
+        await fs.writeFileAsync(
+          outJsFilename + ".unminified.map",
+          JSON.stringify(inSourceMap, null, 2),
+          { encoding: "utf8" }
+        );
       }
 
       this.fireDataEvent("minifiedApplication", {

package/source/class/qx/tool/utils/Json.js

@@ -23,7 +23,7 @@
  * *********************************************************************** */
 
 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", {

package/source/class/qx/tool/utils/Website.js

@@ -25,8 +25,8 @@ const rimraf = require("rimraf");
 const dot = require("dot");
 require("jstransformer-dot");
 const metalsmith = require("metalsmith");
-const layouts = require("metalsmith-layouts");
-const markdown = require("metalsmith-markdown");
+const layouts = require("@metalsmith/layouts");
+const markdown = require("@metalsmith/markdown");
 //const filenames = require("metalsmith-filenames");
 //var permalinks = require("metalsmith-permalinks");
 /**

package/source/class/qx/ui/basic/Label.js

@@ -415,23 +415,19 @@ qx.Class.define("qx.ui.basic.Label", {
 
       if (value != null) {
         value.bind("enabled", this, "enabled");
-        this.__tapListenerId = this.addListener(
-          "tap",
-          function () {
-            // only focus focusable elements [BUG #3555]
-            if (value.isFocusable()) {
-              value.focus.apply(value);
-            }
-            // furthermore toggle if possible [BUG #6881]
-            if (
-              "toggleValue" in value &&
-              typeof value.toggleValue === "function"
-            ) {
-              value.toggleValue();
-            }
-          },
-          this
-        );
+        this.__tapListenerId = this.addListener("tap", () => {
+          // only focus focusable elements [BUG #3555]
+          if (value.isFocusable()) {
+            value.focus.apply(value);
+          }
+          // furthermore toggle if possible [BUG #6881]
+          if (
+            "toggleValue" in value &&
+            typeof value.toggleValue === "function"
+          ) {
+            value.toggleValue();
+          }
+        });
       }
     },
 

package/source/class/qx/ui/core/MPlacement.js

@@ -461,20 +461,16 @@ qx.Mixin.define("qx.ui.core.MPlacement", {
         );
 
         // Remove the listener when the element disappears.
-        this.addListener(
-          "disappear",
-          function () {
-            if (this.__ptwLiveUpdater) {
-              qx.event.Idle.getInstance().removeListener(
-                "interval",
-                this.__ptwLiveUpdater
-              );
-
-              this.__ptwLiveUpdater = null;
-            }
-          },
-          this
-        );
+        this.addListener("disappear", () => {
+          if (this.__ptwLiveUpdater) {
+            qx.event.Idle.getInstance().removeListener(
+              "interval",
+              this.__ptwLiveUpdater
+            );
+
+            this.__ptwLiveUpdater = null;
+          }
+        });
       }
 
       this._place(coords);
@@ -532,13 +528,9 @@ qx.Mixin.define("qx.ui.core.MPlacement", {
       }
 
       if (size == null) {
-        this.addListenerOnce(
-          "appear",
-          function () {
-            this.__getPlacementSize(callback);
-          },
-          this
-        );
+        this.addListenerOnce("appear", () => {
+          this.__getPlacementSize(callback);
+        });
       } else {
         callback.call(this, size);
       }

package/source/class/qx/ui/core/Widget.js

@@ -2109,13 +2109,12 @@ qx.Class.define("qx.ui.core.Widget", {
         var manager = qx.locale.Manager.getInstance();
         this.__toolTipTextListenerId = manager.addListener(
           "changeLocale",
-          function () {
+          () => {
             var toolTipText = this.getToolTipText();
             if (toolTipText && toolTipText.translate) {
               this.setToolTipText(toolTipText.translate());
             }
-          },
-          this
+          }
         );
       }
     },

package/source/class/qx/ui/core/scroll/NativeScrollBar.js

@@ -71,13 +71,9 @@ qx.Class.define("qx.ui.core.scroll.NativeScrollBar", {
     }
 
     // prevent drag & drop on scrolling
-    this.addListener(
-      "track",
-      function (e) {
-        e.stopPropagation();
-      },
-      this
-    );
+    this.addListener("track", e => {
+      e.stopPropagation();
+    });
   },
 
   events: {

package/source/class/qx/ui/core/scroll/ScrollBar.js

@@ -81,13 +81,9 @@ qx.Class.define("qx.ui.core.scroll.ScrollBar", {
     }
 
     // prevent drag & drop on scrolling
-    this.addListener(
-      "track",
-      function (e) {
-        e.stopPropagation();
-      },
-      this
-    );
+    this.addListener("track", e => {
+      e.stopPropagation();
+    });
   },
 
   events: {

package/source/class/qx/ui/embed/Iframe.js

@@ -92,64 +92,54 @@ qx.Class.define("qx.ui.embed.Iframe", {
     this.__blockerElement = this._createBlockerElement();
 
     if (qx.core.Environment.get("ecmascript.mutationobserver")) {
-      this.addListenerOnce(
-        "appear",
-        function () {
-          var element = this.getContentElement().getDomElement();
-
-          // Mutation record check callback
-          var isDOMNodeInserted = function (mutationRecord) {
-            var i;
-            // 'our' iframe was either added...
-            if (mutationRecord.addedNodes) {
-              for (i = mutationRecord.addedNodes.length; i >= 0; --i) {
-                if (mutationRecord.addedNodes[i] == element) {
-                  return true;
-                }
+      this.addListenerOnce("appear", () => {
+        var element = this.getContentElement().getDomElement();
+
+        // Mutation record check callback
+        var isDOMNodeInserted = function (mutationRecord) {
+          var i;
+          // 'our' iframe was either added...
+          if (mutationRecord.addedNodes) {
+            for (i = mutationRecord.addedNodes.length; i >= 0; --i) {
+              if (mutationRecord.addedNodes[i] == element) {
+                return true;
               }
             }
-            // ...or removed
-            if (mutationRecord.removedNodes) {
-              for (i = mutationRecord.removedNodes.length; i >= 0; --i) {
-                if (mutationRecord.removedNodes[i] == element) {
-                  return true;
-                }
+          }
+          // ...or removed
+          if (mutationRecord.removedNodes) {
+            for (i = mutationRecord.removedNodes.length; i >= 0; --i) {
+              if (mutationRecord.removedNodes[i] == element) {
+                return true;
               }
             }
-            return false;
-          };
+          }
+          return false;
+        };
 
-          var observer = new MutationObserver(
-            function (mutationRecords) {
-              if (mutationRecords.some(isDOMNodeInserted)) {
-                this._syncSourceAfterDOMMove();
-              }
-            }.bind(this)
-          );
-
-          // Observe parent element
-          var parent = this.getLayoutParent()
-            .getContentElement()
-            .getDomElement();
-          observer.observe(parent, { childList: true, subtree: true });
-        },
-        this
-      );
+        var observer = new MutationObserver(
+          function (mutationRecords) {
+            if (mutationRecords.some(isDOMNodeInserted)) {
+              this._syncSourceAfterDOMMove();
+            }
+          }.bind(this)
+        );
+
+        // Observe parent element
+        var parent = this.getLayoutParent().getContentElement().getDomElement();
+        observer.observe(parent, { childList: true, subtree: true });
+      });
     }
     // !qx.core.Environment.get("ecmascript.mutationobserver")
     else {
-      this.addListenerOnce(
-        "appear",
-        function () {
-          var element = this.getContentElement().getDomElement();
-          qx.bom.Event.addNativeListener(
-            element,
-            "DOMNodeInserted",
-            this._onDOMNodeInserted
-          );
-        },
-        this
-      );
+      this.addListenerOnce("appear", () => {
+        var element = this.getContentElement().getDomElement();
+        qx.bom.Event.addNativeListener(
+          element,
+          "DOMNodeInserted",
+          this._onDOMNodeInserted
+        );
+      });
 
       this._onDOMNodeInserted = qx.lang.Function.listener(
         this._syncSourceAfterDOMMove,

package/source/class/qx/ui/form/AbstractField.js

@@ -994,18 +994,14 @@ qx.Class.define("qx.ui.form.AbstractField", {
             /* qx Bug #8870: Firefox 35 will not display a text area's
                placeholder text if the attribute is set before the
                element is added to the DOM. This is fixed in FF 36. */
-            this.addListenerOnce(
-              "appear",
-              function () {
-                this.getContentElement()
-                  .getDomElement()
-                  .removeAttribute("placeholder");
-                this.getContentElement()
-                  .getDomElement()
-                  .setAttribute("placeholder", value);
-              },
-              this
-            );
+            this.addListenerOnce("appear", () => {
+              this.getContentElement()
+                .getDomElement()
+                .removeAttribute("placeholder");
+              this.getContentElement()
+                .getDomElement()
+                .setAttribute("placeholder", value);
+            });
           }
         }
       }

package/source/class/qx/ui/form/ComboBox.js

@@ -53,21 +53,13 @@ qx.Class.define("qx.ui.form.ComboBox", {
 
     // forward the focusin and focusout events to the textfield. The textfield
     // is not focusable so the events need to be forwarded manually.
-    this.addListener(
-      "focusin",
-      function (e) {
-        textField.fireNonBubblingEvent("focusin", qx.event.type.Focus);
-      },
-      this
-    );
-
-    this.addListener(
-      "focusout",
-      function (e) {
-        textField.fireNonBubblingEvent("focusout", qx.event.type.Focus);
-      },
-      this
-    );
+    this.addListener("focusin", e => {
+      textField.fireNonBubblingEvent("focusin", qx.event.type.Focus);
+    });
+
+    this.addListener("focusout", e => {
+      textField.fireNonBubblingEvent("focusout", qx.event.type.Focus);
+    });
   },
 
   /*

package/source/class/qx/ui/form/DateField.js

@@ -67,21 +67,13 @@ qx.Class.define("qx.ui.form.DateField", {
 
     // forward the focusin and focusout events to the textfield. The textfield
     // is not focusable so the events need to be forwarded manually.
-    this.addListener(
-      "focusin",
-      function (e) {
-        textField.fireNonBubblingEvent("focusin", qx.event.type.Focus);
-      },
-      this
-    );
-
-    this.addListener(
-      "focusout",
-      function (e) {
-        textField.fireNonBubblingEvent("focusout", qx.event.type.Focus);
-      },
-      this
-    );
+    this.addListener("focusin", e => {
+      textField.fireNonBubblingEvent("focusin", qx.event.type.Focus);
+    });
+
+    this.addListener("focusout", e => {
+      textField.fireNonBubblingEvent("focusout", qx.event.type.Focus);
+    });
 
     // initializes the DateField with the default format
     this._setDefaultDateFormat();
@@ -225,10 +217,9 @@ qx.Class.define("qx.ui.form.DateField", {
       if (qx.core.Environment.get("qx.dynlocale")) {
         this.__localeListenerId = qx.locale.Manager.getInstance().addListener(
           "changeLocale",
-          function () {
+          () => {
             this._setDefaultDateFormat();
-          },
-          this
+          }
         );
       }
     },