@qooxdoo/framework 7.0.0 → 7.2.0

package/source/class/qx/test/util/DynamicScriptLoader.js

@@ -58,29 +58,21 @@ qx.Class.define("qx.test.util.DynamicScriptLoader", {
 
       var l1Ready = false;
       var l2Ready = false;
-      l1.addListenerOnce(
-        "ready",
-        function () {
-          l1Ready = true;
-          this.resume(function () {
-            this.assertTrue(l1Ready && l2Ready);
-            this.assertEquals(
-              qx.test.DYNAMICSCRIPTTEST.second.third,
-              "dynamically loaded"
-            );
-          }, this);
-        },
-        this
-      );
+      l1.addListenerOnce("ready", () => {
+        l1Ready = true;
+        this.resume(function () {
+          this.assertTrue(l1Ready && l2Ready);
+          this.assertEquals(
+            qx.test.DYNAMICSCRIPTTEST.second.third,
+            "dynamically loaded"
+          );
+        }, this);
+      });
 
-      l2.addListenerOnce(
-        "ready",
-        function () {
-          l2Ready = true;
-          this.assertTrue(!l1Ready && l2Ready);
-        },
-        this
-      );
+      l2.addListenerOnce("ready", () => {
+        l2Ready = true;
+        this.assertTrue(!l1Ready && l2Ready);
+      });
 
       l1.start();
       l2.start();
@@ -100,13 +92,9 @@ qx.Class.define("qx.test.util.DynamicScriptLoader", {
           noEvent = false;
         }
       });
-      loader.addListenerOnce(
-        "ready",
-        function () {
-          this.assertTrue(noEvent);
-        },
-        this
-      );
+      loader.addListenerOnce("ready", () => {
+        this.assertTrue(noEvent);
+      });
 
       loader.start();
     },
@@ -115,19 +103,12 @@ qx.Class.define("qx.test.util.DynamicScriptLoader", {
         "qx/test/dynamicscriptloader/xyc.js"
       ]);
 
-      loader.addListenerOnce(
-        "failed",
-        function (e) {
-          var data = e.getData();
-          this.resume(function () {
-            this.assertEquals(
-              data.script,
-              "qx/test/dynamicscriptloader/xyc.js"
-            );
-          }, this);
-        },
-        this
-      );
+      loader.addListenerOnce("failed", e => {
+        var data = e.getData();
+        this.resume(function () {
+          this.assertEquals(data.script, "qx/test/dynamicscriptloader/xyc.js");
+        }, this);
+      });
 
       loader.start();
       this.wait();

package/source/class/qx/theme/iconfont/LoadMaterialIcons.js

@@ -20,9 +20,9 @@
  * A dummy class to trigger the compiler to copy the MaterialIcons font files
  */
 /**
- * @asset(qx/iconfont/MaterialIcons/materialicons-v70.ttf)
- * @asset(qx/iconfont/MaterialIcons/materialicons-v70.woff2)
- * @asset(qx/iconfont/MaterialIcons/materialicons-v70.woff)
- * @asset(qx/iconfont/MaterialIcons/materialicons-v70.eot)
+ * @asset(qx/iconfont/MaterialIcons/materialicons-v126.ttf)
+ * @asset(qx/iconfont/MaterialIcons/materialicons-v126.woff2)
+ * @asset(qx/iconfont/MaterialIcons/materialicons-v126.woff)
+ * @asset(qx/iconfont/MaterialIcons/materialicons-v126.eot)
  */
 qx.Class.define("qx.theme.iconfont.LoadMaterialIcons", {});

package/source/class/qx/theme/iconfont/LoadMaterialIconsOutlined.js

