diff --git a/.travis.yml b/.travis.yml index 31e170d403e..42b86fb0706 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,9 +25,9 @@ install: - npm uninstall tslint --no-save - npm install - if [ "$TRAVIS_NODE_VERSION" = "6" ]; then - npm uninstall typemock @typescript/vfs-om @typescript/vfs @typescript/vfs-path @typescript/vfs-core @typescript/vfs-errors --no-save; + npm uninstall typemock @typescript/vfs @typescript/vfs-path @typescript/vfs-core @typescript/vfs-errors --no-save; npm run build:private-packages; - npm install file:scripts/typemock file:scripts/vfs-om file:scripts/vfs file:scripts/vfs-path --no-save; + npm install file:scripts/typemock file:scripts/vfs file:scripts/vfs-path --no-save; fi cache: diff --git a/jenkins.sh b/jenkins.sh index 24f858dea53..ef9f9535c6f 100755 --- a/jenkins.sh +++ b/jenkins.sh @@ -12,9 +12,9 @@ npm install # Node 6 uses an older version of npm that does not symlink a package with a "file:" reference if [ "$1" = "6" ]; then - npm uninstall typemock @typescript/vfs-om @typescript/vfs @typescript/vfs-path @typescript/vfs-core @typescript/vfs-errors --no-save; + npm uninstall typemock @typescript/vfs @typescript/vfs-path @typescript/vfs-core @typescript/vfs-errors --no-save; npm run build:private-packages; - npm install file:scripts/typemock file:scripts/vfs-om file:scripts/vfs file:scripts/vfs-path --no-save; + npm install file:scripts/typemock file:scripts/vfs file:scripts/vfs-path --no-save; fi npm update diff --git a/src/harness/compiler.ts b/src/harness/compiler.ts index b28b1b01a91..00647dccf20 100644 --- a/src/harness/compiler.ts +++ b/src/harness/compiler.ts @@ -233,7 +233,9 @@ namespace compiler { vpath.combine(project, "tsconfig.json"); } else { - [project] = host.vfs.scanSync(".", "ancestors-or-self", { accept: (path, stats) => stats.isFile() && host.vfs.stringComparer(vpath.basename(path), "tsconfig.json") === 0 }); + [project] = host.vfs.scanSync(".", "ancestors-or-self", { + accept: (path: string, stats: vfs.FileSystem) => stats.isFile() && host.vfs.stringComparer(vpath.basename(path), "tsconfig.json") === 0 + }); } if (project) { diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts index 7ad66449efe..af14f2c2f8f 100644 --- a/src/harness/harnessLanguageService.ts +++ b/src/harness/harnessLanguageService.ts @@ -131,7 +131,7 @@ namespace Harness.LanguageService { public getFilenames(): string[] { const fileNames: string[] = []; this.vfs.scanSync("/", "descendants-or-self", { - accept: (path, stats) => { + accept: (path: string, stats: vfs.FileSystem) => { if (stats.isFile()) { const scriptInfo = this.vfs.filemeta(path).get("scriptInfo") as ScriptInfo; if (scriptInfo && scriptInfo.isRootFile) {