@qooxdoo/framework 7.0.0-beta.6 → 7.0.0-beta.7

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

@@ -21,22 +21,23 @@
  * ************************************************************************/
 
 const fs = qx.tool.utils.Promisify.fs;
+const path = require("upath");
 const sourceMap = require("source-map");
 
 /**
  * An AbstractJavascriptMeta provides an abstraction of some source code, and might be
  * compromised of a number of input files which are merged together as required.
- * 
+ *
  * This object could represent a file which already exists on disk (eg a transpiled
  * source file), or something that is generated on the fly (such as a index.js), or
  * a compilation of files (eg a part)
  */
 qx.Class.define("qx.tool.compiler.targets.meta.AbstractJavascriptMeta", {
   extend: qx.core.Object,
-  
+
   /**
    * Constructor
-   * 
+   *
    * @param appMeta {qx.tool.compiler.targets.meta.ApplicationMeta}
    * @param filename {String} the sourcefile
    * @param originalSourceFile {String?} the URI to give to the source map
@@ -47,7 +48,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.AbstractJavascriptMeta", {
     this.__filename = filename;
     this.__originalSourceFile = originalSourceFile;
   },
-  
+
   properties: {
     /** If true, this is generated on the fly and needs to be output */
     needsWriteToDisk: {
@@ -55,7 +56,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.AbstractJavascriptMeta", {
       check: "Boolean"
     }
   },
-  
+
   members: {
     _appMeta: null,
     __filename: null,
@@ -64,37 +65,37 @@ qx.Class.define("qx.tool.compiler.targets.meta.AbstractJavascriptMeta", {
 
     /**
      * Returns the ApplicationMeta
-     *  
+     *
      * @return {ApplicationMeta}
      */
     getAppMeta() {
       return this._appMeta;
     },
-    
+
     /**
      * Returns the filename for the output of this JS
-     * 
+     *
      * @return {String}
      */
     getFilename() {
       return this.__filename;
     },
-    
+
     wrap(jsMeta) {
       this.__wrapper = jsMeta;
     },
-    
+
     getWrapper() {
       return this.__wrapper;
     },
-    
+
     unwrap() {
       if (this.__wrapper) {
         return this.__wrapper.unwrap();
       }
       return this;
     },
-    
+
     /**
      * Writes the file to disk, if appropriate
      */
@@ -107,31 +108,31 @@ qx.Class.define("qx.tool.compiler.targets.meta.AbstractJavascriptMeta", {
           await this.writeSourceCodeToStream(ws);
           ws.end();
         });
-        
+
         let map = await this.getSourceMap();
         if (map) {
           await fs.writeFileAsync(this.__filename + ".map", JSON.stringify(map, null, 2), "utf8");
         }
       }
     },
-    
+
     /**
      * Writes the source code as a stream, merging source files etc
      * as necessary
-     * 
+     *
      * @param ws {WriteStream} the stream to write to
      */
     async writeSourceCodeToStream(ws) {
       throw new Error(`No implementation for ${this.classname}.writeSourceCodeToStream`);
     },
-    
+
     /**
      * Reads the source map as a string
      */
     async getSourceMap() {
       return null;
     },
-    
+
     /**
      * Utility method that merges multiple source maps
      */
@@ -164,7 +165,13 @@ qx.Class.define("qx.tool.compiler.targets.meta.AbstractJavascriptMeta", {
           }
         }
       }
-      return JSON.parse(generator.toString());
+      let res = JSON.parse(generator.toString());
+      if (this._appMeta.getTarget().getSourceMapRelativePaths && this._appMeta.getTarget().getSourceMapRelativePaths()) {
+        for (let i = 0; i < res.sources.length; i++) {
+          res.sources[i] = path.relative("", res.sources[i]);
+        }
+      }
+      return res;
     }
   }
 });

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

