Skip to content

Commit

Permalink
fix(npm): revert to typescript 1.8.10 from 2.0 to avoid typings issues
Browse files Browse the repository at this point in the history
  • Loading branch information
ocombe committed Aug 12, 2016
1 parent 0413e7f commit 822edd6
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 38 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ coverage
*.d.ts
!make.js
!bundles/*.js
typings

#################
## JetBrains
Expand Down
2 changes: 2 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ coverage
*.ts
!*.d.ts
tests
typings
typings.json

#################
## JetBrains
Expand Down
5 changes: 4 additions & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@ module.exports = function(config) {
},

typescriptPreprocessor: {
options: require('./tsconfig.json').compilerOptions
options: require('./tsconfig.json').compilerOptions,
typings: [
"typings/index.d.ts"
]
},

// test results reporter to use
Expand Down
13 changes: 5 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"test": "tsc && karma start",
"test-watch": "tsc && karma start --no-single-run --auto-watch",
"commit": "npm run prepublish && npm test && git-cz",
"prepublish": "tsc && node make.js",
"prepublish": "typings install && tsc && node make.js",
"semantic-release": "semantic-release pre && npm publish && semantic-release post"
},
"repository": {
Expand All @@ -24,11 +24,11 @@
"url": "https://github.com/ocombe/ng2-translate/issues"
},
"main": "ng2-translate.js",
"typings": "./ng2-translate.d.ts",
"homepage": "https://github.com/ocombe/ng2-translate",
"peerDependencies": {
"@angular/core": "^2.0.0-rc.5",
"@angular/http": "^2.0.0-rc.5",
"es6-shim": "^0.35.0"
"@angular/http": "^2.0.0-rc.5"
},
"devDependencies": {
"@angular/common": "^2.0.0-rc.5",
Expand All @@ -37,10 +37,6 @@
"@angular/http": "^2.0.0-rc.5",
"@angular/platform-browser": "^2.0.0-rc.5",
"@angular/platform-browser-dynamic": "^2.0.0-rc.5",
"@types/es6-shim": "0.0.29",
"@types/hammerjs": "^2.0.30",
"@types/jasmine": "^2.2.31",
"@types/node": "^6.0.33",
"commitizen": "~2.5.0",
"cz-conventional-changelog": "~1.1.4",
"es6-promise": "^3.0.2",
Expand All @@ -59,7 +55,8 @@
"systemjs": "~0.19.24",
"systemjs-builder": "^0.15.13",
"tsd": "^0.6.5",
"typescript": "2.0.0",
"typescript": "1.8.10",
"typings": "1.3.2",
"zone.js": "^0.6.10"
},
"czConfig": {
Expand Down
49 changes: 20 additions & 29 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,32 +1,23 @@
{
"compilerOptions": {
"noImplicitAny": true,
"module": "commonjs",
"target": "es5",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"inlineSourceMap": true,
"inlineSources": true,
"declaration": true,
"moduleResolution": "node",
"types": [
"es6-shim",
"hammerjs",
"jasmine",
"node"
"compilerOptions": {
"noImplicitAny": true,
"module": "commonjs",
"target": "es5",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"inlineSourceMap": true,
"inlineSources": true,
"declaration": true,
"moduleResolution": "node"
},
"files": [
"typings/index.d.ts",
"ng2-translate.ts",
"./src/translate.pipe.ts",
"./src/translate.service.ts",
"./src/translate.parser.ts",
"tests/translate.parser.spec.ts",
"tests/translate.service.spec.ts",
"tests/translate.pipe.spec.ts"
]
},
"files": [
"ng2-translate.ts",
"./src/translate.pipe.ts",
"./src/translate.service.ts",
"./src/translate.parser.ts",
"tests/translate.parser.spec.ts",
"tests/translate.service.spec.ts",
"tests/translate.pipe.spec.ts"
],
"exclude": [
"node_modules",
"bundles"
]
}
9 changes: 9 additions & 0 deletions typings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"globalDevDependencies": {
"jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#36a1be34dbe202c665b3ddafd50824f78c09eea3"
},
"globalDependencies": {
"es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#9807d9b701f58be068cb07833d2b24235351d052",
"node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#6abf99dda133ff859e16e3520b0b00b6b1239341"
}
}

0 comments on commit 822edd6

Please sign in to comment.