Merge pull request #47 from larsendaniel/feature/typescript2.0

Feature/typescript2.0

Author: leakymemory

README.md

@@ -15,19 +15,13 @@ From the root of this project, run:
 $ npm install
 ```
 
-### 4. Setup the external d.ts files and link the non-published npm packages
-From the root of this project, run:
-```sh
-$ gulp setup
-```
-
-### 5. Build and Test
+### 4. Build and Test
 The default gulp command is to build and test:
 ```sh
 $ gulp
 ```
  - Compiles LESS and TypeScript into /build
- - Bundles the JavaScript modules together into /bundle
+ - Bundles the JavaScript modules together into /build/bundles
  - Exports all the needed files to /target
 
 ## Congratulations!
@@ -41,3 +35,8 @@ $ gulp clean
 ```
 Removes all of the generated files from `build`
 
+#### Gulp watch
+```sh
+$ gulp watch
+```
+Automatically rebuilds the project when files are saved

WebClipper.csproj

@@ -13,7 +13,7 @@
     <Content Include="serverRoot\server.js" />
     <Content Include="src\**\*" Exclude="src\**\*.ts*" />
     <TypeScriptCompile Include="src\**\*.ts*" />
-    <TypeScriptCompile Include="typings\main\**\*.d.ts" />
+    <TypeScriptCompile Include="node_modules\@types\**\*.d.ts*" />
   </ItemGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <TypeScriptCompileOnSaveEnabled>False</TypeScriptCompileOnSaveEnabled>

WebClipper.sln

