@qooxdoo/framework 7.0.0-beta.1 → 7.0.0-beta.5

package/source/class/qx/tool/cli/Cli.js

@@ -239,7 +239,9 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
       this._compilerApi.setCommand(command);
       await this.__notifyLibraries();
       try {
-        return await command.process();
+        const res = await command.process();
+        await this._compilerApi.afterProcessFinished(command, res);
+        return res;
       } catch (e) {
         qx.tool.compiler.Console.error("Error: " + (e.stack || e.message));
         process.exit(1);
@@ -420,8 +422,8 @@ Version: v${await qx.tool.config.Utils.getQxVersion()}
       if (config.libraries && needLibraries) {
         let neededLibraries = config.libraries.filter(libData => !fs.existsSync(libData + "/Manifest.json"));
         if (neededLibraries.length) {
-          if (!fs.existsSync(qx.tool.config.Manifest.config.fileName)) { 
-            qx.tool.compiler.Console.error("Libraries are missing and there is no Manifest.json in the current directory so we cannot attempt to install them; the missing libraries are: \n     " + neededLibraries.join("\n     "));  
+          if (!fs.existsSync(qx.tool.config.Manifest.config.fileName)) {
+            qx.tool.compiler.Console.error("Libraries are missing and there is no Manifest.json in the current directory so we cannot attempt to install them; the missing libraries are: \n     " + neededLibraries.join("\n     "));
             process.exit(1);
           }
           qx.tool.compiler.Console.info("One or more libraries not found - trying to install them from library repository...");

package/source/class/qx/tool/cli/api/CompilerApi.js

@@ -25,7 +25,7 @@ const fs = qx.tool.utils.Promisify.fs;
 
 /**
  * Provides an API for the compiler
- * 
+ *
  */
 qx.Class.define("qx.tool.cli.api.CompilerApi", {
   extend: qx.tool.cli.api.AbstractApi,
@@ -75,7 +75,7 @@ qx.Class.define("qx.tool.cli.api.CompilerApi", {
 
     /**
      * called after deployment happens
-     * 
+     *
      * @param data {Object}  contains deployment infos with the following properties:
      *           targetDir  : {String}  The target dir of the build
      *           deployDir  : {String}  The output dir for the deployment
@@ -89,7 +89,7 @@ qx.Class.define("qx.tool.cli.api.CompilerApi", {
 
     /**
      * Loads the configuration data
-     * 
+     *
      * @overridden
      */
     async load() {
@@ -102,6 +102,16 @@ qx.Class.define("qx.tool.cli.api.CompilerApi", {
       return this.base(arguments);
     },
 
+    /**
+     * runs after the whole process is finished
+     * @param cmd {qx.tool.cli.commands.Command} current command
+     * @param res {boolean} result of the just finished process
+     */
+    async afterProcessFinished(cmd, res) {
+      // Nothing
+    },
+
+
     /**
      * Called after all libraries have been loaded and added to the compilation data
      */
@@ -113,7 +123,7 @@ qx.Class.define("qx.tool.cli.api.CompilerApi", {
 
     /**
      * Adds a library configuration
-     * 
+     *
      * @param libraryApi {LibraryApi} the configuration for the library
      */
     addLibraryApi(libraryApi) {
@@ -123,7 +133,7 @@ qx.Class.define("qx.tool.cli.api.CompilerApi", {
 
     /**
      * Returns an array of library configurations
-     * 
+     *
      * @return {LibraryApi[]}
      */
     getLibraryApis() {

package/source/class/qx/tool/cli/commands/Command.js

@@ -127,6 +127,13 @@ qx.Class.define("qx.tool.cli.commands.Command", {
      */
     getQxPath: qx.tool.config.Utils.getQxPath.bind(qx.tool.config.Utils),
 
+    /**
+     *
+     * @returns @see {@link qx.tool.config.Utils#getCompilerVersion}
+     */
+    getCompilerVersion() {
+      return qx.tool.config.Utils.getCompilerVersion();
+    },
 
     /**
      * Returns the qooxdoo version, either from the `--qx-version` command line

package/source/class/qx/tool/cli/commands/Compile.js

@@ -326,7 +326,7 @@ qx.Class.define("qx.tool.cli.commands.Compile", {
 
       if (this.argv.verbose) {
         console.log(`
-Compiler:  v${qx.tool.compiler.Version.VERSION} in ${require.main.filename}
+Compiler:  v${this.getCompilerVersion()} in ${require.main.filename}
 Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
       }
 
@@ -628,7 +628,7 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
         }
         if (appConfig.group) {
           if (typeof appConfig.group == "string") {
-            appConfig.group = [ appConfig.group ]; 
+            appConfig.group = [ appConfig.group ];
           }
         }
         appConfig.index = index;
@@ -1076,15 +1076,15 @@ Framework: v${await this.getQxVersion()} in ${await this.getQxPath()}`);
         let requires_uris = Object.getOwnPropertyNames(requires)
           .filter(uri => !libs.find(lib => lib.getLibraryInfo().name === uri));
 
-        let urisToInstall = requires_uris.filter(name => name !== "@qooxdoo/framework");
+        let urisToInstall = requires_uris.filter(name => (name !== "@qooxdoo/framework") && (name !== "@qooxdoo/compiler"));
 
         let pkg_libs = Object.getOwnPropertyNames(packages);
         if (urisToInstall.length > 0 && pkg_libs.length === 0) {
           // if we don't have package data
           if (this.argv.download) {
-            if (!fs.existsSync(qx.tool.config.Manifest.config.fileName)) { 
-              Console.error("Libraries are missing and there is no Manifest.json in the current directory so we cannot attempt to install them; the missing libraries are: \n     " + 
-                urisToInstall.join("\n     ") + "\nThe library which refers to the missing libraries is " + lib.getNamespace() + " in " + lib.getRootDir());  
+            if (!fs.existsSync(qx.tool.config.Manifest.config.fileName)) {
+              Console.error("Libraries are missing and there is no Manifest.json in the current directory so we cannot attempt to install them; the missing libraries are: \n     " +
+                urisToInstall.join("\n     ") + "\nThe library which refers to the missing libraries is " + lib.getNamespace() + " in " + lib.getRootDir());
               process.exit(1);
             }
               // but we're instructed to download the libraries

package/source/class/qx/tool/cli/commands/Lint.js

@@ -16,8 +16,9 @@
 
 ************************************************************************ */
 
-const CLIEngine = require("eslint").CLIEngine;
+const {ESLint} = require("eslint");
 const fs = qx.tool.utils.Promisify.fs;
+const path = require("path");
 const replaceInFile = require("replace-in-file");
 
 qx.Class.define("qx.tool.cli.commands.Lint", {
@@ -85,12 +86,21 @@ qx.Class.define("qx.tool.cli.commands.Lint", {
 
     process: async function() {
       await this.__applyFixes();
-      let config;
-      config = await qx.tool.cli.Cli.getInstance().getParsedArgs();
+
+      let helperFilePath = require.main.path;
+      while (true) {
+        if (await fs.existsAsync(path.join(helperFilePath, "node_modules"))) {
+          break;
+        }
+        helperFilePath = path.dirname(helperFilePath);
+      }
+
+      let config = await qx.tool.cli.Cli.getInstance().getParsedArgs();
       let lintOptions = config.eslintConfig || {};
       lintOptions.extends = lintOptions.extends || ["@qooxdoo/qx/browser"];
       lintOptions.globals = Object.assign(lintOptions.globals || {}, await this.__addGlobals(config));
-      let linter = new CLIEngine({
+      let linter = new ESLint({
+        cwd: helperFilePath,
         cache: this.argv.cache || false,
         baseConfig: lintOptions,
         useEslintrc: this.argv.useEslintrc,
@@ -98,15 +108,24 @@ qx.Class.define("qx.tool.cli.commands.Lint", {
       });
       let files = this.argv.files || [];
       if (files.length === 0) {
-        files.push("source/class/");
+        files.push("source/class/**/*.js");
+      }
+      for (let i = 0; i < files.length; i++) {
+        files[i] = path.join(process.cwd(), files[i]);
       }
-      if (this.argv.config) {
-        const fileConfig = linter.getConfigForFile(files[0]);
+      if (this.argv.printConfig) {
+        const fileConfig = await linter.calculateConfigForFile(files[0]);
         qx.tool.compiler.Console.info(JSON.stringify(fileConfig, null, "  "));
       } else {
-        let report = linter.executeOnFiles(files);
+        let report = await linter.lintFiles(files);
+        report.errorCount = 0;
+        report.warningCount =0;
+        for (const r of report) {
+           report.errorCount += r.errorCount;
+           report.warningCount += r.warningCount;
+        }
         if (this.argv.fix) {
-          CLIEngine.outputFixes(report);
+          await ESLint.outputFixes(report);
         }
         if (report.errorCount > 0 || report.warningCount > 0) {
           let outputFormat = this.argv.format || "codeframe";
@@ -115,8 +134,8 @@ qx.Class.define("qx.tool.cli.commands.Lint", {
           if (report.errorCount + report.warningCount > 150) {
             outputFormat = "compact";
           }
-          const formatter = linter.getFormatter(outputFormat);
-          const s = formatter(report.results);
+          const formatter = await linter.loadFormatter(outputFormat);
+          const s = formatter.format(report);
           if (this.argv.outputFile) {
             if (this.argv.verbose) {
               qx.tool.compiler.Console.info(`Report to be written to ${this.argv.outputFile}`);

package/source/class/qx/tool/cli/commands/Package.js

@@ -18,7 +18,6 @@
 const fs = qx.tool.utils.Promisify.fs;
 const path = require("upath");
 const process = require("process");
-const jsonlint = require("jsonlint");
 const stringify = require("json-stable-stringify");
 
 /**
@@ -213,7 +212,7 @@ qx.Class.define("qx.tool.cli.commands.Package", {
         return this.__cache;
       }
       try {
-        this.__cache = jsonlint.parse(fs.readFileSync(this.getCachePath(), "UTF-8"));
+        this.__cache = JSON.parse(fs.readFileSync(this.getCachePath(), "UTF-8"));
       } catch (e) {
         this.__cache = {
           repos : {

package/source/class/qx/tool/cli/commands/package/Publish.js

@@ -39,10 +39,8 @@ qx.Class.define("qx.tool.cli.commands.package.Publish", {
             alias : "t",
             describe: "Set the release type",
             nargs: 1,
-            requiresArg: true,
             choices: "major,premajor,minor,preminor,patch,prepatch,prerelease".split(/,/),
-            type: "string",
-            default : "patch"
+            type: "string"
           },
           "noninteractive":{
             alias: "I",
@@ -121,7 +119,10 @@ qx.Class.define("qx.tool.cli.commands.package.Publish", {
       const argv = this.argv;
 
       // qooxdoo version
-      let qxVersion = await this.getAppQxVersion();
+      let qxVersion = await this.getQxVersion();
+      if (fs.existsSync("Manifest.json")) {
+         qxVersion = await this.getAppQxVersion();
+      }
       if (argv.verbose) {
         this.info(`Using qooxdoo version:  ${qxVersion}`);
       }
@@ -210,6 +211,7 @@ qx.Class.define("qx.tool.cli.commands.package.Publish", {
       }
 
       // version
+      let old_version = mainManifestModel.getValue("info.version");
       let new_version;
       if (argv.useVersion) {
         // use user-supplied value
@@ -220,10 +222,17 @@ qx.Class.define("qx.tool.cli.commands.package.Publish", {
         new_version = new_version.toString();
       } else {
         // use version number from manifest and increment it
-        let old_version = mainManifestModel.getValue("info.version");
         if (!semver.valid(old_version)) {
           throw new qx.tool.utils.Utils.UserError("Invalid version number in Manifest. Must be a valid semver version (x.y.z).");
         }
+        if (!argv.type) {
+          argv.type = (semver.prerelease(old_version)) ? "prerelease" : "patch";
+        }
+        argv.prerelease = Boolean(argv.prerelease)
+                          || (argv.type === "prerelease")
+                          || (argv.type === "prepatch")
+                          || (argv.type === "preminor")
+                          || (argv.type === "premajor");
         new_version = semver.inc(old_version, argv.type);
       }
 
@@ -286,7 +295,7 @@ qx.Class.define("qx.tool.cli.commands.package.Publish", {
         let question = {
           type: "confirm",
           name: "doRelease",
-          message: `This will ${argv.version?"set":"increment"} the version to ${new_version}, having a dependency on qooxdoo ${semver_range}, and create a release of the current master on GitHub. Do you want to proceed?`,
+          message: `This will ${argv.version?"set":"increment"} the version from ${old_version} to ${new_version}, having a dependency on qooxdoo ${semver_range}, and create a release of the current master on GitHub. Do you want to proceed?`,
           default: "y"
         };
         let answer = await inquirer.prompt(question);
@@ -306,7 +315,7 @@ qx.Class.define("qx.tool.cli.commands.package.Publish", {
         if (argv.dryrun) {
           if (!argv.quiet) {
             qx.tool.compiler.Console.info(`Dry run: Not committing ${manifestModel.getRelativeDataPath()} with the following content:`);
-            qx.tool.compiler.Console.info(manifestModel.getData());
+            qx.tool.compiler.Console.info(JSON.stringify(manifestModel.getData(), null, 2));
           }
         } else {
           manifestModel.save();
@@ -330,7 +339,7 @@ qx.Class.define("qx.tool.cli.commands.package.Publish", {
 
       if (argv.dryrun) {
         qx.tool.compiler.Console.info(`Dry run: not creating tag and release '${tag}' of ${repo_name}...`);
-        process.exit(0);
+        return;
       }
 
       // commit message
@@ -368,7 +377,7 @@ qx.Class.define("qx.tool.cli.commands.package.Publish", {
           name: tag,
           body: message,
           draft: false,
-          prerelease: Boolean(argv.prerelease)
+          prerelease: argv.prerelease
         };
         await octokit.repos.createRelease(release_data);
         if (!argv.quiet) {
@@ -388,7 +397,7 @@ qx.Class.define("qx.tool.cli.commands.package.Publish", {
           qx.tool.compiler.Console.info(`Added GitHub topic '${topic}'.`);
         }
       }
-      await run("git", ["pull"]);
+      run("git", ["pull"]);
     },
 
     /**

package/source/class/qx/tool/compiler/Analyser.js

@@ -27,7 +27,6 @@
 var fs = require("fs");
 var async = require("async");
 
-var jsonlint = require("jsonlint");
 var hash = require("object-hash");
 
 const {promisify} = require("util");
@@ -104,7 +103,7 @@ qx.Class.define("qx.tool.compiler.Analyser", {
       check: "Map",
       apply: "_applyEnvironment"
     },
-    
+
     /** configuration of babel */
     babelConfig: {
       init: null,
@@ -125,7 +124,7 @@ qx.Class.define("qx.tool.compiler.Analyser", {
       nullable: false,
       check: "Array"
     },
-    
+
     /** Whether and how to mangle private identifiers */
     manglePrivates: {
       init: "readable",
@@ -353,11 +352,11 @@ qx.Class.define("qx.tool.compiler.Analyser", {
 
         compiledClasses[data.classFile.getClassName()] = data;
       });
-      
+
       // Note that it is important to pre-load the classes in all libraries - this is because
       //  Babel plugins MUST be synchronous (ie cannot afford an async lookup of files on disk
       //  in mid parse)
-      await qx.tool.utils.Promisify.map(this.__libraries, async library => 
+      await qx.tool.utils.Promisify.map(this.__libraries, async library =>
         qx.tool.utils.Promisify.call(cb => library.scanForClasses(cb))
       );
 
@@ -390,7 +389,7 @@ qx.Class.define("qx.tool.compiler.Analyser", {
         }
         return deps;
       }
-      
+
       for (var classIndex = 0; classIndex < classes.length; classIndex++) {
         try {
           let dbClassInfo = await qx.tool.utils.Promisify.call(cb => t.getClassInfo(classes[classIndex], cb));
@@ -679,7 +678,7 @@ qx.Class.define("qx.tool.compiler.Analyser", {
               eventMeta.overriddenFrom = eventInfo.overriddenFrom;
             }
           }
-        }  
+        }
 
         if (meta.properties) {
           for (let propertyName in meta.properties) {
@@ -695,7 +694,7 @@ qx.Class.define("qx.tool.compiler.Analyser", {
               }
             }
           }
-  
+
           for (let propertyName in classEntities.properties) {
             let propertyInfo = classEntities.properties[propertyName];
             if ((propertyInfo.abstract || propertyInfo.mixin) && !meta.properties[propertyName]) {
@@ -809,7 +808,7 @@ qx.Class.define("qx.tool.compiler.Analyser", {
         }
         var filename = qx.tool.compiler.ClassFile.getOutputPath(t, classname) + "on";
         return readFile(filename, {encoding: "utf-8"})
-          .then(str => jsonlint.parse(str))
+          .then(str => JSON.parse(str))
           .then(meta => cachedMeta[classname] = meta)
           .catch(err => {
             qx.tool.compiler.Console.error("Failed to load meta for " + classname + ": " + err);
@@ -857,7 +856,7 @@ qx.Class.define("qx.tool.compiler.Analyser", {
 
         await Promise.all(Object.keys(toSave).map(classname => saveMetaData(classname, toSave[classname])));
       }
-      
+
       return await analyzeMeta();
     },
 
@@ -1025,24 +1024,24 @@ qx.Class.define("qx.tool.compiler.Analyser", {
         libraries = [];
       }
       libraries = libraries.filter(lib => lib != appLibrary);
-      
+
       await qx.Promise.all(locales.map(async locale => {
         let libTranslations = {};
         await qx.Promise.all(libraries.map(async lib => {
           var translation = new qx.tool.compiler.app.Translation(lib, locale);
           await translation.read();
-          libTranslations[lib.toHashCode()] = translation; 
+          libTranslations[lib.toHashCode()] = translation;
         }));
-        
+
         var translation = new qx.tool.compiler.app.Translation(appLibrary, locale);
         translation.setWriteLineNumbers(this.isWritePoLineNumbers());
         await translation.read();
-        
+
         let unusedEntries = {};
         for (let msgid in translation.getEntries()) {
           unusedEntries[msgid] = true;
         }
-        
+
         await qx.Promise.all(this.__classes.map(async classname => {
           let isAppClass = appLibrary.isClass(classname);
           let classLibrary = !isAppClass && libraries.find(lib => lib.isClass(classname)) || null;
@@ -1054,7 +1053,7 @@ qx.Class.define("qx.tool.compiler.Analyser", {
           if (!dbClassInfo.translations) {
             return;
           }
-          
+
           function isEmpty(entry) {
             if (!entry) {
               return true;
@@ -1067,7 +1066,7 @@ qx.Class.define("qx.tool.compiler.Analyser", {
 
           dbClassInfo.translations.forEach(function(src) {
             delete unusedEntries[src.msgid];
-            
+
             if (classLibrary) {
               let entry = translation.getEntry(src.msgid);
               if (!isEmpty(entry)) {
@@ -1085,7 +1084,7 @@ qx.Class.define("qx.tool.compiler.Analyser", {
               }
               return;
             }
-            
+
             let entry = translation.getOrCreateEntry(src.msgid);
             if (src.msgid_plural) {
               entry.msgid_plural = src.msgid_plural;
@@ -1114,7 +1113,7 @@ qx.Class.define("qx.tool.compiler.Analyser", {
             }
           });
         }));
-        
+
         Object.keys(unusedEntries).forEach(msgid => {
           var entry = translation.getEntry(msgid);
           if (entry) {
@@ -1129,7 +1128,7 @@ qx.Class.define("qx.tool.compiler.Analyser", {
             }
           }
         });
-        
+
         await translation.write();
       }));
     },
@@ -1345,7 +1344,7 @@ qx.Class.define("qx.tool.compiler.Analyser", {
       }
 
       // then check if compiler version is the same
-      if (db.compilerVersion !== qx.tool.compiler.Version.VERSION) {
+      if (db.compilerVersion !== qx.tool.config.Utils.getCompilerVersion()) {
         return true;
       }
 
@@ -1370,7 +1369,7 @@ qx.Class.define("qx.tool.compiler.Analyser", {
 
       db.libraries = libraries;
       db.environmentHash = this.__environmentHash;
-      db.compilerVersion = qx.tool.compiler.Version.VERSION;
+      db.compilerVersion = qx.tool.config.Utils.getCompilerVersion();
     }
   }
 });

package/source/class/qx/tool/compiler/app/WebFont.js

@@ -23,7 +23,7 @@ const fs = require("fs");
 const path = require("path");
 const tmp = require("tmp");
 const http = require("http");
-const fontkit = require("fontkit");
+const fontkit = require("@foliojs-fork/fontkit");
 
 var log = qx.tool.utils.LogManager.createLog("font");
 

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

@@ -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/targets/TypeScriptWriter.js

@@ -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));
     },
 

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

@@ -24,29 +24,29 @@ const fs = qx.tool.utils.Promisify.fs;
 const path = require("upath");
 
 /**
- * Represents a "polyfill.js" that is generated as part of a compile 
+ * Represents a "polyfill.js" that is generated as part of a compile
  */
 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`);
   },
-  
+
   properties: {
     needsWriteToDisk: {
       init: true,
       refine: true
     }
   },
-  
+
   members: {
-    
+
     /*
      * @Override
      */
     async writeSourceCodeToStream(ws) {
-      const srcFilename = path.join(require.resolve("@babel/polyfill"), "../../dist/polyfill.js");
+      const srcFilename = path.join(require.resolve("core-js-bundle"), "../minified.js");
       let rs = fs.createReadStream(srcFilename, "utf8");
       await new Promise((resolve, reject) => {
         rs.on("end", resolve);
@@ -54,7 +54,7 @@ qx.Class.define("qx.tool.compiler.targets.meta.PolyfillJs", {
         rs.pipe(ws, { end: false });
       });
     },
-    
+
     /*
      * @Override
      */