Merge branch 'master' into incrementalBuildInfo

Author: sheetalkamat

.travis.yml

@@ -5,8 +5,6 @@ node_js:
   - '10'
   - '8'
 
-sudo: false
-
 env:
   - workerCount=3 timeout=600000
 

Gulpfile.js

@@ -12,10 +12,9 @@ const merge2 = require("merge2");
 const mkdirp = require("mkdirp");
 const { src, dest, task, parallel, series, watch } = require("gulp");
 const { append, transform } = require("gulp-insert");
-const { browserify } = require("./scripts/build/browserify");
 const { prependFile } = require("./scripts/build/prepend");
 const { exec, readJson, needsUpdate, getDiffTool, getDirSize, rm } = require("./scripts/build/utils");
-const { runConsoleTests, cleanTestDirs, writeTestConfigFile, refBaseline, localBaseline, refRwcBaseline, localRwcBaseline } = require("./scripts/build/tests");
+const { runConsoleTests, refBaseline, localBaseline, refRwcBaseline, localRwcBaseline } = require("./scripts/build/tests");
 const { buildProject, cleanProject, watchProject } = require("./scripts/build/projects");
 const cmdLineOptions = require("./scripts/build/options");
 
@@ -432,44 +431,6 @@ task("runtests-parallel").flags = {
     "   --built": "Compile using the built version of the compiler.",
 };
 
-const buildWebTestServer = () => buildProject("tests/webTestServer.tsconfig.json");
-const cleanWebTestServer = () => cleanProject("tests/webTestServer.tsconfig.json");
-cleanTasks.push(cleanWebTestServer);
-
-const browserifyTests = () => src(["built/local/run.js"], { base: "built/local" })
-    .pipe(newer("built/local/bundle.js"))
-    .pipe(sourcemaps.init({ loadMaps: true }))
-    .pipe(browserify())
-    .pipe(rename("bundle.js"))
-    .pipe(sourcemaps.write(".", /**@type {*}*/({ includeContent: false, destPath: "built/local" })))
-    .pipe(dest("built/local"));
-
-const runtestsBrowser = async () => {
-    await cleanTestDirs();
-    const { tests, runners, light } = cmdLineOptions;
-    const testConfigFile = "test.config";
-    await del([testConfigFile]);
-    if (tests || runners || light) {
-        writeTestConfigFile(tests, runners, light);
-    }
-    const args = ["tests/webTestServer.js"];
-    if (cmdLineOptions.browser) {
-        args.push(cmdLineOptions.browser);
-    }
-    if (tests) {
-        args.push(JSON.stringify(tests));
-    }
-    await exec(process.execPath, args);
-};
-
-task("runtests-browser", series(preBuild, parallel(buildTests, buildServices, buildLssl, buildWebTestServer), browserifyTests, runtestsBrowser));
-task("runtests-browser").description = "Runs the tests using the built run.js file like 'gulp runtests'.";
-task("runtests-browser").flags = {
-    "-t --tests=<regex>": "pattern for tests to run",
-    "-b --browser=<browser>": "Either 'IE' or 'chrome'",
-    "   --built": "Compile using the built version of the compiler.",
-};
-
 task("diff", () => exec(getDiffTool(), [refBaseline, localBaseline], { ignoreExitCode: true }));
 task("diff").description = "Diffs the compiler baselines using the diff tool specified by the 'DIFF' environment variable";
 
@@ -503,16 +464,6 @@ cleanTasks.push(cleanWebHost);
 task("clean-webhost", cleanWebHost);
 task("clean-webhost").description = "Cleans the outputs of the tsc web host";
 
