Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 3342f7e

Browse files
committedJan 20, 2025
chore: bump webpack 5
1 parent 8f47905 commit 3342f7e

File tree

6 files changed

+3168
-4394
lines changed

6 files changed

+3168
-4394
lines changed
 

‎demo/index.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import * as React from 'react';
22
import * as ReactDOM from 'react-dom';
33
import Viewer from '../src/Viewer';
4-
const img2 = require('./images/landscape2.jpg');
5-
const img = require('./images/landscape.jpg');
6-
const img3 = require('./images/tibet-6.jpg');
7-
const img4 = require('./images/image4.jpg');
4+
const img2 = require('./images/landscape2.jpg').default;
5+
const img = require('./images/landscape.jpg').default;
6+
const img3 = require('./images/tibet-6.jpg').default;
7+
const img4 = require('./images/image4.jpg').default;
88
import './index.less';
99
import classNames from 'classnames';
1010
import { Button, List, Checkbox } from 'antd';

‎package-lock.json

+3,140-4,368
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+18-18
Original file line numberDiff line numberDiff line change
@@ -42,48 +42,48 @@
4242
"@babel/preset-env": "^7.6.3",
4343
"@babel/preset-react": "^7.6.3",
4444
"@types/jest": "^23.3.1",
45-
"@types/node": "^12.11.1",
46-
"@types/react": "^16.9.1",
47-
"@types/react-dom": "^16.8.5",
48-
"antd": "^3.24.1",
45+
"@types/node": "^18.19.70",
46+
"@types/react": "^17.0.83",
47+
"@types/react-dom": "^17.0.26",
48+
"@wojtekmaj/enzyme-adapter-react-17": "0.8.0",
49+
"antd": "^5.23.1",
4950
"autoprefixer": "^9.6.5",
5051
"babel-jest": "^23.4.2",
5152
"babel-loader": "^8.0.6",
5253
"babel-plugin-import": "^1.2.1",
5354
"css-loader": "^3.2.0",
54-
"enzyme": "^3.10.0",
55-
"enzyme-adapter-react-16": "^1.14.0",
56-
"enzyme-to-json": "^3.3.4",
57-
"file-loader": "^4.2.0",
55+
"enzyme": "^3.11.0",
56+
"enzyme-to-json": "^3.6.2",
57+
"file-loader": "^6.2.0",
5858
"fs-extra": "^8.1.0",
5959
"gh-pages": "^2.1.1",
6060
"gulp": "^4.0.2",
6161
"gulp-typescript": "^5.0.1",
62-
"html-webpack-plugin": "^3.2.0",
62+
"html-webpack-plugin": "^5.6.3",
6363
"identity-obj-proxy": "^3.0.0",
6464
"jest": "^23.5.0",
6565
"jest-environment-jsdom": "^23.4.0",
6666
"jest-environment-jsdom-global": "^1.1.0",
6767
"jest-static-stubs": "0.0.1",
6868
"less": "^3.10.3",
69-
"less-loader": "^5.0.0",
69+
"less-loader": "^12.2.0",
7070
"merge2": "^1.3.0",
7171
"postcss-loader": "^3.0.0",
7272
"pre-commit": "^1.1.3",
73-
"react": "^16.10.2",
74-
"react-dom": "^16.10.2",
73+
"react": "^17.0.2",
74+
"react-dom": "^17.0.2",
7575
"style-loader": "^1.0.0",
7676
"through2": "^2.0.1",
7777
"ts-jest": "^23.1.3",
7878
"ts-loader": "^6.2.0",
7979
"tslint": "^5.18.0",
80-
"typescript": "^3.6.4",
81-
"url-loader": "^2.2.0",
82-
"webpack": "^4.41.2",
83-
"webpack-bundle-analyzer": "^3.6.0",
80+
"typescript": "^5.7.2",
81+
"url-loader": "^4.1.1",
82+
"webpack": "^5.97.1",
83+
"webpack-bundle-analyzer": "^4.10.2",
8484
"webpack-chain": "^6.0.0",
85-
"webpack-cli": "^3.3.9",
86-
"webpack-dev-server": "^3.8.2",
85+
"webpack-cli": "^5.1.4",
86+
"webpack-dev-server": "^4.15.2",
8787
"wolfy87-eventemitter": "^5.2.5"
8888
},
8989
"dependencies": {

‎src/__tests__/viewer.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Viewer from '../index';
22
import ViewerProps from '../ViewerProps';
33
import { configure, mount } from 'enzyme';
4-
import * as Adapter from 'enzyme-adapter-react-16';
4+
import * as Adapter from '@wojtekmaj/enzyme-adapter-react-17';
55
import * as React from 'react';
66
const img2 = require('../../demo/images/landscape2.jpg');
77
const img = require('../../demo/images/landscape.jpg');

‎webpack.config.common.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ config.module
7777
.use('less-loader')
7878
.loader('less-loader')
7979
.options({
80-
sourceMap: false,
81-
javascriptEnabled: true,
80+
sourceMap: false
8281
});
8382

8483
config.module

‎webpack.config.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ config.plugin('html-webpack-plugin')
1717
hash: true,
1818
}]);
1919
config.devServer.merge({
20-
contentBase: path.join(__dirname, 'dist'),
20+
// contentBase: path.join(__dirname, 'dist'),
2121
compress: false,
2222
port: 8001,
2323
host: '0.0.0.0',
@@ -36,6 +36,9 @@ config.module.rule('less')
3636
return {
3737
...options,
3838
sourceMap: true,
39+
lessOptions: {
40+
javascriptEnabled: true
41+
}
3942
};
4043
});
4144

0 commit comments

Comments
 (0)
Please sign in to comment.