Skip to content

Commit 301cc72

Browse files
committed
chore(*): update dependencies
chore(*): update webpack to 3.5.x chore(*): update typescript to 2.5.x chore(typescript): add paths to resolve type definitions conflicts
1 parent 091403a commit 301cc72

File tree

3 files changed

+198
-140
lines changed

3 files changed

+198
-140
lines changed

package.json

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"@types/lodash": "^4.14.64",
4949
"@types/prop-types": "^15.5.1",
5050
"@types/react": "^16.0.5",
51-
"@types/react-dom": "^0.14.18",
51+
"@types/react-dom": "^15.5.4",
5252
"awesome-typescript-loader": "^3.2.3",
5353
"babel-jest": "^15.0.0",
5454
"babel-polyfill": "^6.13.0",
@@ -71,21 +71,26 @@
7171
"shx": "^0.1.4",
7272
"sinon": "^2.3.1",
7373
"ts-jest": "^20.0.4",
74-
"typedoc": "0.5.3",
74+
"typedoc": "^0.8.0",
7575
"typedoc-plugin-external-module-name": "^1.0.8",
7676
"typedoc-plugin-internal-external": "^1.0.8",
7777
"typedoc-plugin-ui-router": "^1.0.6",
78-
"typescript": "2.4.2",
78+
"typescript": "^2.5.2",
7979
"ui-router-typedoc-themes": "^1.0.2",
80-
"webpack": "^2.3.1",
81-
"webpack-dev-server": "^2.4.2"
80+
"webpack": "^3.5.6",
81+
"webpack-dev-server": "^2.8.1"
8282
},
8383
"jest": {
8484
"rootDir": "src",
8585
"transform": {
8686
".(ts|tsx)": "<rootDir>/../node_modules/ts-jest/preprocessor.js"
8787
},
88-
"moduleFileExtensions": ["ts", "tsx", "js", "json"],
88+
"moduleFileExtensions": [
89+
"ts",
90+
"tsx",
91+
"js",
92+
"json"
93+
],
8994
"testURL": "http://localhost:4000",
9095
"testRegex": "/__tests__/.*\\.(ts|tsx|js)$",
9196
"globals": {

tsconfig.json

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,24 @@
33
"moduleResolution": "node",
44
"module": "commonjs",
55
"target": "es5",
6-
"lib": [ "es2015", "dom" ],
6+
"lib": ["es2015", "dom"],
77
"outDir": "lib",
88
"allowSyntheticDefaultImports": true,
99
"suppressImplicitAnyIndexErrors": true,
1010
"forceConsistentCasingInFileNames": true,
11-
"skipLibCheck": true,
1211
"sourceMap": true,
1312
"declaration": true,
14-
"jsx": "react"
13+
"jsx": "react",
14+
"typeRoots": ["./node_modules/@types"],
15+
"baseUrl": ".",
16+
"paths": {
17+
"react": ["./node_modules/@types/react"]
18+
}
1519
},
16-
"files": [
17-
"./src/index.ts"
18-
],
20+
"files": ["./src/index.ts"],
1921
"compileOnSave": false,
2022
"buildOnSave": false,
2123
"rules": {
22-
"indent": [
23-
true,
24-
2
25-
]
24+
"indent": [true, 2]
2625
}
2726
}

0 commit comments

Comments
 (0)