@@ -25,24 +25,24 @@ const fs = qx.tool.utils.Promisify.fs;
 const path = require("upath");
 
 /**
- * Represents a "index.js" that is generated as part of a compile 
+ * Represents a "index.js" that is generated as part of a compile
  */
 qx.Class.define("qx.tool.compiler.targets.meta.BootJs", {
   extend: qx.tool.compiler.targets.meta.AbstractJavascriptMeta,
-  
+
   construct(appMeta) {
     this.base(arguments, appMeta, `${appMeta.getApplicationRoot()}index.js`);
     this.__embeddedJs = [];
     this.__embeddedJsLookup = {};
   },
-  
+
   properties: {
     needsWriteToDisk: {
       init: true,
       refine: true
     }
   },
-  
+
   members: {
     __embeddedJs: null,
     __sourceMapOffsets: null,
@@ -50,7 +50,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.BootJs", {
     /**
      * Adds Javascript which is to be added to the end of the index.js, just before the app
      * is finalised
-     * 
+     *
      * @param jsMeta {AbstractJavascriptMeta} the jaavscript to add
      */
     addEmbeddedJs(jsMeta) {
@@ -59,7 +59,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.BootJs", {
         this.__embeddedJsLookup[jsMeta.toHashCode()] = jsMeta;
       }
     },
-    
+
     /*
      * @Override
      */
@@ -78,13 +78,13 @@ qx.Class.define("qx.tool.compiler.targets.meta.BootJs", {
           if (uri.startsWith("__external__:")) {
             return true;
           }
-          
+
           inlines.push(uri);
           return false;
         });
         for (let i = 0; i < inlines.length; i++) {
           let uri = inlines[i];
-          
+
           let filename = path.join(target.getOutputDir(), "resources", uri);
           try {
             var data = await fs.readFileAsync(filename, { encoding: "utf-8" });
@@ -92,12 +92,12 @@ qx.Class.define("qx.tool.compiler.targets.meta.BootJs", {
             ws.write("\n");
           } catch (ex) {
             if (ex.code != "ENOENT") {
-              throw ex; 
+              throw ex;
             }
           }
         }
       }
-      
+
       var MAP = {
         EnvSettings: appMeta.getEnvironment(),
         Libraries: appMeta.getLibraries().map(library => library.getNamespace()),
@@ -140,7 +140,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.BootJs", {
         while ((match = line.match(/\%\{([^}]+)\}/))) {
           var keyword = match[1];
           var replace = "";
-          
+
           if (keyword == "BootPart") {
             for (let j = 0; j < this.__embeddedJs.length; j++) {
               this.__sourceMapOffsets.push(ws.getLineNumber());
@@ -154,7 +154,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.BootJs", {
               replace = JSON.stringify(MAP[keyword], null, 2);
             }
           }
-          
+
           var newLine = line.substring(0, match.index) + replace + line.substring(match.index + keyword.length + 3);
           line = newLine;
         }
@@ -164,19 +164,19 @@ qx.Class.define("qx.tool.compiler.targets.meta.BootJs", {
         ws.write(line + "\n");
       }
     },
-    
+
     /*
      * @Override
      */
     async getSourceMap() {
       if (this.__sourceMapOffsets === null) {
-        throw new Error(`Cannot get the source map for ${this} until the stream has been written`); 
+        throw new Error(`Cannot get the source map for ${this} until the stream has been written`);
       }
       let res = await this._copySourceMap(this.__embeddedJs, this.__sourceMapOffsets);
       let target = this._appMeta.getTarget();
       for (let i = 0; i < res.sources.length; i++) {
-        res.sources[i] = path.relative("", res.sources[i]);
-        let mapTo = target.getPathMapping(res.sources[i]);
+        let s = path.relative("", res.sources[i]);
+        let mapTo = target.getPathMapping(s);
         res.sources[i] = mapTo ? mapTo : res.sources[i];
       }
       return res;

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

@@ -22,14 +22,14 @@
 
 const fs = qx.tool.utils.Promisify.fs;
 const path = require("upath");
-const UglifyJS = require("uglify-js");
+const UglifyJS = require("terser");
 
 qx.Class.define("qx.tool.compiler.targets.meta.Uglify", {
   extend: qx.tool.compiler.targets.meta.AbstractJavascriptMeta,
-  
+
   /**
    * Constructor
-   * 
+   *
    * @param appMeta {qx.tool.compiler.targets.meta.ApplicationMeta}
    * @param jsMeta {AbstractJavascriptMeta} the source
    */
@@ -37,17 +37,17 @@ qx.Class.define("qx.tool.compiler.targets.meta.Uglify", {
     this.base(arguments, appMeta, jsMeta.getFilename());
     this.__jsMeta = jsMeta;
   },
-  
+
   properties: {
     needsWriteToDisk: {
       init: true,
       refine: true
     }
   },
-  
+
   members: {
     __jsMeta: null,
-    
+
     /*
      * @Override
      */
@@ -79,10 +79,10 @@ qx.Class.define("qx.tool.compiler.targets.meta.Uglify", {
       }
 
       var application = this._appMeta.getApplication();
-      
+
       var outJsFilename = this.__jsMeta.getFilename();
       let baseJsFilename = path.basename(outJsFilename);
-      
+
       let inSourceCode = await (async () => {
         let ss = new qx.tool.utils.Utils.ToStringWriteStream();
         let ws = new qx.tool.utils.Utils.LineCountingTransform();
@@ -96,7 +96,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.Uglify", {
       })();
       await qx.tool.utils.files.Utils.safeUnlink(outJsFilename + ".unminified");
       await qx.tool.utils.files.Utils.safeRename(outJsFilename, outJsFilename + ".unminified");
-      
+
       let inSourceMap = await this.__jsMeta.getSourceMap();
       await qx.tool.utils.files.Utils.safeUnlink(outJsFilename + ".unminified.map");
       await qx.tool.utils.files.Utils.safeRename(outJsFilename + ".map", outJsFilename + ".unminified.map");
@@ -107,7 +107,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.Uglify", {
         url: baseJsFilename + ".map",
         includeSources: true
       };
-      var result = UglifyJS.minify(inSourceCode, uglifyOpts);
+      var result = await UglifyJS.minify(inSourceCode, uglifyOpts);
       var err = result.error;
       if (err) {
         if (err.name == "SyntaxError") {

package/source/class/qx/ui/decoration/MLinearBackgroundGradient.js

@@ -240,7 +240,8 @@ qx.Mixin.define("qx.ui.decoration.MLinearBackgroundGradient",
      *
      * @return {Boolean} Whether this implementation supports multiple gradients atop each other (true).
      */
-    __styleLinearBackgroundGradientWithCanvas: function me(startColor, endColor, unit, orientation, startColorPosition, endColorPosition, styles, backgroundStyle) {
+    __styleLinearBackgroundGradientWithCanvas: function(startColor, endColor, unit, orientation, startColorPosition, endColorPosition, styles, backgroundStyle) {
+      const me = qx.ui.decoration.MLinearBackgroundGradient.__styleLinearBackgroundGradientWithCanvas;
       if (!me.__canvas) {
         me.__canvas = document.createElement("canvas");
       }

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

@@ -168,15 +168,6 @@
           },
           "parts": {
             "$ref": "#/properties/parts"
-          },
-          "minify": {
-            "$ref": "#/properties/targets"
-          },
-          "save-source-in-map": {
-            "$ref": "#/properties/targets"
-          },
-          "save-unminified": {
-            "$ref": "#/properties/targets"
           }
         }
       }
@@ -266,11 +257,15 @@
             "type": "boolean"
 		      },
           "save-source-in-map": {
-            "description": "If true, the source file will be saved in the map file if the target supports it. Can be overridden on a per application basis.",
+            "description": "If true, the source file will be saved in the map file if the target supports it.",
+            "type": "boolean"
+          },
+          "source-map-relative-paths": {
+            "description": "If true, the source map files will be saved with relative paths in the map file if the target supports it.",
             "type": "boolean"
           },
           "save-unminified": {
-            "description": "If true, the unminified files will be saved if the target supports it. Can be overridden on a per application basis.",
+            "description": "If true, the unminified files will be saved if the target supports it.",
             "type": "boolean"
           },
           "inline-external-scripts": {