From fcf5aa79e12bef0845d74d0fd413acf6a7708a24 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Fri, 17 Apr 2020 08:07:03 -0400 Subject: [PATCH 1/3] Removing node 8 support, bumping file-loader v1->6, url-loader v2->4 --- package.json | 6 +- yarn.lock | 170 +++++++-------------------------------------------- 2 files changed, 26 insertions(+), 150 deletions(-) diff --git a/package.json b/package.json index 930a7ce4..a7d6d5b3 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "url": "https://github.com/symfony/webpack-encore/issues" }, "engines": { - "node": "8.* || >= 10.*" + "node": ">= 10.13.0" }, "homepage": "https://github.com/symfony/webpack-encore", "dependencies": { @@ -34,7 +34,7 @@ "clean-webpack-plugin": "^0.1.19", "css-loader": "^3.5.2", "fast-levenshtein": "^2.0.6", - "file-loader": "^1.1.10", + "file-loader": "^6.0.0", "friendly-errors-webpack-plugin": "^2.0.0-beta.1", "loader-utils": "^1.1.0", "mini-css-extract-plugin": ">=0.4.0 <0.4.3", @@ -91,7 +91,7 @@ "stylus-loader": "^3.0.2", "ts-loader": "^5.3.0", "typescript": ">=2.9", - "url-loader": "^1.0.1 || ^2.0.1", + "url-loader": "^4.0.0", "vue": "^2.3.4", "vue-loader": "^15.0.11", "vue-template-compiler": "^2.3.4", diff --git a/yarn.lock b/yarn.lock index a6e7aa32..c14e7f9e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2662,7 +2662,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: dependencies: ms "2.0.0" -debug@3.2.6, debug@^3.0.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: +debug@3.2.6, debug@^3.0.0, debug@^3.1.1, debug@^3.2.5: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -2712,11 +2712,6 @@ deep-equal@^1.0.1: object-keys "^1.1.1" regexp.prototype.flags "^1.2.0" -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - deep-is@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" @@ -2805,11 +2800,6 @@ detect-file@^1.0.0: resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= -detect-libc@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= - detect-node@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" @@ -3529,13 +3519,13 @@ file-entry-cache@^5.0.1: dependencies: flat-cache "^2.0.1" -file-loader@^1.1.10: - version "1.1.11" - resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.11.tgz#6fe886449b0f2a936e43cabaac0cdbfb369506f8" - integrity sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg== +file-loader@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.0.0.tgz#97bbfaab7a2460c07bcbd72d3a6922407f67649f" + integrity sha512-/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ== dependencies: - loader-utils "^1.0.2" - schema-utils "^0.4.5" + loader-utils "^2.0.0" + schema-utils "^2.6.5" file-uri-to-path@1.0.0: version "1.0.0" @@ -3751,13 +3741,6 @@ fs-extra@^8.1.0: jsonfile "^4.0.0" universalify "^0.1.0" -fs-minipass@^1.2.5: - version "1.2.7" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" - integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== - dependencies: - minipass "^2.6.0" - fs-write-stream-atomic@^1.0.8: version "1.0.10" resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9" @@ -4281,7 +4264,7 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= -iconv-lite@0.4.24, iconv-lite@^0.4.21, iconv-lite@^0.4.24, iconv-lite@^0.4.4: +iconv-lite@0.4.24, iconv-lite@^0.4.21, iconv-lite@^0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -4305,13 +4288,6 @@ iferr@^0.1.5: resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= -ignore-walk@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" - integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== - dependencies: - minimatch "^3.0.4" - ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" @@ -4422,7 +4398,7 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: +ini@^1.3.4, ini@^1.3.5: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== @@ -5344,7 +5320,7 @@ mime-db@1.43.0, "mime-db@>= 1.43.0 < 2": resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58" integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ== -mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: +mime-types@^2.1.12, mime-types@^2.1.26, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: version "2.1.26" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06" integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ== @@ -5407,21 +5383,6 @@ minimist@~0.0.1: resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8= -minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" - integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== - dependencies: - safe-buffer "^5.1.2" - yallist "^3.0.0" - -minizlib@^1.2.1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" - integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== - dependencies: - minipass "^2.9.0" - mississippi@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" @@ -5573,15 +5534,6 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= -needle@^2.2.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.1.tgz#14af48732463d7475696f937626b1b993247a56a" - integrity sha512-x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g== - dependencies: - debug "^3.2.6" - iconv-lite "^0.4.4" - sax "^1.2.4" - negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -5673,22 +5625,6 @@ node-notifier@^5.1.2: shellwords "^0.1.1" which "^1.3.0" -node-pre-gyp@*: - version "0.14.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" - integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4.4.2" - node-releases@^1.1.53: version "1.1.53" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4" @@ -5724,14 +5660,6 @@ node-sass@^4.5.3: dependencies: abbrev "1" -nopt@^4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48" - integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== - dependencies: - abbrev "1" - osenv "^0.1.4" - normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -5764,27 +5692,6 @@ normalize-url@^3.0.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== -npm-bundled@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b" - integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== - dependencies: - npm-normalize-package-bin "^1.0.1" - -npm-normalize-package-bin@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" - integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== - -npm-packlist@^1.1.6: - version "1.4.8" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" - integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== - dependencies: - ignore-walk "^3.0.1" - npm-bundled "^1.0.1" - npm-normalize-package-bin "^1.0.1" - npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -5792,7 +5699,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2: +"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -6032,7 +5939,7 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= -osenv@0, osenv@^0.1.4: +osenv@0: version "0.1.5" resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== @@ -6941,16 +6848,6 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" -rc@^1.2.7: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - react-is@^16.8.1: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" @@ -7417,14 +7314,6 @@ sax@^1.2.4, sax@~1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -schema-utils@^0.4.5: - version "0.4.7" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187" - integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ== - dependencies: - ajv "^6.1.0" - ajv-keywords "^3.1.0" - schema-utils@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770" @@ -7434,7 +7323,7 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -schema-utils@^2.5.0, schema-utils@^2.6.5: +schema-utils@^2.6.5: version "2.6.5" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.5.tgz#c758f0a7e624263073d396e29cd40aa101152d8a" integrity sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ== @@ -7462,7 +7351,7 @@ selfsigned@^1.10.7: dependencies: node-forge "0.9.0" -"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0: +"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -8001,7 +7890,7 @@ strip-indent@^1.0.1: dependencies: get-stdin "^4.0.1" -strip-json-comments@2.0.1, strip-json-comments@^2.0.1, strip-json-comments@~2.0.1: +strip-json-comments@2.0.1, strip-json-comments@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= @@ -8125,19 +8014,6 @@ tar@^2.0.0: fstream "^1.0.12" inherits "2" -tar@^4.4.2: - version "4.4.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" - integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== - dependencies: - chownr "^1.1.1" - fs-minipass "^1.2.5" - minipass "^2.8.6" - minizlib "^1.2.1" - mkdirp "^0.5.0" - safe-buffer "^5.1.2" - yallist "^3.0.3" - terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c" @@ -8482,14 +8358,14 @@ url-join@^2.0.5: resolved "https://registry.yarnpkg.com/url-join/-/url-join-2.0.5.tgz#5af22f18c052a000a48d7b82c5e9c2e2feeda728" integrity sha1-WvIvGMBSoACkjXuCxenC4v7tpyg= -"url-loader@^1.0.1 || ^2.0.1": - version "2.3.0" - resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-2.3.0.tgz#e0e2ef658f003efb8ca41b0f3ffbf76bab88658b" - integrity sha512-goSdg8VY+7nPZKUEChZSEtW5gjbS66USIGCeSJ1OVOJ7Yfuh/36YxCwMi5HVEJh6mqUYOoy3NJ0vlOMrWsSHog== +url-loader@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-4.1.0.tgz#c7d6b0d6b0fccd51ab3ffc58a78d32b8d89a7be2" + integrity sha512-IzgAAIC8wRrg6NYkFIJY09vtktQcsvU8V6HhtQj9PTefbYImzLB1hufqo4m+RyM5N3mLx5BqJKccgxJS+W3kqw== dependencies: - loader-utils "^1.2.3" - mime "^2.4.4" - schema-utils "^2.5.0" + loader-utils "^2.0.0" + mime-types "^2.1.26" + schema-utils "^2.6.5" url-parse@^1.4.3: version "1.4.7" @@ -8957,7 +8833,7 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= -yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: +yallist@^3.0.2: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== From 69f62cf4015863eb4ff5e3befaa5b55162c218ea Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Fri, 17 Apr 2020 10:37:39 -0400 Subject: [PATCH 2/3] tweaking test matrix --- .appveyor.yml | 2 +- .travis.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 45367597..bbaf34ec 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -3,7 +3,7 @@ cache: - "%LOCALAPPDATA%\\Yarn" environment: - nodejs_version: "8" + nodejs_version: "10" platform: - x86 diff --git a/.travis.yml b/.travis.yml index 7dbf888a..e90e0e39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ matrix: - yarn - name: 'Highest versions of the dependencies' os: linux - node_js: "10" + node_js: "12" env: - JOB_PART=test - DISABLE_UNSTABLE_CHECKS=1 @@ -37,7 +37,7 @@ matrix: node_js: "10" env: JOB_PART=test - os: linux - node_js: "8" + node_js: "12" env: JOB_PART=test script: npm run $JOB_PART From a7ab7b7a2faed6a8b463a3d8ebe4aa08110714ae Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Fri, 17 Apr 2020 10:40:28 -0400 Subject: [PATCH 3/3] updating test for hash changes --- test/functional.js | 94 +++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/test/functional.js b/test/functional.js index f81b03c6..2455c3d9 100644 --- a/test/functional.js +++ b/test/functional.js @@ -97,8 +97,8 @@ describe('Functional tests using webpack', function() { 'main.js', 'font.css', 'bg.css', - 'fonts/Roboto.9896f773.woff2', - 'images/symfony_logo.ea1ca6f7.png', + 'fonts/Roboto.e1dcc0db.woff2', + 'images/symfony_logo.91beba37.png', 'manifest.json', 'entrypoints.json' ]); @@ -123,11 +123,11 @@ describe('Functional tests using webpack', function() { ); webpackAssert.assertManifestPath( 'build/fonts/Roboto.woff2', - '/build/fonts/Roboto.9896f773.woff2' + '/build/fonts/Roboto.e1dcc0db.woff2' ); webpackAssert.assertManifestPath( 'build/images/symfony_logo.png', - '/build/images/symfony_logo.ea1ca6f7.png' + '/build/images/symfony_logo.91beba37.png' ); webpackAssert.assertOutputJsonFileMatches('entrypoints.json', { @@ -217,11 +217,11 @@ describe('Functional tests using webpack', function() { webpackAssert.assertOutputFileContains( 'bg.css', - 'http://localhost:8090/assets/images/symfony_logo.ea1ca6f7.png' + 'http://localhost:8090/assets/images/symfony_logo.91beba37.png' ); webpackAssert.assertOutputFileContains( 'font.css', - 'http://localhost:8090/assets/fonts/Roboto.9896f773.woff2' + 'http://localhost:8090/assets/fonts/Roboto.e1dcc0db.woff2' ); // manifest file has CDN in value webpackAssert.assertManifestPath( @@ -272,7 +272,7 @@ describe('Functional tests using webpack', function() { webpackAssert.assertOutputFileContains( 'bg.css', - 'http://localhost:8090/assets/images/symfony_logo.ea1ca6f7.png' + 'http://localhost:8090/assets/images/symfony_logo.91beba37.png' ); // manifest file has CDN in value webpackAssert.assertManifestPath( @@ -509,7 +509,7 @@ describe('Functional tests using webpack', function() { '0.8ec31654.css', 'main.4a5effdb.js', 'h1.8ec31654.css', - 'bg.0ec2735b.css', + 'bg.d06c66d9.css', 'manifest.json', 'entrypoints.json', 'runtime.0f36ae93.js', @@ -518,12 +518,12 @@ describe('Functional tests using webpack', function() { expect(path.join(config.outputPath, 'images')).to.be.a.directory() .with.files([ - 'symfony_logo.ea1ca6f7.png' + 'symfony_logo.91beba37.png' ]); webpackAssert.assertOutputFileContains( - 'bg.0ec2735b.css', - '/build/images/symfony_logo.ea1ca6f7.png' + 'bg.d06c66d9.css', + '/build/images/symfony_logo.91beba37.png' ); done(); @@ -552,22 +552,22 @@ describe('Functional tests using webpack', function() { expect(path.join(config.outputPath, 'images')).to.be.a.directory() .with.files([ - 'symfony_logo.ea1ca6f7.png' + 'symfony_logo.91beba37.png' ]); expect(path.join(config.outputPath, 'fonts')).to.be.a.directory() .with.files([ - 'Roboto.9896f773.woff2' + 'Roboto.e1dcc0db.woff2' ]); webpackAssert.assertOutputFileContains( 'bg.css', - '/build/images/symfony_logo.ea1ca6f7.png' + '/build/images/symfony_logo.91beba37.png' ); webpackAssert.assertOutputFileContains( 'font.css', - '/build/fonts/Roboto.9896f773.woff2' + '/build/fonts/Roboto.e1dcc0db.woff2' ); done(); @@ -591,34 +591,34 @@ describe('Functional tests using webpack', function() { expect(path.join(config.outputPath, 'images')).to.be.a.directory() .with.files([ - 'symfony_logo.ea1ca6f7.png', - 'symfony_logo.f27119c2.png' + 'symfony_logo.91beba37.png', + 'symfony_logo.f880ba14.png' ]); expect(path.join(config.outputPath, 'fonts')).to.be.a.directory() .with.files([ - 'Roboto.9896f773.woff2', - 'Roboto.3c37aa69.woff2' + 'Roboto.e1dcc0db.woff2', + 'Roboto.2779fd7b.woff2' ]); webpackAssert.assertOutputFileContains( 'styles.css', - '/build/images/symfony_logo.ea1ca6f7.png' + '/build/images/symfony_logo.91beba37.png' ); webpackAssert.assertOutputFileContains( 'styles.css', - '/build/images/symfony_logo.f27119c2.png' + '/build/images/symfony_logo.f880ba14.png' ); webpackAssert.assertOutputFileContains( 'styles.css', - '/build/fonts/Roboto.9896f773.woff2' + '/build/fonts/Roboto.e1dcc0db.woff2' ); webpackAssert.assertOutputFileContains( 'styles.css', - '/build/fonts/Roboto.3c37aa69.woff2' + '/build/fonts/Roboto.2779fd7b.woff2' ); done(); @@ -1641,7 +1641,7 @@ module.exports = { expect(config.outputPath).to.be.a.directory().with.deep.files([ 'main.js', 'main.css', - 'images/logo.82b9c7a5.png', + 'images/logo.26bd867d.png', 'manifest.json', 'entrypoints.json', 'runtime.js', @@ -1706,7 +1706,7 @@ module.exports = { expect(config.outputPath).to.be.a.directory().with.deep.files([ 'main.js', 'main.css', - 'images/logo.82b9c7a5.png', + 'images/logo.26bd867d.png', 'manifest.json', 'entrypoints.json', 'runtime.js', @@ -1866,7 +1866,7 @@ module.exports = { expect(config.outputPath).to.be.a.directory().with.deep.files([ 'main.js', 'main.css', - 'images/logo.82b9c7a5.png', + 'images/logo.26bd867d.png', 'manifest.json', 'entrypoints.json', 'runtime.js', @@ -2212,13 +2212,13 @@ module.exports = { expect(path.join(config.outputPath, 'images')).to.be.a.directory() .with.files([ - 'symfony_logo.ea1ca6f7.png', - 'symfony_logo_alt.f27119c2.png', + 'symfony_logo.91beba37.png', + 'symfony_logo_alt.f880ba14.png', ]); expect(path.join(config.outputPath, 'images', 'same_filename')).to.be.a.directory() .with.files([ - 'symfony_logo.f27119c2.png', + 'symfony_logo.f880ba14.png', ]); webpackAssert.assertManifestPath( @@ -2228,17 +2228,17 @@ module.exports = { webpackAssert.assertManifestPath( 'build/images/symfony_logo.png', - '/build/images/symfony_logo.ea1ca6f7.png' + '/build/images/symfony_logo.91beba37.png' ); webpackAssert.assertManifestPath( 'build/images/symfony_logo_alt.png', - '/build/images/symfony_logo_alt.f27119c2.png' + '/build/images/symfony_logo_alt.f880ba14.png' ); webpackAssert.assertManifestPath( 'build/images/same_filename/symfony_logo.png', - '/build/images/same_filename/symfony_logo.f27119c2.png' + '/build/images/same_filename/symfony_logo.f880ba14.png' ); done(); @@ -2305,8 +2305,8 @@ module.exports = { 'runtime.e9dea5e6.js', 'main.00415522.js', 'manifest.json', - 'symfony_logo.ea1ca6f7.png', - 'symfony_logo_alt.f27119c2.png', + 'symfony_logo.91beba37.png', + 'symfony_logo_alt.f880ba14.png', ]); webpackAssert.assertManifestPath( @@ -2322,12 +2322,12 @@ module.exports = { webpackAssert.assertManifestPath( 'build/symfony_logo.png', - '/build/symfony_logo.ea1ca6f7.png' + '/build/symfony_logo.91beba37.png' ); webpackAssert.assertManifestPath( 'build/symfony_logo_alt.png', - '/build/symfony_logo_alt.f27119c2.png' + '/build/symfony_logo_alt.f880ba14.png' ); webpackAssert.assertManifestPath( @@ -2398,13 +2398,13 @@ module.exports = { expect(path.join(config.outputPath, 'images')).to.be.a.directory() .with.files([ - 'symfony_logo.ea1ca6f7.png', - 'symfony_logo_alt.f27119c2.png', + 'symfony_logo.91beba37.png', + 'symfony_logo_alt.f880ba14.png', ]); expect(path.join(config.outputPath, 'images', 'same_filename')).to.be.a.directory() .with.files([ - 'symfony_logo.f27119c2.png', + 'symfony_logo.f880ba14.png', ]); webpackAssert.assertManifestPath( @@ -2414,17 +2414,17 @@ module.exports = { webpackAssert.assertManifestPath( 'build/images/symfony_logo.png', - '/build/images/symfony_logo.ea1ca6f7.png' + '/build/images/symfony_logo.91beba37.png' ); webpackAssert.assertManifestPath( 'build/images/symfony_logo_alt.png', - '/build/images/symfony_logo_alt.f27119c2.png' + '/build/images/symfony_logo_alt.f880ba14.png' ); webpackAssert.assertManifestPath( 'build/images/same_filename/symfony_logo.png', - '/build/images/same_filename/symfony_logo.f27119c2.png' + '/build/images/same_filename/symfony_logo.f880ba14.png' ); done(); @@ -2508,8 +2508,8 @@ module.exports = { 'manifest.json', // 1st rule - 'foo-40095734b7c5293c04603aa78333c23e.css', - 'foo-40095734b7c5293c04603aa78333c23e.js', + 'foo-5d76c098640df1edecc7ca66ee62b1ea.css', + 'foo-5d76c098640df1edecc7ca66ee62b1ea.js', // 2nd rule 'foo.json', @@ -2963,7 +2963,7 @@ module.exports = { '/build/runtime.js': 'sha384-GhoJXFTd5hHxARTOCT3RTrcOdggU7hmL/esw02KNiVIWsdumxg20TRjgdzXBMGfE', '/build/main.js': 'sha384-TnYCkFJqLSzDkhJOQRhe1JPC6MhfAurWWjEqNVNa0YK8N4a89mMsaAHFOP+8u3Oq', '/build/main~other.js': 'sha384-XFgE9lNhD68TAYS7RjTCP7aXyjUxWftiNFMNxG7izJZ3urzp/7u1Tn4DMARxCLIw', - '/build/main~other.css': 'sha384-hfZmq9+2oI5Cst4/F4YyS2tJAAYdGz7vqSMP8cJoa8bVOr2kxNRLxSw6P8UZjwUn', + '/build/main~other.css': 'sha384-CwxeOsagC0TZKZIMFU7gd1fQG1nbF7wHg/uLJSsU/5Soa9JwEOZcAzAFMmctn6kX', '/build/other.js': 'sha384-xZXDGUPL+RIK36nvmtEbJleQy9BCgG89MXkrYTNcbpDcZs4C1VbWAFMFehc8Mmnw', // vendors~main~other.js's hash is not tested since its @@ -2996,7 +2996,7 @@ module.exports = { 'http://localhost:8090/assets/runtime.js': 'sha256-qW5QarAS9yWb4YTF5gVKNF24g4p5GayDErYme10iu7A=', 'http://localhost:8090/assets/main.js': 'sha256-GCcvESjPed0klG3VxS0DLeRZ0UNJl/Ln210ldsAz9U4=', 'http://localhost:8090/assets/main~other.js': 'sha256-iNXyEC346lU4Z8e4pxtatvElwLSJu/in5Mpg+EsIrwA=', - 'http://localhost:8090/assets/main~other.css': 'sha256-KVo9sI0v6MnbxPg/xZMSn2XE7qIChWiDh1uED1tP5Fo=', + 'http://localhost:8090/assets/main~other.css': 'sha256-GyGOCV1nJYunb8s/DT5wICbruabZcqzDFJRnXIlZ9I4=', 'http://localhost:8090/assets/other.js': 'sha256-O2agOBc6WzelNGpE0dg3k6X1jtEVTRq9ogik4UAlBjg=', // vendors~main~other.js's hash is not tested since its @@ -3028,7 +3028,7 @@ module.exports = { '/build/runtime.js': 'sha256-wxWX1GOm4edacCjvQsqZ1hG9tls4ZtuUOGQ8goGNg54= sha512-eiQrrAyaBpUlypIGVURWONjsAW8sImJllkwQ6NSDK6tIVNy/lInthruFT30x/OGRfHa4aYEaOHriEjisoxcw1Q==', '/build/main.js': 'sha256-GCcvESjPed0klG3VxS0DLeRZ0UNJl/Ln210ldsAz9U4= sha512-dxwgdqyuVFpEn4D/xSTLDf524+OSdwBgAYwB6zRswaM4SszrrClIBK3FScktIU3CNWEqiHgjHPj2SnQTLAonGg==', '/build/main~other.js': 'sha256-iNXyEC346lU4Z8e4pxtatvElwLSJu/in5Mpg+EsIrwA= sha512-ay9A5f9PnQgqkt0obZY0UD+Bx0IVf13NijC74/Gek6Fl5JoOpHMXBlqWxZnMlnbP0/OCm1lgKRDitLd4vys87w==', - '/build/main~other.css': 'sha256-6AltZJTjdVuLywCBE8qQevkscxazmWyh/19OL6cxkwY= sha512-zE1kAcqJ/jNnycEwELK7BfauEgRlK6cGrN+9urz4JI1K+s5BpglYFF9G0VOiSA7Kj3w46XX1WcjZ5w5QohBFEw==', + '/build/main~other.css': 'sha256-bsTMZz4D7wBon35PnVm0dN51OH4EMq79NRecjZVoJ0A= sha512-kUbxtlmFlqBd+mB0P2HfsGoTZDGjdPz/BT9wc7l5fdSkML8CCNGg/ccrWXglUNIdgH10y92Jf8zIOHTRygXwxQ==', '/build/other.js': 'sha256-O2agOBc6WzelNGpE0dg3k6X1jtEVTRq9ogik4UAlBjg= sha512-tXToyMmW0EuKUF667SlO7QJZFg8eE6fHSmZIk7G0qIo9oUhgMQzwWyc5UpzlHlTOoLaKWB+UNgjOb0x3t28PZg==', // vendors~main~other.js's hash is not tested since its