Skip to content

Commit bfa094e

Browse files
committed
Auto merge of #3954 - Turbo87:disable-sri, r=locks
Remove `ember-cli-sri` addon temporarily ember-cli/broccoli-asset-rev#29 can in some cases cause SRI failures. specifically, when file A depends on file B depends on file C, and file C changes, then the fingerprinting in file A and file B might not change, even though the injected filename of file C has changed, which leads to a fingerprint collision, which results in a user-visible SRI failure. Disabling SRI is certainly not perfect, but it's better than having a broken site every now and then without any way to resolve it.
2 parents 487446d + 5feef7b commit bfa094e

File tree

2 files changed

+1
-63
lines changed

2 files changed

+1
-63
lines changed

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
"ember-cli-meta-tags": "6.1.2",
8080
"ember-cli-mirage": "2.2.0",
8181
"ember-cli-notifications": "7.0.0",
82-
"ember-cli-sri": "2.1.1",
8382
"ember-cli-terser": "4.0.2",
8483
"ember-click-outside": "2.0.0",
8584
"ember-concurrency": "2.1.2",

yarn.lock

Lines changed: 1 addition & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -4131,18 +4131,6 @@ broccoli-builder@^0.18.14:
41314131
rsvp "^3.0.17"
41324132
silent-error "^1.0.1"
41334133

4134-
broccoli-caching-writer@^2.2.0:
4135-
version "2.3.1"
4136-
resolved "https://registry.yarnpkg.com/broccoli-caching-writer/-/broccoli-caching-writer-2.3.1.tgz#b93cf58f9264f003075868db05774f4e7f25bd07"
4137-
integrity sha1-uTz1j5Jk8AMHWGjbBXdPTn8lvQc=
4138-
dependencies:
4139-
broccoli-kitchen-sink-helpers "^0.2.5"
4140-
broccoli-plugin "1.1.0"
4141-
debug "^2.1.1"
4142-
rimraf "^2.2.8"
4143-
rsvp "^3.0.17"
4144-
walk-sync "^0.2.5"
4145-
41464134
broccoli-caching-writer@^3.0.3:
41474135
version "3.0.3"
41484136
resolved "https://registry.yarnpkg.com/broccoli-caching-writer/-/broccoli-caching-writer-3.0.3.tgz#0bd2c96a9738d6a6ab590f07ba35c5157d7db476"
@@ -4327,14 +4315,6 @@ broccoli-funnel@^3.0.0, broccoli-funnel@^3.0.2, broccoli-funnel@^3.0.3, broccoli
43274315
minimatch "^3.0.0"
43284316
walk-sync "^2.0.2"
43294317

4330-
broccoli-kitchen-sink-helpers@^0.2.5:
4331-
version "0.2.9"
4332-
resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.2.9.tgz#a5e0986ed8d76fb5984b68c3f0450d3a96e36ecc"
4333-
integrity sha1-peCYbtjXb7WYS2jD8EUNOpbjbsw=
4334-
dependencies:
4335-
glob "^5.0.10"
4336-
mkdirp "^0.5.1"
4337-
43384318
broccoli-kitchen-sink-helpers@^0.3.1:
43394319
version "0.3.1"
43404320
resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.3.1.tgz#77c7c18194b9664163ec4fcee2793444926e0c06"
@@ -4464,16 +4444,6 @@ broccoli-persistent-filter@^3.1.2:
44644444
symlink-or-copy "^1.0.1"
44654445
sync-disk-cache "^2.0.0"
44664446

4467-
4468-
version "1.1.0"
4469-
resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-1.1.0.tgz#73e2cfa05f8ea1e3fc1420c40c3d9e7dc724bf02"
4470-
integrity sha1-c+LPoF+OoeP8FCDEDD2efcckvwI=
4471-
dependencies:
4472-
promise-map-series "^0.2.1"
4473-
quick-temp "^0.1.3"
4474-
rimraf "^2.3.4"
4475-
symlink-or-copy "^1.0.1"
4476-
44774447
broccoli-plugin@^1.0.0, broccoli-plugin@^1.1.0, broccoli-plugin@^1.2.0, broccoli-plugin@^1.2.1, broccoli-plugin@^1.3.0, broccoli-plugin@^1.3.1:
44784448
version "1.3.1"
44794449
resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-1.3.1.tgz#a26315732fb99ed2d9fb58f12a1e14e986b4fabd"
@@ -4587,17 +4557,6 @@ broccoli-source@^3.0.0, broccoli-source@^3.0.1:
45874557
dependencies:
45884558
broccoli-node-api "^1.6.0"
45894559

