Update build script

rbuckton · rbuckton · commit 774ed0c47aa2 · 2018-01-23T10:27:20.000-08:00
diff --git 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
@@ -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
@@ -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
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,9 @@ namespace compiler {`
`233`	`233`	`vpath.combine(project, "tsconfig.json");`
`234`	`234`	`}`
`235`	`235`	`else {`
`236`		`- [project] = host.vfs.scanSync(".", "ancestors-or-self", { accept: (path, stats) => stats.isFile() && host.vfs.stringComparer(vpath.basename(path), "tsconfig.json") === 0 });`
	`236`	`+ [project] = host.vfs.scanSync(".", "ancestors-or-self", {`
	`237`	`+ accept: (path: string, stats: vfs.FileSystem) => stats.isFile() && host.vfs.stringComparer(vpath.basename(path), "tsconfig.json") === 0`
	`238`	`+ });`
`237`	`239`	`}`
`238`	`240`
`239`	`241`	`if (project) {`