@qooxdoo/framework 7.0.0-beta.6 → 7.0.0

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

@@ -29,12 +29,12 @@ const fs = require("fs");
  */
 qx.Class.define("qx.tool.compiler.targets.meta.Package", {
   extend: qx.core.Object,
-  
+
   /**
    * Constructor
    */
   construct(appMeta, packageIndex) {
-    this.base(arguments);
+    super();
     this.__appMeta = appMeta;
     this.__packageIndex = packageIndex;
     this.__assets = [];
@@ -42,16 +42,19 @@ qx.Class.define("qx.tool.compiler.targets.meta.Package", {
     this.__translations = {};
     this.__javascriptMetas = [];
     this.__classnames = [];
-    this.__javascript = new qx.tool.compiler.targets.meta.PackageJavascript(this.__appMeta, this);
+    this.__javascript = new qx.tool.compiler.targets.meta.PackageJavascript(
+      this.__appMeta,
+      this
+    );
   },
-  
+
   properties: {
     /** Whether to embed all the javascript into the one, main package .js file */
     embedAllJavascript: {
       init: false,
       check: "Boolean"
     },
-    
+
     /** If true, this is generated on the fly and needs to be output */
     needsWriteToDisk: {
       init: true,
@@ -59,43 +62,42 @@ qx.Class.define("qx.tool.compiler.targets.meta.Package", {
       apply: "_applyNeedsWriteToDisk"
     }
   },
-  
+
   members: {
-    /** @type {AppMeta} the AppMeta instance */ 
+    /** @type {AppMeta} the AppMeta instance */
     __appMeta: null,
-    
+
     /** @type {Integer} the package index, 0 == boot package */
     __packageIndex: -1,
-    
+
     /** @type {qx.tool.compiler.resources.Asset[]} assets to be included in this package */
     __assets: null,
-    
+
     /** @type {Map} locale data, indexed by locale ID */
     __locales: null,
-    
+
     /** @type {Map} translations, indexed by message ID */
     __translations: null,
-    
+
     /** @type {String[]} array of class names loaded by this package */
     __classnames: null,
-    
+
     /** @type {AbstractJavascriptMeta[]} array of Javascript sources loaded by this package */
     __javascriptMetas: null,
-    
+
     /** @type {AbstractJavascriptMeta} the javascript generated by this package */
     __javascript: null,
-    
-    
+
     /**
      * Detects whether this package is empty; packages can be added for a number
      * of reasons, but sometimes they don't actually end up with anything in them.
-     * 
+     *
      * Note that this is used to suppress the generation of an additional `package-*.js`
      * file in the output, and just means that the content of the file should be embedded
      * (or ignored) instead of written into that package file; however, there can still
      * be script files which need to be loaded by this package (and that is handled by
-     * the index.js file) 
-     * 
+     * the index.js file)
+     *
      * @return {Boolean}
      */
     isEmpty() {
@@ -119,56 +121,56 @@ qx.Class.define("qx.tool.compiler.targets.meta.Package", {
       }
       return true;
     },
-    
+
     /**
      * Returns the package index
-     * 
+     *
      * @return {Integer}
      */
     getPackageIndex() {
       return this.__packageIndex;
     },
-    
+
     /**
      * Adds an asset, expected to be unique
-     * 
+     *
      * @param asset {qx.tool.compiler.resources.Asset}
      */
     addAsset(asset) {
       this.__assets.push(asset);
     },
-    
+
     /**
      * Returns the array of assets
-     * 
+     *
      * @return {qx.tool.compiler.resources.Asset[]}
      */
     getAssets() {
       return this.__assets;
     },
-    
+
     /**
      * Adds locale data
-     * 
+     *
      * @param localeId {String}
      * @param localeData {Object}
      */
     addLocale(localeId, localeData) {
       this.__locales[localeId] = localeData;
     },
-    
+
     /**
      * Returns locale data, as a map where the key is the locale ID
-     * 
+     *
      * @return {Map}
      */
     getLocales() {
       return this.__locales;
     },
-    
+
     /**
      * Adds a translation
-     * 
+     *
      * @param localeId {String} locale ID
      * @param entry {Object} translation
      */
@@ -188,57 +190,57 @@ qx.Class.define("qx.tool.compiler.targets.meta.Package", {
         translations[entry.msgid_plural] = msgstr[1];
       }
     },
-    
+
     /**
      * Returns a map of all translations, indexed by Locale ID
-     * 
+     *
      * @return {Object}
      */
     getTranslations() {
       return this.__translations;
     },
-    
+
     /**
      * Adds a Javascript to be loaded by this package.  You typically need to
      * call `addClassname` also.
-     * 
+     *
      * @param jsMeta {AbstractJavascriptMeta}
      */
     addJavascriptMeta(jsMeta) {
       this.__javascriptMetas.push(jsMeta);
     },
-    
+
     /**
      * Returns a list of all Javascripts to be loaded by this package
-     * 
+     *
      * @return {AbstractJavascriptMeta[]}
      */
     getJavascriptMetas() {
       return this.__javascriptMetas;
     },
-    
+
     /**
      * Removes a Javascript
-     * 
+     *
      * @param jsMeta {AbstractJavascriptMeta} the javascript to remove
      */
     removeJavascriptMeta(jsMeta) {
       qx.lang.Array.remove(this.__javascriptMetas, jsMeta);
     },
-    
+
     /**
      * Adds a classname to the list which is loaded by this package; this does not
      * cause the code to be loaded, @see {addJavascriptMeta}.
-     * 
+     *
      * @param classname {String}
      */
     addClassname(classname) {
       this.__classnames.push(classname);
     },
-    
+
     /**
      * Returns a list of all classnames
-     * 
+     *
      * @return {String[]}
      */
     getClassnames() {
@@ -247,22 +249,23 @@ qx.Class.define("qx.tool.compiler.targets.meta.Package", {
 
     /**
      * Returns the AbstractJavascriptMeta for this Package
-     * 
+     *
      * @return {AbstractJavascriptMeta}
      */
     getJavascript() {
       return this.__javascript;
     },
-    
+
     /**
      * Writes the data into the configuration which is passed to the loader template
-     * 
+     *
      * @param packages {Object} the `qx.$$packages` object data
      */
     serializeInto(packages) {
-      let data = packages[String(this.__packageIndex)] = {
-        uris: [ ]
-      };
+      let data = (packages[String(this.__packageIndex)] = {
+        uris: []
+      });
+
       let appRoot = this.__appMeta.getApplicationRoot();
       const toUri = filename => {
         if (this.__appMeta.isAddTimestampsToUrls()) {
@@ -275,7 +278,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.Package", {
         } else {
           return path.relative(appRoot, filename);
         }
-      }
+      };
       if (!this.isEmbedAllJavascript()) {
         data.uris = this.__javascriptMetas.map(js => toUri(js.getFilename()));
       }
@@ -283,7 +286,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.Package", {
         data.uris.unshift(toUri(this.__javascript.getFilename()));
       }
     },
-    
+
     /**
      * Apply for needsWriteToDisk property
      */

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

@@ -25,59 +25,64 @@ const path = require("upath");
 /**
  * A PackageJavascript is the serialisation of the javascript required to produce a package;
  * at the minimum, this is the locales and resources provided by the package, but also can be
- * the javascript code from loaded classes, all merged into one .js file for the browser. 
+ * the javascript code from loaded classes, all merged into one .js file for the browser.
  */
 qx.Class.define("qx.tool.compiler.targets.meta.PackageJavascript", {
   extend: qx.tool.compiler.targets.meta.AbstractJavascriptMeta,
-  
+
   /**
    * Constructor
    */
   construct(appMeta, pkg) {
-    this.base(arguments, appMeta, `${appMeta.getApplicationRoot()}package-${pkg.getPackageIndex()}.js`);
+    super(
+      appMeta,
+      `${appMeta.getApplicationRoot()}package-${pkg.getPackageIndex()}.js`
+    );
+
     this.__pkg = pkg;
   },
-  
+
   properties: {
     needsWriteToDisk: {
       init: true,
       refine: true
     }
   },
-  
+
   members: {
     __sourceMapOffsets: null,
-    
+
     /*
      * @Override
      */
     async writeSourceCodeToStream(ws) {
       let pkg = this.__pkg;
       let data = {
-        "locales": pkg.getLocales(),
-        "resources": {},
-        "translations": pkg.getTranslations()
+        locales: pkg.getLocales(),
+        resources: {},
+        translations: pkg.getTranslations()
       };
-      
+
       pkg.getAssets().forEach(asset => {
         let ext = path.extname(asset.getFilename());
         if (ext.length) {
           ext = ext.substring(1);
         }
         let fileInfo = asset.getFileInfo();
-        var arr = data.resources[asset.getFilename()] = [
+        var arr = (data.resources[asset.getFilename()] = [
           fileInfo.width,
           fileInfo.height,
           ext,
           asset.getLibrary().getNamespace()
-        ];
+        ]);
+
         if (fileInfo.composite !== undefined) {
           arr.push(fileInfo.composite);
           arr.push(fileInfo.x);
           arr.push(fileInfo.y);
         }
       });
-      
+
       if (pkg.isEmbedAllJavascript()) {
         this.__sourceMapOffsets = [];
         let strip = new qx.tool.utils.Utils.StripSourceMapTransform();
@@ -91,24 +96,34 @@ qx.Class.define("qx.tool.compiler.targets.meta.PackageJavascript", {
           }
           resolve();
         });
-        ws.write(`//# sourceMappingURL=${path.basename(this.getFilename())}.map?dt=${new Date().getTime()}\n`);
+        ws.write(
+          `//# sourceMappingURL=${path.basename(
+            this.getFilename()
+          )}.map?dt=${new Date().getTime()}\n`
+        );
       }
-      
-      ws.write(`qx.$$packageData['${this.__pkg.getPackageIndex()}'] = ${JSON.stringify(data, null, 2)};\n`);
+
+      ws.write(
+        `qx.$$packageData['${this.__pkg.getPackageIndex()}'] = ${JSON.stringify(
+          data,
+          null,
+          2
+        )};\n`
+      );
     },
-    
+
     /*
      * @Override
      */
     async writeToDisk() {
-      await this.base(arguments);
+      await super.writeToDisk();
       if (!this.__pkg.isEmbedAllJavascript()) {
         for (let i = 0; i < this.__pkg.getJavascriptMetas().length; i++) {
           await this.__pkg.getJavascriptMetas()[i].unwrap().writeToDisk();
         }
       }
     },
-    
+
     /*
      * @Override
      */
@@ -117,9 +132,14 @@ qx.Class.define("qx.tool.compiler.targets.meta.PackageJavascript", {
         return null;
       }
       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`
+        );
       }
-      return this._copySourceMap(this.__pkg.getJavascriptMetas(), this.__sourceMapOffsets);
+      return this._copySourceMap(
+        this.__pkg.getJavascriptMetas(),
+        this.__sourceMapOffsets
+      );
     }
   }
 });

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

@@ -20,54 +20,53 @@
  *
  * ************************************************************************/
 
-
 /**
  * A Part collects together all of the javascript files required for a single
  * part (load on demand) and merges them together as required.
  */
 qx.Class.define("qx.tool.compiler.targets.meta.Part", {
   extend: qx.core.Object,
-  
+
   /**
    * Constructor
-   * 
+   *
    * @param target {Target} the target doing the compilation
    * @param name {String} the name of the part
    * @param partIndex {Integer}
    */
   construct(target, name, partIndex) {
-    this.base(arguments);
+    super();
     this.__target = target;
     this.__name = name;
     this.__partIndex = partIndex;
     this.__packages = [];
     this.__packageLookup = {};
   },
-  
+
   members: {
     __target: null,
     __name: null,
     __partIndex: -1,
     __packages: null,
     __packageLookup: null,
-    
+
     addPackage(pkg) {
       if (!this.__packageLookup[pkg.toHashCode()]) {
         this.__packages.push(pkg);
         this.__packageLookup[pkg.toHashCode()] = pkg;
       }
     },
-    
+
     hasPackage(pkg) {
       return Boolean(this.__packageLookup[pkg.toHashCode()]);
     },
-    
+
     getDefaultPackage() {
-      return this.__packages[0]||null;
+      return this.__packages[0] || null;
     },
 
     serializeInto(parts) {
-      let arr = parts[this.__name] = [];
+      let arr = (parts[this.__name] = []);
       this.__packages.forEach(pkg => arr.push(String(pkg.getPackageIndex())));
     }
   }

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

@@ -30,7 +30,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.PolyfillJs", {
   extend: qx.tool.compiler.targets.meta.AbstractJavascriptMeta,
 
   construct(appMeta) {
-    this.base(arguments, appMeta, `${appMeta.getApplicationRoot()}polyfill.js`);
+    super(appMeta, `${appMeta.getApplicationRoot()}polyfill.js`);
   },
 
   properties: {
@@ -41,16 +41,22 @@ qx.Class.define("qx.tool.compiler.targets.meta.PolyfillJs", {
   },
 
   members: {
-
     /**
      * @Override
      */
     async writeSourceCodeToStream(ws) {
-      await this.__write(path.join(require.resolve("core-js-bundle"), "../minified.js"), ws);
+      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);
+      await this.__write(
+        path.join(require.resolve("regenerator-runtime"), "../runtime.js"),
+        ws
+      );
     },
 
     async __write(srcFilename, ws) {
@@ -62,7 +68,6 @@ qx.Class.define("qx.tool.compiler.targets.meta.PolyfillJs", {
       });
     },
 
-
     /**
      * @Override
      */

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

@@ -22,32 +22,32 @@
 
 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
    */
   construct(appMeta, jsMeta) {
-    this.base(arguments, appMeta, jsMeta.getFilename());
+    super(appMeta, jsMeta.getFilename());
     this.__jsMeta = jsMeta;
   },
-  
+
   properties: {
     needsWriteToDisk: {
       init: true,
       refine: true
     }
   },
-  
+
   members: {
     __jsMeta: null,
-    
+
     /*
      * @Override
      */
@@ -56,10 +56,12 @@ qx.Class.define("qx.tool.compiler.targets.meta.Uglify", {
         compress: {
           sequences: false
         },
+
         output: {
           comments: "some"
         }
       };
+
       switch (this._appMeta.getTarget().getMinify()) {
         case "off":
           return;
@@ -79,10 +81,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();
@@ -94,34 +96,44 @@ qx.Class.define("qx.tool.compiler.targets.meta.Uglify", {
         });
         return ss.toString();
       })();
-      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");
+      this.fireDataEvent("minifyingApplication", {
+        application: application,
+        filename: baseJsFilename
+      });
 
-      this.fireDataEvent("minifyingApplication", { application: application, filename: baseJsFilename });
       uglifyOpts.sourceMap = {
         content: inSourceMap,
         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") {
-          qx.tool.compiler.Console.print("qx.tool.compiler.build.uglifyParseError", err.line, err.col, err.message, baseJsFilename);
+          qx.tool.compiler.Console.print(
+            "qx.tool.compiler.build.uglifyParseError",
+            err.line,
+            err.col,
+            err.message,
+            baseJsFilename
+          );
         }
-        throw new Error("UglifyJS failed to minimise: " + (err.message||err));
+        throw new Error("UglifyJS failed to minimise: " + (err.message || err));
       }
       await fs.writeFileAsync(outJsFilename, result.code, { encoding: "utf8" });
-      if (!this._appMeta.getTarget().isSaveUnminified()) {
-        await qx.tool.utils.files.Utils.safeUnlink(outJsFilename + ".unminified");
-        await qx.tool.utils.files.Utils.safeUnlink(outJsFilename + ".unminified.map");
+      await fs.writeFileAsync(outJsFilename + ".map", result.map, { encoding: "utf8"  });
+      if (this._appMeta.getTarget().isSaveUnminified()) {
+        await fs.writeFileAsync(outJsFilename + ".unminified", inSourceCode, { encoding: "utf8" });
+        await fs.writeFileAsync(outJsFilename + ".unminified.map", JSON.stringify(inSourceMap, null, 2), { encoding: "utf8" });
       }
-      await fs.writeFileAsync(outJsFilename + ".map", result.map, { encoding: "utf8" });
-      this.fireDataEvent("minifiedApplication", { application: application, filename: baseJsFilename });
+
+      this.fireDataEvent("minifiedApplication", {
+        application: application,
+        filename: baseJsFilename
+      });
     }
   }
 });