From a0f343d9225fe7ff430ebd79bbb70423b4013d6b Mon Sep 17 00:00:00 2001 From: Markus Sanin Date: Mon, 15 Sep 2025 09:22:07 +0200 Subject: [PATCH 1/2] Allow `ember-truth-helpers` v5 as dependency --- ember-basic-dropdown/package.json | 2 +- pnpm-lock.yaml | 52 +++++-------------------------- test-app/package.json | 2 +- 3 files changed, 9 insertions(+), 47 deletions(-) diff --git a/ember-basic-dropdown/package.json b/ember-basic-dropdown/package.json index ecc45438..dc1e519e 100644 --- a/ember-basic-dropdown/package.json +++ b/ember-basic-dropdown/package.json @@ -70,7 +70,7 @@ "ember-modifier": "^4.2.0", "ember-lifeline": "^7.0.0", "ember-style-modifier": "^4.4.0", - "ember-truth-helpers": "^4.0.3" + "ember-truth-helpers": "^4.0.3 || ^5.0.0" }, "devDependencies": { "@babel/core": "^7.27.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 39b2c404..c24c28b1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -286,8 +286,8 @@ importers: specifier: ^4.4.0 version: 4.4.0(@babel/core@7.27.1)(@ember/string@4.0.1)(ember-source@6.4.0(@glimmer/component@2.0.0)(rsvp@4.8.5)) ember-truth-helpers: - specifier: ^4.0.3 - version: 4.0.3(ember-source@6.4.0(@glimmer/component@2.0.0)(rsvp@4.8.5)) + specifier: ^4.0.3 || ^5.0.0 + version: 5.0.0 devDependencies: '@babel/core': specifier: ^7.27.1 @@ -536,8 +536,8 @@ importers: specifier: ^7.6.0 version: 7.6.0(@babel/core@7.27.1) ember-truth-helpers: - specifier: ^4.0.3 - version: 4.0.3(ember-source@6.4.0(@glimmer/component@2.0.0)(rsvp@4.8.5)) + specifier: ^5.0.0 + version: 5.0.0 ember-try: specifier: ^4.0.0 version: 4.0.0(encoding@0.1.13) @@ -3793,10 +3793,6 @@ packages: resolution: {integrity: sha512-0iKTZ+/wH6UB/VTWKvGuXlmwiE8HSIGcxHamwNhEC5x1mN3z8RfvsFZdQWYUzIWFN2Tek0gmepGRPTwWdBYl/A==} engines: {node: 10.* || >= 12.*} - ember-cli-typescript@5.3.0: - resolution: {integrity: sha512-gFA+ZwmsvvFwo2Jz/B9GMduEn+fPoGb69qWGP0Tp3+Tu5xypDtIKVSZ5086I3Cr19cLXD4HkrOR3YQvdUKzAkQ==} - engines: {node: '>= 12.*'} - ember-cli-version-checker@2.2.0: resolution: {integrity: sha512-G+KtYIVlSOWGcNaTFHk76xR4GdzDLzAS4uxZUKdASuFX0KJE43C6DaqL+y3VTpUFLI2FIkAS6HZ4I1YBi+S3hg==} engines: {node: '>= 4'} @@ -3852,12 +3848,6 @@ packages: resolution: {integrity: sha512-TVx24/jrvDIuPL296DV0hBwp7BWLcSMf0I8464KGz01sPytAB+ZAePbc9ooBTJDkKZEGFgatJa4nj3yF1S9Bpw==} engines: {node: '>= 10'} - ember-functions-as-helper-polyfill@2.1.3: - resolution: {integrity: sha512-Hte8jfOmSNzrz/vOchf68CGaBWXN2/5qKgFaylqr9omW2i4Wt9JmaBWRkeR0AJ53N57q3DX2TOb166Taq6QjiA==} - engines: {node: '>= 14.0.0'} - peerDependencies: - ember-source: ^3.25.0 || >=4.0.0 - ember-lifeline@7.0.0: resolution: {integrity: sha512-2l51NzgH5vjN972zgbs+32rnXnnEFKB7qsSpJF+lBI4V5TG6DMy4SfowC72ZEuAtS58OVfwITbOO+RnM21EdpA==} engines: {node: 16.* || >= 18} @@ -3945,10 +3935,8 @@ packages: resolution: {integrity: sha512-eL7lZat68E6P/D7b9UoTB5bB5Oh/0aju0Z7PCMi3aTwhaydRaxloE7TGrTRYU+NdJuyNVZXeGyxFxn2frvd3TA==} engines: {node: 12.* || >= 14} - ember-truth-helpers@4.0.3: - resolution: {integrity: sha512-T6Ogd3pk9FxYiZfSxdjgn3Hb3Ksqgw7CD23V9qfig9jktNdkNEHo4+3PA3cSD/+3a2kdH3KmNvKyarVuzdtEkA==} - peerDependencies: - ember-source: '>=3.28.0' + ember-truth-helpers@5.0.0: + resolution: {integrity: sha512-PnQd6D6hvlNC3k6gBu0SC2cvfXX6wH6W0nToomIIoxqyrD5cllk0zBh/j/1H0KsczVCWeuF9PWj5xJgL4jQAGg==} ember-try-config@4.0.0: resolution: {integrity: sha512-jAv7fqYJK7QYYekPc/8Nr7KOqDpv/asqM6F8xcRnbmf9UrD35BkSffY63qUuiD9e0aR5qiMNBIQzH8f65rGDqw==} @@ -12349,21 +12337,6 @@ snapshots: transitivePeerDependencies: - supports-color - ember-cli-typescript@5.3.0: - dependencies: - ansi-to-html: 0.6.15 - broccoli-stew: 3.0.0 - debug: 4.4.0 - execa: 4.1.0 - fs-extra: 9.1.0 - resolve: 1.22.10 - rsvp: 4.8.5 - semver: 7.7.1 - stagehand: 1.0.1 - walk-sync: 2.2.0 - transitivePeerDependencies: - - supports-color - ember-cli-version-checker@2.2.0: dependencies: resolve: 1.22.10 @@ -12598,15 +12571,6 @@ snapshots: - encoding - supports-color - ember-functions-as-helper-polyfill@2.1.3(ember-source@6.4.0(@glimmer/component@2.0.0)(rsvp@4.8.5)): - dependencies: - ember-cli-babel: 7.26.11 - ember-cli-typescript: 5.3.0 - ember-cli-version-checker: 5.1.2 - ember-source: 6.4.0(@glimmer/component@2.0.0)(rsvp@4.8.5) - transitivePeerDependencies: - - supports-color - ember-lifeline@7.0.0(@ember/test-helpers@5.2.2(@babel/core@7.27.1)(@glint/template@1.5.2)): dependencies: '@embroider/addon-shim': 1.10.0 @@ -12795,11 +12759,9 @@ snapshots: transitivePeerDependencies: - supports-color - ember-truth-helpers@4.0.3(ember-source@6.4.0(@glimmer/component@2.0.0)(rsvp@4.8.5)): + ember-truth-helpers@5.0.0: dependencies: '@embroider/addon-shim': 1.10.0 - ember-functions-as-helper-polyfill: 2.1.3(ember-source@6.4.0(@glimmer/component@2.0.0)(rsvp@4.8.5)) - ember-source: 6.4.0(@glimmer/component@2.0.0)(rsvp@4.8.5) transitivePeerDependencies: - supports-color diff --git a/test-app/package.json b/test-app/package.json index bfbb3c51..e89cff76 100644 --- a/test-app/package.json +++ b/test-app/package.json @@ -80,7 +80,7 @@ "ember-source-channel-url": "^3.0.0", "ember-template-imports": "^4.3.0", "ember-template-lint": "^7.6.0", - "ember-truth-helpers": "^4.0.3", + "ember-truth-helpers": "^5.0.0", "ember-try": "^4.0.0", "eslint": "^9.26.0", "eslint-config-prettier": "^10.1.5", From d5e13d1cbd02c3d22c0435a5a013fb970d5793eb Mon Sep 17 00:00:00 2001 From: Markus Sanin Date: Mon, 15 Sep 2025 09:31:43 +0200 Subject: [PATCH 2/2] Test ember-truth-helpers 4.x with older ember-source version --- test-app/config/ember-try.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test-app/config/ember-try.js b/test-app/config/ember-try.js index 83c1d589..f12cc00d 100644 --- a/test-app/config/ember-try.js +++ b/test-app/config/ember-try.js @@ -18,6 +18,7 @@ module.exports = async function () { 'ember-qunit': '^6.0.0', 'ember-resolver': '^8.0.0', 'ember-source': '~3.28.0', + 'ember-truth-helpers': '^4.0.3', }, }, }, @@ -31,6 +32,7 @@ module.exports = async function () { 'ember-load-initializers': '^2.1.2', 'ember-resolver': '^8.0.0', 'ember-source': '~4.4.0', + 'ember-truth-helpers': '^4.0.3', }, }, },