@qooxdoo/framework 7.1.0 → 7.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qooxdoo/framework",
-  "version": "7.1.0",
+  "version": "7.1.1",
   "description": "The JS Framework for Coders",
   "author": "The qooxdoo project",
   "keywords": [
@@ -51,7 +51,7 @@
     "bin/deploy"
   ],
   "dependencies": {
-    "@babel/core": "^7.12.10",
+    "@babel/core": "^7.17.10",
     "@babel/eslint-parser": "^7.16.3",
     "@babel/generator": "^7.12.11",
     "@babel/parser": "^7.12.11",
@@ -60,7 +60,7 @@
     "@babel/plugin-syntax-jsx": "^7.16.7",
     "@babel/plugin-transform-block-scoping": "^7.12.12",
     "@babel/plugin-transform-react-jsx": "^7.12.12",
-    "@babel/preset-env": "^7.12.11",
+    "@babel/preset-env": "^7.17.10",
     "@babel/preset-react": "^7.12.10",
     "@babel/preset-typescript": "^7.12.7",
     "@babel/traverse": "^7.12.12",
@@ -73,6 +73,7 @@
     "ajv": "^8.8.1",
     "app-module-path": "^2.2.0",
     "async": "^2.6.3",
+    "babelify": "^10.0.0",
     "better-ajv-errors": "^1.1.1",
     "browserify": "^17.0.0",
     "chokidar": "^3.5.1",

package/source/class/qx/event/handler/Focus.js

@@ -88,7 +88,7 @@ qx.Class.define("qx.event.handler.Focus", {
       nullable: true
     },
 
-    /** The focussed DOM element */
+    /** The focused DOM element */
     focus: {
       apply: "_applyFocus",
       nullable: true

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/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/commands/Compile.js

@@ -359,7 +359,10 @@ qx.Class.define("qx.tool.cli.commands.Compile", {
         this.argv["feedback"] = configDb.db("qx.default.feedback", true);
       }
 
-      if (this.argv.verbose) {
+     // 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}
 Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
@@ -1204,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);
@@ -1226,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,16 @@ 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) {
@@ -134,13 +143,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, "  "));
@@ -230,19 +232,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/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");
@@ -275,6 +277,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 +285,13 @@ 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 +327,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" &&

package/source/class/qx/tool/compiler/app/Application.js

@@ -217,6 +217,20 @@ qx.Class.define("qx.tool.compiler.app.Application", {
     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"
     }
   },
 

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

@@ -432,11 +432,12 @@ 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/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,
@@ -45,35 +45,52 @@ 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 =>
-            {
-              // 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]) {
-                references[moduleName] = new Set();
-              }
-              references[moduleName].add([ ...classInfo.commonjsModules[moduleName] ]);
-
-              // There is at least one module
-              hasCommonjsModules = true;
-            });
+      // 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]) {
+                  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 (hasCommonjsModules) {
+      // 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
         );
       }
@@ -83,8 +100,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");
 
@@ -97,7 +115,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.Browserify", {
 
       return new Promise(resolve =>
         {
-          b = browserify(
+          let b = browserify(
             [],
             {
               builtins      : builtins,
@@ -106,20 +124,44 @@ qx.Class.define("qx.tool.compiler.targets.meta.Browserify", {
               detectGlobals : true
             });
           b._mdeps.on("missing", (id, parent) => {
-              let message = [];
+            let message = [];
 
-              message.push(`ERROR: could not locate require()d module: "${id}"`);
-              message.push("  required from:");
+            message.push(`ERROR: could not locate require()d module: "${id}"`);
+            message.push("  required from:");
+
+            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"));
-            });
-          b.require(commonjsModules);
+            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.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.

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/resource/qx/tool/cli/templates/loader/loader-browser.tmpl.js

@@ -91,7 +91,6 @@ qx.$$createdAt = function(obj, filename, lineNumber, column) {
 };
 
 var isWebkit = /AppleWebKit\/([^ ]+)/.test(navigator.userAgent);
-var isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
 var isIE11 = !!window.MSInputMethodContext && !!document.documentMode;
 
 qx.$$loader = {
@@ -103,7 +102,7 @@ qx.$$loader = {
   closureParts : %{ClosureParts},
   bootIsInline : %{BootIsInline},
   addNoCacheParam : %{NoCacheParam},
-  isLoadParallel: !isFirefox && !isIE11 && 'async' in document.createElement('script'),
+  isLoadParallel: !isIE11 && 'async' in document.createElement('script'),
   delayDefer: false,
   splashscreen: window.QOOXDOO_SPLASH_SCREEN || null,
   isLoadChunked: false,

package/source/resource/qx/tool/schema/compile-1-0-0.json

@@ -53,11 +53,11 @@
       "minItems": 1,
       "items": {
         "type": "object",
-        "additionalItems": false,
         "required": [
           "class",
           "name"
         ],
+        "additionalProperties": false,
         "properties": {
           "class" : {
             "description": "The class name of the main application class (it typically inherits from `qx.application.Standalone` for web applications)",
@@ -105,6 +105,10 @@
             "type": "boolean",
             "default": true
           },
+          "default": {
+            "description": "This browser application is written into the root of the target dir. If not set the first application is used instead",
+            "type": "boolean"
+          },
           "standalone": {
             "description": "Whether this application can be opened in a browser on its own (true) or is part of a different application (false)",
             "type": "boolean",
@@ -168,6 +172,12 @@
           },
           "parts": {
             "$ref": "#/properties/parts"
+          },
+          "localModules": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
           }
         }
       }