Skip to content

Commit d209b20

Browse files
weaverryanweaverryan
committed
feature #731 Upgrade file-loader and allowed version for url-loader, drop Node 8 support (weaverryan)
This PR was squashed before being merged into the master branch. Discussion ---------- Upgrade file-loader and allowed version for url-loader, drop Node 8 support * Upgrades file-loader from v1 to v6 * Upgrades url-loader from allowing v1 or v2 to v4 * Removes support for Node 8 Commits ------- a7ab7b7 updating test for hash changes 69f62cf tweaking test matrix fcf5aa7 Removing node 8 support, bumping file-loader v1->6, url-loader v2->4
2 parents 33d3277 + a7ab7b7 commit d209b20

File tree

4 files changed

+73
-197
lines changed

4 files changed

+73
-197
lines changed

‎.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ cache:
33
- "%LOCALAPPDATA%\\Yarn"
44

55
environment:
6-
nodejs_version: "8"
6+
nodejs_version: "10"
77

88
platform:
99
- x86

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ matrix:
2020
- yarn
2121
- name: 'Highest versions of the dependencies'
2222
os: linux
23-
node_js: "10"
23+
node_js: "12"
2424
env:
2525
- JOB_PART=test
2626
- DISABLE_UNSTABLE_CHECKS=1
@@ -37,7 +37,7 @@ matrix:
3737
node_js: "10"
3838
env: JOB_PART=test
3939
- os: linux
40-
node_js: "8"
40+
node_js: "12"
4141
env: JOB_PART=test
4242

4343
script: npm run $JOB_PART