4590-
broccoli-sri-hash@^2.1.0:
4591-
version "2.1.2"
4592-
resolved "https://registry.yarnpkg.com/broccoli-sri-hash/-/broccoli-sri-hash-2.1.2.tgz#bc69905ed7a381ad325cc0d02ded071328ebf3f3"
4593-
integrity sha1-vGmQXtejga0yXMDQLe0HEyjr8/M=
4594-
dependencies:
4595-
broccoli-caching-writer "^2.2.0"
4596-
mkdirp "^0.5.1"
4597-
rsvp "^3.1.0"
4598-
sri-toolbox "^0.2.0"
4599-
symlink-or-copy "^1.0.1"
4600-
46014560
broccoli-stew@^1.5.0:
46024561
version "1.6.0"
46034562
resolved "https://registry.yarnpkg.com/broccoli-stew/-/broccoli-stew-1.6.0.tgz#01f6d92806ed6679ddbe48d405066a0e164dfbef"
@@ -6580,13 +6539,6 @@ ember-cli-preprocess-registry@^3.1.2, ember-cli-preprocess-registry@^3.3.0:
65806539
debug "^3.0.1"
65816540
process-relative-require "^1.0.0"
65826541

6583-
6584-
version "2.1.1"
6585-
resolved "https://registry.yarnpkg.com/ember-cli-sri/-/ember-cli-sri-2.1.1.tgz#971620934a4b9183cf7923cc03e178b83aa907fd"
6586-
integrity sha1-lxYgk0pLkYPPeSPMA+F4uDqpB/0=
6587-
dependencies:
6588-
broccoli-sri-hash "^2.1.0"
6589-
65906542
ember-cli-string-utils@^1.0.0, ember-cli-string-utils@^1.1.0:
65916543
version "1.1.0"
65926544
resolved "https://registry.yarnpkg.com/ember-cli-string-utils/-/ember-cli-string-utils-1.1.0.tgz#39b677fc2805f55173735376fcef278eaa4452a1"
@@ -12908,7 +12860,7 @@ route-recognizer@^0.3.3:
1290812860
resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.4.tgz#39ab1ffbce1c59e6d2bdca416f0932611e4f3ca3"
1290912861
integrity sha512-2+MhsfPhvauN1O8KaXpXAOfR/fwe8dnUXVM+xw7yt40lJRfPVQxV6yryZm0cgRvAj5fMF/mdRZbL2ptwbs5i2g==
1291012862

12911-
rsvp@^3.0.14, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.1.0, rsvp@~3.2.1:
12863+
rsvp@^3.0.14, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@~3.2.1:
1291212864
version "3.2.1"
1291312865
resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.2.1.tgz#07cb4a5df25add9e826ebc67dcc9fd89db27d84a"
1291412866
integrity sha1-B8tKXfJa3Z6Cbrxn3Mn9idsn2Eo=
@@ -13463,11 +13415,6 @@ sprintf-js@^1.0.3, sprintf-js@~1.0.2:
1346313415
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
1346413416
integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
1346513417

13466-
sri-toolbox@^0.2.0:
13467-
version "0.2.0"
13468-
resolved "https://registry.yarnpkg.com/sri-toolbox/-/sri-toolbox-0.2.0.tgz#a7fea5c3fde55e675cf1c8c06f3ebb5c2935835e"
13469-
integrity sha1-p/6lw/3lXmdc8cjAbz67XCk1g14=
13470-
1347113418
sshpk@^1.7.0:
1347213419
version "1.16.1"
1347313420
resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
@@ -14528,14 +14475,6 @@ w3c-xmlserializer@^2.0.0:
1452814475
dependencies:
1452914476
xml-name-validator "^3.0.0"
1453014477

14531-
walk-sync@^0.2.5:
14532-
version "0.2.7"
14533-
resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.2.7.tgz#b49be4ee6867657aeb736978b56a29d10fa39969"
14534-
integrity sha1-tJvk7mhnZXrrc2l4tWop0Q+jmWk=
14535-
dependencies:
14536-
ensure-posix-path "^1.0.0"
14537-
matcher-collection "^1.0.0"
14538-
1453914478
walk-sync@^0.3.0, walk-sync@^0.3.1, walk-sync@^0.3.2, walk-sync@^0.3.3:
1454014479
version "0.3.4"
1454114480
resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.3.4.tgz#cf78486cc567d3a96b5b2237c6108017a5ffb9a4"

0 commit comments

Comments
 (0)