Skip to content

Commit 5f2fb7f

Browse files
committed
bug #1631 [LiveComponent] Fix idiomorph dependency (fix #1567) (smnandre)
This PR was merged into the 2.x branch. Discussion ---------- [LiveComponent] Fix idiomorph dependency (fix #1567) Current idiomorph dependency does not work for some users with npm Now it's available as a ES module it should fix the problem Thanks `@pcmmf` for the hand Commits ------- b8076f8 [LiveComponent] Fix idiomorph dependency (fix #1567)
2 parents 057abdb + b8076f8 commit 5f2fb7f

File tree

3 files changed

+41
-21
lines changed

3 files changed

+41
-21
lines changed

src/LiveComponent/assets/dist/live_controller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ var Idiomorph = (function () {
588588
* @returns {boolean}
589589
*/
590590
function ignoreValueOfActiveElement(possibleActiveElement, ctx) {
591-
return ctx.ignoreActiveValue && possibleActiveElement === document.activeElement && possibleActiveElement !== document.body;
591+
return ctx.ignoreActiveValue && possibleActiveElement === document.activeElement;
592592
}
593593

594594
/**

src/LiveComponent/assets/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
}
2828
},
2929
"dependencies": {
30-
"idiomorph": "https://github.com/bigskysoftware/idiomorph.git"
30+
"idiomorph": "^0.3.0"
3131
},
3232
"peerDependencies": {
3333
"@hotwired/stimulus": "^3.0.0"

yarn.lock

Lines changed: 39 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
"@jridgewell/trace-mapping" "^0.3.9"
1717

1818
"@ampproject/remapping@^2.2.1":
19-
version "2.2.1"
20-
resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630"
21-
integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==
19+
version "2.3.0"
20+
resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4"
21+
integrity sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==
2222
dependencies:
23-
"@jridgewell/gen-mapping" "^0.3.0"
24-
"@jridgewell/trace-mapping" "^0.3.9"
23+
"@jridgewell/gen-mapping" "^0.3.5"
24+
"@jridgewell/trace-mapping" "^0.3.24"
2525

2626
"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6":
2727
version "7.18.6"
@@ -2127,10 +2127,10 @@
21272127
resolved "https://registry.npmjs.org/@hotwired/stimulus/-/stimulus-3.2.1.tgz"
21282128
integrity sha512-HGlzDcf9vv/EQrMJ5ZG6VWNs8Z/xMN+1o2OhV1gKiSG6CqZt5MCBB1gRg5ILiN3U0jEAxuDTNPRfBcnZBDmupQ==
21292129

2130-
"@hotwired/turbo@^7.1.0 || ^8.0":
2131-
version "8.0.3"
2132-
resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-8.0.3.tgz#338e07278f4b3c76921328d3c92dbc4831c209d0"
2133-
integrity sha512-qLgp7d6JaegKjMToTJahosrFxV3odfSbiekispQ3soOzE5jnU+iEMWlRvYRe/jvy5Q+JWoywtf9j3RD4ikVjIg==
2130+
"@hotwired/turbo@^8.0":
2131+
version "8.0.4"
2132+
resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-8.0.4.tgz#5c5361c06a37cdf10dcba4223f1afd0ca1c75091"
2133+
integrity sha512-mlZEFUZrJnpfj+g/XeCWWuokvQyN68WvM78JM+0jfSFc98wegm259vCbC1zSllcspRwbgXK31ibehCy5PA78/Q==
21342134

21352135
"@humanwhocodes/config-array@^0.11.8":
21362136
version "0.11.8"
@@ -2390,6 +2390,15 @@
23902390
"@jridgewell/sourcemap-codec" "^1.4.10"
23912391
"@jridgewell/trace-mapping" "^0.3.9"
23922392

2393+
"@jridgewell/gen-mapping@^0.3.5":
2394+
version "0.3.5"
2395+
resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36"
2396+
integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==
2397+
dependencies:
2398+
"@jridgewell/set-array" "^1.2.1"
2399+
"@jridgewell/sourcemap-codec" "^1.4.10"
2400+
"@jridgewell/trace-mapping" "^0.3.24"
2401+
23932402
"@jridgewell/[email protected]":
23942403
version "3.1.0"
23952404
resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"
@@ -2405,6 +2414,11 @@
24052414
resolved "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz"
24062415
integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
24072416

2417+
"@jridgewell/set-array@^1.2.1":
2418+
version "1.2.1"
2419+
resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280"
2420+
integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==
2421+
24082422
"@jridgewell/source-map@^0.3.3":
24092423
version "0.3.5"
24102424
resolved "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz"
@@ -2431,10 +2445,10 @@
24312445
"@jridgewell/resolve-uri" "3.1.0"
24322446
"@jridgewell/sourcemap-codec" "1.4.14"
24332447

2434-
"@jridgewell/trace-mapping@^0.3.18":
2435-
version "0.3.23"
2436-
resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.23.tgz#afc96847f3f07841477f303eed687707a5aacd80"
2437-
integrity sha512-9/4foRoUKp8s96tSkh8DlAAc5A0Ty8vLXld+l9gjKKY6ckwI8G15f0hskGmuLZu78ZlGa1vtsfOa+lnB4vG6Jg==
2448+
"@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.24":
2449+
version "0.3.25"
2450+
resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
2451+
integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
24382452
dependencies:
24392453
"@jridgewell/resolve-uri" "^3.1.0"
24402454
"@jridgewell/sourcemap-codec" "^1.4.14"
@@ -5444,9 +5458,10 @@ icss-utils@^5.0.0:
54445458
resolved "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz"
54455459
integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
54465460

5447-
"idiomorph@https://github.com/bigskysoftware/idiomorph.git":
5461+
idiomorph@^0.3.0:
54485462
version "0.3.0"
5449-
resolved "https://github.com/bigskysoftware/idiomorph.git#8e40c42cc573609eb6863e72fa3403574974dd7d"
5463+
resolved "https://registry.yarnpkg.com/idiomorph/-/idiomorph-0.3.0.tgz#f6675bc5bef1a72c94021e43141a3f605d2d6288"
5464+
integrity sha512-UhV1Ey5xCxIwR9B+OgIjQa+1Jx99XQ1vQHUsKBU1RpQzCx1u+b+N6SOXgf5mEJDqemUI/ffccu6+71l2mJUsRA==
54505465

54515466
ignore@^5.2.0:
54525467
version "5.2.4"
@@ -6680,9 +6695,9 @@ magic-string@^0.30.1, magic-string@^0.30.3:
66806695
"@jridgewell/sourcemap-codec" "^1.4.15"
66816696

66826697
magic-string@^0.30.4:
6683-
version "0.30.7"
6684-
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.7.tgz#0cecd0527d473298679da95a2d7aeb8c64048505"
6685-
integrity sha512-8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA==
6698+
version "0.30.8"
6699+
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.8.tgz#14e8624246d2bedba70d5462aa99ac9681844613"
6700+
integrity sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==
66866701
dependencies:
66876702
"@jridgewell/sourcemap-codec" "^1.4.15"
66886703

@@ -8307,7 +8322,12 @@ snapdragon@^0.8.1:
83078322
source-map-resolve "^0.5.0"
83088323
use "^3.1.0"
83098324

8310-
source-map-js@^1.0.1, source-map-js@^1.0.2:
8325+
source-map-js@^1.0.1:
8326+
version "1.2.0"
8327+
resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
8328+
integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
8329+
8330+
source-map-js@^1.0.2:
83118331
version "1.0.2"
83128332
resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"
83138333
integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==

0 commit comments

Comments
 (0)