@qooxdoo/framework 7.4.0 → 7.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@qooxdoo/framework",
3
- "version": "7.4.0",
3
+ "version": "7.4.1",
4
4
  "description": "The JS Framework for Coders",
5
5
  "author": "The qooxdoo project",
6
6
  "keywords": [
@@ -28,7 +28,6 @@ var babelCore = require("@babel/core");
28
28
  var types = require("@babel/types");
29
29
  var babylon = require("@babel/parser");
30
30
  var async = require("async");
31
- var pathModule = require("upath");
32
31
 
33
32
  var log = qx.tool.utils.LogManager.createLog("analyser");
34
33
 
@@ -1704,11 +1703,12 @@ qx.Class.define("qx.tool.compiler.ClassFile", {
1704
1703
  arg.value
1705
1704
  );
1706
1705
  } else {
1707
- qx.tool.compiler.Console.log(
1708
- `${t.__className}:${path.node.loc.start.line}:` +
1709
- ` automatically detected \'require(${arg.value})\``
1710
- );
1711
-
1706
+ if (qx.tool.compiler.Console.getInstance().getVerbose()) {
1707
+ qx.tool.compiler.Console.log(
1708
+ `${t.__className}:${path.node.loc.start.line}:` +
1709
+ ` automatically detected \'require(${arg.value})\``
1710
+ );
1711
+ }
1712
1712
  t.addCommonjsModule(
1713
1713
  arg.value,
1714
1714
  t.__className,
@@ -30,8 +30,6 @@ qx.Class.define("qx.tool.compiler.targets.meta.Browserify", {
30
30
 
31
31
  construct(appMeta) {
32
32
  super(appMeta, `${appMeta.getApplicationRoot()}commonjs-browserify.js`);
33
- this.__commonjsModules = [];
34
- this.__references = {};
35
33
  this.setNeedsWriteToDisk(true);
36
34
  },
37
35
 
@@ -40,33 +38,40 @@ qx.Class.define("qx.tool.compiler.targets.meta.Browserify", {
40
38
  __references: null,
41
39
 
42
40
  __getCommonjsModules() {
43
- let commonjsModules = new Set();
44
- let references = {};
45
- const db = this.getAppMeta().getAnalyser().getDatabase();
46
- const localModules =
47
- this.getAppMeta().getApplication().getLocalModules() || {};
48
- // Get a Set of unique `require`d CommonJS module names from
49
- // all classes
50
- for (let className in db.classInfo) {
51
- let classInfo = db.classInfo[className];
52
- if (classInfo.commonjsModules) {
53
- Object.keys(classInfo.commonjsModules).forEach(moduleName => {
54
- // Ignore this found `require()` if its a local modules
55
- if (!(moduleName in localModules)) {
56
- // Add this module name to the set of module names
57
- commonjsModules.add(moduleName);
58
- }
59
- // Add the list of references from which this module was require()d
60
- if (!references[moduleName]) {
61
- references[moduleName] = new Set();
62
- }
63
- references[moduleName].add([
64
- ...classInfo.commonjsModules[moduleName]
65
- ]);
66
- });
41
+ if (this.__commonjsModules === null) {
42
+ let commonjsModules = new Set();
43
+ let references = {};
44
+ const db = this.getAppMeta().getAnalyser().getDatabase();
45
+ const localModules =
46
+ this.getAppMeta().getApplication().getLocalModules() || {};
47
+ // Get a Set of unique `require`d CommonJS module names from
48
+ // all classes
49
+ for (let className in db.classInfo) {
50
+ let classInfo = db.classInfo[className];
51
+ if (classInfo.commonjsModules) {
52
+ Object.keys(classInfo.commonjsModules).forEach(moduleName => {
53
+ // Ignore this found `require()` if its a local modules
54
+ if (!(moduleName in localModules)) {
55
+ // Add this module name to the set of module names
56
+ commonjsModules.add(moduleName);
57
+ }
58
+ // Add the list of references from which this module was require()d
59
+ if (!references[moduleName]) {
60
+ references[moduleName] = new Set();
61
+ }
62
+ references[moduleName].add([
63
+ ...classInfo.commonjsModules[moduleName]
64
+ ]);
65
+ });
66
+ }
67
67
  }
68
+ this.__commonjsModules = [...commonjsModules];
69
+ this.__references = references;
68
70
  }
69
- return { commonjsModules: [...commonjsModules], references: references };
71
+ return {
72
+ commonjsModules: this.__commonjsModules,
73
+ references: this.__references
74
+ };
70
75
  },
71
76
 
72
77
  /**
@@ -75,7 +80,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.Browserify", {
75
80
  async writeToDisk() {
76
81
  const localModules = this.getAppMeta().getApplication().getLocalModules();
77
82
  let db = this.getAppMeta().getAnalyser().getDatabase();
78
- const { commonjsModules, references } = this.__getCommonjsModules();
83
+ const { commonjsModules } = this.__getCommonjsModules();
79
84
 
80
85
  let modules = [];
81
86
  let modulesInfo = {};
@@ -108,8 +113,6 @@ qx.Class.define("qx.tool.compiler.targets.meta.Browserify", {
108
113
  if (doIt) {
109
114
  db.modulesInfo = modulesInfo;
110
115
  await this.getAppMeta().getAnalyser().saveDatabase();
111
- this.__commonjsModules = commonjsModules;
112
- this.__references = references;
113
116
  }
114
117
  this.setNeedsWriteToDisk(doIt);
115
118
  return super.writeToDisk();
@@ -129,10 +132,11 @@ qx.Class.define("qx.tool.compiler.targets.meta.Browserify", {
129
132
  const localModules = this.getAppMeta()
130
133
  .getApplication()
131
134
  .getLocalModules();
132
- if (this.__commonjsModules || localModules) {
135
+ const { commonjsModules, references } = this.__getCommonjsModules();
136
+ if (commonjsModules.length > 0 || localModules) {
133
137
  await this.__browserify(
134
- this.__commonjsModules,
135
- this.__references,
138
+ commonjsModules,
139
+ references,
136
140
  localModules,
137
141
  ws
138
142
  );
@@ -58,11 +58,6 @@ qx.Mixin.define("qx.ui.core.scroll.MRoll", {
58
58
  * @param e {qx.event.type.Roll} Roll event
59
59
  */
60
60
  _onRoll(e) {
61
- // only wheel and touch
62
- if (e.getPointerType() == "mouse") {
63
- return;
64
- }
65
-
66
61
  if (this._cancelRoll && e.getMomentum()) {
67
62
  e.stopMomentum();
68
63
  this._cancelRoll = null;