Update to TypeScript 2.0

superpowers · Oct 29, 2016 · fc39b21 · fc39b21
1 parent f50b36d
commit fc39b21
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 21 deletions.
diff --git a/player/gulpfile.js b/player/gulpfile.js
@@ -2,7 +2,7 @@ var gulp = require("gulp");
 
 // TypeScript
 var ts = require("gulp-typescript");
-var tsProject = ts.createProject("src/tsconfig.json");
+var tsProject = ts.createProject("tsconfig.json");
 var tslint = require("gulp-tslint");
 
 gulp.task("typescript", function() {
@@ -11,17 +11,17 @@ gulp.task("typescript", function() {
     .pipe(tslint())
     .pipe(tslint.report("prose", { emitError: true }))
     .on("error", (err) => { throw err; })
-    .pipe(ts(tsProject))
+    .pipe(tsProject())
     .on("error", () => { failed = true; })
     .on("end", () => { if (failed) throw new Error("There were TypeScript errors."); });
-  return tsResult.js.pipe(gulp.dest("src/"));
+  return tsResult.js.pipe(gulp.dest("./"));
 });
 
 // Browserify
 var browserify = require("browserify");
 var source = require("vinyl-source-stream");
 gulp.task("browserify", [ "typescript" ],function() {
-  var bundler = browserify("./src/index.js");
+  var bundler = browserify("./index.js");
   function bundle() { return bundler.bundle().pipe(source("index.js")).pipe(gulp.dest("../public")); }
   return bundle();
 });

diff --git a/player/src/index.ts → player/index.ts b/player/src/index.ts → player/index.ts
@@ -1,9 +1,8 @@
-/// <reference path="../../../../typings/tsd.d.ts" />
-/// <reference path="../../../../SupClient/typings/SupApp.d.ts" />
+/// <reference path="../../../SupClient/typings/SupApp.d.ts" />
 
 import * as async from "async";
 import * as querystring from "querystring";
-import supFetch from "../../../../SupClient/src/fetch";
+import supFetch from "../../../SupClient/src/fetch";
 import * as path from "path";
 
 const statusElt = document.querySelector(".status") as HTMLDivElement;

diff --git a/player/src/tsconfig.json b/player/src/tsconfig.json
diff --git a/player/tsconfig.json b/player/tsconfig.json
@@ -0,0 +1,8 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "es5",
+    "noImplicitAny": true,
+    "typeRoots": [ "../../../node_modules/@types" ]
+  }
+}
diff --git a/plugins/common b/plugins/common
diff --git a/plugins/default/blob/tsconfig.json b/plugins/default/blob/tsconfig.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "module": "commonjs",
     "target": "es5",
-    "noImplicitAny": true
+    "noImplicitAny": true,
+    "typeRoots": [ "../../../../../node_modules/@types" ]
   }
 }
diff --git a/plugins/default/export/tsconfig.json b/plugins/default/export/tsconfig.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "module": "commonjs",
     "target": "es5",
-    "noImplicitAny": true
+    "noImplicitAny": true,
+    "typeRoots": [ "../../../../../node_modules/@types" ]
   }
 }
diff --git a/plugins/default/lua/tsconfig.json b/plugins/default/lua/tsconfig.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "module": "commonjs",
     "target": "es5",
-    "noImplicitAny": true
+    "noImplicitAny": true,
+    "typeRoots": [ "../../../../../node_modules/@types" ]
   }
 }
diff --git a/server/gulpfile.js b/server/gulpfile.js
@@ -13,7 +13,7 @@ gulp.task("typescript", function() {
     .pipe(tslint())
     .pipe(tslint.report("prose", { emitError: true }))
     .on("error", (err) => { throw err; })
-    .pipe(ts(tsProject))
+    .pipe(tsProject())
     .on("error", () => { failed = true; })
     .on("end", () => { if (failed) throw new Error("There were TypeScript errors."); });
   return tsResult.js.pipe(gulp.dest("./"));

diff --git a/server/index.d.ts b/server/index.d.ts
diff --git a/server/index.ts b/server/index.ts
@@ -1,3 +1,5 @@
+/// <reference path="../../../SupCore/SupCore.d.ts" />
+
 import * as fs from "fs";
 import * as async from "async";
 

diff --git a/server/tsconfig.json b/server/tsconfig.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "module": "commonjs",
     "target": "es5",
-    "noImplicitAny": true
+    "noImplicitAny": true,
+    "typeRoots": [ "../../../node_modules/@types" ]
   }
 }
+0 −1		documentation/index.d.ts
+3 −0		documentation/package.json
+2 −1		documentation/tsconfig.json
+0 −12		documentation/tsd.json
+0 −127		documentation/typings/marked/marked.d.ts
+0 −2		documentation/typings/tsd.d.ts
+18 −18		home/editors/main/index.ts
+10 −0		home/public/locales/it/home.json
+7 −0		home/public/locales/it/plugin.json
+10 −0		home/public/locales/ru/home.json
+7 −0		home/public/locales/ru/plugin.json
+2 −1		home/tsconfig.json
+7 −0		settings/public/locales/it/plugin.json
+6 −0		settings/public/locales/it/settingsEditors.json
+7 −0		settings/public/locales/ru/plugin.json
+6 −0		settings/public/locales/ru/settingsEditors.json
+2 −1		settings/tsconfig.json
+0 −2		textEditorWidget/index.d.ts
+2 −1		textEditorWidget/package.json
+2 −1		textEditorWidget/tsconfig.json
+0 −12		textEditorWidget/tsd.json
+0 −1,107		textEditorWidget/typings/codemirror/codemirror.d.ts
+0 −1		textEditorWidget/typings/tsd.d.ts
+1 −1		textEditorWidget/widget.d.ts
+2 −0		textEditorWidget/widget/widget.styl
+25 −21		textEditorWidget/widget/widget.ts
+1 −1		three/helpers.d.ts
+1 −3		three/helpers/GridHelper.ts
+1 −1		three/helpers/SelectionBoxRenderer.ts
+5 −6		three/helpers/TransformControls.ts
+0 −2		three/index.d.ts
+18 −11		three/main.d.ts
+2 −2		three/main/Camera.ts
+86 −18		three/main/Camera3DControls.ts
+3 −0		three/package.json
+2 −1		three/tsconfig.json
+0 −12		three/tsd.json
+0 −6,565		three/typings/threejs/three.d.ts
+0 −2		three/typings/tsd.d.ts