Skip to content

Commit d42bfe0

Browse files
Merge pull request #109 from FormidableLabs/task/update-dependencies
Update React and webpack dependencies
2 parents cf5e20f + 143b388 commit d42bfe0

File tree

4 files changed

+746
-1901
lines changed

4 files changed

+746
-1901
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,5 @@ jobs:
3636
run: yarn install --frozen-lockfile
3737
- name: Test
3838
run: yarn test
39-
- name: Test IE
40-
if: ${{ matrix.os == 'windows-latest' }}
41-
run: yarn test-browser-ie
4239
- name: Codecov
4340
run: yarn codecov

package.json

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,11 @@
1010
"eslint": "eslint \"*.js\" benchmark test",
1111
"tslint": "eslint test/typescript/*.tsx",
1212
"test-browser": "karma start test/browser/karma.conf.js",
13-
"test-browser-ie": "karma start test/browser/karma.conf.ie.js",
1413
"test-node": "mocha \"test/node/*.spec.js\"",
1514
"test-node-cov": "nyc mocha \"test/node/*.spec.js\"",
1615
"test-ts-usage": "tsc --esModuleInterop --jsx react --noEmit test/typescript/sample-react-redux-usage.tsx test/typescript/sample-usage.tsx",
1716
"test-ts-defs": "tsc --target ES5 index.d.ts",
1817
"test": "builder concurrent --buffer eslint tslint test-ts-usage test-ts-defs test-node-cov test-browser",
19-
"test-ie": "builder concurrent --buffer eslint tslint test-ts-usage test-ts-defs test-node-cov test-browser-ie",
2018
"compress": "terser --compress --mangle=\"toplevel:true\" -- index.js",
2119
"size-min-gz": "yarn -s compress | gzip -9 | wc -c"
2220
},
@@ -48,6 +46,7 @@
4846
"@types/react-dom": "^16.9.8",
4947
"@types/react-redux": "^7.1.9",
5048
"@typescript-eslint/parser": "^2.34.0",
49+
"assert": "^2.0.0",
5150
"babel-loader": "^8.0.6",
5251
"benchmark": "^2.1.4",
5352
"builder": "^5.0.0",
@@ -62,26 +61,26 @@
6261
"karma": "^6.3.14",
6362
"karma-chrome-launcher": "^3.1.0",
6463
"karma-firefox-launcher": "^1.1.0",
65-
"karma-ie-launcher": "^1.0.0",
6664
"karma-mocha": "^1.3.0",
6765
"karma-mocha-reporter": "^2.2.5",
6866
"karma-safari-launcher": "^1.0.0",
69-
"karma-webpack": "^4.0.2",
67+
"karma-webpack": "^5.0.0",
7068
"lodash": "^4.17.10",
7169
"mocha": "^6.2.2",
7270
"nano-equal": "^2.0.2",
7371
"nyc": "^14.1.1",
7472
"preact": "^10.4.1",
75-
"react": "^16.3.1",
76-
"react-dom": "^16.13.1",
77-
"react-redux": "^7.2.0",
78-
"react-test-renderer": "^16.13.1",
79-
"redux": "^4.0.5",
73+
"process": "^0.11.10",
74+
"react": "^18.0.0",
75+
"react-dom": "^18.0.0",
76+
"react-redux": "^8.0.1",
77+
"react-test-renderer": "^18.0.0",
78+
"redux": "^4.2.0",
8079
"shallow-equal-fuzzy": "0.0.2",
8180
"sinon": "^7.5.0",
8281
"terser": "^4.4.3",
83-
"typescript": "^3.7.3",
84-
"webpack": "^4.5.0"
82+
"typescript": "^4.6.3",
83+
"webpack": "^5.72.0"
8584
},
8685
"nyc": {
8786
"exclude": [

test/browser/karma.conf.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
'use strict';
22

33
const path = require('path');
4+
const webpack = require('webpack');
45

56
// **Debugging Help**
67
// We normally dislike commented out code, but as Karma doesn't easily produce
@@ -73,7 +74,13 @@ module.exports = function(config) {
7374
}
7475
}
7576
]
76-
}
77+
},
78+
plugins: [
79+
new webpack.ProvidePlugin({
80+
assert: 'assert',
81+
process: 'process'
82+
})
83+
]
7784
},
7885
exclude: [],
7986
port: 8080,

0 commit comments

Comments
 (0)