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

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

@@ -81,7 +81,7 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
       inheritable: true,
       nullable: true
     },
-    
+
     /**
      * List of environment keys to preserve in code, ie reserve for runtime detection
      * and exclude from code elimination
@@ -98,7 +98,7 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
     analyser: {
       nullable: false
     },
-    
+
     /**
      * Whether to inline external scripts
      */
@@ -121,7 +121,7 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
       init: [ "en" ],
       transform: "_transformLocales"
     },
-    
+
     /** Whether to break locale & translation data out into separate parts */
     i18nAsParts: {
       init: false,
@@ -142,7 +142,7 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
       nullable: false,
       check: "Boolean"
     },
-    
+
     /** What to do with library transation strings */
     libraryPoPolicy: {
       init: "ignore",
@@ -166,6 +166,15 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
       init: true,
       nullable: false,
       check: "Boolean"
+    },
+
+    /**
+     * Whether to use relative paths in source maps
+     */
+     sourceMapRelativePaths: {
+      init: false,
+      nullable: false,
+      check: "Boolean"
     }
 
   },
@@ -178,15 +187,15 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
      *  enviroment: {Object} enviroment data
      */
     "checkEnvironment": "qx.event.type.Data",
-    
-    /** 
+
+    /**
      * Fired when an application is about to be serialized to disk; the appMeta is fully
      * populated, and this is an opportunity to amend the meta data before it is serialized
-     * into files on disk 
+     * into files on disk
      */
     "writingApplication": "qx.event.type.Event",
-    
-    /** 
+
+    /**
      * Fired when an application has been serialized to disk
      */
     "writtenApplication": "qx.event.type.Event"
@@ -196,10 +205,10 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
   members: {
     /** @type {Map} maps filenames to uris */
     __pathMappings: null,
-    
+
     /** @type {qx.tool.compiler.targets.meta.ApplicationMeta} for the current application */
     __appMeta: null,
-    
+
     /**
      * Initialises the target, creating directories etc
      */
@@ -221,7 +230,7 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
       }
       return value;
     },
-    
+
     /**
      * Returns the root for applications
      */
@@ -237,7 +246,7 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
     getProjectDir: function (application) {
       return application.getOutputPath() || application.getName();
     },
-    
+
     /**
      * Returns the URI for the root of the output, relative to the application
      */
@@ -331,22 +340,22 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
 
       let appMeta = this.__appMeta = new qx.tool.compiler.targets.meta.ApplicationMeta(this, application);
       appMeta.setAddTimestampsToUrls(this.getAddTimestampsToUrls());
-      /*      
+      /*
       if (!appMeta.getAppLibrary()) {
         qx.tool.compiler.Console.print("qx.tool.compiler.target.missingAppLibrary", application.getClassName());
         return;
       }
-*/      
+*/
       let targetUri = t._getOutputRootUri(application);
       var appRootDir = this.getApplicationRoot(application);
-      
+
       let mapTo = this.getPathMapping(path.join(appRootDir, this.getOutputDir(), "transpiled/"));
       appMeta.setSourceUri(mapTo ? mapTo : targetUri + "transpiled/");
       mapTo = this.getPathMapping(path.join(appRootDir, this.getOutputDir(), "resource"));
       appMeta.setResourceUri(mapTo ? mapTo : targetUri + "resource");
-      
+
       const requiredLibs = application.getRequiredLibraries();
-      
+
       await qx.tool.utils.Utils.makeDirs(appRootDir);
 
       appMeta.setEnvironment({
@@ -357,7 +366,7 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
         "qx.compiler.targetType": this.getType(),
         "qx.compiler.outputDir": this.getOutputDir()
       });
-      
+
       let externals = {};
       const addExternal = (arr, type) => {
         if (arr) {
@@ -380,7 +389,7 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
           });
         }
       };
