Skip to content

Commit

Permalink
chore(typings): Removed typings and added @types instead
Browse files Browse the repository at this point in the history
  • Loading branch information
dotansimha committed Oct 15, 2016
1 parent f6eece6 commit ccb5346
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 18 deletions.
9 changes: 4 additions & 5 deletions package.json
Expand Up @@ -4,15 +4,13 @@
"scripts": {
"start": "meteor run",
"test": "meteor test --driver-package practicalmeteor:mocha",
"test:ci": "meteor test --once --driver-package dispatch:mocha-phantomjs",
"postinstall": "typings i"
"test:ci": "meteor test --once --driver-package dispatch:mocha-phantomjs"
},
"devDependencies": {
"@types/chai": "^3.4.33",
"@types/mocha": "^2.2.32",
"chai": "3.5.0",
"chai-spies": "0.7.1",
"typings": "^1.3.3"
"chai-spies": "0.7.1"
},
"dependencies": {
"@angular/common": "2.1.0",
Expand All @@ -29,6 +27,7 @@
"meteor-rxjs": "0.3.0",
"reflect-metadata": "0.1.8",
"rxjs": "5.0.0-beta.12",
"zone.js": "0.6.25"
"zone.js": "0.6.25",
"meteor-typings": "^1.3.0"
}
}
14 changes: 12 additions & 2 deletions tsconfig.json
@@ -1,7 +1,10 @@
{
"compilerOptions": {
"target": "es5",
"lib": ["es6", "dom"],
"lib": [
"es6",
"dom"
],
"module": "commonjs",
"moduleResolution": "node",
"experimentalDecorators": true,
Expand All @@ -11,5 +14,12 @@
"exclude": [
"node_modules"
],
"compileOnSave": false
"files": [
"typings.d.ts"
],
"compileOnSave": false,
"angularCompilerOptions": {
"genDir": "aot",
"skipMetadataEmit": true
}
}
7 changes: 6 additions & 1 deletion typings.d.ts
@@ -1,3 +1,7 @@
/// <reference types="zone.js" />
/// <reference types="meteor-typings" />
/// <reference types="@types/underscore" />

declare module '*.html' {
const template: string;
export default template;
Expand All @@ -21,4 +25,5 @@ declare module '*.css' {
declare module '*.sass' {
const style: string;
export default style;
}
}

10 changes: 0 additions & 10 deletions typings.json

This file was deleted.

0 comments on commit ccb5346

Please sign in to comment.