@qooxdoo/framework 7.0.0-beta → 7.0.0-beta.4

package/source/class/qx/tool/compiler/jsdoc/ReturnParser.js

@@ -3,7 +3,7 @@
  *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
  *    toolchain
  *
- *    https://github.com/qooxdoo/qooxdoo-compiler
+ *    https://github.com/qooxdoo/qooxdoo
  *
  *    Copyright:
  *      2011-2017 Zenesis Limited, http://www.zenesis.com

package/source/class/qx/tool/compiler/jsdoc/ThrowsParser.js

@@ -3,7 +3,7 @@
  *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
  *    toolchain
  *
- *    https://github.com/qooxdoo/qooxdoo-compiler
+ *    https://github.com/qooxdoo/qooxdoo
  *
  *    Copyright:
  *      2011-2017 Zenesis Limited, http://www.zenesis.com

package/source/class/qx/tool/compiler/makers/AbstractAppMaker.js

@@ -3,7 +3,7 @@
  *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
  *    toolchain
  *
- *    https://github.com/qooxdoo/qooxdoo-compiler
+ *    https://github.com/qooxdoo/qooxdoo
  *
  *    Copyright:
  *      2011-2017 Zenesis Limited, http://www.zenesis.com

package/source/class/qx/tool/compiler/makers/AppMaker.js

@@ -3,7 +3,7 @@
  *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
  *    toolchain
  *
- *    https://github.com/qooxdoo/qooxdoo-compiler
+ *    https://github.com/qooxdoo/qooxdoo
  *
  *    Copyright:
  *      2011-2017 Zenesis Limited, http://www.zenesis.com
