Skip to content

Commit 0e3a8a0

Browse files
committed
chore: update babel, rollup, prettier
1 parent 0b25780 commit 0e3a8a0

File tree

5 files changed

+1333
-2386
lines changed

5 files changed

+1333
-2386
lines changed

.babelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"presets": ["@babel/preset-env", "@babel/preset-react"]
3+
}

.babelrc.js

Lines changed: 0 additions & 21 deletions
This file was deleted.

package.json

Lines changed: 33 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -27,28 +27,46 @@
2727
"react-split-pane",
2828
"es6"
2929
],
30+
"scripts": {
31+
"prebuild": "npm run clean",
32+
"build": "rollup -c",
33+
"build:watch": "rollup -c --watch",
34+
"clean": "rimraf dist",
35+
"test": "mochify -R spec --transform babelify",
36+
"test:watch": "mochify -R spec --watch --transform babelify",
37+
"test:coverage": "mochify --plugin [ mochify-istanbul --exclude '**/test/**' --report lcovonly ] --transform babelify && cat lcov.info | coveralls && rm lcov.info",
38+
"website:start": "npm run start --prefix website",
39+
"website:deploy": "npm run deploy --prefix website",
40+
"prettier": "prettier --write '{src,test}/**/*.js'",
41+
"lint": "eslint src test",
42+
"release:patch": "npm test && npm run build && npm version patch && git push && npm publish",
43+
"precommit": "lint-staged"
44+
},
45+
"husky": {
46+
"hooks": {
47+
"pre-commit": "pretty-quick --staged"
48+
}
49+
},
3050
"dependencies": {
31-
"inline-style-prefixer": "^3.0.6",
3251
"prop-types": "^15.5.10",
52+
"react": "^16.6.3",
53+
"react-dom": "^16.6.3",
3354
"react-lifecycles-compat": "^3.0.4",
3455
"react-style-proptype": "^3.0.0"
3556
},
3657
"devDependencies": {
37-
"@types/inline-style-prefixer": "^3.0.1",
58+
"@babel/core": "^7.2.0",
59+
"@babel/preset-env": "^7.2.0",
60+
"@babel/preset-react": "^7.0.0",
3861
"@types/react": "^16.0.36",
39-
"babel-cli": "^6.24.1",
40-
"babel-eslint": "^8.2.3",
41-
"babel-plugin-external-helpers": "^6.22.0",
42-
"babel-preset-env": "^1.7.0",
43-
"babel-preset-react": "^6.24.1",
44-
"babel-preset-stage-0": "^6.24.1",
45-
"babelify": "^7.3.0",
62+
"babel-eslint": "^10.0.1",
63+
"babelify": "^10.0.0",
4664
"chai": "^4.0.2",
4765
"chai-spies": "^0.7.1",
4866
"coveralls": "^2.13.1",
4967
"cross-env": "^5.2.0",
5068
"eslint": "^4.19.1",
51-
"eslint-config-fbjs": "^2.0.1",
69+
"eslint-config-fbjs": "^2.1.0",
5270
"eslint-config-prettier": "^2.9.0",
5371
"eslint-config-react": "^1.1.7",
5472
"eslint-plugin-babel": "^5.1.0",
@@ -57,43 +75,15 @@
5775
"eslint-plugin-prettier": "^2.6.0",
5876
"eslint-plugin-react": "^7.9.1",
5977
"eslint-plugin-relay": "^0.0.21",
60-
"husky": "^0.14.3",
61-
"lint-staged": "^7.2.0",
78+
"husky": "^1.2.0",
6279
"mochify": "^5.8.0",
6380
"mochify-istanbul": "^2.4.2",
64-
"prettier": "^1.13.5",
65-
"react": "^16.4.2",
66-
"react-dom": "^16.4.2",
81+
"prettier": "1.15.3",
82+
"pretty-quick": "^1.8.0",
6783
"rimraf": "^2.6.2",
6884
"rollup": "^0.60.7",
69-
"rollup-plugin-babel": "^3.0.4",
85+
"rollup-plugin-babel": "^4.0.3",
7086
"rollup-plugin-commonjs": "^9.1.3",
71-
"rollup-plugin-node-resolve": "^3.3.0",
72-
"surge": "^0.19.0"
73-
},
74-
"scripts": {
75-
"build": "npm run clean && rollup -c",
76-
"build:watch": "rollup -c --watch",
77-
"clean": "rimraf dist",
78-
"test": "cross-env NODE_ENV=test mochify -R spec --transform babelify",
79-
"test:watch": "cross-env NODE_ENV=test mochify -R spec --watch --transform babelify",
80-
"test:coverage": "cross-env NODE_ENV=test mochify --plugin [ mochify-istanbul --exclude '**/test/**' --report lcovonly ] --transform babelify && cat lcov.info | coveralls && rm lcov.info",
81-
"website:start": "npm run start --prefix website",
82-
"website:deploy": "npm run deploy --prefix website",
83-
"prettier": "prettier --write '{src,test}/**/*.js'",
84-
"lint": "eslint src test",
85-
"release:patch": "npm test && npm run build && npm version patch && git push && npm publish",
86-
"precommit": "lint-staged"
87-
},
88-
"lint-staged": {
89-
"*.js": [
90-
"prettier --write",
91-
"git add"
92-
]
93-
},
94-
"babel": {
95-
"presets": [
96-
"./.babelrc.js"
97-
]
87+
"rollup-plugin-node-resolve": "^3.3.0"
9888
}
9989
}

