Skip to content

Commit b27f281

Browse files
committed
chore(*): update peerDependency to support react@16.0.0-rc
chore(*): remove deprecated __TS_CONFIG__ in favour of separate config file for ts-jest
1 parent 732f7be commit b27f281

File tree

3 files changed

+818
-730
lines changed

3 files changed

+818
-730
lines changed

package.json

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"jsnext:main": "lib-esm/index.js",
88
"scripts": {
99
"test": "jest --watch",
10-
"test:ci": "NODE_ENV=production jest",
1110
"dev": "cross-env NODE_ENV=development webpack-dev-server --host 0.0.0.0 --port 8000 --config webpack.example.js --history-api-fallback --content-base example",
11+
"test:ci": "NODE_ENV=production jest --silent",
1212
"build": "npm run clean && tsc && tsc -m es6 --outDir lib-esm && cross-env NODE_ENV=production webpack",
1313
"clean": "shx rm -rf _bundles lib lib-esm build",
1414
"docs": "./scripts/docs.js",
@@ -41,15 +41,15 @@
4141
},
4242
"peerDependencies": {
4343
"prop-types": "^15.5.8",
44-
"react": "^15.0.0 || ^16.0.0-alpha"
44+
"react": "^15.0.0 || ^16.0.0-alpha || 16.0.0-rc.2"
4545
},
4646
"devDependencies": {
4747
"@types/classnames": "0.0.31",
4848
"@types/lodash": "^4.14.64",
4949
"@types/prop-types": "^15.5.1",
50-
"@types/react": "^0.14.43",
50+
"@types/react": "^16.0.5",
5151
"@types/react-dom": "^0.14.18",
52-
"awesome-typescript-loader": "^3.1.3",
52+
"awesome-typescript-loader": "^3.2.3",
5353
"babel-jest": "^15.0.0",
5454
"babel-polyfill": "^6.13.0",
5555
"babel-preset-es2015": "^6.14.0",
@@ -62,9 +62,8 @@
6262
"jest": "^20.0.3",
6363
"prettier": "^1.5.2",
6464
"prop-types": "^15.5.10",
65-
"react": "^15.0.2",
66-
"react-addons-test-utils": "^15.3.1",
67-
"react-dom": "^15.0.2",
65+
"react": "15.6.1",
66+
"react-dom": "15.6.1",
6867
"react-test-renderer": "^15.3.1",
6968
"readline-sync": "^1.4.7",
7069
"replace-in-file": "^2.0.3",
@@ -76,7 +75,7 @@
7675
"typedoc-plugin-external-module-name": "^1.0.8",
7776
"typedoc-plugin-internal-external": "^1.0.8",
7877
"typedoc-plugin-ui-router": "^1.0.6",
79-
"typescript": "~2.4.1",
78+
"typescript": "2.4.2",
8079
"ui-router-typedoc-themes": "^1.0.2",
8180
"webpack": "^2.3.1",
8281
"webpack-dev-server": "^2.4.2"
@@ -86,19 +85,12 @@
8685
"transform": {
8786
".(ts|tsx)": "<rootDir>/../node_modules/ts-jest/preprocessor.js"
8887
},
89-
"moduleFileExtensions": [
90-
"ts",
91-
"tsx",
92-
"js",
93-
"json"
94-
],
88+
"moduleFileExtensions": ["ts", "tsx", "js", "json"],
9589
"testURL": "http://localhost:4000",
9690
"testRegex": "/__tests__/.*\\.(ts|tsx|js)$",
9791
"globals": {
98-
"__TS_CONFIG__": {
99-
"jsx": "react",
100-
"module": "commonjs",
101-
"target": "es6"
92+
"ts-jest": {
93+
"tsConfigFile": "tsconfig.jest.json"
10294
}
10395
}
10496
}

tsconfig.jest.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"compilerOption": {
3+
"jsx": "react",
4+
"module": "commonjs",
5+
"target": "es6"
6+
}
7+
}

0 commit comments

Comments
 (0)