Remove the files entry from the tsconfig.json

PanayotCankov · PanayotCankov · commit 940174b20814 · 2016-06-13T14:04:42.000+03:00
diff --git a/apps/perf-tests/controls-page.ts b/apps/perf-tests/controls-page.ts
@@ -1,3 +1,6 @@
+// When there are both <file>.d.ts and <file>.ts, The default TypeScript file resolution will ignore the .d.ts
+/// <reference path="controls-page.d.ts" />
+
 import definition = require("controls-page");
 import pagesModule = require("ui/page");
 import stackLayoutModule = require("ui/layouts/stack-layout");
diff --git a/build/tsc-dev.js b/build/tsc-dev.js
@@ -110,20 +110,14 @@ function compile(fileNames, options) {
     console.log("Process exiting with code " + exitCode + ".");
     process.exit(exitCode);
 }
-var files = JSON.parse(fs.readFileSync("./tsconfig.json")).files;
-var options = {
-    noEmitOnError: true,
-    noEmitHelpers: true,
-    target: ts.ScriptTarget.ES5,
-    module: ts.ModuleKind.CommonJS,
-    declaration: false,
-    noImplicitAny: false,
-    noImplicitUseStrict: true,
-    experimentalDecorators: true
-};
+// Perhaps on file change before incremental compilation we should read the tsconfig.json again.
+var configFileName = path.resolve("tsconfig.json");
+var configObject = JSON.parse(fs.readFileSync("./tsconfig.json"));
+var configParseResult = ts.parseJsonConfigFileContent(configObject, ts.sys, path.dirname(configFileName));
+configParseResult.fileNames.forEach(console.log);
 if (isTranspile) {
-    transpile(files, { module: ts.ModuleKind.CommonJS, noImplicitUseStrict: true });
+    transpile(configParseResult.fileNames, configParseResult.options);
 }
 else {
-    compile(files, options);
+    compile(configParseResult.fileNames, configParseResult.options);
 }
diff --git a/build/tsc-dev.ts b/build/tsc-dev.ts
@@ -70,6 +70,8 @@ function transpile(fileNames: string[], options: ts.CompilerOptions) {
     console.timeEnd("transpile");
     
     if (isWatching) {
+        // NOTE: Perhaps on file change before incremental compilation we should read the tsconfig.json again and update only tsconfig.json files.
+
         console.log("Watching for changes...");
         fs.watch(".", { persistent: true, recursive: true, encoding: "utf8" }, (event, file) => {
             try {
@@ -132,19 +134,13 @@ function compile(fileNames: string[], options: ts.CompilerOptions) {
     process.exit(exitCode);
 }
 
-var files = JSON.parse(fs.readFileSync("./tsconfig.json")).files;
-var options: ts.CompilerOptions = {
-    noEmitOnError: true,
-    noEmitHelpers: true,
-    target: ts.ScriptTarget.ES5,
-    module: ts.ModuleKind.CommonJS,
-    declaration: false,
-    noImplicitAny: false,
-    noImplicitUseStrict: true,
-    experimentalDecorators: true
-};
+var configFileName = path.resolve("tsconfig.json");
+var configObject = JSON.parse(fs.readFileSync("./tsconfig.json"));
+var configParseResult = ts.parseJsonConfigFileContent(configObject, ts.sys, path.dirname(configFileName));
+
 if (isTranspile) {
-    transpile(files, { module: ts.ModuleKind.CommonJS, noImplicitUseStrict: true });
+    transpile(configParseResult.fileNames, configParseResult.options);
 } else {
-    compile(files, options);
+    compile(configParseResult.fileNames, configParseResult.options);
 }
+
diff --git a/gruntfile.js b/gruntfile.js
@@ -160,7 +160,17 @@ module.exports = function(grunt) {
     localCfg.mainPackageContent = grunt.file.readJSON(localCfg.packageJsonFilePath);
     localCfg.packageVersion = getPackageVersion(localCfg.packageJsonFilePath);
     localCfg.commitSHA = getCommitSha();
-    localCfg.typeScriptSrc = tsconfig.filesGlob;
+    localCfg.typeScriptSrc = [
+        "**/*.ts",
+        "!node_modules/**/*.*",
+        "!tests/node_modules/**/*.*",
+        "!bin/**/*.*",
+        "!build/**/*.*",
+        "!Deploy/**/*.*",
+        "!out/**/*.*",
+        "!.*/**/*.*",
+        "!obj/**/*.*"
+    ];
     localCfg.defaultExcludes = localCfg.typeScriptSrc.filter(function(item) { return /^!/.test(item); });
     localCfg.typeScriptSrcForTsLint = localCfg.typeScriptSrc.concat([
         "!tns-core-modules/ios.d.ts",
@@ -399,7 +409,9 @@ module.exports = function(grunt) {
                     'tns-core-modules/module.d.ts',
                     'tns-core-modules/xml/**/*.ts',
                     'tns-core-modules/es-collections.d.ts',
-                    'node-tests/**/*.ts',
+                    'tns-core-modules/declarations.d.ts',
+                    'tns-core-modules/es6-promise.d.ts',
+                    'node-tests/**/*.ts'
                 ],
                 outDir: localCfg.outDir,
                 dest: localCfg.outDir,
diff --git a/node-tests/node-shims.ts b/node-tests/node-shims.ts
diff --git a/tsconfig.json b/tsconfig.json