website/package.json

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,12 @@
6767
"whatwg-fetch": "2.0.3"
6868
},
6969
"jest": {
70-
"collectCoverageFrom": ["src/**/*.{js,jsx,mjs}"],
71-
"setupFiles": ["<rootDir>/config/polyfills.js"],
70+
"collectCoverageFrom": [
71+
"src/**/*.{js,jsx,mjs}"
72+
],
73+
"setupFiles": [
74+
"<rootDir>/config/polyfills.js"
75+
],
7276
"testMatch": [
7377
"<rootDir>/src/**/__tests__/**/*.{js,jsx,mjs}",
7478
"<rootDir>/src/**/?(*.)(spec|test).{js,jsx,mjs}"
@@ -78,10 +82,11 @@
7882
"transform": {
7983
"^.+\\.(js|jsx|mjs)$": "<rootDir>/node_modules/babel-jest",
8084
"^.+\\.css$": "<rootDir>/config/jest/cssTransform.js",
81-
"^(?!.*\\.(js|jsx|mjs|css|json)$)":
82-
"<rootDir>/config/jest/fileTransform.js"
85+
"^(?!.*\\.(js|jsx|mjs|css|json)$)": "<rootDir>/config/jest/fileTransform.js"
8386
},
84-
"transformIgnorePatterns": ["[/\\\\]node_modules[/\\\\].+\\.(js|jsx|mjs)$"],
87+
"transformIgnorePatterns": [
88+
"[/\\\\]node_modules[/\\\\].+\\.(js|jsx|mjs)$"
89+
],
8590
"moduleNameMapper": {
8691
"^react-native$": "react-native-web"
8792
},
@@ -96,20 +101,28 @@
96101
]
97102
},
98103
"babel": {
99-
"presets": ["react-app"]
104+
"presets": [
105+
"react-app"
106+
]
100107
},
101108
"eslintConfig": {
102109
"extends": "react-app"
103110
},
104111
"devDependencies": {
105-
"language-babel": "https://github.com/gandm/language-babel"
112+
"language-babel": "https://github.com/gandm/language-babel",
113+
"surge": "^0.20.1"
106114
},
107115
"browserslist": {
108116
"development": [
109117
"last 2 chrome versions",
110118
"last 2 firefox versions",
111119
"last 2 edge versions"
112120
],
113-
"production": [">1%", "last 4 versions", "Firefox ESR", "not ie < 11"]
121+
"production": [
122+
">1%",
123+
"last 4 versions",
124+
"Firefox ESR",
125+
"not ie < 11"
126+
]
114127
}
115128
}

0 commit comments

Comments
 (0)