@@ -70,7 +70,7 @@ qx.Class.define("qx.tool.compiler.makers.AppMaker", {
     async make() {
       var analyser = this.getAnalyser();
       let target = this.getTarget();
-      
+
       await this.fireEventAsync("making");
       this.setSuccess(null);
       this.setHasWarnings(null);
@@ -82,12 +82,12 @@ qx.Class.define("qx.tool.compiler.makers.AppMaker", {
         qx.tool.compiler.ClassFile.ENVIRONMENT_CONSTANTS,
         {
           "qx.compiler": true,
-          "qx.compiler.version": qx.tool.compiler.Version.VERSION
+          "qx.compiler.version": qx.tool.config.Utils.getCompilerVersion()
         },
         this.getEnvironment(),
         target.getDefaultEnvironment(),
         target.getEnvironment());
-        
+
       let preserve = target.getPreserveEnvironment();
       if (preserve) {
         let tmp = {};
@@ -101,7 +101,7 @@ qx.Class.define("qx.tool.compiler.makers.AppMaker", {
       this.getApplications().forEach(app => {
         appEnvironments[app.toHashCode()] = qx.tool.utils.Values.merge({}, compileEnv, app.getCalculatedEnvironment());
       });
-      
+
       // Analyze the list of environment variables, detect which are shared between all apps
       let allAppEnv = {};
       this.getApplications().forEach(app => {
@@ -117,7 +117,7 @@ qx.Class.define("qx.tool.compiler.makers.AppMaker", {
           }
         });
       });
-      
+
       // If an env setting is the same for all apps, move it to the target for code elimination; similarly,
       //  if it varies between apps, then remove it from the target and make each app specify it individually
       this.getApplications().forEach(app => {
@@ -132,8 +132,8 @@ qx.Class.define("qx.tool.compiler.makers.AppMaker", {
           }
         });
       });
-      
-      // Cleanup to remove env that have been moved to the app 
+
+      // Cleanup to remove env that have been moved to the app
       Object.keys(allAppEnv).forEach(key => {
         if (!preserve[key] && allAppEnv[key].same) {
           compileEnv[key] = allAppEnv[key].value;
@@ -150,14 +150,14 @@ qx.Class.define("qx.tool.compiler.makers.AppMaker", {
         await qx.tool.utils.Utils.makeParentDir(this.getOutputDir());
         await analyser.resetDatabase();
       }
-      
+
       await qx.tool.utils.Utils.promisifyThis(analyser.initialScan, analyser);
       await analyser.updateEnvironmentData();
 
       target.setAnalyser(analyser);
       this.__applications.forEach(app => app.setAnalyser(analyser));
       await target.open();
-      
+
       if (this.isOutputTypescript()) {
         analyser.getLibraries().forEach(library => {
           var symbols = library.getKnownSymbols();
@@ -179,7 +179,7 @@ qx.Class.define("qx.tool.compiler.makers.AppMaker", {
         }
       });
       await analyser.analyseClasses();
-      
+
       await analyser.saveDatabase();
       await this.fireEventAsync("writingApplications");
 
@@ -191,11 +191,11 @@ qx.Class.define("qx.tool.compiler.makers.AppMaker", {
       var appsThisTime = this.__applications.filter(app => {
         let loadDeps = app.getDependencies();
         if (!loadDeps || !loadDeps.length) {
-          return true; 
+          return true;
         }
         return loadDeps.some(name => Boolean(compiledClasses[name]));
       });
-      
+
       let allAppInfos = [];
 
       let db = analyser.getDatabase();
@@ -244,7 +244,7 @@ qx.Class.define("qx.tool.compiler.makers.AppMaker", {
             .run()
         );
       }
-      
+
       await analyser.saveDatabase();
       await this.fireEventAsync("made");
       this.setSuccess(success);

package/source/class/qx/tool/compiler/makers/Maker.js

@@ -3,7 +3,7 @@
  *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
  *    toolchain
  *
- *    https://github.com/qooxdoo/qooxdoo-compiler
+ *    https://github.com/qooxdoo/qooxdoo
  *
  *    Copyright:
  *      2011-2017 Zenesis Limited, http://www.zenesis.com

package/source/class/qx/tool/compiler/resources/AbstractMatcher.js

@@ -3,7 +3,7 @@
  *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
  *    toolchain
  *
- *    https://github.com/qooxdoo/qooxdoo-compiler
+ *    https://github.com/qooxdoo/qooxdoo
  *
  *    Copyright:
  *      2011-2019 Zenesis Limited, http://www.zenesis.com

package/source/class/qx/tool/compiler/resources/Asset.js

@@ -3,7 +3,7 @@
  *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
  *    toolchain
  *
- *    https://github.com/qooxdoo/qooxdoo-compiler
+ *    https://github.com/qooxdoo/qooxdoo
  *
  *    Copyright:
  *      2011-2019 Zenesis Limited, http://www.zenesis.com
@@ -205,7 +205,7 @@ qx.Class.define("qx.tool.compiler.resources.Asset", {
           });
         }
         let rm = target.getAnalyser().getResourceManager();
-        dependsOn = dependsOn.map(filename => rm.getAsset(path.resolve(filename), true)).filter(tmp => tmp !== this);
+        dependsOn = dependsOn.map(filename => rm.getAsset(path.resolve(filename), true, this.isThemeFile())).filter(tmp => tmp !== this);
         this.setDependsOn(dependsOn);
       } else {
         await qx.tool.utils.files.Utils.copyFile(srcFilename, destFilename);

package/source/class/qx/tool/compiler/resources/ImageLoader.js

@@ -3,7 +3,7 @@
  *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
  *    toolchain
  *
- *    https://github.com/qooxdoo/qooxdoo-compiler
+ *    https://github.com/qooxdoo/qooxdoo
  *
  *    Copyright:
  *      2011-2017 Zenesis Limited, http://www.zenesis.com
@@ -48,8 +48,9 @@ qx.Class.define("qx.tool.compiler.resources.ImageLoader", {
     matches: function(filename, library) {
       if (filename.endsWith("svg")) {
         let isWebFont = library.getWebFonts() && library.getWebFonts().find(webFont => webFont.getResources().find(resource => resource == filename));
-        if (isWebFont)
+        if (isWebFont) {
           return false;
+        }
       }
 
       return this.base(arguments, filename, library);

package/source/class/qx/tool/compiler/resources/Manager.js

@@ -3,7 +3,7 @@
  *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
  *    toolchain
  *
- *    https://github.com/qooxdoo/qooxdoo-compiler
+ *    https://github.com/qooxdoo/qooxdoo
  *
  *    Copyright:
  *      2011-2017 Zenesis Limited, http://www.zenesis.com
@@ -149,7 +149,7 @@ qx.Class.define("qx.tool.compiler.resources.Manager", {
 
         // Non-wildcards are a direct lookup
         // check for $ and *. less pos wins
-        // fix for https://github.com/qooxdoo/qooxdoo-compiler/issues/260
+        // fix for https://github.com/qooxdoo/qooxdoo/issues/260
         var pos1 = uri.indexOf("$"); // Variable references are effectively a wildcard lookup
         var pos2 = uri.indexOf("*");
         if (pos1 === -1) {
@@ -347,17 +347,17 @@ qx.Class.define("qx.tool.compiler.resources.Manager", {
      *
      * @param srcPath {String} the resource name, with or without a namespace prefix
      * @param create {Boolean?} if true the asset will be created if it does not exist
+     * @param isThemeFile {Boolean?} if true the asset will be expected to be in the theme folder
      * @return {Asset?} the asset, if found
      */
-    getAsset(srcPath, create) {
+    getAsset(srcPath, create, isThemeFile) {
       let library = this.findLibraryForResource(srcPath);
       if (!library) {
         qx.tool.compiler.Console.warn("Cannot find library for " + srcPath);
         return null;
       }
 
-
-      let resourceDir = path.join(library.getRootDir(), library.getResourcePath());
+      let resourceDir = path.join(library.getRootDir(), isThemeFile ? library.getThemePath() : library.getResourcePath());
       srcPath = path.relative(resourceDir, path.isAbsolute(srcPath)?srcPath:path.join(resourceDir, srcPath));
       let asset = this.__assets[library.getNamespace() + ":" + srcPath];
       if (!asset && create) {

package/source/class/qx/tool/compiler/resources/MetaLoader.js

@@ -3,7 +3,7 @@
  *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
  *    toolchain
  *
- *    https://github.com/qooxdoo/qooxdoo-compiler
+ *    https://github.com/qooxdoo/qooxdoo
  *
  *    Copyright:
  *      2011-2017 Zenesis Limited, http://www.zenesis.com

package/source/class/qx/tool/compiler/resources/ResourceConverter.js

@@ -3,7 +3,7 @@
  *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
  *    toolchain
  *
- *    https://github.com/qooxdoo/qooxdoo-compiler
+ *    https://github.com/qooxdoo/qooxdoo
  *
  *    Copyright:
  *      2011-2017 Zenesis Limited, http://www.zenesis.com

package/source/class/qx/tool/compiler/resources/ResourceLoader.js

@@ -3,7 +3,7 @@
  *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
  *    toolchain
  *
- *    https://github.com/qooxdoo/qooxdoo-compiler
+ *    https://github.com/qooxdoo/qooxdoo
  *
  *    Copyright:
  *      2011-2017 Zenesis Limited, http://www.zenesis.com

package/source/class/qx/tool/compiler/resources/ScssConverter.js

@@ -3,7 +3,7 @@
  *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
  *    toolchain
  *
- *    https://github.com/qooxdoo/qooxdoo-compiler
+ *    https://github.com/qooxdoo/qooxdoo
  *
  *    Copyright:
  *      2011-2017 Zenesis Limited, http://www.zenesis.com
@@ -18,10 +18,16 @@
  *    Authors:
  *      * Henner Kollmann (henner.kollmann@gmx.de)
  *
+ *
  * *********************************************************************** */
 
-var path = require("upath");
-var sass = require("node-sass");
+const path = require("upath");
+/**
+ * @external(qx/tool/loadsass.js)
+ * @ignore(loadSass)
+ */
+/* global loadSass */
+const sass = loadSass();
 const fs = qx.tool.utils.Promisify.fs;
 
 qx.Class.define("qx.tool.compiler.resources.ScssConverter", {

package/source/class/qx/tool/compiler/resources/ScssFile.js

@@ -3,7 +3,7 @@
  *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
  *    toolchain
  *
- *    https://github.com/qooxdoo/qooxdoo-compiler
+ *    https://github.com/qooxdoo/qooxdoo
  *
  *    Copyright:
  *      2011-2019 Zenesis Limited, http://www.zenesis.com
@@ -19,16 +19,16 @@
  *      * John Spackman (john.spackman@zenesis.com, @johnspackman)
  *
  * *********************************************************************** */
-
-/**
- * @ignore(require)
- */
-
 /* eslint-disable @qooxdoo/qx/no-illegal-private-usage */
 
 const fs = qx.tool.utils.Promisify.fs;
 const path = require("upath");
-const nodeSass = require("node-sass");
+/**
+ * @external(qx/tool/loadsass.js)
+ * @ignore(loadSass)
+ */
+/* global loadSass */
+const sass = loadSass();
 
 /**
  * @ignore(process)
@@ -79,7 +79,7 @@ qx.Class.define("qx.tool.compiler.resources.ScssFile", {
       let inputFileData = await this.loadSource(this.__filename, this.__library);
 
       await new qx.Promise((resolve, reject) => {
-        nodeSass.render({
+        sass.render({
           // Always have file so that the source map knows the name of the original
           file: this.__filename,
 
@@ -215,7 +215,8 @@ qx.Class.define("qx.tool.compiler.resources.ScssFile", {
           return null;
         }
         promises.push(this.loadSource(pathInfo.filename, newLibrary));
-        return "@import \"" + path.relative(process.cwd(), newLibrary.getResourceFilename(pathInfo.filename)) + "\"";
+        let filename = this.isThemeFile() ? newLibrary.getThemeFilename(pathInfo.filename) : newLibrary.getResourceFilename(pathInfo.filename);
+        return "@import \"" + path.relative(process.cwd(), filename) + "\"";
       });
 
       contents = contents.replace(/\burl\s*\(\s*([^\)]+)*\)/ig, (match, url) => {
@@ -264,17 +265,17 @@ qx.Class.define("qx.tool.compiler.resources.ScssFile", {
 
       if (pathInfo) {
         if (pathInfo.externalUrl) {
-          return nodeSass.types.String("url(" + pathInfo.externalUrl + ")");
+          return sass.types.String("url(" + pathInfo.externalUrl + ")");
         }
 
         if (pathInfo.namespace) {
           let targetFile = path.relative(process.cwd(), path.join(this.__target.getOutputDir(), "resource", pathInfo.filename));
           let relative = path.relative(this.__outputDir, targetFile);
-          return nodeSass.types.String("url(" + relative + ")");
+          return sass.types.String("url(" + relative + ")");
         }
       }
 
-      return nodeSass.types.String("url(" + url + ")");
+      return sass.types.String("url(" + url + ")");
     }
   }
 });

package/source/class/qx/tool/compiler/resources/ScssIncludeConverter.js

@@ -3,7 +3,7 @@
  *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
  *    toolchain
  *
- *    https://github.com/qooxdoo/qooxdoo-compiler
+ *    https://github.com/qooxdoo/qooxdoo
  *
  *    Copyright:
  *      2011-2017 Zenesis Limited, http://www.zenesis.com

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

@@ -3,7 +3,7 @@
  *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
  *    toolchain
  *
- *    https://github.com/qooxdoo/qooxdoo-compiler
+ *    https://github.com/qooxdoo/qooxdoo
  *
  *    Copyright:
  *      2011-2017 Zenesis Limited, http://www.zenesis.com

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

@@ -3,7 +3,7 @@
  *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
  *    toolchain
  *
- *    https://github.com/qooxdoo/qooxdoo-compiler
+ *    https://github.com/qooxdoo/qooxdoo
  *
  *    Copyright:
  *      2011-2019 Zenesis Limited, http://www.zenesis.com

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

@@ -3,7 +3,7 @@
  *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
  *    toolchain
  *
- *    https://github.com/qooxdoo/qooxdoo-compiler
+ *    https://github.com/qooxdoo/qooxdoo
  *
  *    Copyright:
  *      2011-2017 Zenesis Limited, http://www.zenesis.com

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

@@ -3,7 +3,7 @@
  *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
  *    toolchain
  *
- *    https://github.com/qooxdoo/qooxdoo-compiler
+ *    https://github.com/qooxdoo/qooxdoo
  *
  *    Copyright:
  *      2011-2017 Zenesis Limited, http://www.zenesis.com
@@ -107,6 +107,14 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
       check: "Boolean"
     },
 
+    /**
+     * Whether to add timestamps to all URLs (cache busting)
+     */
+    addTimestampsToUrls: {
+      init: true,
+      check: "Boolean"
+    },
+
     /** Locales being generated */
     locales: {
       nullable: false,
@@ -322,6 +330,7 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
       var rm = analyser.getResourceManager();
 
       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());
@@ -344,7 +353,9 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
         "qx.application": application.getClassName(),
         "qx.revision": "",
         "qx.theme": application.getTheme(),
-        "qx.version": analyser.getQooxdooVersion()
+        "qx.version": analyser.getQooxdooVersion(),
+        "qx.compiler.targetType": this.getType(),
+        "qx.compiler.outputDir": this.getOutputDir()
       });
       
       let externals = {};
@@ -461,38 +472,59 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
       });
 
       if (analyser.getApplicationTypes().indexOf("browser") > -1) {
-        requiredLibs.forEach(libnamespace => {
-          var library = analyser.findLibrary(libnamespace);
+        // 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 
+        //  developer has purchased the commercial/full version of the font (eg FontAwesome)
+        let appLibrary = appMeta.getAppLibrary();
+        let fontsToLoad = { };
+        const addLibraryFonts = library => {
           var fonts = library.getWebFonts();
           if (!fonts) {
             return;
           }
-
-          const loadFont = async (library, font) => {
-            try {
-              // check if font is asset somewhere
-              let res = font.getResources().filter(res => assets[res]);
-              if (res.length === 0) {
-                qx.tool.compiler.Console.print("qx.tool.compiler.webfonts.noResources", font.toString(), application.getName(), font.getResources().join(","));
-                return;
-              }
-              font.setResources(res);
-          
-              var p = await font.generateForTarget(t);
-              let resources = await font.generateForApplication(t, application);
-              for (var key in resources) {
-                appMeta.addResource(key, resources[key]);
-              }
-              var code = font.getBootstrapCode(t, application, fontCntr++ == 0);
-              if (code) {
-                appMeta.addPreBootCode(code);
-              }
-            } catch (ex) {
-              qx.tool.compiler.Console.print("qx.tool.compiler.webfonts.error", font.toString(), ex.toString());
+          fonts.forEach(font => {
+            fontsToLoad[font.getName()] = {
+              font, library
+            };
+          });
+        };
+        requiredLibs.forEach(libnamespace => {
+          var library = analyser.findLibrary(libnamespace);
+          if (library != appLibrary) {
+            addLibraryFonts(library);
+          }
+        });
+        addLibraryFonts(appLibrary);
+
+        const loadFont = async (library, font) => {
+          try {
+            // check if font is asset somewhere
+            let res = font.getResources().filter(res => assets[res]);
+            if (res.length === 0) {
+              qx.tool.compiler.Console.print("qx.tool.compiler.webfonts.noResources", font.toString(), application.getName(), font.getResources().join(","));
+              return;
             }
-            promises.push(p);
-          };
-          fonts.forEach(font => promises.push(loadFont(library, font)));
+            font.setResources(res);
+        
+            await font.generateForTarget(t);
+            let resources = await font.generateForApplication(t, application);
+            for (var key in resources) {
+              appMeta.addResource(key, resources[key]);
+            }
+            var code = font.getBootstrapCode(t, application, fontCntr++ == 0);
+            if (code) {
+              appMeta.addPreBootCode(code);
+            }
+          } catch (ex) {
+            qx.tool.compiler.Console.print("qx.tool.compiler.webfonts.error", font.toString(), ex.toString());
+          }
+        };
+
+        Object.keys(fontsToLoad).forEach(fontName => {
+          let { font, library } = fontsToLoad[fontName];
+          promises.push(loadFont(library, font));
         });
       }
       await qx.Promise.all(promises);
@@ -779,13 +811,19 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
       
       let timeStamp = (new Date()).getTime();
       let pathToTarget = path.relative(path.join(t.getOutputDir(), t.getProjectDir(application)), t.getOutputDir()) + "/";
+      let indexJsTimestamp = "";
+      if (this.isAddTimestampsToUrls()) {
+        let indexJsFilename = path.join(appMeta.getApplicationRoot(), "index.js");
+        indexJsTimestamp = "?" + fs.statSync(indexJsFilename).mtimeMs;
+      }
       let TEMPLATE_VARS = {
         "resourcePath": pathToTarget + "resource/",
         "targetPath": pathToTarget,
         "appPath": "",
         "preBootJs": "",
         "appTitle": (application.getTitle()||"Qooxdoo Application"),
-        "timeStamp": timeStamp
+        "timeStamp": timeStamp,
+        "indexJsTimestamp": indexJsTimestamp
       };
 
       function replaceVars(code) {
@@ -807,7 +845,7 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
           "       the one below because they will be added automatically)\n" +
           "    -->\n" +
           "${preBootJs}\n" +
-          "  <script type=\"text/javascript\" src=\"${appPath}index.js\"></script>\n" +
+          "  <script type=\"text/javascript\" src=\"${appPath}index.js${indexJsTimestamp}\"></script>\n" +
           "</body>\n" +
           "</html>\n";
       /* eslint-enable no-template-curly-in-string */
@@ -831,7 +869,7 @@ qx.Class.define("qx.tool.compiler.targets.Target", {
               }
               if (!data.match(/\s*index.js\s*/)) {
               /* eslint-disable no-template-curly-in-string */
-                data = data.replace("</body>", "\n  <script type=\"text/javascript\" src=\"${appPath}index.js\"></script>\n</body>");
+                data = data.replace("</body>", "\n  <script type=\"text/javascript\" src=\"${appPath}index.js${indexJsTimestamp}\"></script>\n</body>");
                 /* eslint-enable no-template-curly-in-string */
                 qx.tool.compiler.Console.print("qx.tool.compiler.target.missingBootJs", from);
               }

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

@@ -3,7 +3,7 @@
  *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
  *    toolchain
  *
- *    https://github.com/qooxdoo/qooxdoo-compiler
+ *    https://github.com/qooxdoo/qooxdoo
  *
  *    Copyright:
  *      2011-2017 Zenesis Limited, http://www.zenesis.com
@@ -24,7 +24,6 @@
 var path = require("path");
 
 var fs = require("fs");
-var jsonlint = require("jsonlint");
 const {promisify} = require("util");
 const readFile = promisify(fs.readFile);
 /**
@@ -150,7 +149,7 @@ qx.Class.define("qx.tool.compiler.targets.TypeScriptWriter", {
       }
       var fileName = path.join(this.__target.getOutputDir(), "transpiled", classname.replace(/\./g, "/") + ".json");
       return readFile(fileName, "UTF-8")
-        .then(content => this.__apiCache[classname] = jsonlint.parse(content))
+        .then(content => this.__apiCache[classname] = JSON.parse(content))
         .catch(err => qx.tool.compiler.Console.error("Error parsing " + classname + ": " + err.stack));
     },
 
@@ -159,7 +158,7 @@ qx.Class.define("qx.tool.compiler.targets.TypeScriptWriter", {
      * @async
      */
     writeBase: function() {
-      return readFile(path.join(__dirname, "TypeScriptWriter-base_declaration.txt"), "UTF-8")
+      return readFile(path.join(qx.tool.utils.Utils.getTemplateDir(), "TypeScriptWriter-base_declaration.txt"), "UTF-8")
         .then(content => this.write(content));
     },
 

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

@@ -1,3 +1,25 @@
+/* ************************************************************************
+ *
+ *    qooxdoo-compiler - node.js based replacement for the Qooxdoo python
+ *    toolchain
+ *
+ *    https://github.com/qooxdoo/qooxdoo-compiler
+ *
+ *    Copyright:
+ *      2011-2021 Zenesis Limited, http://www.zenesis.com
+ *
+ *    License:
+ *      MIT: https://opensource.org/licenses/MIT
+ *
+ *      This software is provided under the same licensing terms as Qooxdoo,
+ *      please see the LICENSE file in the Qooxdoo project's top-level directory
+ *      for details.
+ *
+ *    Authors:
+ *      * John Spackman (john.spackman@zenesis.com, @johnspackman)
+ *
+ * ************************************************************************/
+
 const fs = qx.tool.utils.Promisify.fs;
 const sourceMap = require("source-map");