Skip to content

Commit 13752ca

Browse files
mwiencekmwiencek
committed
Bump file-loader to 6.2.0
They made esModule: true the default. I could've reverted it back to false, but switching should seemingly enable some optimizations like module concatenation in production (though I didn't verify that).
1 parent fa9e19d commit 13752ca

18 files changed

+189
-70
lines changed

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"copy-webpack-plugin": "4.6.0",
3333
"core-js": "3.6.5",
3434
"detect-node": "2.0.3",
35-
"file-loader": "3.0.1",
35+
"file-loader": "6.2.0",
3636
"filesize": "2.0.4",
3737
"generic-diff": "1.0.1",
3838
"he": "1.1.1",

‎root/layout/components/Head.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ import * as React from 'react';
1212
import {CatalystContext} from '../../context';
1313
import * as manifest from '../../static/manifest';
1414
import DBDefs from '../../static/scripts/common/DBDefs';
15+
import commonLessUrl from '../../static/styles/common.less';
16+
import iconLessUrl from '../../static/styles/icons.less';
17+
import noScriptLessUrl from '../../static/styles/noscript.less';
1518
import escapeClosingTags from '../../utility/escapeClosingTags';
1619

1720
import globalsScript from './globalsScript';
@@ -79,14 +82,14 @@ const Head = ({...props}: HeadProps): React.Element<'head'> => {
7982
<CanonicalLink requestUri={$c.req.uri} />
8083

8184
<link
82-
href={require('../../static/styles/common.less')}
85+
href={commonLessUrl}
8386
rel="stylesheet"
8487
type="text/css"
8588
/>
8689

8790
{props.noIcons ? null : (
8891
<link
89-
href={require('../../static/styles/icons.less')}
92+
href={iconLessUrl}
9093
rel="stylesheet"
9194
type="text/css"
9295
/>
@@ -119,7 +122,7 @@ const Head = ({...props}: HeadProps): React.Element<'head'> => {
119122

120123
<noscript>
121124
<link
122-
href={require('../../static/styles/noscript.less')}
125+
href={noScriptLessUrl}
123126
rel="stylesheet"
124127
type="text/css"
125128
/>

‎root/layout/components/HeaderLogo.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@
99

1010
import * as React from 'react';
1111

12+
import headerLogoSvgUrl
13+
from '../../static/images/layout/header-logo.svg';
14+
1215
const HeaderLogo = (): React.Element<'img'> => (
1316
<img
1417
alt="MusicBrainz"
1518
className="logo"
16-
src={require('../../static/images/layout/header-logo.svg')}
19+
src={headerLogoSvgUrl}
1720
/>
1821
);
1922

‎root/layout/components/sidebar/SidebarLicenses.js

+36-12
Original file line numberDiff line numberDiff line change
@@ -9,56 +9,80 @@
99

1010
import * as React from 'react';
1111

12+
import artLibreIconUrl
13+
from '../../../static/images/licenses/ArtLibre.png';
14+
import cc0IconUrl
15+
from '../../../static/images/licenses/CC0.png';
16+
import ccByIconUrl
17+
from '../../../static/images/licenses/CCBY.png';
18+
import ccByNcIconUrl
19+
from '../../../static/images/licenses/CCBYNC.png';
20+
import ccByNcNdIconUrl
21+
from '../../../static/images/licenses/CCBYNCND.png';
22+
import ccByNcSaIconUrl
23+
from '../../../static/images/licenses/CCBYNCSA.png';
24+
import ccByNdIconUrl
25+
from '../../../static/images/licenses/CCBYND.png';
26+
import ccBySaIconUrl
27+
from '../../../static/images/licenses/CCBYSA.png';
28+
import ccNcSamplingPlusIconUrl
29+
from '../../../static/images/licenses/CCNCSamplingPlus.png';
30+
import ccPdIconUrl
31+
from '../../../static/images/licenses/CCPD.png';
32+
import ccSamplingIconUrl
33+
from '../../../static/images/licenses/CCSampling.png';
34+
import ccSamplingPlusIconUrl
35+
from '../../../static/images/licenses/CCSamplingPlus.png';
1236
import {compare} from '../../../static/scripts/common/i18n';
1337
import linkedEntities from '../../../static/scripts/common/linkedEntities';
1438

1539
const LICENSE_CLASSES = {
1640
ArtLibre: {
17-
icon: require('../../../static/images/licenses/ArtLibre.png'),
41+
icon: artLibreIconUrl,
1842
pattern: /artlibre\.org\/licence\/lal/,
1943
},
2044
CC0: {
21-
icon: require('../../../static/images/licenses/CC0.png'),
45+
icon: cc0IconUrl,
2246
pattern: /creativecommons\.org\/publicdomain\/zero\//,
2347
},
2448
CCBY: {
25-
icon: require('../../../static/images/licenses/CCBY.png'),
49+
icon: ccByIconUrl,
2650
pattern: /creativecommons\.org\/licenses\/by\//,
2751
},
2852
CCBYNC: {
29-
icon: require('../../../static/images/licenses/CCBYNC.png'),
53+
icon: ccByNcIconUrl,
3054
pattern: /creativecommons\.org\/licenses\/by-nc\//,
3155
},
3256
CCBYNCND: {
33-
icon: require('../../../static/images/licenses/CCBYNCND.png'),
57+
icon: ccByNcNdIconUrl,
3458
pattern: /creativecommons\.org\/licenses\/by-nc-nd\//,
3559
},
3660
CCBYNCSA: {
37-
icon: require('../../../static/images/licenses/CCBYNCSA.png'),
61+
icon: ccByNcSaIconUrl,
3862
pattern: /creativecommons\.org\/licenses\/by-nc-sa\//,
3963
},
4064
CCBYND: {
41-
icon: require('../../../static/images/licenses/CCBYND.png'),
65+
icon: ccByNdIconUrl,
4266
pattern: /creativecommons\.org\/licenses\/by-nd\//,
4367
},
4468
CCBYSA: {
45-
icon: require('../../../static/images/licenses/CCBYSA.png'),
69+
icon: ccBySaIconUrl,
4670
pattern: /creativecommons\.org\/licenses\/by-sa\//,
4771
},
4872
CCNCSamplingPlus: {
49-
icon: require('../../../static/images/licenses/CCNCSamplingPlus.png'),
73+
icon: ccNcSamplingPlusIconUrl,
5074
pattern: /creativecommons\.org\/licenses\/nc-sampling\+\//,
5175
},
5276
CCPD: {
53-
icon: require('../../../static/images/licenses/CCPD.png'),
77+
icon: ccPdIconUrl,
5478
pattern: /creativecommons\.org\/licenses\/publicdomain\//,
5579
},
5680
CCSampling: {
57-
icon: require('../../../static/images/licenses/CCSampling.png'),
81+
icon: ccSamplingIconUrl,
5882
pattern: /creativecommons\.org\/licenses\/sampling\//,
5983
},
6084
CCSamplingPlus: {
61-
icon: require('../../../static/images/licenses/CCSamplingPlus.png'),
85+
icon: ccSamplingPlusIconUrl,
6286
pattern: /creativecommons\.org\/licenses\/sampling\+\//,
6387
},
6488
};

‎root/static/scripts/area/places-map.js

+24-8
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,22 @@ import 'leaflet.markercluster/dist/leaflet.markercluster-src';
1212
import he from 'he';
1313
import * as ReactDOMServer from 'react-dom/server';
1414

15+
import clusterMarkerIconUrl
16+
from '../../images/leaflet/cluster-marker-icon.png';
17+
import endedMarkerIconUrl
18+
from '../../images/leaflet/ended-marker-icon.png';
19+
import studioMarkerIconUrl
20+
from '../../images/leaflet/studio-marker-icon.png';
21+
import venueMarkerIconUrl
22+
from '../../images/leaflet/venue-marker-icon.png';
23+
import markerIconUrl
24+
from '../../images/leaflet/marker-icon.png';
25+
import stadiumMarkerIconUrl
26+
from '../../images/leaflet/stadium-marker-icon.png';
27+
import arenaMarkerIconUrl
28+
from '../../images/leaflet/arena-marker-icon.png';
29+
import religiousMarkerIconUrl
30+
from '../../images/leaflet/religious-marker-icon.png';
1531
import EntityLink from '../common/components/EntityLink';
1632
import {createMap, L} from '../common/leaflet';
1733
import getScriptArgs from '../common/utility/getScriptArgs';
@@ -38,18 +54,18 @@ if (places.length) {
3854
const buildIcon = iconUrl => new LeafIcon({iconUrl});
3955

4056
const icons = {
41-
0: buildIcon(require('../../images/leaflet/ended-marker-icon.png')),
42-
1: buildIcon(require('../../images/leaflet/studio-marker-icon.png')),
43-
2: buildIcon(require('../../images/leaflet/venue-marker-icon.png')),
44-
3: buildIcon(require('../../images/leaflet/marker-icon.png')),
45-
4: buildIcon(require('../../images/leaflet/stadium-marker-icon.png')),
46-
5: buildIcon(require('../../images/leaflet/arena-marker-icon.png')),
47-
6: buildIcon(require('../../images/leaflet/religious-marker-icon.png')),
57+
0: buildIcon(endedMarkerIconUrl),
58+
1: buildIcon(studioMarkerIconUrl),
59+
2: buildIcon(venueMarkerIconUrl),
60+
3: buildIcon(markerIconUrl),
61+
4: buildIcon(stadiumMarkerIconUrl),
62+
5: buildIcon(arenaMarkerIconUrl),
63+
6: buildIcon(religiousMarkerIconUrl),
4864
};
4965

5066
const markers = L.markerClusterGroup({
5167
iconCreateFunction: function (cluster) {
52-
const iconURL = require('../../images/leaflet/cluster-marker-icon.png');
68+
const iconURL = clusterMarkerIconUrl;
5369

5470
return L.divIcon({
5571
className: 'cluster-div-icon',

‎root/static/scripts/common/components/ArtistCreditLink.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import * as React from 'react';
1111

1212
import hydrate from '../../../../utility/hydrate';
13+
import informationIconUrl from '../../../images/icons/information.png';
1314
import Tooltip from '../../edit/components/Tooltip';
1415

1516
import EntityLink, {DeletedLink} from './EntityLink';
@@ -51,7 +52,7 @@ const MpIcon = hydrate<MpIconProps>('span.ac-mp', (
5152
className="info"
5253
onMouseEnter={() => setHover(true)}
5354
onMouseLeave={() => setHover(false)}
54-
src={require('../../../images/icons/information.png')}
55+
src={informationIconUrl}
5556
/>
5657
{hover ? (
5758
<Tooltip

‎root/static/scripts/common/components/Filter.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import * as React from 'react';
1111

1212
import hydrate from '../../../../utility/hydrate';
13+
import filterIconUrl from '../../../images/icons/filter.png';
1314
import setCookie from '../utility/setCookie';
1415

1516
import FilterForm, {type FilterFormT} from './FilterForm';
@@ -56,7 +57,7 @@ const Filter = ({ajaxFormUrl, initialFilterForm}: Props) => {
5657
<a className="filter-button">
5758
<img
5859
alt=""
59-
src={require('../../../images/icons/filter.png')}
60+
src={filterIconUrl}
6061
/>
6162
</a>
6263
{' '}

‎root/static/scripts/common/components/SearchIcon.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@
99

1010
import * as React from 'react';
1111

12+
import searchIconUrl from '../../../images/icons/search.svg';
13+
1214
const SearchIcon = (): React.Element<'img'> => (
1315
<img
1416
alt={l('Search')}
1517
className="search"
16-
src={require('../../../images/icons/search.svg')}
18+
src={searchIconUrl}
1719
/>
1820
);
1921

‎root/static/scripts/common/components/TaggerIcon.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import * as React from 'react';
1111

1212
import {CatalystContext} from '../../../../context';
13+
import taggerIconUrl from '../../../images/icons/mblookup-tagger.png';
1314

1415
function buildTaggerLink(entity, tport: number): string {
1516
const gid = entity.gid;
@@ -37,7 +38,7 @@ const TaggerIcon = ({entity}: Props): React.MixedElement => (
3738
>
3839
<img
3940
alt={l('Tagger')}
40-
src={require('../../../images/icons/mblookup-tagger.png')}
41+
src={taggerIconUrl}
4142
/>
4243
</a>
4344
)}

‎root/static/scripts/common/components/WarningIcon.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@
99

1010
import * as React from 'react';
1111

12+
import warningIconUrl from '../../../images/icons/warning.png';
13+
1214
const WarningIcon = (): React.Element<'img'> => (
1315
<img
1416
alt={l('Warning')}
1517
className="warning"
16-
src={require('../../../images/icons/warning.png')}
18+
src={warningIconUrl}
1719
/>
1820
);
1921

‎root/static/scripts/common/leaflet.js

+46-28
Original file line numberDiff line numberDiff line change
@@ -8,37 +8,55 @@
88

99
import L from 'leaflet/dist/leaflet-src';
1010

11+
import arenaMarkerIconUrl
12+
from '../../images/leaflet/arena-marker-icon.png';
13+
import arenaMarkerIcon2xUrl
14+
from '../../images/leaflet/arena-marker-icon-2x.png';
15+
import clusterMarkerIconUrl
16+
from '../../images/leaflet/cluster-marker-icon.png';
17+
import endedMarkerIconUrl
18+
from '../../images/leaflet/ended-marker-icon.png';
19+
import endedMarkerIcon2xUrl
20+
from '../../images/leaflet/ended-marker-icon-2x.png';
21+
import markerIconUrl
22+
from '../../images/leaflet/marker-icon.png';
23+
import markerIcon2xUrl
24+
from '../../images/leaflet/marker-icon-2x.png';
25+
import religiousMarkerIconUrl
26+
from '../../images/leaflet/religious-marker-icon.png';
27+
import religiousMarkerIcon2xUrl
28+
from '../../images/leaflet/religious-marker-icon-2x.png';
29+
import stadiumMarkerIconUrl
30+
from '../../images/leaflet/stadium-marker-icon.png';
31+
import stadiumMarkerIcon2xUrl
32+
from '../../images/leaflet/stadium-marker-icon-2x.png';
33+
import studioMarkerIconUrl
34+
from '../../images/leaflet/studio-marker-icon.png';
35+
import studioMarkerIcon2xUrl
36+
from '../../images/leaflet/studio-marker-icon-2x.png';
37+
import venueMarkerIconUrl
38+
from '../../images/leaflet/venue-marker-icon.png';
39+
import venueMarkerIcon2xUrl
40+
from '../../images/leaflet/venue-marker-icon-2x.png';
41+
1142
import DBDefs from './DBDefs-client';
1243

1344
const iconsUrls = {
14-
'arena-marker-icon.png':
15-
require('../../images/leaflet/arena-marker-icon.png'),
16-
'arena-marker-icon-2x.png':
17-
require('../../images/leaflet/arena-marker-icon-2x.png'),
18-
'cluster-marker-icon.png':
19-
require('../../images/leaflet/cluster-marker-icon.png'),
20-
'ended-marker-icon.png':
21-
require('../../images/leaflet/ended-marker-icon.png'),
22-
'ended-marker-icon-2x.png':
23-
require('../../images/leaflet/ended-marker-icon-2x.png'),
24-
'marker-icon.png': require('../../images/leaflet/marker-icon.png'),
25-
'marker-icon-2x.png': require('../../images/leaflet/marker-icon-2x.png'),
26-
'religious-marker-icon.png':
27-
require('../../images/leaflet/religious-marker-icon.png'),
28-
'religious-marker-icon-2x.png':
29-
require('../../images/leaflet/religious-marker-icon-2x.png'),
30-
'stadium-marker-icon.png':
31-
require('../../images/leaflet/stadium-marker-icon.png'),
32-
'stadium-marker-icon-2x.png':
33-
require('../../images/leaflet/stadium-marker-icon-2x.png'),
34-
'studio-marker-icon.png':
35-
require('../../images/leaflet/studio-marker-icon.png'),
36-
'studio-marker-icon-2x.png':
37-
require('../../images/leaflet/studio-marker-icon-2x.png'),
38-
'venue-marker-icon.png':
39-
require('../../images/leaflet/venue-marker-icon.png'),
40-
'venue-marker-icon-2x.png':
41-
require('../../images/leaflet/venue-marker-icon-2x.png'),
45+
'arena-marker-icon.png': arenaMarkerIconUrl,
46+
'arena-marker-icon-2x.png': arenaMarkerIcon2xUrl,
47+
'cluster-marker-icon.png': clusterMarkerIconUrl,
48+
'ended-marker-icon.png': endedMarkerIconUrl,
49+
'ended-marker-icon-2x.png': endedMarkerIcon2xUrl,
50+
'marker-icon.png': markerIconUrl,
51+
'marker-icon-2x.png': markerIcon2xUrl,
52+
'religious-marker-icon.png': religiousMarkerIconUrl,
53+
'religious-marker-icon-2x.png': religiousMarkerIcon2xUrl,
54+
'stadium-marker-icon.png': stadiumMarkerIconUrl,
55+
'stadium-marker-icon-2x.png': stadiumMarkerIcon2xUrl,
56+
'studio-marker-icon.png': studioMarkerIconUrl,
57+
'studio-marker-icon-2x.png': studioMarkerIcon2xUrl,
58+
'venue-marker-icon.png': venueMarkerIconUrl,
59+
'venue-marker-icon-2x.png': venueMarkerIcon2xUrl,
4260
};
4361

4462
L.Icon.Default.prototype._getIconUrl = function (name) {

‎root/static/scripts/edit/MB/CoverArt.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import $ from 'jquery';
1111
import ko from 'knockout';
1212
import * as Sentry from '@sentry/browser';
1313

14+
import image404Url from '../../../images/image404-125.png';
1415
import MB from '../../common/MB';
1516

1617
MB.CoverArt = {};
@@ -23,7 +24,7 @@ MB.CoverArt.image_error = function ($img, image) {
2324
* FIXME: start over if this happens? obviously the
2425
* data in the index is incorrect.
2526
*/
26-
$img.attr('src', require('../../../images/image404-125.png'));
27+
$img.attr('src', image404Url);
2728
} else {
2829
$img.attr('src', image.image);
2930
}

‎root/static/scripts/edit/components/AddIcon.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@
99

1010
import * as React from 'react';
1111

12+
import addIconUrl from '../../../images/icons/add.png';
13+
1214
const AddIcon = (): React.Element<'img'> => (
1315
<img
1416
className="bottom"
15-
src={require('../../../images/icons/add.png')}
17+
src={addIconUrl}
1618
/>
1719
);
1820

0 commit comments

Comments
 (0)