Skip to content

Commit e878aaf

Browse files
Merge pull request ngrx#19 from ngrx/peer-deps-build
fix(deps): Fixed peer dependencies to support Angular 4.x
2 parents 10eed3b + 7522ab7 commit e878aaf

File tree

5 files changed

+3004
-34
lines changed

5 files changed

+3004
-34
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
[![CircleCI Status for ngrx/db](https://circleci.com/gh/ngrx/db.svg?style=shield&circle-token=af75fce7603493fca82caac8f0c46cd614407e2c
33
)](https://circleci.com/gh/ngrx/db)
44

5-
### RxJS powered IndexedDB for Angular2 apps
5+
### RxJS powered IndexedDB for Angular apps
66

7-
Don't use me yet.
7+
Don't use me yet.

circle.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
machine:
2+
node:
3+
version: 6.1.0
4+
5+
dependencies:
6+
pre:
7+
- npm install -g npm

karma.conf.js

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
var path = require('path');
2+
var webpack = require('webpack');
23

34
module.exports = function(karma) {
45
'use strict';
@@ -29,6 +30,10 @@ module.exports = function(karma) {
2930
]
3031
},
3132

33+
mime: {
34+
'text/x-typescript': ['ts', 'tsx']
35+
},
36+
3237
browsers: ['Chrome'],
3338

3439
port: 9018,
@@ -41,29 +46,26 @@ module.exports = function(karma) {
4146
webpack: {
4247
devtool: 'inline-source-map',
4348
resolve: {
44-
root: __dirname,
45-
extensions: ['', '.ts', '.js']
49+
extensions: ['.ts', '.js']
4650
},
4751
module: {
48-
preLoaders: [
52+
loaders: [
4953
{
54+
enforce: 'pre',
5055
test: /\.ts$/,
5156
loader: 'tslint-loader',
5257
exclude: [
5358
/node_modules/
5459
]
55-
}
56-
],
57-
loaders: [
60+
},
5861
{
5962
test: /\.ts?$/,
6063
exclude: /(node_modules)/,
61-
loader: 'ts'
62-
}
63-
],
64-
postLoaders: [
64+
loader: 'awesome-typescript-loader'
65+
},
6566
{
66-
test: /\.(js|ts)$/, loader: 'istanbul-instrumenter',
67+
enforce: 'post',
68+
test: /\.(js|ts)$/, loader: 'istanbul-instrumenter-loader',
6769
include: path.resolve(__dirname, 'src'),
6870
exclude: [
6971
/\.(e2e|spec|bundle)\.ts$/,
@@ -72,11 +74,23 @@ module.exports = function(karma) {
7274
}
7375
]
7476
},
75-
tslint: {
76-
emitErrors: false,
77-
failOnHint: false,
78-
resourcePath: 'src'
79-
}
77+
plugins: [
78+
new webpack.LoaderOptionsPlugin({
79+
options: {
80+
tslint: {
81+
emitErrors: false,
82+
failOnHint: false,
83+
resourcePath: 'src'
84+
}
85+
}
86+
}),
87+
new webpack.ContextReplacementPlugin(
88+
// The (\\|\/) piece accounts for path separators in *nix and Windows
89+
/angular(\\|\/)core(\\|\/)(esm(\\|\/)src|src)(\\|\/)linker/,
90+
path.resolve('src'),
91+
{}
92+
)
93+
]
8094
}
8195
});
82-
};
96+
};

package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@ngrx/db",
33
"version": "2.0.1",
4-
"description": "RxJS + IndexedDB for Angular2",
4+
"description": "RxJS + IndexedDB for Angular",
55
"main": "bundles/db.umd.js",
66
"module": "index.js",
77
"scripts": {
@@ -20,20 +20,20 @@
2020
"author": "Rob Wormald <[email protected]>",
2121
"license": "MIT",
2222
"peerDependencies": {
23-
"@angular/core": "^2.0.0-rc.6",
24-
"rxjs": "^5.0.0-beta.11"
23+
"@angular/core": "^2.0.0 || ^4.0.0",
24+
"rxjs": "^5.0.0"
2525
},
2626
"devDependencies": {
27-
"@angular/common": "^2.0.0-rc.6",
28-
"@angular/compiler": "^2.0.0-rc.6",
29-
"@angular/compiler-cli": "^0.6.0",
30-
"@angular/core": "^2.0.0-rc.6",
31-
"@angular/platform-browser": "^2.0.0-rc.6",
32-
"@angular/platform-browser-dynamic": "^2.0.0-rc.6",
33-
"@angular/platform-server": "^2.0.0-rc.6",
27+
"@angular/common": "^2.0.0",
28+
"@angular/compiler": "^2.0.0",
29+
"@angular/compiler-cli": "^2.0.0",
30+
"@angular/core": "^2.0.0",
31+
"@angular/platform-browser": "^2.0.0",
32+
"@angular/platform-browser-dynamic": "^2.0.0",
33+
"@angular/platform-server": "^2.0.0",
3434
"@types/jasmine": "^2.2.33",
3535
"@types/node": "^6.0.38",
36-
"awesome-typescript-loader": "^2.2.1",
36+
"awesome-typescript-loader": "^3.0.0",
3737
"core-js": "^2.4.1",
3838
"cpy-cli": "^1.0.1",
3939
"istanbul-instrumenter-loader": "^0.2.0",
@@ -44,16 +44,16 @@
4444
"karma-jasmine": "^1.0.2",
4545
"karma-mocha-reporter": "^2.1.0",
4646
"karma-sourcemap-loader": "^0.3.7",
47-
"karma-webpack": "^1.8.0",
47+
"karma-webpack": "^2.0.0",
4848
"rimraf": "^2.5.4",
4949
"rollup": "^0.34.13",
50-
"rxjs": "^5.0.0-beta.11",
50+
"rxjs": "^5.0.0",
5151
"ts-loader": "^0.8.2",
5252
"tslint": "^3.15.1",
5353
"tslint-loader": "^2.1.5",
5454
"typescript": "^2.0.2",
5555
"uglifyjs": "^2.4.10",
56-
"webpack": "^2.1.0-beta.21",
57-
"zone.js": "^0.6.17"
56+
"webpack": "^2.2.0",
57+
"zone.js": "^0.7.2"
5858
}
5959
}

0 commit comments

Comments
 (0)