Merge pull request #609 from palantir/next-2.5.0-dev.4

Prepare v2.5.0-dev.4 release

CHANGELOG.md

@@ -1,6 +1,10 @@
 Change Log
 ===
 
+v2.5.0-dev.4
+---
+* Upgrade TypeScript compiler to v1.6.0-dev.20150825
+
 v2.5.0-dev.3
 ---
 * Upgrade TypeScript compiler to v1.6.0-dev.20150821
@@ -15,6 +19,10 @@ v2.5.0-dev.1
 * Upgrade TypeScript compiler to v1.6.0-dev.20150805
 * [enhancement] Support `.tsx` syntax (#490)
 
+v2.4.4
+---
+* [bugfix] remove "typescript" block from package.json (#606)
+
 v2.4.3
 ---
 * [new-rule] `no-conditional-assignment` (#507)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tslint",
-  "version": "2.5.0-dev.3",
+  "version": "2.5.0-dev.4",
   "description": "a static analysis linter for TypeScript",
   "bin": {
     "tslint": "./bin/tslint"
@@ -35,7 +35,7 @@
     "grunt-ts": "^4.1.0",
     "grunt-tslint": "latest",
     "mocha": "^2.2.5",
-    "tslint": "^2.4.2",
+    "tslint": "latest",
     "typescript": "next"
   },
   "license": "Apache-2.0"

src/rules/tsconfig.json

@@ -70,4 +70,4 @@
         "./variableNameRule.ts",
         "./whitespaceRule.ts"
     ]
-}
+}

src/tslint.ts

@@ -33,7 +33,7 @@ module Lint {
     }
 
     export class Linter {
-        public static VERSION = "2.5.0-dev.3";
+        public static VERSION = "2.5.0-dev.4";
 
         private fileName: string;
         private source: string;

typings/typescriptServices.d.ts

@@ -1025,11 +1025,6 @@ declare namespace ts {
         emitSkipped: boolean;
         diagnostics: Diagnostic[];
     }
-    interface TypeCheckerHost {
-        getCompilerOptions(): CompilerOptions;
-        getSourceFiles(): SourceFile[];
-        getSourceFile(fileName: string): SourceFile;
-    }
     interface TypeChecker {
         getTypeOfSymbolAtLocation(symbol: Symbol, node: Node): Type;
         getDeclaredTypeOfSymbol(symbol: Symbol): Type;
@@ -1298,6 +1293,10 @@ declare namespace ts {
         Error = 1,
         Message = 2,
     }
+    const enum ModuleResolutionKind {
+        Classic = 1,
+        NodeJs = 2,
+    }
     interface CompilerOptions {
         allowNonTsExtensions?: boolean;
         charset?: string;
@@ -1321,6 +1320,7 @@ declare namespace ts {
         noLib?: boolean;
         noResolve?: boolean;
         out?: string;
+        outFile?: string;
         outDir?: string;
         preserveConstEnums?: boolean;
         project?: string;
@@ -1336,6 +1336,7 @@ declare namespace ts {
         experimentalDecorators?: boolean;
         experimentalAsyncFunctions?: boolean;
         emitDecoratorMetadata?: boolean;
+        moduleResolution?: ModuleResolutionKind;
         [option: string]: string | number | boolean;
     }
     const enum ModuleKind {
@@ -1513,6 +1514,9 @@ declare namespace ts {
     function findConfigFile(searchPath: string): string;
     function resolveTripleslashReference(moduleName: string, containingFile: string): string;
     function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModule;
+    function nodeModuleNameResolver(moduleName: string, containingFile: string, host: ModuleResolutionHost): ResolvedModule;
+    function baseUrlModuleNameResolver(moduleName: string, containingFile: string, baseUrl: string, host: ModuleResolutionHost): ResolvedModule;
+    function classicNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModule;
     function createCompilerHost(options: CompilerOptions, setParentNodes?: boolean): CompilerHost;
     function getPreEmitDiagnostics(program: Program, sourceFile?: SourceFile, cancellationToken?: CancellationToken): Diagnostic[];
     function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain, newLine: string): string;