Merge branch 'master' of github.com:Microsoft/TypeScript

weswigham · weswigham · commit 0b12e9dc0189 · 2018-09-26T16:37:03.000-07:00
diff --git a/tests/projects/empty-files/core/tsconfig.json b/tests/projects/empty-files/core/tsconfig.json
@@ -2,6 +2,7 @@
     "compilerOptions": {
         "composite": true,
         "declaration": true,
-        "declarationMap": true
+        "declarationMap": true,
+        "skipDefaultLibCheck": true
     }
 }
diff --git a/tests/projects/empty-files/no-references/tsconfig.json b/tests/projects/empty-files/no-references/tsconfig.json
@@ -4,6 +4,7 @@
     "compilerOptions": {
         "composite": true,
         "declaration": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "skipDefaultLibCheck": true
     }
 }
diff --git a/tests/projects/empty-files/with-references/tsconfig.json b/tests/projects/empty-files/with-references/tsconfig.json
@@ -6,6 +6,7 @@
     "compilerOptions": {
         "composite": true,
         "declaration": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "skipDefaultLibCheck": true
     }
 }
diff --git a/tests/projects/outfile-concat/first/tsconfig.json b/tests/projects/outfile-concat/first/tsconfig.json
@@ -6,7 +6,8 @@
     "strict": false,
     "sourceMap": true,
     "declarationMap": true,
-    "outFile": "./bin/first-output.js"
+    "outFile": "./bin/first-output.js",
+    "skipDefaultLibCheck": true
   },
   "files": [
     "first_PART1.ts",
diff --git a/tests/projects/outfile-concat/second/tsconfig.json b/tests/projects/outfile-concat/second/tsconfig.json
@@ -7,7 +7,8 @@
     "sourceMap": true,
     "declarationMap": true,
     "declaration": true,
-    "outFile": "../2/second-output.js"
+    "outFile": "../2/second-output.js",
+    "skipDefaultLibCheck": true
   },
   "references": [
   ]
diff --git a/tests/projects/outfile-concat/third/tsconfig.json b/tests/projects/outfile-concat/third/tsconfig.json
@@ -7,7 +7,8 @@
     "sourceMap": true,
     "declarationMap": true,
     "declaration": true,
-    "outFile": "./thirdjs/output/third-output.js"
+    "outFile": "./thirdjs/output/third-output.js",
+    "skipDefaultLibCheck": true
   },
   "files": [
     "third_part1.ts"
diff --git a/tests/projects/projectReferenceWithRootDirInParent/tsconfig.base.json b/tests/projects/projectReferenceWithRootDirInParent/tsconfig.base.json
@@ -3,7 +3,8 @@
     "composite": true,
     "declaration": true,
     "rootDir": "./src/",
-    "outDir": "./dist/"
+    "outDir": "./dist/",
+    "skipDefaultLibCheck": true
   },
   "exclude": [
     "node_modules"
diff --git a/tests/projects/resolveJsonModuleAndComposite/tests/tsconfig_withFiles.json b/tests/projects/resolveJsonModuleAndComposite/tests/tsconfig_withFiles.json
@@ -7,7 +7,8 @@
     "resolveJsonModule": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
-    "outDir": "dist"
+    "outDir": "dist",
+    "skipDefaultLibCheck": true
   },
   "files": [
     "src/index.ts", "src/hello.json"
diff --git a/tests/projects/resolveJsonModuleAndComposite/tests/tsconfig_withInclude.json b/tests/projects/resolveJsonModuleAndComposite/tests/tsconfig_withInclude.json
@@ -7,7 +7,8 @@
     "resolveJsonModule": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
-    "outDir": "dist"
+    "outDir": "dist",
+    "skipDefaultLibCheck": true
   },
   "include": [
     "src/**/*"
diff --git a/tests/projects/resolveJsonModuleAndComposite/tests/tsconfig_withIncludeAndFiles.json b/tests/projects/resolveJsonModuleAndComposite/tests/tsconfig_withIncludeAndFiles.json
@@ -7,7 +7,8 @@
     "resolveJsonModule": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
-    "outDir": "dist"
+    "outDir": "dist",
+    "skipDefaultLibCheck": true
   },
   "files": [
     "src/hello.json"
diff --git a/tests/projects/sample1/core/tsconfig.json b/tests/projects/sample1/core/tsconfig.json
@@ -2,6 +2,7 @@
     "compilerOptions": {
         "composite": true,
         "declaration": true,
-        "declarationMap": true
+        "declarationMap": true,
+        "skipDefaultLibCheck": true
     }
 }
diff --git a/tests/projects/sample1/logic/tsconfig.json b/tests/projects/sample1/logic/tsconfig.json
@@ -3,7 +3,8 @@
         "composite": true,
         "declaration": true,
         "sourceMap": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "skipDefaultLibCheck": true
     },
     "references": [
         { "path": "../core" }
diff --git a/tests/projects/sample1/tests/tsconfig.json b/tests/projects/sample1/tests/tsconfig.json
@@ -7,6 +7,7 @@
     "compilerOptions": {
         "composite": true,
         "declaration": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "skipDefaultLibCheck": true
     }
 }
diff --git a/tests/projects/sample1/ui/tsconfig.json b/tests/projects/sample1/ui/tsconfig.json
@@ -1,4 +1,7 @@
 {
+    "compilerOptions": {
+        "skipDefaultLibCheck": true
+    },
     "references": [
         { "path": "../logic/index" }
     ]

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`"compilerOptions": {`
`3`	`3`	`"composite": true,`
`4`	`4`	`"declaration": true,`
`5`		`- "declarationMap": true`
	`5`	`+ "declarationMap": true,`
	`6`	`+ "skipDefaultLibCheck": true`
`6`	`7`	`}`
`7`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`"compilerOptions": {`
`5`	`5`	`"composite": true,`
`6`	`6`	`"declaration": true,`
`7`		`- "forceConsistentCasingInFileNames": true`
	`7`	`+ "forceConsistentCasingInFileNames": true,`
	`8`	`+ "skipDefaultLibCheck": true`
`8`	`9`	`}`
`9`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`"compilerOptions": {`
`7`	`7`	`"composite": true,`
`8`	`8`	`"declaration": true,`
`9`		`- "forceConsistentCasingInFileNames": true`
	`9`	`+ "forceConsistentCasingInFileNames": true,`
	`10`	`+ "skipDefaultLibCheck": true`
`10`	`11`	`}`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`"compilerOptions": {`
`8`	`8`	`"composite": true,`
`9`	`9`	`"declaration": true,`
`10`		`- "forceConsistentCasingInFileNames": true`
	`10`	`+ "forceConsistentCasingInFileNames": true,`
	`11`	`+ "skipDefaultLibCheck": true`
`11`	`12`	`}`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
`1`	`1`	`{`
	`2`	`+ "compilerOptions": {`
	`3`	`+ "skipDefaultLibCheck": true`
	`4`	`+ },`
`2`	`5`	`"references": [`
`3`	`6`	`{ "path": "../logic/index" }`
`4`	`7`	`]`