@@ -20,9 +20,9 @@
  * A dummy class to trigger the compiler to copy the MaterialIconsOutlined font files
  */
 /**
- * @asset(qx/iconfont/MaterialIcons/materialiconsoutlined-v38.otf)
- * @asset(qx/iconfont/MaterialIcons/materialiconsoutlined-v38.woff2)
- * @asset(qx/iconfont/MaterialIcons/materialiconsoutlined-v38.woff)
- * @asset(qx/iconfont/MaterialIcons/materialiconsoutlined-v38.eot)
+ * @asset(qx/iconfont/MaterialIcons/materialiconsoutlined-v101.otf)
+ * @asset(qx/iconfont/MaterialIcons/materialiconsoutlined-v101.woff2)
+ * @asset(qx/iconfont/MaterialIcons/materialiconsoutlined-v101.woff)
+ * @asset(qx/iconfont/MaterialIcons/materialiconsoutlined-v101.eot)
  */
 qx.Class.define("qx.theme.iconfont.LoadMaterialIconsOutlined", {});

package/source/class/qx/theme/iconfont/LoadMaterialIconsRound.js

@@ -20,9 +20,9 @@
  * A dummy class to trigger the compiler to copy the MaterialIconsRound font files
  */
 /**
- * @asset(qx/iconfont/MaterialIcons/materialiconsround-v37.otf)
- * @asset(qx/iconfont/MaterialIcons/materialiconsround-v37.woff2)
- * @asset(qx/iconfont/MaterialIcons/materialiconsround-v37.woff)
- * @asset(qx/iconfont/MaterialIcons/materialiconsround-v37.eot)
+ * @asset(qx/iconfont/MaterialIcons/materialiconsround-v100.otf)
+ * @asset(qx/iconfont/MaterialIcons/materialiconsround-v100.woff2)
+ * @asset(qx/iconfont/MaterialIcons/materialiconsround-v100.woff)
+ * @asset(qx/iconfont/MaterialIcons/materialiconsround-v100.eot)
  */
 qx.Class.define("qx.theme.iconfont.LoadMaterialIconsRound", {});

package/source/class/qx/theme/iconfont/LoadMaterialIconsSharp.js

@@ -20,9 +20,9 @@
  * A dummy class to trigger the compiler to copy the MaterialIconsSharpe font files
  */
 /**
- * @asset(qx/iconfont/MaterialIcons/materialiconssharp-v38.otf)
- * @asset(qx/iconfont/MaterialIcons/materialiconssharp-v38.woff2)
- * @asset(qx/iconfont/MaterialIcons/materialiconssharp-v38.woff)
- * @asset(qx/iconfont/MaterialIcons/materialiconssharp-v38.eot)
+ * @asset(qx/iconfont/MaterialIcons/materialiconssharp-v101.otf)
+ * @asset(qx/iconfont/MaterialIcons/materialiconssharp-v101.woff2)
+ * @asset(qx/iconfont/MaterialIcons/materialiconssharp-v101.woff)
+ * @asset(qx/iconfont/MaterialIcons/materialiconssharp-v101.eot)
  */
 qx.Class.define("qx.theme.iconfont.LoadMaterialIconsSharp", {});

package/source/class/qx/theme/iconfont/LoadMaterialIconsTwoTone.js

@@ -20,9 +20,9 @@
  * A dummy class to trigger the compiler to copy the MaterialIconsTwoTone font files
  */
 /**
- * @asset(qx/iconfont/MaterialIcons/materialiconstwotone-v36.otf)
- * @asset(qx/iconfont/MaterialIcons/materialiconstwotone-v36.woff2)
- * @asset(qx/iconfont/MaterialIcons/materialiconstwotone-v36.woff)
- * @asset(qx/iconfont/MaterialIcons/materialiconstwotone-v36.eot)
+ * @asset(qx/iconfont/MaterialIcons/materialiconstwotone-v104.otf)
+ * @asset(qx/iconfont/MaterialIcons/materialiconstwotone-v104.woff2)
+ * @asset(qx/iconfont/MaterialIcons/materialiconstwotone-v104.woff)
+ * @asset(qx/iconfont/MaterialIcons/materialiconstwotone-v104.eot)
  */
 qx.Class.define("qx.theme.iconfont.LoadMaterialIconsTwoTone", {});