@@ -1,20 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebClipper", "WebClipper.csproj", "{CEC9A52E-3052-4CB5-8644-9D0C1F346E35}"
-	ProjectSection(ProjectDependencies) = postProject
-		{523C9308-B7F5-4C53-8A33-FCA2F34F6AE3} = {523C9308-B7F5-4C53-8A33-FCA2F34F6AE3}
-		{0923A3FD-7F48-4E89-827B-2035750EB8E7} = {0923A3FD-7F48-4E89-827B-2035750EB8E7}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneNoteApi", "..\OneNoteApi\OneNoteApi.csproj", "{523C9308-B7F5-4C53-8A33-FCA2F34F6AE3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneNotePicker-JS", "..\OneNotePicker-JS\OneNotePicker-JS.csproj", "{0923A3FD-7F48-4E89-827B-2035750EB8E7}"
-	ProjectSection(ProjectDependencies) = postProject
-		{523C9308-B7F5-4C53-8A33-FCA2F34F6AE3} = {523C9308-B7F5-4C53-8A33-FCA2F34F6AE3}
-	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -23,10 +12,6 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{CEC9A52E-3052-4CB5-8644-9D0C1F346E35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CEC9A52E-3052-4CB5-8644-9D0C1F346E35}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{523C9308-B7F5-4C53-8A33-FCA2F34F6AE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{523C9308-B7F5-4C53-8A33-FCA2F34F6AE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0923A3FD-7F48-4E89-827B-2035750EB8E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0923A3FD-7F48-4E89-827B-2035750EB8E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

WebClipper.sln.DotSettings

@@ -3,7 +3,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=523C9308_002DB7F5_002D4C53_002D8A33_002DFCA2F34F6AE3_002Fd_003Asrc_002Ff_003AoneNoteApi_002Emodules_002Ed_002Ets/@EntryIndexedValue">ExplicitlyExcluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=0923A3FD_002D7F48_002D4E89_002D827B_002D2035750EB8E7_002Fd_003Asrc_002Ff_003AoneNotePicker_002Ed_002Ets/@EntryIndexedValue">ExplicitlyExcluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/AnalysisEnabled/@EntryValue">SOLUTION</s:String>
-	<s:String x:Key="/Default/CodeInspection/TypeScriptInspections/Level/@EntryValue">TypeScript16</s:String>
+	<s:String x:Key="/Default/CodeInspection/TypeScriptInspections/Level/@EntryValue">TypeScript20</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/FORCE_CONTROL_STATEMENTS_BRACES/@EntryValue">ALWAYS_ADD</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/INDENT_CASE_FROM_SWITCH/@EntryValue">True</s:Boolean>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/KEEP_BLANK_LINES_BETWEEN_DECLARATIONS/@EntryValue">1</s:Int64>
@@ -12,7 +12,9 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/SINGLE_STATEMENT_FUNCTION_STYLE/@EntryValue">LINE_BREAK</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/SPACE_WITHIN_EMPTY_OBJECT_LITERAL_BRACES/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FCONSTANT/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FCLASS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FCONSTRUCTOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FGLOBAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>

gulpfile.js

@@ -25,12 +25,9 @@ var shell = require("gulp-shell");
 var source = require("vinyl-source-stream");
 var ts = require("gulp-typescript");
 var tslint = require("gulp-tslint");
-var typings = require("gulp-typings");
 var uglify = require("gulp-uglify");
 var zip = require("gulp-zip");
 
-var tsProject = ts.createProject("./tsconfig.json");
-
 var PATHS = {
 	SRC: {
 		ROOT: "src/",
@@ -39,7 +36,6 @@ var PATHS = {
 	BUILDROOT: "build/",
 	BUNDLEROOT: "build/bundles/",
 	LIBROOT: "lib/",
-	DEFINITIONS: "typings/",
 	SERVERROOT: "serverRoot/root/",
 	TARGET: {
 		ROOT: "target/",
@@ -70,27 +66,6 @@ function printGlobResults(glob) {
 	});
 }
 
-////////////////////////////////////////
-// SETUP
-////////////////////////////////////////
-gulp.task("cleanDefinitions", function(callback) {
-	return del([
-		PATHS.DEFINITIONS
-	], callback);
-});
-
-gulp.task("definitions", function() {
-	return gulp.src("./typings.json")
-		.pipe(typings());
-});
-
-gulp.task("setup", function(callback) {
-	runSequence(
-		"cleanDefinitions",
-		"definitions",
-		callback);
-});
-
 ////////////////////////////////////////
 // CLEAN
 ////////////////////////////////////////
@@ -187,8 +162,8 @@ gulp.task("preCompileInternal", function (callback) {
 });
 
 gulp.task("compileTypeScript", ["copyStrings", "mergeSettings", "preCompileInternal"], function () {
-	return gulp.src([PATHS.SRC.ROOT + "**/*.+(ts|tsx)", PATHS.DEFINITIONS + "main/**/*.d.ts"])
-		.pipe(ts(tsProject))
+	return gulp.src([PATHS.SRC.ROOT + "**/*.+(ts|tsx)"])
+		.pipe(ts(ts.createProject("./tsconfig.json", { typescript: require('typescript') })))
 		.pipe(gulp.dest(PATHS.BUILDROOT));
 });
 

package.json

@@ -11,6 +11,18 @@
     "url": "git+https://github.com/OneNoteDev/WebClipper.git"
   },
   "devDependencies": {
+    "@types/chrome": "0.0.33",
+    "@types/es6-promise": "0.0.32",
+    "@types/jquery": "^2.0.32",
+    "@types/mithril": "0.0.31",
+    "@types/pdf": "0.0.31",
+    "@types/qunit": "^1.16.30",
+    "@types/rangy": "0.0.27",
+    "@types/safari-extension": "0.0.27",
+    "@types/sanitize-html": "^1.13.31",
+    "@types/sinon": "^1.16.30",
+    "@types/urijs": "^1.15.30",
+    "@types/velocity-animate": "^1.2.27",
     "browserify": "^13.0.0",
     "del": "^2.0.2",
     "es5-shim": "^4.5.8",
@@ -31,7 +43,6 @@
     "gulp-shell": "^0.5.1",
     "gulp-tslint": "^5.0.0",
     "gulp-typescript": "^2.13.6",
-    "gulp-typings": "~1.1.0",
     "gulp-uglify": "^1.5.3",
     "gulp-zip": "^3.2.0",
     "json3": "^3.3.2",
@@ -49,7 +60,7 @@
     "sinon-qunit": "^2.0.0",
     "ssl-root-cas": "^1.1.10",
     "tslint": "^3.9.0",
-    "typings": "~0.6.8",
+    "typescript": "^2.0.3",
     "urijs": "^1.18.1",
     "velocity-animate": "^1.2.3",
     "vinyl-source-stream": "^1.1.0",

src/scripts/clipperUI/animations/animationHelper.ts

@@ -1,4 +1,3 @@
-/// <reference path="../../../../typings/main/ambient/velocity-animate/velocity-animate.d.ts"/>
 declare var Velocity: jquery.velocity.VelocityStatic;
 
 export class AnimationHelper {

src/scripts/clipperUI/animations/expandFromRightAnimationStrategy.ts

@@ -1,4 +1,3 @@
-/// <reference path="../../../../typings/main/ambient/velocity-animate/velocity-animate.d.ts"/>
 declare var Velocity: jquery.velocity.VelocityStatic;
 
 import {Constants} from "../../constants";

src/scripts/clipperUI/animations/slideFromRightAnimationStrategy.ts

@@ -1,4 +1,3 @@
-/// <reference path="../../../../typings/main/ambient/velocity-animate/velocity-animate.d.ts"/>
 declare var Velocity: jquery.velocity.VelocityStatic;
 
 import {AnimationState} from "./animationState";

src/scripts/clipperUI/animations/slidingHeightAnimationStrategy.ts

@@ -1,4 +1,3 @@
-/// <reference path="../../../../typings/main/ambient/velocity-animate/velocity-animate.d.ts"/>
 declare var Velocity: jquery.velocity.VelocityStatic;
 
 import {Constants} from "../../constants";