Fix some typescript compilations issues

diff --git a/client/.gitignore b/client/.gitignore
index 24129f7c5812f05e51afde3c175f6a24b011102d..0ab218d7183c25806f52edb6ee412e23ece66143 100644 (file)
--- a/client/.gitignore
+++ b/client/.gitignore
@@ -1,5 +1,4 @@
 typings
-!typings/typings.d.ts
 angular/**/*.js
 angular/**/*.map
 angular/**/*.css

diff --git a/client/angular/videos/components/watch/videos-watch.component.ts b/client/angular/videos/components/watch/videos-watch.component.ts
index 6ac2787ed8257fd57696e0c98d858047ec123e1e..3d1829b99047fb057cad6ce60412aaaa59d7846c 100644 (file)
--- a/client/angular/videos/components/watch/videos-watch.component.ts
+++ b/client/angular/videos/components/watch/videos-watch.component.ts
@@ -22,7 +22,7 @@ export class VideosWatchComponent implements OnInit, CanDeactivate {
   numPeers: number;
   loading: boolean = false;
 
-  private _interval: number;
+  private _interval: NodeJS.Timer;
   private client: any;
 
   constructor(

diff --git a/client/typings/typings.d.ts b/client/typings/typings.d.ts
index 579c9a586cd9bf1320acd917849162dc8e958501..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/client/typings/typings.d.ts
+++ b/client/typings/typings.d.ts
@@ -1,13 +0,0 @@
-/**
- * Declares the 'commonjs' format module object that identifies the "module id" for the current module.
- * Set a component's `moduleId` metadata property to `module.id` for module-relative urls
- * when the generated module format is 'commonjs'.
- */
-declare var module: {id: string};
-
-/**
- * Declares the 'system' format string that identifies the "module id" for the current module.
- * Set a component's `moduleId` metadata property to `__moduleName` for module-relative urls
- * when the generated module format is 'system'.
- */
-declare var __moduleName: string;

diff --git a/scripts/danger/clean/modules.sh b/scripts/danger/clean/modules.sh
index d357e1b77f53ccdab295591216afe83748d1869f..1aa6c732b9cbc7eb05ec58dd73bdb17657447fa4 100755 (executable)
--- a/scripts/danger/clean/modules.sh
+++ b/scripts/danger/clean/modules.sh
@@ -3,5 +3,5 @@
 read -p "This will remove all node and typescript modules. Are you sure? " -n 1 -r
 
 if [[ "$REPLY" =~ ^[Yy]$ ]]; then
-  rm -rf node_modules client/node_modules client/typings/{browser,main}*
+  rm -rf node_modules client/node_modules client/typings
 fi