Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
jupl committed Apr 23, 2019
1 parent 48d22cf commit e8f644b
Show file tree
Hide file tree
Showing 9 changed files with 4,692 additions and 3,256 deletions.
19 changes: 0 additions & 19 deletions .jestrc.json

This file was deleted.

7 changes: 7 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module.exports = { // tslint:disable-line:no-object-mutation
preset: '@jupl/ts',
setupTestFrameworkScriptFile: '<rootDir>/jest/setup.ts',
snapshotSerializers: [
'enzyme-to-json/serializer',
],
}
7,795 changes: 4,643 additions & 3,152 deletions package-lock.json

Large diffs are not rendered by default.

79 changes: 38 additions & 41 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"coverage:watch": "npm run coverage -- --watch",
"lint": "tsc && npm run lint:file",
"lint:file": "tslint --project tsconfig.json",
"test": "jest --config .jestrc.json",
"test": "jest",
"test:update": "npm run test -- -u",
"test:watch": "npm run test -- --watch",
"server": "npm run server:dev",
Expand All @@ -20,55 +20,52 @@
"build:story": "cross-env STORYBOOK=true NODE_ENV=production TS_NODE_PROJECT=tsconfig.base.json build-storybook -o dist/story"
},
"devDependencies": {
"@babel/core": "^7.2.2",
"@babel/core": "^7.4.3",
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
"@babel/plugin-transform-react-inline-elements": "^7.2.0",
"@babel/polyfill": "^7.0.0",
"@babel/preset-env": "^7.2.0",
"@jupl/tslint-config": "^0.6.5",
"@storybook/addon-actions": "^4.1.2",
"@storybook/react": "^4.1.2",
"@types/enzyme": "^3.1.15",
"@types/enzyme-adapter-react-16": "^1.0.3",
"@types/jest": "^23.3.10",
"@types/node": "^10.12.15",
"@types/react": "^16.7.17",
"@types/react-dom": "^16.0.11",
"@babel/polyfill": "^7.4.3",
"@babel/preset-env": "^7.4.3",
"@jupl/ts": "0.0.5",
"@storybook/addon-actions": "^5.0.10",
"@storybook/react": "^5.0.10",
"@types/enzyme": "^3.9.1",
"@types/enzyme-adapter-react-16": "^1.0.5",
"@types/jest": "^23.3.14",
"@types/node": "^11.13.7",
"@types/react": "^16.8.14",
"@types/react-dom": "^16.8.4",
"@types/react-hot-loader": "^4.1.0",
"@types/storybook__addon-actions": "^3.4.1",
"@types/storybook__react": "^4.0.0",
"@types/styled-components": "^4.1.4",
"@types/webpack": "^4.4.21",
"@types/webpack-dev-server": "^3.1.1",
"@types/webpack-env": "^1.13.6",
"@types/storybook__addon-actions": "^3.4.2",
"@types/storybook__react": "^4.0.1",
"@types/styled-components": "^4.1.14",
"@types/webpack": "^4.4.27",
"@types/webpack-dev-server": "^3.1.5",
"@types/webpack-env": "^1.13.9",
"babel-core": "^7.0.0-bridge.0",
"babel-loader": "^8.0.4",
"babel-plugin-dynamic-import-node": "^2.2.0",
"babel-loader": "^8.0.5",
"cross-env": "^5.2.0",
"css-loader": "^2.0.1",
"enzyme": "^3.8.0",
"enzyme-adapter-react-16": "^1.7.1",
"css-loader": "^2.1.1",
"enzyme": "^3.9.0",
"enzyme-adapter-react-16": "^1.12.1",
"enzyme-to-json": "^3.3.5",
"file-loader": "^2.0.0",
"husky": "^1.2.1",
"file-loader": "^3.0.1",
"husky": "^1.3.1",
"jest": "^23.6.0",
"jest-cli": "^23.6.0",
"jest-enzyme": "^7.0.1",
"lint-staged": "^8.1.0",
"jest-enzyme": "^7.0.2",
"lint-staged": "^8.1.5",
"normalize.css": "^8.0.1",
"react": "^16.6.3",
"react-dom": "^16.6.3",
"react-hot-loader": "^4.6.0",
"styled-components": "^4.1.2",
"trash-cli": "^1.3.0",
"ts-jest": "^23.10.5",
"ts-node": "^7.0.1",
"tslint": "^5.11.0",
"typescript": "^3.2.2",
"typescript-tslint-plugin": "^0.2.1",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-hot-loader": "^4.8.4",
"styled-components": "^4.2.0",
"trash-cli": "^2.0.0",
"ts-node": "^8.1.0",
"tslint": "^5.16.0",
"typescript": "^3.4.5",
"wcb": "^0.15.2",
"webpack": "^4.27.1",
"webpack-cli": "^3.1.2",
"webpack-dev-server": "^3.1.10"
"webpack": "^4.28.0",
"webpack-cli": "^3.3.1",
"webpack-dev-server": "^3.3.1"
}
}
28 changes: 1 addition & 27 deletions tsconfig.base.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,3 @@
{
"compileOnSave": false,
"compilerOptions": {
"allowJs": true,
"baseUrl": "./src",
"esModuleInterop": true,
"jsx": "react",
"maxNodeModuleJsDepth": 1,
"moduleResolution": "node",
"noEmit": true,
"noFallthroughCasesInSwitch": true,
"noImplicitReturns": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"paths": {
"~/*": ["*"]
},
"plugins": [
{"name": "typescript-tslint-plugin"}
],
"skipLibCheck": true,
"sourceMap": true,
"strict": true,
"target": "es2017"
},
"exclude": [
"dist"
]
"extends": "./node_modules/@jupl/ts/config/base.json"
}
5 changes: 1 addition & 4 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"extends": "./tsconfig.base.json",
"compilerOptions": {
"module": "esnext"
}
"extends": "./node_modules/@jupl/ts/tsconfig.json"
}
6 changes: 0 additions & 6 deletions tsconfig.node.json

This file was deleted.

8 changes: 1 addition & 7 deletions tslint.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
{
"extends": [
"@jupl/tslint-config",
"@jupl/tslint-config/jsx"
],
"rules": {
"no-implicit-dependencies": [true, "dev", ["~"]]
}
"extends": "@jupl/ts"
}
1 change: 1 addition & 0 deletions webpack.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Patch to fix tsconfig-paths plugin
// tslint:disable-next-line:no-object-mutation
Object.assign(process.env, {TS_NODE_PROJECT: ''})

export {configuration as default} from './webpack.config.main'

0 comments on commit e8f644b

Please sign in to comment.