Skip to content

Commit a2864b8

Browse files
authored
Feature/enable browserslist support (#4250)
* use webpack-dev-server 4 * fix devServer * add .browserslistrc * use browserslist * fix svg height for safari
1 parent e455a35 commit a2864b8

File tree

7 files changed

+262
-392
lines changed

7 files changed

+262
-392
lines changed

.browserslistrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
defaults
2+
not ie 11

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
"webpack": "^5.9.0",
150150
"webpack-bundle-analyzer": "^3.3.2",
151151
"webpack-cli": "^4.2.0",
152-
"webpack-dev-server": "^3.2.1",
152+
"webpack-dev-server": "^4.0.0-beta.0",
153153
"webpack-merge": "^5.1.4",
154154
"workbox-webpack-plugin": "^6.0.0"
155155
},

src/components/Print/Print.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export default function Print (props) {
2727

2828
return (
2929
<div className="sidebar-item sidebar-item--disabled`">
30-
<BarIcon className="sidebar-item__toggle" width={15} fill="#175d96" />
30+
<BarIcon className="sidebar-item__toggle" width={15} height={17} fill="#175d96" />
3131
<a className="sidebar-item__title sidebar-link__print"
3232
href={printUrl}
3333
rel="nofollow noopener noreferrer"

src/components/SidebarItem/SidebarItem.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,12 @@ export default class SidebarItem extends Component {
5353
{anchors.length > 0 ? (
5454
<ChevronRightIcon
5555
width={15}
56+
height={17}
5657
fill="#175d96"
5758
className={`${block}__toggle`}
5859
onClick={this._toggle.bind(this)} />
5960
) : (
60-
<BarIcon className={`${block}__toggle`} width={15} fill="#175d96" />
61+
<BarIcon className={`${block}__toggle`} width={15} height={17} fill="#175d96" />
6162
)}
6263

6364
<Link

webpack.dev.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,9 @@ module.exports = env => merge(common(env), {
3535
})
3636
],
3737
devServer: {
38-
contentBase: path.resolve(__dirname, './dist'),
38+
static: path.resolve(__dirname, './dist'),
3939
port: 3000,
4040
hot: true,
41-
inline: true,
4241
compress: true,
4342
historyApiFallback: true
4443
}

webpack.prod.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ const common = require('./webpack.common.js');
99

1010
module.exports = env => merge(common(env), {
1111
mode: 'production',
12-
target: 'web',
1312
cache: {
1413
buildDependencies: {
1514
config: [__filename],

0 commit comments

Comments
 (0)