package/source/class/qx/theme/tangible/Appearance.js

@@ -634,7 +634,8 @@ qx.Theme.define("qx.theme.tangible.Appearance", {
       style(states) {
         return {
           decorator: undefined,
-          padding: [2, 2]
+          padding: [2, 2],
+          backgroundColor: "surface"
         };
       }
     },
@@ -644,7 +645,10 @@ qx.Theme.define("qx.theme.tangible.Appearance", {
       alias: "selectbox",
 
       style(states) {
-        return { padding: [0, 2] };
+        return { 
+          padding: [0, 2],
+          backgroundColor: "surface"
+        };
       }
     },
 
@@ -653,7 +657,10 @@ qx.Theme.define("qx.theme.tangible.Appearance", {
       alias: "combobox",
 
       style(states) {
-        return { decorator: undefined };
+        return { 
+          decorator: undefined,
+          backgroundColor: "surface"
+         };
       }
     },
 
@@ -999,6 +1006,18 @@ qx.Theme.define("qx.theme.tangible.Appearance", {
         };
       }
     },
+    "menubar-button/icon": {
+      style(states) {
+        return {
+          textColor: states.disabled 
+            ? "text-disabled-on-surface" 
+            : ( states.pressed || states.hovered )
+            ? "text-on-primary" 
+            : "text-on-surface"
+        }
+      }
+    },
+    
 
     /*
     ---------------------------------------------------------------------------

package/source/class/qx/theme/tangible/ColorEngine.js

@@ -87,7 +87,7 @@ var helper = {
     var color = d[0];
     var state = d[1];
     switch (state) {
-      case "focussed":
+      case "focused":
         return qx.util.ColorUtil.scale(color, {
           lightness: 10,
           saturation: 10
@@ -159,10 +159,10 @@ qx.Theme.define("qx.theme.tangible.ColorEngine", {
     "text-on-error": helper.onX,
     "primary-hovered": helper.xState,
     "primary-disabled": helper.xState,
-    "primary-focussed": helper.xState,
+    "primary-focused": helper.xState,
     "primary-selected": helper.xState,
     "primary-selected_disabled": helper.xState,
-    "error-focussed": helper.xState,
+    "error-focused": helper.xState,
 
     // alpha colors
     "primary-alpha-5": helper.setAlpha,

package/source/class/qx/theme/tangible/Decoration.js

@@ -40,7 +40,7 @@ qx.Theme.define("qx.theme.tangible.Decoration", {
       include: "material-textfield",
       style: {
         widthBottom: 2,
-        colorBottom: "primary-focussed"
+        colorBottom: "primary-focused"
       }
     },
 
@@ -56,7 +56,7 @@ qx.Theme.define("qx.theme.tangible.Decoration", {
       include: "material-textfield",
       style: {
         widthBottom: 2,
-        colorBottom: "error-focussed"
+        colorBottom: "error-focused"
       }
     },
 
@@ -287,7 +287,7 @@ qx.Theme.define("qx.theme.tangible.Decoration", {
     "button-box-pressed": {
       include: "button-box",
 
-      style: { backgroundColor: "primary-focussed" }
+      style: { backgroundColor: "primary-focused" }
     },
 
     "button-box-pressed-hovered": {

package/source/class/qx/tool/cli/Watch.js

@@ -140,13 +140,9 @@ qx.Class.define("qx.tool.cli.Watch", {
 
       var dirs = [];
       var analyser = this.__maker.getAnalyser();
-      analyser.addListener(
-        "compiledClass",
-        function () {
-          this.__stats.classesCompiled++;
-        },
-        this
-      );
+      analyser.addListener("compiledClass", () => {
+        this.__stats.classesCompiled++;
+      });
 
       dirs.push(qx.tool.config.Compile.config.fileName);
       dirs.push("compile.js");

package/source/class/qx/tool/cli/api/AbstractApi.js

@@ -86,7 +86,10 @@ qx.Class.define("qx.tool.cli.api.AbstractApi", {
      */
     loadNpmModule(module) {
       const { execSync } = require("child_process");
-      let s = `npm install --no-save --no-package-lock ${module}`;
+      // since npm 7 --no-save deletes the node_modules folder
+      // see https://github.com/npm/cli/pull/3907
+      //       let s = `npm install --no-save --no-package-lock ${module}`;
+      let s = `npm install --no-package-lock ${module}`;
       qx.tool.compiler.Console.info(s);
       execSync(s, {
         stdio: "inherit"

package/source/class/qx/tool/cli/api/CompilerApi.js

@@ -33,13 +33,9 @@ qx.Class.define("qx.tool.cli.api.CompilerApi", {
   construct() {
     super();
     this.__libraryApis = {};
-    this.addListener(
-      "changeCommand",
-      function () {
-        this.afterCommandLoaded(this.getCommand());
-      },
-      this
-    );
+    this.addListener("changeCommand", () => {
+      this.afterCommandLoaded(this.getCommand());
+    });
   },
 
   properties: {

package/source/class/qx/tool/cli/commands/Compile.js

@@ -359,6 +359,9 @@ qx.Class.define("qx.tool.cli.commands.Compile", {
         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(`
 Compiler:  v${this.getCompilerVersion()} in ${require.main.filename}
@@ -915,6 +918,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
        */
       let targetOutputPaths = {};
       let makers = [];
+
       targetConfigs.forEach(targetConfig => {
         if (!targetConfig.appConfigs) {
           qx.tool.compiler.Console.print(
@@ -1203,7 +1207,8 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
             "loaderTemplate",
             "publish",
             "deploy",
-            "standalone"
+            "standalone",
+            "localModules"
           ].forEach(name => {
             if (appConfig[name] !== undefined) {
               var fname = "set" + qx.lang.String.firstUp(name);
@@ -1225,6 +1230,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) {
             if (!parts.boot) {

package/source/class/qx/tool/cli/commands/Lint.js

@@ -95,7 +95,15 @@ qx.Class.define("qx.tool.cli.commands.Lint", {
 
   members: {
     async process() {
-      await this.__applyFixes();
+      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.__applyFixes(files);
 
       let helperFilePath = require.main.path;
       while (true) {
@@ -112,14 +120,14 @@ qx.Class.define("qx.tool.cli.commands.Lint", {
         lintOptions.globals || {},
         await this.__addGlobals(config)
       );
+
       lintOptions.parser = "@babel/eslint-parser";
       lintOptions.parserOptions = lintOptions.parserOptions || {};
       lintOptions.parserOptions.requireConfigFile = false;
       lintOptions.parserOptions.babelOptions = {
         cwd: helperFilePath,
-        plugins: [
-          "@babel/plugin-syntax-jsx"
-        ],
+        plugins: ["@babel/plugin-syntax-jsx"],
+
         parserOpts: {
           allowSuperOutsideMethod: true
         }
@@ -134,13 +142,6 @@ qx.Class.define("qx.tool.cli.commands.Lint", {
         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]);
         qx.tool.compiler.Console.info(JSON.stringify(fileConfig, null, "  "));
@@ -157,13 +158,27 @@ qx.Class.define("qx.tool.cli.commands.Lint", {
         }
         if (report.errorCount > 0 || report.warningCount > 0) {
           let outputFormat = this.argv.format || "codeframe";
-
-          // If there are too many errors, the pretty formatter is appallingly slow
-          if (report.errorCount + report.warningCount > 150) {
-            outputFormat = "compact";
-          }
           const formatter = await linter.loadFormatter(outputFormat);
           const s = formatter.format(report);
+          // If there are too many errors, the pretty formatter is appallingly slow so if the
+          // user has not specified a format, change to compact mode
+          const maxDefaultFormatErrorCount = 150;
+          if (
+            report.errorCount + report.warningCount >
+            maxDefaultFormatErrorCount
+          ) {
+            if (!this.argv.format) {
+              qx.tool.compiler.Console.info(
+                `Total errors and warnings exceed ${maxDefaultFormatErrorCount}, switching to "compact" style report`
+              );
+
+              outputFormat = "compact";
+            } else {
+              qx.tool.compiler.Console.info(
+                `Total errors and warnings exceed ${maxDefaultFormatErrorCount}, the report may take some time to generate.`
+              );
+            }
+          }
           if (this.argv.outputFile) {
             if (this.argv.verbose) {
               qx.tool.compiler.Console.info(
@@ -220,19 +235,18 @@ qx.Class.define("qx.tool.cli.commands.Lint", {
      * @return {Promise<void>}
      * @private
      */
-    async __applyFixes() {
+    async __applyFixes(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);
       }

package/source/class/qx/tool/compiler/ClassFile.js

@@ -223,6 +223,7 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
     };
 
     this.__externals = [];
+    this.__commonjsModules = {};
 
     this.__taskQueueDrains = [];
     this.__taskQueue = async.queue(function (task, cb) {
@@ -281,6 +282,7 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
     __privates: null,
     __blockedPrivates: null,
     __externals: null,
+    __commonjsModules: null,
 
     _onTaskQueueDrain() {
       var cbs = this.__taskQueueDrain;
@@ -390,6 +392,7 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
                   qx.tool.compiler.ClassFile.JSX_OPTIONS
                 ]
               ],
+
               generatorOpts: {
                 compact: false
               },
@@ -496,6 +499,7 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
       delete dbClassInfo.translations;
       delete dbClassInfo.markers;
       delete dbClassInfo.fatalCompileError;
+      delete dbClassInfo.commonjsModules;
       for (var key in this.__dbClassInfo) {
         dbClassInfo[key] = this.__dbClassInfo[key];
       }
@@ -667,6 +671,16 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
         dbClassInfo.fatalCompileError = true;
       }
 
+      // CommonJS modules
+      if (Object.keys(this.__commonjsModules).length > 0) {
+        dbClassInfo.commonjsModules = {};
+        for (let moduleName in this.__commonjsModules) {
+          dbClassInfo.commonjsModules[moduleName] = [
+            ...this.__commonjsModules[moduleName]
+          ];
+        }
+      }
+
       return dbClassInfo;
     },
 
@@ -1648,6 +1662,58 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
               }
             }
 
+            // Are we looking at the Identifier `require`, and is it a
+            // function call (identified by having
+            // `path.node.arguments`? If so, we'll add the discovered
+            // module to the list of modules that must be browserified
+            // if the application is destined for the browser.
+            let scope;
+            let applicationTypes = t.__analyser.getApplicationTypes();
+
+            if (
+              path.node.callee.type == "Identifier" &&
+              path.node?.callee?.name == "require" &&
+              path.node.arguments?.length == 1 &&
+              applicationTypes.includes("browser")
+            ) {
+              // See if this is a reference to global `require` or
+              // something in the scope chain
+              for (scope = t.__scope; scope; scope = scope.parent) {
+                if (scope.vars["require"]) {
+                  // It's in the scope chain. Ignore it.
+                  break;
+                }
+              }
+              // Did we reach top level without finding it in a local scope?
+              if (!scope) {
+                // Yup. It's the global one we're looking for. Ensure the argument is valid.
+                let arg = path.node.arguments[0];
+                if (types.isLiteral(arg)) {
+                  if (typeof arg.value != "string") {
+                    log.error(
+                      `${t.__className}: ` +
+                        "Only literal string arguments to require() are supported: " +
+                        arg.value
+                    );
+                  } else {
+                    qx.tool.compiler.Console.log(
+                      `${t.__className}:${path.node.loc.start.line}:` +
+                        ` automatically detected \'require(${arg.value})\``
+                    );
+                    t.addCommonjsModule(
+                      arg.value,
+                      t.__className,
+                      path.node.loc.start.line
+                    );
+
+                    // Don't show "unresolved" error for `require` since the
+                    // browserified code defines it as a global
+                    t.addIgnore("require");
+                  }
+                }
+              }
+            }
+
             if (
               types.isMemberExpression(path.node.callee) ||
               (es6ClassDeclarations == 0 &&
@@ -1828,6 +1894,7 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
                       types.stringLiteral(t.__classMeta.functionName)
                     ]
                   );
+
                   expr = types.memberExpression(expr, types.identifier("call"));
                 } else if (t.__classMeta.functionName == "$$constructor") {
                   expr = expandMemberExpression(
@@ -1836,8 +1903,8 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
                 } else if (t.__classMeta.className) {
                   expr = expandMemberExpression(
                     t.__classMeta.className +
-                    ".superclass" +
-                    ".prototype." +
+                      ".superclass" +
+                      ".prototype." +
                       t.__classMeta.functionName +
                       ".call"
                   );
@@ -2506,6 +2573,19 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
       }
     },
 
+    /**
+     * Adds a CommonJS module to be browserified
+     *
+     * @param name {String} name of the module
+     */
+    addCommonjsModule(moduleName, className, linenum) {
+      if (!this.__commonjsModules[moduleName]) {
+        this.__commonjsModules[moduleName] = new Set();
+      }
+
+      this.__commonjsModules[moduleName].add(`${className}:${linenum}`);
+    },
+
     /**
      * Adds an ignored symbol
      * @param name {String} name of the symbol

package/source/class/qx/tool/compiler/Es6ify.js

@@ -106,6 +106,7 @@ qx.Class.define("qx.tool.compiler.Es6ify", {
   construct(filename) {
     super();
     this.__filename = filename;
+    this.__knownApiFunctions = ["addListener", "addListenerOnce"];
   },
 
   properties: {
@@ -125,6 +126,7 @@ qx.Class.define("qx.tool.compiler.Es6ify", {
 
   members: {
     __filename: null,
+    __knownApiFunctions: null,
 
     async transform() {
       let src = await fs.promises.readFile(this.__filename, "utf8");
@@ -174,7 +176,9 @@ qx.Class.define("qx.tool.compiler.Es6ify", {
       while (true) {
         cycleCount++;
         if (cycleCount > 10) {
-          qx.tool.compiler.Console.warn(`Can not find a stable format for ${this.__filename}`);
+          qx.tool.compiler.Console.warn(
+            `Can not find a stable format for ${this.__filename}`
+          );
           break;
         }
         result = babelCore.transform(src, config);
@@ -275,6 +279,7 @@ qx.Class.define("qx.tool.compiler.Es6ify", {
       let t = this;
       const isTest = this.__filename.indexOf("/test/") > -1;
       let arrowFunctions = this.getArrowFunctions();
+      let knownApiFunctions = this.__knownApiFunctions;
 
       return {
         visitor: {
@@ -282,13 +287,15 @@ qx.Class.define("qx.tool.compiler.Es6ify", {
             if (path.node.callee.type == "MemberExpression") {
               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[1].type != "FunctionExpression" ||
                   path.node.arguments[2].type != "ThisExpression"
                 ) {
                   return;
@@ -324,14 +331,14 @@ qx.Class.define("qx.tool.compiler.Es6ify", {
      * @returns
      */
     __pluginRemoveUnnecessaryThis() {
+      let knownApiFunctions = this.__knownApiFunctions;
       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" &&
+              knownApiFunctions.includes(path.node.callee.property.name) &&
               path.node.arguments.length == 3 &&
               path.node.arguments[0].type == "StringLiteral" &&
               path.node.arguments[1].type == "ArrowFunctionExpression" &&