Skip to content

Commit 48d3566

Browse files
authored
chore: update dependencies (#1459)
* update EVERYTHING except for tests * update circleci * fixing tests for ArrowKeyStepper * skipping collection cache test
1 parent aa674b9 commit 48d3566

22 files changed

+4835
-5064
lines changed

.babelrc.js

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,44 +12,64 @@ if (env === 'commonjs' || env === 'es') {
1212
'source/TestUtils.js',
1313
],
1414
plugins: [
15-
'transform-runtime',
15+
'@babel/plugin-transform-runtime',
16+
'@babel/plugin-proposal-class-properties',
1617
['flow-react-proptypes', {deadCode: true, useESModules: true}],
1718
['transform-react-remove-prop-types', {mode: 'wrap'}],
1819
],
19-
presets: [['env', {modules: false}], 'react', 'flow', 'stage-2'],
20+
presets: [
21+
['@babel/preset-env', {modules: false}],
22+
'@babel/preset-react',
23+
'@babel/preset-flow',
24+
],
2025
};
2126

2227
if (env === 'commonjs') {
23-
module.exports.plugins.push('transform-es2015-modules-commonjs');
28+
module.exports.plugins.push('@babel/plugin-transform-modules-commonjs');
2429
}
2530
}
2631

2732
if (env === 'rollup') {
2833
module.exports = {
2934
comments: false,
30-
plugins: ['external-helpers'],
31-
presets: [['env', {modules: false}], 'react', 'flow', 'stage-2'],
35+
plugins: [
36+
'@babel/plugin-external-helpers',
37+
'@babel/plugin-proposal-class-properties',
38+
],
39+
presets: [
40+
['@babel/preset-env', {modules: false}],
41+
'@babel/preset-react',
42+
'@babel/preset-flow',
43+
],
3244
};
3345
}
3446

3547
if (env === 'development') {
3648
module.exports = {
37-
presets: ['react', 'flow', 'stage-2'],
49+
plugins: ['@babel/plugin-proposal-class-properties'],
50+
presets: ['@babel/preset-react', '@babel/preset-flow'],
3851
};
3952
}
4053

4154
if (env === 'production') {
4255
module.exports = {
4356
comments: false,
44-
plugins: ['transform-runtime'],
45-
presets: ['env', 'react', 'flow', 'stage-2'],
57+
plugins: [
58+
'@babel/plugin-transform-runtime',
59+
'@babel/plugin-proposal-class-properties',
60+
],
61+
presets: ['@babel/preset-env', '@babel/preset-react', '@babel/preset-flow'],
4662
};
4763
}
4864

4965
if (env === 'test') {
5066
module.exports = {
5167
comments: false,
52-
plugins: ['transform-es2015-modules-commonjs'],
53-
presets: ['react', 'flow', 'stage-2'],
68+
69+
plugins: [
70+
'@babel/plugin-transform-modules-commonjs',
71+
'@babel/plugin-proposal-class-properties',
72+
],
73+
presets: ['@babel/preset-react', '@babel/preset-flow'],
5474
};
5575
}