-      
+
       requiredLibs.forEach(libnamespace => {
         var library = analyser.findLibrary(libnamespace);
         appMeta.addLibrary(library);
@@ -400,7 +409,7 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
       }
       await t.fireDataEventAsync("checkEnvironment", { application: application, environment: appMeta.getEnvironment() });
 
-      
+
       /*
        * Boot files
        */
@@ -408,7 +417,7 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
       let bootPackage = appMeta.createPackage();
       appMeta.setBootMetaJs(bootJs);
       bootPackage.addJavascriptMeta(new qx.tool.compiler.targets.meta.PolyfillJs(appMeta));
-      
+
 
       /*
        * Assemble the Parts
@@ -425,7 +434,7 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
         if (index == 0) {
           partMeta.addPackage(bootPackage);
         }
-        
+
         partData.classes.forEach(classname => {
           let classFilename = classname.replace(/\./g, "/") + ".js";
 
@@ -435,10 +444,10 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
           let library = analyser.findLibrary(dbClassInfo.libraryName);
           let sourcePath = library.getFilename(classFilename);
           let jsMeta = new qx.tool.compiler.targets.meta.Javascript(appMeta, transpiledClassFilename, sourcePath);
-          
+
           let packageName = matchBundle(classname) ? "__bundle" : partData.name;
           let pkg = packages[packageName];
-          
+
           if (!pkg || pkg !== lastPackage) {
             pkg = packages[packageName] = appMeta.createPackage();
             if (packageName == "__bundle") {
@@ -454,7 +463,7 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
           lastPackage = pkg;
         });
       });
-      
+
       var assetUris = application.getAssetUris(t, rm, appMeta.getEnvironment()); // Save any changes that getAssets collected
       await rm.saveDatabase();
 
@@ -462,8 +471,8 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
         analyser.getCldr("en")
           .then(cldr => bootPackage.addLocale("C", cldr)),
         t._writeTranslations()
-      ];      
-      
+      ];
+
       var fontCntr = 0;
       var assets = {};
       rm.getAssetsForPaths(assetUris).forEach(asset => {
@@ -475,7 +484,7 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
         // Get a list of all fonts to load; use the font name as a unique identifier, and
         //  prioritise the application's library's definitions - this allows the application
         //  the opportunity to override the font definitions.  This is important when the
-        //  library uses the open source/free versions of a font but the application 
+        //  library uses the open source/free versions of a font but the application
         //  developer has purchased the commercial/full version of the font (eg FontAwesome)
         let appLibrary = appMeta.getAppLibrary();
         let fontsToLoad = { };
@@ -507,7 +516,7 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
               return;
             }
             font.setResources(res);
-        
+
             await font.generateForTarget(t);
             let resources = await font.generateForApplication(t, application);
             for (var key in resources) {
@@ -617,10 +626,10 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
         return accumulateCldr(localeId);
       }
 
-      var promises = t.getLocales().map(async localeId => { 
+      var promises = t.getLocales().map(async localeId => {
         let cldr = await loadLocaleData(localeId);
         let pkg = this.isI18nAsParts() ? appMeta.getLocalePackage(localeId) : bootPackage;
-        pkg.addLocale(localeId, cldr); 
+        pkg.addLocale(localeId, cldr);
       });
 
       await qx.Promise.all(promises);
@@ -656,8 +665,8 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
           promises.push(
             addTrans(library, localeId)
           );
-        });  
-        // translation from main app should overwrite package translations 
+        });
+        // translation from main app should overwrite package translations
         promises.push(
           addTrans(appMeta.getAppLibrary(), localeId)
         );
@@ -726,24 +735,24 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
         });
       });
     },
-    
+
     /**
      * Writes the application
      */
     async _writeApplication() {
       var t = this;
-      
+
       await this.fireEventAsync("writingApplication");
-      
+
       let appMeta = this.getAppMeta();
       var application = appMeta.getApplication();
       var appRootDir = appMeta.getApplicationRoot();
-      
+
       if (!appMeta.getAppLibrary()) {
         qx.tool.compiler.Console.print("qx.tool.compiler.target.missingAppLibrary", application.getName());
         return;
       }
-        
+
       let bootMeta = appMeta.getBootMetaJs();
       for (let arr = appMeta.getPackages(), i = 0; i < arr.length; i++) {
         let pkg = arr[i];
@@ -753,16 +762,16 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
         }
         await pkg.getJavascript().unwrap().writeToDisk();
       }
-      
+
       await appMeta.getBootMetaJs().unwrap().writeToDisk();
-      
+
       await this._writeIndexHtml();
 
       if (!t.isWriteCompileInfo()) {
         await this.fireEventAsync("writtenApplication");
         return;
       }
-      
+
       let bootPackage = appMeta.getPackages()[0];
       let appSummary = {
         appClass: application.getClassName(),
@@ -783,11 +792,11 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
           name: partData.name
         });
       });
-        
+
       await fs.writeFileAsync(appRootDir + "/compile-info.json",
         JSON.stringify(appSummary, null, 2) + "\n",
         { encoding: "utf8" });
-        
+
       await this.fireEventAsync("writtenApplication");
     },
 
@@ -808,7 +817,7 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
       }
 
       var resDir = this.getApplicationRoot(application);
-      
+
       let timeStamp = (new Date()).getTime();
       let pathToTarget = path.relative(path.join(t.getOutputDir(), t.getProjectDir(application)), t.getOutputDir()) + "/";
       let indexJsTimestamp = "";
@@ -894,12 +903,13 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
           "appPath": t.getProjectDir(application) + "/",
           "preBootJs": "",
           "appTitle": (application.getTitle()||"Qooxdoo Application"),
-          "timeStamp": timeStamp
+          "timeStamp": timeStamp,
+          "indexJsTimestamp": indexJsTimestamp
         };
         await fs.writeFileAsync(t.getOutputDir() + "index.html", replaceVars(indexHtml), { encoding: "utf8" });
       }
     },
-    
+
     getAppMeta() {
       return this.__appMeta;
     }

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/PolyfillJs.js

@@ -42,11 +42,18 @@ qx.Class.define("qx.tool.compiler.targets.meta.PolyfillJs", {
 
   members: {
 
-    /*
+    /**
      * @Override
      */
     async writeSourceCodeToStream(ws) {
-      const srcFilename = path.join(require.resolve("core-js-bundle"), "../minified.js");
+      await this.__write(path.join(require.resolve("core-js-bundle"), "../minified.js"), ws);
+      await new Promise(resolve => {
+        ws.write("\n", resolve);
+      });
+      await this.__write(path.join(require.resolve("regenerator-runtime"), "../runtime.js"), ws);
+    },
+
+    async __write(srcFilename, ws) {
       let rs = fs.createReadStream(srcFilename, "utf8");
       await new Promise((resolve, reject) => {
         rs.on("end", resolve);
@@ -55,7 +62,8 @@ qx.Class.define("qx.tool.compiler.targets.meta.PolyfillJs", {
       });
     },
 
-    /*
+
+    /**
      * @Override
      */
     async getSourceMap() {

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") {