Skip to content
This repository has been archived by the owner on Jul 27, 2018. It is now read-only.

Commit

Permalink
fix(deps): Fixed peer dependencies for Angular 4.x (#52)
Browse files Browse the repository at this point in the history
Also updated testing to use latest webpack release
  • Loading branch information
brandonroberts authored Apr 20, 2017
1 parent a43a4eb commit 6e63e9e
Show file tree
Hide file tree
Showing 4 changed files with 3,454 additions and 22 deletions.
12 changes: 9 additions & 3 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module.exports = function(karma) {
{ type: 'html' }
]
},

mime: {
'text/x-typescript': ['ts', 'tsx']
},
Expand Down Expand Up @@ -65,7 +65,7 @@ module.exports = function(karma) {
},
{
enforce: 'post',
test: /\.(js|ts)$/, loader: 'istanbul-instrumenter',
test: /\.(js|ts)$/, loader: 'istanbul-instrumenter-loader',
include: path.resolve(__dirname, 'src'),
exclude: [
/\.(e2e|spec|bundle)\.ts$/,
Expand All @@ -83,7 +83,13 @@ module.exports = function(karma) {
resourcePath: 'src'
}
}
})
}),
new webpack.ContextReplacementPlugin(
// The (\\|\/) piece accounts for path separators in *nix and Windows
/angular(\\|\/)core(\\|\/)(esm(\\|\/)src|src)(\\|\/)linker/,
path.resolve('src'),
{}
)
]
}
});
Expand Down
36 changes: 18 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"test": "npm run karma",
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
"clean:pre": "rimraf release",
"clean:post": "rimraf src/**/*.ngfactory.ts",
"clean:post": "rimraf src/**/*.ngfactory.ts && rimraf release/node_modules",
"copy": "cpy LICENSE package.json README.md release",
"build:js": "ngc -p tsconfig.dist.json",
"build:umd": "rollup -c rollup.config.js",
Expand All @@ -30,51 +30,51 @@
],
"license": "MIT",
"peerDependencies": {
"@angular/common": "^2.0.0",
"@angular/core": "^2.0.0",
"@angular/router": "^3.0.0",
"@angular/common": "^2.0.0 || ^4.0.0",
"@angular/core": "^2.0.0 || ^4.0.0",
"@angular/router": "^3.0.0 || ^4.0.0",
"@ngrx/core": "^1.2.0",
"@ngrx/store": "^1.5.0 || ^2.0.0",
"rxjs": "^5.0.1"
},
"devDependencies": {
"@angular/common": "~2.0.0",
"@angular/compiler": "~2.0.0",
"@angular/compiler-cli": "~0.6.1",
"@angular/core": "~2.0.0",
"@angular/platform-browser": "~2.0.0",
"@angular/platform-browser-dynamic": "~2.0.0",
"@angular/platform-server": "~2.0.0",
"@angular/router": "~3.0.0",
"@angular/common": "^2.0.0",
"@angular/compiler": "^2.0.0",
"@angular/compiler-cli": "^2.0.0",
"@angular/core": "^2.0.0",
"@angular/platform-browser": "^2.0.0",
"@angular/platform-browser-dynamic": "^2.0.0",
"@angular/platform-server": "^2.0.0",
"@angular/router": "^3.0.0",
"@ngrx/core": "^1.2.0",
"@ngrx/store": "^2.0.0",
"@types/jasmine": "^2.2.33",
"@types/node": "^6.0.38",
"awesome-typescript-loader": "^2.2.1",
"awesome-typescript-loader": "^3.1.2",
"conventional-changelog-cli": "^1.1.1",
"core-js": "^2.2.2",
"cpy-cli": "^1.0.1",
"istanbul-instrumenter-loader": "^0.2.0",
"jasmine-core": "^2.5.0",
"karma": "^1.2.0",
"karma": "^1.4.0",
"karma-chrome-launcher": "^2.0.0",
"karma-coverage": "^1.1.1",
"karma-jasmine": "^1.0.2",
"karma-mocha-reporter": "^2.1.0",
"karma-sourcemap-loader": "^0.3.7",
"karma-typescript-preprocessor": "0.0.21",
"karma-webpack": "^1.7.0",
"karma-webpack": "^2.0.0",
"npm-run-all": "^1.7.0",
"reflect-metadata": "^0.1.3",
"rimraf": "^2.5.4",
"rollup": "^0.34.13",
"rxjs": "^5.0.0-beta.12",
"rxjs": "^5.0.0",
"source-map-loader": "^0.1.5",
"tslint": "^3.15.1",
"tslint-loader": "^2.1.5",
"typescript": "~2.0.2",
"typescript": "^2.0.0",
"uglifyjs": "^2.4.10",
"webpack": "2.1.0-beta.25",
"webpack": "^2.2.1",
"zone.js": "^0.7.2"
}
}
3 changes: 2 additions & 1 deletion tsconfig.dist.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"index.ts"
],
"angularCompilerOptions": {
"strictMetadataEmit": true
"strictMetadataEmit": true,
"genDir": "./release"
}
}
Loading

0 comments on commit 6e63e9e

Please sign in to comment.