.circleci/config.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ jobs:
77
- checkout
88
- restore_cache:
99
keys:
10-
- dependencies-{{ checksum "yarn.lock" }}
11-
# fallback to using the latest cache if no exact match is found
12-
- dependencies-
10+
- dependencies-{{ checksum "yarn.lock" }}
11+
# fallback to using the latest cache if no exact match is found
12+
- dependencies-
1313
- run:
1414
name: Install
1515
command: yarn install
@@ -22,14 +22,14 @@ jobs:
2222
command: yarn ci-check
2323
test:
2424
docker:
25-
- image: circleci/node:8.9.1-stretch-browsers
25+
- image: circleci/node:10.16.3-stretch-browsers
2626
steps:
2727
- checkout
2828
- restore_cache:
2929
keys:
30-
- dependencies-{{ checksum "yarn.lock" }}
31-
# fallback to using the latest cache if no exact match is found
32-
- dependencies-
30+
- dependencies-{{ checksum "yarn.lock" }}
31+
# fallback to using the latest cache if no exact match is found
32+
- dependencies-
3333
- run:
3434
name: Install
3535
command: yarn install

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ Thanks for contributing to react-virtualized!
66
- [ ] For any new features or bug fixes, both positive and negative test cases have been added
77
- [ ] For any new features, documentation has been added
88
- [ ] For any documentation changes, the text has been proofread and is clear to both experienced users and beginners.
9-
- [ ] Format your code with [prettier](https://github.com/prettier/prettier) (`npm run prettier`).
10-
- [ ] Run the [Flow](https://flowtype.org/) typechecks (`npm run typecheck`).
9+
- [ ] Format your code with [prettier](https://github.com/prettier/prettier) (`yarn run prettier`).
10+
- [ ] Run the [Flow](https://flowtype.org/) typechecks (`yarn run typecheck`).
1111

1212
Here is a short checklist of additional things to keep in mind before submitting:
13-
* Please make sure your pull request description makes it very clear what you're trying to accomplish. If it's a bug fix, please also provide a failing test case (if possible). In either case, please add additional unit test coverage for your changes. :)
14-
* Be sure you have notifications setup so that you'll see my code review responses. (I may ask you to make some adjustments before merging.)
13+
14+
- Please make sure your pull request description makes it very clear what you're trying to accomplish. If it's a bug fix, please also provide a failing test case (if possible). In either case, please add additional unit test coverage for your changes. :)
15+
- Be sure you have notifications setup so that you'll see my code review responses. (I may ask you to make some adjustments before merging.)

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v8.4.0
1+
v10.16.3

jest.config.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
module.exports = {
2+
globalSetup: 'jest-environment-puppeteer/setup',
3+
globalTeardown: 'jest-environment-puppeteer/teardown',
4+
setupFiles: ['./source/jest-setup.js'],
5+
roots: ['./source'],
6+
coverageReporters: ['lcov'],
7+
collectCoverageFrom: [
8+
'source/**/*.js',
9+
'!source/vendor/**',
10+
'!source/demo/**',
11+
'!source/jest-*.js',
12+
'!source/TestUtils.js',
13+
'!**/*.example.js',
14+
],
15+
testRegex: '.(jest|e2e|ssr).js$',
16+
verbose: true,
17+
};

package.json

Lines changed: 75 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -11,44 +11,39 @@
1111
"license": "MIT",
1212
"scripts": {
1313
"build:types": "flow-copy-source --ignore \"**/*.{jest,e2e,ssr,example}.js\" source/WindowScroller dist/es/WindowScroller && flow-copy-source --ignore \"**/*.{jest,e2e,ssr,example}.js\" source/AutoSizer dist/es/AutoSizer",
14-
"build": "npm run build:commonjs && npm run build:css && npm run build:es && npm run build:demo && npm run build:umd",
15-
"build:commonjs": "npm run clean:commonjs && cross-env NODE_ENV=commonjs babel source --out-dir dist/commonjs",
14+
"build": "yarn run build:commonjs && yarn run build:css && yarn run build:es && yarn run build:demo && yarn run build:umd",
15+
"build:commonjs": "yarn run clean:commonjs && cross-env NODE_ENV=commonjs babel source --out-dir dist/commonjs",
1616
"build:css": "postcss source/styles.css -o styles.css --use autoprefixer",
17-
"build:demo": "npm run clean:demo && cross-env NODE_ENV=production webpack --config webpack.config.demo.js -p --bail",
18-
"build:es": "npm run clean:es && npm run build:types && cross-env NODE_ENV=es babel source --out-dir dist/es",
19-
"build:umd": "npm run clean:umd && cross-env NODE_ENV=rollup rollup -c",
17+
"build:demo": "yarn run clean:demo && cross-env NODE_ENV=production webpack --config webpack.config.demo.js -p --bail",
18+
"build:es": "yarn run clean:es && yarn run build:types && cross-env NODE_ENV=es babel source --out-dir dist/es",
19+
"build:umd": "yarn run clean:umd && cross-env NODE_ENV=rollup rollup -c",
2020
"check-all": "yarn prettier && yarn lint && yarn flow",
2121
"ci-check": "yarn prettier:diff && yarn lint && yarn flow",
22-
"clean": "npm run clean:commonjs && npm run clean:demo && npm run clean:es && npm run clean:umd",
22+
"clean": "yarn run clean:commonjs && yarn run clean:demo && yarn run clean:es && yarn run clean:umd",
2323
"clean:commonjs": "rimraf dist/commonjs",
2424
"clean:demo": "rimraf build",
2525
"clean:es": "rimraf dist/es",
2626
"clean:umd": "rimraf dist/umd",
2727
"deploy": "gh-pages -d build",
2828
"lint": "eslint 'source/**/*.js'",
2929
"typecheck": "flow check",
30-
"prebuild": "npm run typecheck && npm run lint",
30+
"prebuild": "yarn run typecheck && yarn run lint",
3131
"prettier": "prettier --write '{playground,source}/**/*.js'",
3232
"prettier:diff": "prettier --list-different '{playground,source}/**/*.js'",
33-
"postpublish": "npm run deploy",
34-
"prepublish": "npm run build",
33+
"postpublish": "yarn run deploy",
34+
"prepublish": "yarn run build",
3535
"start": "cross-env NODE_ENV=development webpack-dev-server --hot --config webpack.config.dev.js",
36-
"test": "npm run test:jest",
36+
"test": "yarn run test:jest",
3737
"test:jest": "jest --no-watchman --runInBand",
3838
"test:ci": "jest --no-watchman --maxWorkers 2 --coverage && codecov",
39-
"watch": "watch 'clear && npm run test -s' source",
39+
"watch": "watch 'clear && yarn run test -s' source",
4040
"watch:jest": "jest --no-watchman --watch"
4141
},
4242
"husky": {
4343
"hooks": {
4444
"pre-commit": "pretty-quick --staged"
4545
}
4646
},
47-
"babel": {
48-
"presets": [
49-
"./.babelrc.js"
50-
]
51-
},
5247
"files": [
5348
"dist",
5449
"styles.css"
@@ -77,101 +72,80 @@
7772
"bugs": {
7873
"url": "https://github.com/bvaughn/react-virtualized/issues"
7974
},
80-
"jest": {
81-
"globalSetup": "jest-environment-puppeteer/setup",
82-
"globalTeardown": "jest-environment-puppeteer/teardown",
83-
"setupFiles": [
84-
"./source/jest-setup.js"
85-
],
86-
"roots": [
87-
"./source"
88-
],
89-
"coverageReporters": [
90-
"lcov"
91-
],
92-
"collectCoverageFrom": [
93-
"source/**/*.js",
94-
"!source/vendor/**",
95-
"!source/demo/**",
96-
"!source/jest-*.js",
97-
"!source/TestUtils.js",
98-
"!**/*.example.js"
99-
],
100-
"testRegex": ".(jest|e2e|ssr).js$",
101-
"verbose": true
102-
},
10375
"devDependencies": {
104-
"autoprefixer": "^7.2.3",
105-
"babel-cli": "^6.26.0",
106-
"babel-core": "^6.26.0",
107-
"babel-eslint": "^8.1.2",
108-
"babel-jest": "^22.0.4",
109-
"babel-loader": "7.1.2",
110-
"babel-plugin-external-helpers": "^6.22.0",
111-
"babel-plugin-flow-react-proptypes": "^21.0.0",
112-
"babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
113-
"babel-plugin-transform-react-remove-prop-types": "^0.4.12",
114-
"babel-plugin-transform-runtime": "^6.23.0",
115-
"babel-polyfill": "^6.26.0",
116-
"babel-preset-env": "^1.6.1",
117-
"babel-preset-flow": "^6.23.0",
118-
"babel-preset-react": "^6.24.1",
119-
"babel-preset-stage-2": "^6.24.1",
120-
"codecov": "^2.2.0",
121-
"codemirror": "^5.18.0",
122-
"cross-env": "^5.0.1",
123-
"css-loader": "^0.28.7",
124-
"eslint": "^4.14.0",
125-
"eslint-config-fbjs": "^2.0.1",
126-
"eslint-config-prettier": "^2.9.0",
76+
"@babel/cli": "^7.7.0",
77+
"@babel/core": "^7.7.2",
78+
"@babel/plugin-external-helpers": "^7.2.0",
79+
"@babel/plugin-proposal-class-properties": "^7.7.0",
80+
"@babel/plugin-transform-modules-commonjs": "^7.7.0",
81+
"@babel/plugin-transform-runtime": "^7.6.2",
82+
"@babel/polyfill": "^7.7.0",
83+
"@babel/preset-env": "^7.7.1",
84+
"@babel/preset-flow": "^7.0.0",
85+
"@babel/preset-react": "^7.7.0",
86+
"@babel/preset-stage-2": "^7.0.0",
87+
"autoprefixer": "^9.7.1",
88+
"babel-eslint": "^10.0.3",
89+
"babel-jest": "^24.9.0",
90+
"babel-loader": "8.0.6",
91+
"babel-plugin-flow-react-proptypes": "^25.1.0",
92+
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
93+
"codecov": "^3.6.1",
94+
"codemirror": "^5.49.2",
95+
"cross-env": "^6.0.3",
96+
"css-loader": "^3.2.0",
97+
"eslint": "^6.6.0",
98+
"eslint-config-fbjs": "^3.1.1",
99+
"eslint-config-prettier": "^6.5.0",
127100
"eslint-config-react": "^1.1.7",
128-
"eslint-plugin-babel": "^4.1.2",
129-
"eslint-plugin-flowtype": "^2.40.1",
130-
"eslint-plugin-jsx-a11y": "^6.0.3",
131-
"eslint-plugin-prettier": "^2.4.0",
132-
"eslint-plugin-react": "^7.5.1",
133-
"eslint-plugin-relay": "^0.0.20",
101+
"eslint-plugin-babel": "^5.3.0",
102+
"eslint-plugin-flowtype": "^4.3.0",
103+
"eslint-plugin-jsx-a11y": "^6.2.3",
104+
"eslint-plugin-prettier": "^3.1.1",
105+
"eslint-plugin-react": "^7.16.0",
106+
"eslint-plugin-relay": "^1.3.12",
134107
"extract-text-webpack-plugin": "^3.0.2",
135-
"file-loader": "^1.1.6",
136-
"flow-bin": "^0.63.1",
137-
"flow-copy-source": "^1.2.1",
138-
"gh-pages": "^1.0.0",
139-
"html-webpack-plugin": "^2.30.1",
108+
"file-loader": "^4.2.0",
109+
"flow-bin": "^0.111.3",
110+
"flow-copy-source": "^2.0.8",
111+
"gh-pages": "^2.1.1",
112+
"html-webpack-plugin": "^3.2.0",
140113
"husky": "^3.0.9",
141-
"immutable": "^3.7.5",
142-
"jest": "^22.0.4",
143-
"jest-environment-puppeteer": "^1.1.1",
144-
"lint-staged": "^7.0.4",
145-
"postcss": "^6.0.14",
146-
"postcss-cli": "^4.1.1",
147-
"postcss-loader": "^2.0.9",
114+
"immutable": "^4.0.0-rc.12",
115+
"jest": "^24.9.0",
116+
"jest-environment-puppeteer": "^4.3.0",
117+
"lint-staged": "^9.4.2",
118+
"postcss": "^7.0.21",
119+
"postcss-cli": "^6.1.3",
120+
"postcss-loader": "^3.0.0",
148121
"prettier": "1.19.1",
149122
"pretty-quick": "^2.0.1",
150-
"puppeteer": "^1.1.1",
151-
"react": "^16.2.0",
123+
"puppeteer": "^2.0.0",
124+
"react": "^16.11.0",
152125
"react-codemirror": "^1.0.0",
153-
"react-dom": "^16.2.0",
154-
"react-router": "^4.1.1",
155-
"react-router-dom": "^4.1.1",
156-
"react-test-renderer": "^16.2.0",
157-
"rimraf": "^2.4.3",
158-
"rollup": "^0.57.1",
159-
"rollup-plugin-babel": "^3.0.3",
160-
"rollup-plugin-commonjs": "^9.1.0",
161-
"rollup-plugin-node-resolve": "^3.3.0",
162-
"rollup-plugin-replace": "^2.0.0",
163-
"rollup-plugin-uglify": "^3.0.0",
164-
"style-loader": "^0.19.1",
126+
"react-dom": "^16.11.0",
127+
"react-router": "^5.1.2",
128+
"react-router-dom": "^5.1.2",
129+
"react-test-renderer": "^16.11.0",
130+
"rimraf": "^3.0.0",
131+
"rollup": "^1.26.5",
132+
"rollup-plugin-babel": "^4.3.3",
133+
"rollup-plugin-commonjs": "^10.1.0",
134+
"rollup-plugin-node-resolve": "^5.2.0",
135+
"rollup-plugin-replace": "^2.2.0",
136+
"rollup-plugin-uglify": "^6.0.3",
137+
"style-loader": "^1.0.0",
165138
"watch": "^1.0.2",
166-
"webpack": "^3.10.0",
167-
"webpack-dev-server": "^3.1.11"
139+
"webpack": "^4.41.2",
140+
"webpack-cli": "^3.3.10",
141+
"webpack-dev-server": "^3.9.0"
168142
},
169143
"dependencies": {
170-
"babel-runtime": "^6.26.0",
171-
"clsx": "^1.0.1",
172-
"dom-helpers": "^5.0.0",
173-
"loose-envify": "^1.3.0",
174-
"prop-types": "^15.6.0",
144+
"@babel/runtime": "^7.7.2",
145+
"clsx": "^1.0.4",
146+
"dom-helpers": "^5.1.3",
147+
"loose-envify": "^1.4.0",
148+
"prop-types": "^15.7.2",
175149
"react-lifecycles-compat": "^3.0.4"
176150
},
177151
"peerDependencies": {

rollup.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import nodeResolve from 'rollup-plugin-node-resolve';
22
import commonjs from 'rollup-plugin-commonjs';
33
import babel from 'rollup-plugin-babel';
44
import replace from 'rollup-plugin-replace';
5-
import uglify from 'rollup-plugin-uglify';
5+
import {uglify} from 'rollup-plugin-uglify';
66

77
export default {
88
input: './source/index.js',

0 commit comments

Comments
 (0)