From f03996dad65281fbb64b7b8ab31d279d7b332a22 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 13 May 2016 14:42:14 +0200 Subject: [PATCH] Fix some typescript compilations issues --- client/.gitignore | 1 - .../components/watch/videos-watch.component.ts | 2 +- client/typings/typings.d.ts | 13 ------------- scripts/danger/clean/modules.sh | 2 +- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/client/.gitignore b/client/.gitignore index 24129f7c5..0ab218d71 100644 --- 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 6ac2787ed..3d1829b99 100644 --- 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 579c9a586..e69de29bb 100644 --- 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 d357e1b77..1aa6c732b 100755 --- 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