diff --git a/Gulpfile.js b/Gulpfile.js index 6dc97369b3f15..edf1cebb00c6c 100644 --- a/Gulpfile.js +++ b/Gulpfile.js @@ -19,6 +19,7 @@ const cmdLineOptions = require("./scripts/build/options"); const copyright = "CopyrightNotice.txt"; const testRoot = "built/local/testRunner/Harness.js"; +//!!! const testRoot = "built/local/run.js"; const cleanTasks = []; const buildScripts = () => buildProject("scripts"); @@ -126,6 +127,7 @@ const localPreBuild = parallel(generateLibs, series(buildScripts, generateDiagno const preBuild = cmdLineOptions.lkg ? lkgPreBuild : localPreBuild; const buildServices = (() => { + return cb => { console.log("!!!TODO!!! buildServices"); cb(); }; // build typescriptServices.out.js const buildTypescriptServicesOut = () => buildProject("src/typescriptServices/tsconfig.json", cmdLineOptions); @@ -250,6 +252,7 @@ task("watch-min").flags = { }; const buildLssl = (() => { + return cb => { console.log("!!!TODO!!! buildLssl"); cb(); }; // build tsserverlibrary.out.js const buildServerLibraryOut = () => buildProject("src/tsserverlibrary/tsconfig.json", cmdLineOptions); diff --git a/package.json b/package.json index aafbd543bf869..ab184263d642b 100644 --- a/package.json +++ b/package.json @@ -66,6 +66,7 @@ "convert-source-map": "latest", "del": "5.1.0", "diff": "^4.0.2", + "esbuild": "^0.13.8", "eslint": "7.12.1", "eslint-formatter-autolinkable-stylish": "1.1.4", "eslint-plugin-import": "2.22.1", diff --git a/scripts/bisect-test.ts b/scripts/bisect-test.ts index a3e48b29a81f5..52668a849a9a5 100644 --- a/scripts/bisect-test.ts +++ b/scripts/bisect-test.ts @@ -1,3 +1,5 @@ +//!!! should this be updated or removed? + /** * You should have ts-node installed globally before executing this, probably! * Otherwise you'll need to compile this script before you start bisecting! diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts index 52c66627d9f4c..c529aa0aa111a 100644 --- a/src/compiler/sys.ts +++ b/src/compiler/sys.ts @@ -1248,7 +1248,7 @@ export let sys: System = (() => { } }, getExecutingFilePath() { - return __filename; + return __filename; //!!! }, getCurrentDirectory, getDirectories, diff --git a/src/harness/virtualFileSystemWithWatch.ts b/src/harness/virtualFileSystemWithWatch.ts index e384190a780ff..6fdd6e41a4ed5 100644 --- a/src/harness/virtualFileSystemWithWatch.ts +++ b/src/harness/virtualFileSystemWithWatch.ts @@ -29,7 +29,7 @@ export const safeList = { }) }; -function getExecutingFilePathFromLibFile(): string { +function getExecutingFilePathFromLibFile(): string { //!!! return combinePaths(getDirectoryPath(libFile.path), "tsc.js"); } diff --git a/src/server/project.ts b/src/server/project.ts index f8723c646a5c5..b80f72fe09862 100644 --- a/src/server/project.ts +++ b/src/server/project.ts @@ -1493,8 +1493,8 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo // Search any globally-specified probe paths, then our peer node_modules const searchPaths = [ ...this.projectService.pluginProbeLocations, - // ../../.. to walk from X/node_modules/typescript/lib/tsserver.js to X/node_modules/ - combinePaths(this.projectService.getExecutingFilePath(), "../../.."), + // ../../.. to walk from X/node_modules/typescript/lib/tsserver.js to X/node_modules/ //!!! + combinePaths(this.projectService.getExecutingFilePath(), "../../.."), //!!! ]; if (this.projectService.globalPlugins) { @@ -2171,8 +2171,8 @@ export class ConfiguredProject extends Project { } // Search our peer node_modules, then any globally-specified probe paths - // ../../.. to walk from X/node_modules/typescript/lib/tsserver.js to X/node_modules/ - const searchPaths = [combinePaths(this.projectService.getExecutingFilePath(), "../../.."), ...this.projectService.pluginProbeLocations]; + // ../../.. to walk from X/node_modules/typescript/lib/tsserver.js to X/node_modules/ //!!! + const searchPaths = [combinePaths(this.projectService.getExecutingFilePath(), "../../.."), ...this.projectService.pluginProbeLocations]; //!!! if (this.projectService.allowLocalPluginLoads) { const local = getDirectoryPath(this.canonicalConfigFilePath); diff --git a/tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts b/tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts index 4cb9c6cb75dc8..1f0db4ff6795f 100644 --- a/tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts +++ b/tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts @@ -37,7 +37,7 @@ function filePath(fullPath: string) { return path.join("/") + "/"; } -var typescriptServiceFileName = filePath(IO.getExecutingFilePath()) + "typescriptServices.js"; +var typescriptServiceFileName = filePath(IO.getExecutingFilePath()) + "typescriptServices.js"; //!!! var typescriptServiceFile = IO.readFile(typescriptServiceFileName); if (typeof ActiveXObject === "function") { eval(typescriptServiceFile);