‎test/functional.js

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ describe('Functional tests using webpack', function() {
9797
'main.js',
9898
'font.css',
9999
'bg.css',
100-
'fonts/Roboto.9896f773.woff2',
101-
'images/symfony_logo.ea1ca6f7.png',
100+
'fonts/Roboto.e1dcc0db.woff2',
101+
'images/symfony_logo.91beba37.png',
102102
'manifest.json',
103103
'entrypoints.json'
104104
]);
@@ -123,11 +123,11 @@ describe('Functional tests using webpack', function() {
123123
);
124124
webpackAssert.assertManifestPath(
125125
'build/fonts/Roboto.woff2',
126-
'/build/fonts/Roboto.9896f773.woff2'
126+
'/build/fonts/Roboto.e1dcc0db.woff2'
127127
);
128128
webpackAssert.assertManifestPath(
129129
'build/images/symfony_logo.png',
130-
'/build/images/symfony_logo.ea1ca6f7.png'
130+
'/build/images/symfony_logo.91beba37.png'
131131
);
132132

133133
webpackAssert.assertOutputJsonFileMatches('entrypoints.json', {
@@ -217,11 +217,11 @@ describe('Functional tests using webpack', function() {
217217

218218
webpackAssert.assertOutputFileContains(
219219
'bg.css',
220-
'http://localhost:8090/assets/images/symfony_logo.ea1ca6f7.png'
220+
'http://localhost:8090/assets/images/symfony_logo.91beba37.png'
221221
);
222222
webpackAssert.assertOutputFileContains(
223223
'font.css',
224-
'http://localhost:8090/assets/fonts/Roboto.9896f773.woff2'
224+
'http://localhost:8090/assets/fonts/Roboto.e1dcc0db.woff2'
225225
);
226226
// manifest file has CDN in value
227227
webpackAssert.assertManifestPath(
@@ -272,7 +272,7 @@ describe('Functional tests using webpack', function() {
272272

273273
webpackAssert.assertOutputFileContains(
274274
'bg.css',
275-
'http://localhost:8090/assets/images/symfony_logo.ea1ca6f7.png'
275+
'http://localhost:8090/assets/images/symfony_logo.91beba37.png'
276276
);
277277
// manifest file has CDN in value
278278
webpackAssert.assertManifestPath(
@@ -509,7 +509,7 @@ describe('Functional tests using webpack', function() {
509509
'0.8ec31654.css',
510510
'main.4a5effdb.js',
511511
'h1.8ec31654.css',
512-
'bg.0ec2735b.css',
512+
'bg.d06c66d9.css',
513513
'manifest.json',
514514
'entrypoints.json',
515515
'runtime.0f36ae93.js',
@@ -518,12 +518,12 @@ describe('Functional tests using webpack', function() {
518518

519519
expect(path.join(config.outputPath, 'images')).to.be.a.directory()
520520
.with.files([
521-
'symfony_logo.ea1ca6f7.png'
521+
'symfony_logo.91beba37.png'
522522
]);
523523

524524
webpackAssert.assertOutputFileContains(
525-
'bg.0ec2735b.css',
526-
'/build/images/symfony_logo.ea1ca6f7.png'
525+
'bg.d06c66d9.css',
526+
'/build/images/symfony_logo.91beba37.png'
527527
);
528528

529529
done();
@@ -552,22 +552,22 @@ describe('Functional tests using webpack', function() {
552552

553553
expect(path.join(config.outputPath, 'images')).to.be.a.directory()
554554
.with.files([
555-
'symfony_logo.ea1ca6f7.png'
555+
'symfony_logo.91beba37.png'
556556
]);
557557

558558
expect(path.join(config.outputPath, 'fonts')).to.be.a.directory()
559559
.with.files([
560-
'Roboto.9896f773.woff2'
560+
'Roboto.e1dcc0db.woff2'
561561
]);
562562

563563
webpackAssert.assertOutputFileContains(
564564
'bg.css',
565-
'/build/images/symfony_logo.ea1ca6f7.png'
565+
'/build/images/symfony_logo.91beba37.png'
566566
);
567567

568568
webpackAssert.assertOutputFileContains(
569569
'font.css',
570-
'/build/fonts/Roboto.9896f773.woff2'
570+
'/build/fonts/Roboto.e1dcc0db.woff2'
571571
);
572572

573573
done();
@@ -591,34 +591,34 @@ describe('Functional tests using webpack', function() {
591591

592592
expect(path.join(config.outputPath, 'images')).to.be.a.directory()
593593
.with.files([
594-
'symfony_logo.ea1ca6f7.png',
595-
'symfony_logo.f27119c2.png'
594+
'symfony_logo.91beba37.png',
595+
'symfony_logo.f880ba14.png'
596596
]);
597597

598598
expect(path.join(config.outputPath, 'fonts')).to.be.a.directory()
599599
.with.files([
600-
'Roboto.9896f773.woff2',
601-
'Roboto.3c37aa69.woff2'
600+
'Roboto.e1dcc0db.woff2',
601+
'Roboto.2779fd7b.woff2'
602602
]);
603603

604604
webpackAssert.assertOutputFileContains(
605605
'styles.css',
606-
'/build/images/symfony_logo.ea1ca6f7.png'
606+
'/build/images/symfony_logo.91beba37.png'
607607
);
608608

609609
webpackAssert.assertOutputFileContains(
610610
'styles.css',
611-
'/build/images/symfony_logo.f27119c2.png'
611+
'/build/images/symfony_logo.f880ba14.png'
612612
);
613613

614614
webpackAssert.assertOutputFileContains(
615615
'styles.css',
616-
'/build/fonts/Roboto.9896f773.woff2'
616+
'/build/fonts/Roboto.e1dcc0db.woff2'
617617
);
618618

619619
webpackAssert.assertOutputFileContains(
620620
'styles.css',
621-
'/build/fonts/Roboto.3c37aa69.woff2'
621+
'/build/fonts/Roboto.2779fd7b.woff2'
622622
);
623623

624624
done();
@@ -1641,7 +1641,7 @@ module.exports = {
16411641
expect(config.outputPath).to.be.a.directory().with.deep.files([
16421642
'main.js',
16431643
'main.css',
1644-
'images/logo.82b9c7a5.png',
1644+
'images/logo.26bd867d.png',
16451645
'manifest.json',
16461646
'entrypoints.json',
16471647
'runtime.js',
@@ -1706,7 +1706,7 @@ module.exports = {
17061706
expect(config.outputPath).to.be.a.directory().with.deep.files([
17071707
'main.js',
17081708
'main.css',
1709-
'images/logo.82b9c7a5.png',
1709+
'images/logo.26bd867d.png',
17101710
'manifest.json',
17111711
'entrypoints.json',
17121712
'runtime.js',
@@ -1866,7 +1866,7 @@ module.exports = {
18661866
expect(config.outputPath).to.be.a.directory().with.deep.files([
18671867
'main.js',
18681868
'main.css',
1869-
'images/logo.82b9c7a5.png',
1869+
'images/logo.26bd867d.png',
18701870
'manifest.json',
18711871
'entrypoints.json',
18721872
'runtime.js',
@@ -2212,13 +2212,13 @@ module.exports = {
22122212

22132213
expect(path.join(config.outputPath, 'images')).to.be.a.directory()
22142214
.with.files([
2215-
'symfony_logo.ea1ca6f7.png',
2216-
'symfony_logo_alt.f27119c2.png',
2215+
'symfony_logo.91beba37.png',
2216+
'symfony_logo_alt.f880ba14.png',
22172217
]);
22182218

22192219
expect(path.join(config.outputPath, 'images', 'same_filename')).to.be.a.directory()
22202220
.with.files([
2221-
'symfony_logo.f27119c2.png',
2221+
'symfony_logo.f880ba14.png',
22222222
]);
22232223

22242224
webpackAssert.assertManifestPath(
@@ -2228,17 +2228,17 @@ module.exports = {
22282228

22292229
webpackAssert.assertManifestPath(
22302230
'build/images/symfony_logo.png',
2231-
'/build/images/symfony_logo.ea1ca6f7.png'
2231+
'/build/images/symfony_logo.91beba37.png'
22322232
);
22332233

22342234
webpackAssert.assertManifestPath(
22352235
'build/images/symfony_logo_alt.png',
2236-
'/build/images/symfony_logo_alt.f27119c2.png'
2236+
'/build/images/symfony_logo_alt.f880ba14.png'
22372237
);
22382238

22392239
webpackAssert.assertManifestPath(
22402240
'build/images/same_filename/symfony_logo.png',
2241-
'/build/images/same_filename/symfony_logo.f27119c2.png'
2241+
'/build/images/same_filename/symfony_logo.f880ba14.png'
22422242
);
22432243

22442244
done();
@@ -2305,8 +2305,8 @@ module.exports = {
23052305
'runtime.e9dea5e6.js',
23062306
'main.00415522.js',
23072307
'manifest.json',
2308-
'symfony_logo.ea1ca6f7.png',
2309-
'symfony_logo_alt.f27119c2.png',
2308+
'symfony_logo.91beba37.png',
2309+
'symfony_logo_alt.f880ba14.png',
23102310
]);
23112311

23122312
webpackAssert.assertManifestPath(
@@ -2322,12 +2322,12 @@ module.exports = {
23222322

23232323
webpackAssert.assertManifestPath(
23242324
'build/symfony_logo.png',
2325-
'/build/symfony_logo.ea1ca6f7.png'
2325+
'/build/symfony_logo.91beba37.png'
23262326
);
23272327

23282328
webpackAssert.assertManifestPath(
23292329
'build/symfony_logo_alt.png',
2330-
'/build/symfony_logo_alt.f27119c2.png'
2330+
'/build/symfony_logo_alt.f880ba14.png'
23312331
);
23322332

23332333
webpackAssert.assertManifestPath(
@@ -2398,13 +2398,13 @@ module.exports = {
23982398

23992399
expect(path.join(config.outputPath, 'images')).to.be.a.directory()
24002400
.with.files([
2401-
'symfony_logo.ea1ca6f7.png',
2402-
'symfony_logo_alt.f27119c2.png',
2401+
'symfony_logo.91beba37.png',
2402+
'symfony_logo_alt.f880ba14.png',
24032403
]);
24042404

24052405
expect(path.join(config.outputPath, 'images', 'same_filename')).to.be.a.directory()
24062406
.with.files([
2407-
'symfony_logo.f27119c2.png',
2407+
'symfony_logo.f880ba14.png',
24082408
]);
24092409

24102410
webpackAssert.assertManifestPath(
@@ -2414,17 +2414,17 @@ module.exports = {
24142414

24152415
webpackAssert.assertManifestPath(
24162416
'build/images/symfony_logo.png',
2417-
'/build/images/symfony_logo.ea1ca6f7.png'
2417+
'/build/images/symfony_logo.91beba37.png'
24182418
);
24192419

24202420
webpackAssert.assertManifestPath(
24212421
'build/images/symfony_logo_alt.png',
2422-
'/build/images/symfony_logo_alt.f27119c2.png'
2422+
'/build/images/symfony_logo_alt.f880ba14.png'
24232423
);
24242424

24252425
webpackAssert.assertManifestPath(
24262426
'build/images/same_filename/symfony_logo.png',
2427-
'/build/images/same_filename/symfony_logo.f27119c2.png'
2427+
'/build/images/same_filename/symfony_logo.f880ba14.png'
24282428
);
24292429

24302430
done();
@@ -2508,8 +2508,8 @@ module.exports = {
25082508
'manifest.json',
25092509

25102510
// 1st rule
2511-
'foo-40095734b7c5293c04603aa78333c23e.css',
2512-
'foo-40095734b7c5293c04603aa78333c23e.js',
2511+
'foo-5d76c098640df1edecc7ca66ee62b1ea.css',
2512+
'foo-5d76c098640df1edecc7ca66ee62b1ea.js',
25132513

25142514
// 2nd rule
25152515
'foo.json',
@@ -2963,7 +2963,7 @@ module.exports = {
29632963
'/build/runtime.js': 'sha384-GhoJXFTd5hHxARTOCT3RTrcOdggU7hmL/esw02KNiVIWsdumxg20TRjgdzXBMGfE',
29642964
'/build/main.js': 'sha384-TnYCkFJqLSzDkhJOQRhe1JPC6MhfAurWWjEqNVNa0YK8N4a89mMsaAHFOP+8u3Oq',
29652965
'/build/main~other.js': 'sha384-XFgE9lNhD68TAYS7RjTCP7aXyjUxWftiNFMNxG7izJZ3urzp/7u1Tn4DMARxCLIw',
2966-
'/build/main~other.css': 'sha384-hfZmq9+2oI5Cst4/F4YyS2tJAAYdGz7vqSMP8cJoa8bVOr2kxNRLxSw6P8UZjwUn',
2966+
'/build/main~other.css': 'sha384-CwxeOsagC0TZKZIMFU7gd1fQG1nbF7wHg/uLJSsU/5Soa9JwEOZcAzAFMmctn6kX',
29672967
'/build/other.js': 'sha384-xZXDGUPL+RIK36nvmtEbJleQy9BCgG89MXkrYTNcbpDcZs4C1VbWAFMFehc8Mmnw',
29682968

29692969
// vendors~main~other.js's hash is not tested since its
@@ -2996,7 +2996,7 @@ module.exports = {
29962996
'http://localhost:8090/assets/runtime.js': 'sha256-qW5QarAS9yWb4YTF5gVKNF24g4p5GayDErYme10iu7A=',
29972997
'http://localhost:8090/assets/main.js': 'sha256-GCcvESjPed0klG3VxS0DLeRZ0UNJl/Ln210ldsAz9U4=',
29982998
'http://localhost:8090/assets/main~other.js': 'sha256-iNXyEC346lU4Z8e4pxtatvElwLSJu/in5Mpg+EsIrwA=',
2999-
'http://localhost:8090/assets/main~other.css': 'sha256-KVo9sI0v6MnbxPg/xZMSn2XE7qIChWiDh1uED1tP5Fo=',
2999+
'http://localhost:8090/assets/main~other.css': 'sha256-GyGOCV1nJYunb8s/DT5wICbruabZcqzDFJRnXIlZ9I4=',
30003000
'http://localhost:8090/assets/other.js': 'sha256-O2agOBc6WzelNGpE0dg3k6X1jtEVTRq9ogik4UAlBjg=',
30013001

30023002
// vendors~main~other.js's hash is not tested since its
@@ -3028,7 +3028,7 @@ module.exports = {
30283028
'/build/runtime.js': 'sha256-wxWX1GOm4edacCjvQsqZ1hG9tls4ZtuUOGQ8goGNg54= sha512-eiQrrAyaBpUlypIGVURWONjsAW8sImJllkwQ6NSDK6tIVNy/lInthruFT30x/OGRfHa4aYEaOHriEjisoxcw1Q==',
30293029
'/build/main.js': 'sha256-GCcvESjPed0klG3VxS0DLeRZ0UNJl/Ln210ldsAz9U4= sha512-dxwgdqyuVFpEn4D/xSTLDf524+OSdwBgAYwB6zRswaM4SszrrClIBK3FScktIU3CNWEqiHgjHPj2SnQTLAonGg==',
30303030
'/build/main~other.js': 'sha256-iNXyEC346lU4Z8e4pxtatvElwLSJu/in5Mpg+EsIrwA= sha512-ay9A5f9PnQgqkt0obZY0UD+Bx0IVf13NijC74/Gek6Fl5JoOpHMXBlqWxZnMlnbP0/OCm1lgKRDitLd4vys87w==',
3031-
'/build/main~other.css': 'sha256-6AltZJTjdVuLywCBE8qQevkscxazmWyh/19OL6cxkwY= sha512-zE1kAcqJ/jNnycEwELK7BfauEgRlK6cGrN+9urz4JI1K+s5BpglYFF9G0VOiSA7Kj3w46XX1WcjZ5w5QohBFEw==',
3031+
'/build/main~other.css': 'sha256-bsTMZz4D7wBon35PnVm0dN51OH4EMq79NRecjZVoJ0A= sha512-kUbxtlmFlqBd+mB0P2HfsGoTZDGjdPz/BT9wc7l5fdSkML8CCNGg/ccrWXglUNIdgH10y92Jf8zIOHTRygXwxQ==',
30323032
'/build/other.js': 'sha256-O2agOBc6WzelNGpE0dg3k6X1jtEVTRq9ogik4UAlBjg= sha512-tXToyMmW0EuKUF667SlO7QJZFg8eE6fHSmZIk7G0qIo9oUhgMQzwWyc5UpzlHlTOoLaKWB+UNgjOb0x3t28PZg==',
30333033

30343034
// vendors~main~other.js's hash is not tested since its

0 commit comments

Comments
 (0)