-// TODO(rbuckton): Determine if 'perftsc' is still in use.
-const buildPerfTsc = () => buildProject("tests/perftsc.tsconfig.json");
-task("perftsc", series(lkgPreBuild, buildPerfTsc));
-task("perftsc").description = "Builds augmented version of the compiler for perf tests";
-
-const cleanPerfTsc = () => cleanProject("tests/perftsc.tsconfig.json");
-cleanTasks.push(cleanPerfTsc);
-task("clean-perftsc", cleanPerfTsc);
-task("clean-perftsc").description = "Cleans the outputs of the perftsc project";
-
 const buildLoggedIO = async () => {
     mkdirp.sync("built/local/temp");
     await exec(process.execPath, ["lib/tsc", "--types", "--target", "es5", "--lib", "es5", "--outdir", "built/local/temp", "src/harness/loggedIO.ts"]);

scripts/browserify-optional.js

@@ -1,102 +1,4 @@
 // @ts-check
-/// <reference path="../types/ambient.d.ts" />
-
-const path = require("path");
-const convertMap = require("convert-source-map");
-const applySourceMap = require("vinyl-sourcemaps-apply");
-const through2 = require("through2");
-
-/**
- * @param {import("vinyl")} input
- * @param {string | Buffer} contents
- * @param {string | RawSourceMap} [sourceMap]
- */
-function replaceContents(input, contents, sourceMap) {
-    const output = input.clone();
-    output.contents = typeof contents === "string" ? Buffer.from(contents, "utf8") : contents;
-    if (input.sourceMap) {
-        output.sourceMap = typeof input.sourceMap === "string" ? /**@type {RawSourceMap}*/(JSON.parse(input.sourceMap)) : input.sourceMap;
-        if (typeof sourceMap === "string") {
-            sourceMap = /** @type {RawSourceMap} */(JSON.parse(sourceMap));
-        }
-        else if (sourceMap === undefined) {
-            const stringContents = typeof contents === "string" ? contents : contents.toString("utf8");
-            const newSourceMapConverter = convertMap.fromSource(stringContents);
-            if (newSourceMapConverter) {
-                sourceMap = /** @type {RawSourceMap} */(newSourceMapConverter.toObject());
-                output.contents = new Buffer(convertMap.removeMapFileComments(stringContents), "utf8");
-            }
-        }
-        if (sourceMap) {
-            const cwd = input.cwd || process.cwd();
-            const base = input.base || cwd;
-            const sourceRoot = output.sourceMap.sourceRoot;
-            makeAbsoluteSourceMap(cwd, base, output.sourceMap);
-            makeAbsoluteSourceMap(cwd, base, /** @type {RawSourceMap} */(sourceMap));
-            applySourceMap(output, sourceMap);
-            makeRelativeSourceMap(cwd, base, sourceRoot, output.sourceMap);
-        }
-        else {
-            output.sourceMap = undefined;
-        }
-    }
-    return output;
-}
-exports.replaceContents = replaceContents;
-
-function removeSourceMaps() {
-    return through2.obj((/**@type {import("vinyl")}*/file, _, cb) => {
-        if (file.isBuffer()) {
-            file.contents = Buffer.from(convertMap.removeMapFileComments(file.contents.toString("utf8")), "utf8");
-            if (file.sourceMap) {
-                file.sourceMap = undefined;
-            }
-        }
-        cb(null, file);
-    });
-}
-exports.removeSourceMaps = removeSourceMaps;
-
-/**
- * @param {string | undefined} cwd
- * @param {string | undefined} base
- * @param {RawSourceMap} sourceMap
- *
- * @typedef {object} RawSourceMap
- * @property {string} version
- * @property {string} file
- * @property {string} [sourceRoot]
- * @property {string[]} sources
- * @property {string[]} [sourcesContent]
- * @property {string} mappings
- * @property {string[]} [names]
- */
-function makeAbsoluteSourceMap(cwd = process.cwd(), base = "", sourceMap) {
-    const sourceRoot = sourceMap.sourceRoot || "";
-    const resolvedBase = path.resolve(cwd, base);
-    const resolvedSourceRoot = path.resolve(resolvedBase, sourceRoot);
-    sourceMap.file = path.resolve(resolvedBase, sourceMap.file).replace(/\\/g, "/");
-    sourceMap.sources = sourceMap.sources.map(source => path.resolve(resolvedSourceRoot, source).replace(/\\/g, "/"));
-    sourceMap.sourceRoot = "";
-}
-exports.makeAbsoluteSourceMap = makeAbsoluteSourceMap;
-
-/**
- * @param {string | undefined} cwd
- * @param {string | undefined} base
- * @param {string} sourceRoot
- * @param {RawSourceMap} sourceMap
- */
-function makeRelativeSourceMap(cwd = process.cwd(), base = "", sourceRoot, sourceMap) {
-    makeAbsoluteSourceMap(cwd, base, sourceMap);
-    const resolvedBase = path.resolve(cwd, base);
-    const resolvedSourceRoot = path.resolve(resolvedBase, sourceRoot);
-    sourceMap.file = path.relative(resolvedBase, sourceMap.file).replace(/\\/g, "/");
-    sourceMap.sources = sourceMap.sources.map(source => path.relative(resolvedSourceRoot, source).replace(/\\/g, "/"));
-    sourceMap.sourceRoot = sourceRoot;
-}
-exports.makeRelativeSourceMap = makeRelativeSourceMap;
-
 /**
  * @param {string} message
  * @returns {never}