From c665beb82dbae618432d634f7679e5c36dd5f9e2 Mon Sep 17 00:00:00 2001 From: Robert Wagner Date: Thu, 26 Mar 2026 09:47:19 -0400 Subject: [PATCH 1/5] Require ember >= 4.8 --- .github/workflows/ci-cd.yml | 1 - README.md | 4 +- package.json | 10 +- pnpm-lock.yaml | 167 +++++++++++++----------- test-apps/new-addon/config/ember-try.js | 10 -- tests/dummy/config/ember-try.js | 10 -- 6 files changed, 99 insertions(+), 103 deletions(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 0540b42d4..6eca94309 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -89,7 +89,6 @@ jobs: fail-fast: false matrix: try-scenario: - - ember-lts-4.4 - ember-lts-4.8 - ember-lts-4.12 - ember-lts-5.4 diff --git a/README.md b/README.md index bd2025fb8..abdcfae94 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ ember-cli-addon-docs Compatibility ------------------------------------------------------------------------------ -* Ember.js v4.4 or above -* Ember CLI v4.4 or above +* Ember.js v4.8 or above +* Ember CLI v4.8 or above * Node.js v22.21.1 or above The original maintainers of AddonDocs have moved on, but this addon is still very much actively maintained and is still being used by many addons. diff --git a/package.json b/package.json index 55e55d6ee..8bed9acc5 100644 --- a/package.json +++ b/package.json @@ -65,11 +65,11 @@ "ember-keyboard": "^9.0.4", "ember-modal-dialog": "^5.0.0", "ember-router-generator": "^2.0.0", - "ember-set-helper": "^2.0.1", + "ember-set-helper": "^3.1.0", "ember-svg-jar": "^2.7.1", "ember-template-imports": "^4.3.0", "ember-tether": "^3.1.0", - "ember-truth-helpers": "^4.0.3", + "ember-truth-helpers": "^5.0.0", "execa": "5.1.1", "fs-extra": "^11.3.2", "git-repo-info": "^2.1.1", @@ -91,11 +91,11 @@ "postcss-nested": "^7.0.2", "postcss-scss": "^4.0.9", "quick-temp": "^0.1.9", - "semver": "^7.7.3", + "semver": "^7.7.4", "striptags": "^3.2.0", "tailwindcss": "1.9.6", - "tracked-toolbox": "^2.0.0", - "walk-sync": "^3.0.0", + "tracked-toolbox": "^2.2.0", + "walk-sync": "^4.0.1", "yuidocjs": "^0.10.2" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f096b6be4..598302819 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -124,8 +124,8 @@ importers: specifier: ^2.0.0 version: 2.0.0 ember-set-helper: - specifier: ^2.0.1 - version: 2.0.1(@babel/core@7.28.5) + specifier: ^3.1.0 + version: 3.1.0(@babel/core@7.28.5) ember-svg-jar: specifier: ^2.7.1 version: 2.7.1(@babel/core@7.28.5) @@ -136,8 +136,8 @@ importers: specifier: ^3.1.0 version: 3.1.0(ember-source@6.2.0(@glimmer/component@1.1.2(@babel/core@7.28.5))(rsvp@4.8.5)(webpack@5.103.0))(webpack@5.103.0) ember-truth-helpers: - specifier: ^4.0.3 - version: 4.0.3(@babel/core@7.28.5)(ember-source@6.2.0(@glimmer/component@1.1.2(@babel/core@7.28.5))(rsvp@4.8.5)(webpack@5.103.0)) + specifier: ^5.0.0 + version: 5.0.0 execa: specifier: 5.1.1 version: 5.1.1 @@ -202,8 +202,8 @@ importers: specifier: ^0.1.9 version: 0.1.9 semver: - specifier: ^7.7.3 - version: 7.7.3 + specifier: ^7.7.4 + version: 7.7.4 striptags: specifier: ^3.2.0 version: 3.2.0 @@ -211,11 +211,11 @@ importers: specifier: 1.9.6 version: 1.9.6 tracked-toolbox: - specifier: ^2.0.0 - version: 2.0.0(@babel/core@7.28.5)(ember-source@6.2.0(@glimmer/component@1.1.2(@babel/core@7.28.5))(rsvp@4.8.5)(webpack@5.103.0)) + specifier: ^2.2.0 + version: 2.2.0(@babel/core@7.28.5) walk-sync: - specifier: ^3.0.0 - version: 3.0.0 + specifier: ^4.0.1 + version: 4.0.1 yuidocjs: specifier: ^0.10.2 version: 0.10.2 @@ -2061,6 +2061,9 @@ packages: '@types/minimatch@3.0.5': resolution: {integrity: sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==} + '@types/minimatch@5.1.2': + resolution: {integrity: sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==} + '@types/ms@2.1.0': resolution: {integrity: sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==} @@ -2597,6 +2600,10 @@ packages: balanced-match@2.0.0: resolution: {integrity: sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==} + balanced-match@4.0.4: + resolution: {integrity: sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==} + engines: {node: 18 || 20 || >=22} + base64-js@1.5.1: resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} @@ -2670,6 +2677,10 @@ packages: brace-expansion@2.0.2: resolution: {integrity: sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==} + brace-expansion@5.0.5: + resolution: {integrity: sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==} + engines: {node: 18 || 20 || >=22} + braces@2.3.2: resolution: {integrity: sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==} engines: {node: '>=0.10.0'} @@ -4077,12 +4088,6 @@ packages: '@typescript-eslint/parser': optional: true - ember-functions-as-helper-polyfill@2.1.3: - resolution: {integrity: sha512-Hte8jfOmSNzrz/vOchf68CGaBWXN2/5qKgFaylqr9omW2i4Wt9JmaBWRkeR0AJ53N57q3DX2TOb166Taq6QjiA==} - engines: {node: '>= 14.0.0'} - peerDependencies: - ember-source: ~6.2.0 - ember-get-config@2.1.1: resolution: {integrity: sha512-uNmv1cPG/4qsac8oIf5txJ2FZ8p88LEpG4P3dNcjsJS98Y8hd0GPMFwVqpnzI78Lz7VYRGQWY4jnE4qm5R3j4g==} engines: {node: 12.* || 14.* || >= 16} @@ -4142,9 +4147,8 @@ packages: resolution: {integrity: sha512-89oVHVJwmLDvGvAUWgS87KpBoRhy3aZ6U0Ql6HOmU4TrPkyaa8pM0W81wj9cIwjYprcQtN9EwzZMHnq46+oUyw==} engines: {node: 8.* || 10.* || >= 12} - ember-set-helper@2.0.1: - resolution: {integrity: sha512-6IIimVGOdehZcncH1ilCY4p7hWBtZqWYMc1Xodr1ATOCuIk6ZO1yztKcUQhlmwl7fE82gL4wHD01T6XP5W59Ng==} - engines: {node: 10.* || >= 12} + ember-set-helper@3.1.0: + resolution: {integrity: sha512-5BTcvqktYjpDbi1HRaSKjuIZsSioilWczDDY3AevwbxoEiasfQMLuXFJkiCKm4aW34OXz652Upo7mumCVXJKOw==} ember-source-channel-url@3.0.0: resolution: {integrity: sha512-vF/8BraOc66ZxIDo3VuNP7iiDrnXEINclJgSJmqwAAEpg84Zb1DHPI22XTXSDA+E8fW5btPUxu65c3ZXi8AQFA==} @@ -4189,10 +4193,8 @@ packages: peerDependencies: ember-source: ~6.2.0 - ember-truth-helpers@4.0.3: - resolution: {integrity: sha512-T6Ogd3pk9FxYiZfSxdjgn3Hb3Ksqgw7CD23V9qfig9jktNdkNEHo4+3PA3cSD/+3a2kdH3KmNvKyarVuzdtEkA==} - peerDependencies: - ember-source: ~6.2.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==} @@ -6274,6 +6276,10 @@ packages: peerDependencies: webpack: ^5.103.0 + minimatch@10.2.4: + resolution: {integrity: sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==} + engines: {node: 18 || 20 || >=22} + minimatch@3.1.2: resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} @@ -7577,6 +7583,11 @@ packages: engines: {node: '>=10'} hasBin: true + semver@7.7.4: + resolution: {integrity: sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==} + engines: {node: '>=10'} + hasBin: true + send@0.19.0: resolution: {integrity: sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==} engines: {node: '>= 0.8.0'} @@ -8191,14 +8202,8 @@ packages: resolution: {integrity: sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==} engines: {node: '>=18'} - tracked-toolbox@2.0.0: - resolution: {integrity: sha512-adZtX+RGN6F+pWs/5JqVuDxLhuia4uhqmQp+UlUaxpykWjDFETtAdQR+LdDJiFPXFAXnS6FBqn/tnSLJQCm3Yw==} - engines: {node: 14.* || 16.* || >= 18} - peerDependencies: - ember-source: ~6.2.0 - peerDependenciesMeta: - ember-source: - optional: true + tracked-toolbox@2.2.0: + resolution: {integrity: sha512-YknotXj74U0nCqBk9nh1Uv1IWTnVOgt8sXIecNkyEq4oFOU70niQUlozO4E3kMKx7ae/rNlOtoF+1ALcHYzCrQ==} tree-kill@1.2.2: resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} @@ -8485,6 +8490,10 @@ packages: resolution: {integrity: sha512-41TvKmDGVpm2iuH7o+DAOt06yyu/cSHpX3uzAwetzASvlNtVddgIjXIb2DfB/Wa20B1Jo86+1Dv1CraSU7hWdw==} engines: {node: 10.* || >= 12.*} + walk-sync@4.0.1: + resolution: {integrity: sha512-oXP3IlkfG9Mqdgqh3JGYTPAcryRQd1J1CJOxOgsri2I1MD6N+k4OqxEVP4ZQ0xyYJfYPhBVPRMUVK+N5f13+jQ==} + engines: {node: '>= 20.*'} + walker@1.0.8: resolution: {integrity: sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==} @@ -9663,7 +9672,7 @@ snapshots: '@embroider/shared-internals': 3.0.1 broccoli-funnel: 3.0.8 common-ancestor-path: 1.0.1 - semver: 7.7.3 + semver: 7.7.4 transitivePeerDependencies: - supports-color @@ -9676,7 +9685,7 @@ snapshots: find-up: 5.0.0 lodash: 4.17.21 resolve: 1.22.11 - semver: 7.7.3 + semver: 7.7.4 transitivePeerDependencies: - '@babel/core' - supports-color @@ -9698,7 +9707,7 @@ snapshots: minimatch: 3.1.2 pkg-entry-points: 1.1.1 resolve-package-path: 4.0.3 - semver: 7.7.3 + semver: 7.7.4 typescript-memoize: 1.1.1 transitivePeerDependencies: - supports-color @@ -9712,11 +9721,11 @@ snapshots: is-subdir: 1.2.0 js-string-escape: 1.0.1 lodash: 4.17.21 - minimatch: 3.1.2 + minimatch: 3.1.5 pkg-entry-points: 1.1.1 resolve-package-path: 4.0.3 resolve.exports: 2.0.3 - semver: 7.7.3 + semver: 7.7.4 typescript-memoize: 1.1.1 transitivePeerDependencies: - supports-color @@ -10375,7 +10384,7 @@ snapshots: '@npmcli/fs@1.1.1': dependencies: '@gar/promisify': 1.1.3 - semver: 7.7.3 + semver: 7.7.4 '@npmcli/move-file@1.1.2': dependencies: @@ -10677,6 +10686,8 @@ snapshots: '@types/minimatch@3.0.5': {} + '@types/minimatch@5.1.2': {} + '@types/ms@2.1.0': {} '@types/node@24.10.1': @@ -11333,6 +11344,8 @@ snapshots: balanced-match@2.0.0: {} + balanced-match@4.0.4: {} + base64-js@1.5.1: {} base64id@2.0.0: {} @@ -11421,6 +11434,10 @@ snapshots: dependencies: balanced-match: 1.0.2 + brace-expansion@5.0.5: + dependencies: + balanced-match: 4.0.4 + braces@2.3.2: dependencies: arr-flatten: 1.1.0 @@ -11605,7 +11622,7 @@ snapshots: fast-ordered-set: 1.0.3 fs-tree-diff: 0.5.9 heimdalljs: 0.2.6 - minimatch: 3.1.2 + minimatch: 3.1.5 mkdirp: 0.5.6 path-posix: 1.0.0 rimraf: 2.7.1 @@ -11802,7 +11819,7 @@ snapshots: dependencies: applause: 2.0.4 broccoli-filter: 1.3.0 - minimatch: 3.1.2 + minimatch: 3.1.5 transitivePeerDependencies: - supports-color @@ -11835,7 +11852,7 @@ snapshots: debug: 3.2.7 ensure-posix-path: 1.1.1 fs-extra: 5.0.0 - minimatch: 3.1.2 + minimatch: 3.1.5 resolve: 1.22.11 rsvp: 4.8.5 symlink-or-copy: 1.3.1 @@ -12504,7 +12521,7 @@ snapshots: postcss-modules-values: 4.0.0(postcss@8.5.6) postcss-value-parser: 4.2.0 schema-utils: 3.3.0 - semver: 7.7.3 + semver: 7.7.4 webpack: 5.103.0 css-select-base-adapter@0.1.1: {} @@ -13235,7 +13252,7 @@ snapshots: fs-extra: 9.1.0 resolve: 1.22.11 rsvp: 4.8.5 - semver: 7.7.3 + semver: 7.7.4 stagehand: 1.0.1 walk-sync: 2.2.0 transitivePeerDependencies: @@ -13254,7 +13271,7 @@ snapshots: ember-cli-version-checker@5.1.2: dependencies: resolve-package-path: 3.1.0 - semver: 7.7.3 + semver: 7.7.4 silent-error: 1.1.1 transitivePeerDependencies: - supports-color @@ -13452,16 +13469,6 @@ snapshots: - eslint - typescript - ember-functions-as-helper-polyfill@2.1.3(@babel/core@7.28.5)(ember-source@6.2.0(@glimmer/component@1.1.2(@babel/core@7.28.5))(rsvp@4.8.5)(webpack@5.103.0)): - dependencies: - ember-cli-babel: 8.2.0(@babel/core@7.28.5) - ember-cli-typescript: 5.3.0 - ember-cli-version-checker: 5.1.2 - ember-source: 6.2.0(@glimmer/component@1.1.2(@babel/core@7.28.5))(rsvp@4.8.5)(webpack@5.103.0) - transitivePeerDependencies: - - '@babel/core' - - supports-color - ember-get-config@2.1.1(@babel/core@7.28.5): dependencies: '@embroider/macros': 1.19.5(@babel/core@7.28.5) @@ -13552,9 +13559,10 @@ snapshots: transitivePeerDependencies: - supports-color - ember-set-helper@2.0.1(@babel/core@7.28.5): + ember-set-helper@3.1.0(@babel/core@7.28.5): dependencies: - ember-cli-babel: 8.2.0(@babel/core@7.28.5) + '@embroider/addon-shim': 1.10.2 + decorator-transforms: 1.2.1(@babel/core@7.28.5) transitivePeerDependencies: - '@babel/core' - supports-color @@ -13723,13 +13731,10 @@ snapshots: - supports-color - webpack - ember-truth-helpers@4.0.3(@babel/core@7.28.5)(ember-source@6.2.0(@glimmer/component@1.1.2(@babel/core@7.28.5))(rsvp@4.8.5)(webpack@5.103.0)): + ember-truth-helpers@5.0.0: dependencies: '@embroider/addon-shim': 1.10.2 - ember-functions-as-helper-polyfill: 2.1.3(@babel/core@7.28.5)(ember-source@6.2.0(@glimmer/component@1.1.2(@babel/core@7.28.5))(rsvp@4.8.5)(webpack@5.103.0)) - ember-source: 6.2.0(@glimmer/component@1.1.2(@babel/core@7.28.5))(rsvp@4.8.5)(webpack@5.103.0) transitivePeerDependencies: - - '@babel/core' - supports-color ember-try-config@4.0.0(encoding@0.1.13): @@ -13738,7 +13743,7 @@ snapshots: lodash: 4.17.21 package-json: 6.5.0 remote-git-tags: 3.0.0 - semver: 7.7.3 + semver: 7.7.4 transitivePeerDependencies: - encoding @@ -13943,7 +13948,7 @@ snapshots: eslint-compat-utils@0.5.1(eslint@9.39.4(jiti@2.6.1)): dependencies: eslint: 9.39.4(jiti@2.6.1) - semver: 7.7.3 + semver: 7.7.4 eslint-config-prettier@9.1.2(eslint@9.39.4(jiti@2.6.1)): dependencies: @@ -14502,7 +14507,7 @@ snapshots: is-type: 0.0.1 lodash.debounce: 3.1.1 lodash.flatten: 3.0.2 - minimatch: 3.1.2 + minimatch: 3.1.5 fixturify-project@2.1.1: dependencies: @@ -14832,7 +14837,7 @@ snapshots: dependencies: inflight: 1.0.6 inherits: 2.0.4 - minimatch: 3.1.2 + minimatch: 3.1.5 once: 1.4.0 path-is-absolute: 1.0.1 @@ -14841,7 +14846,7 @@ snapshots: fs.realpath: 1.0.0 inflight: 1.0.6 inherits: 2.0.4 - minimatch: 3.1.2 + minimatch: 3.1.5 once: 1.4.0 path-is-absolute: 1.0.1 @@ -16043,12 +16048,12 @@ snapshots: matcher-collection@1.1.2: dependencies: - minimatch: 3.1.2 + minimatch: 3.1.5 matcher-collection@2.0.1: dependencies: '@types/minimatch': 3.0.5 - minimatch: 3.1.2 + minimatch: 3.1.5 math-intrinsics@1.1.0: {} @@ -16331,6 +16336,10 @@ snapshots: tapable: 2.3.0 webpack: 5.103.0 + minimatch@10.2.4: + dependencies: + brace-expansion: 5.0.5 + minimatch@3.1.2: dependencies: brace-expansion: 1.1.12 @@ -16539,7 +16548,7 @@ snapshots: dependencies: growly: 1.3.0 is-wsl: 2.2.0 - semver: 7.7.3 + semver: 7.7.4 shellwords: 0.1.1 uuid: 8.3.2 which: 2.0.2 @@ -16570,7 +16579,7 @@ snapshots: dependencies: hosted-git-info: 8.1.0 proc-log: 5.0.0 - semver: 7.7.3 + semver: 7.7.4 validate-npm-package-name: 6.0.2 npm-run-path@2.0.2: @@ -17710,6 +17719,8 @@ snapshots: semver@7.7.3: {} + semver@7.7.4: {} + send@0.19.0: dependencies: debug: 2.6.9 @@ -17954,7 +17965,7 @@ snapshots: get-stdin: 9.0.0 git-hooks-list: 3.2.0 is-plain-obj: 4.1.0 - semver: 7.7.3 + semver: 7.7.4 sort-object-keys: 1.1.3 tinyglobby: 0.2.15 @@ -18574,12 +18585,11 @@ snapshots: dependencies: punycode: 2.3.1 - tracked-toolbox@2.0.0(@babel/core@7.28.5)(ember-source@6.2.0(@glimmer/component@1.1.2(@babel/core@7.28.5))(rsvp@4.8.5)(webpack@5.103.0)): + tracked-toolbox@2.2.0(@babel/core@7.28.5): dependencies: '@embroider/addon-shim': 1.10.2 + decorator-transforms: 2.3.0(@babel/core@7.28.5) ember-cache-primitive-polyfill: 1.0.1(@babel/core@7.28.5) - optionalDependencies: - ember-source: 6.2.0(@glimmer/component@1.1.2(@babel/core@7.28.5))(rsvp@4.8.5)(webpack@5.103.0) transitivePeerDependencies: - '@babel/core' - supports-color @@ -18814,12 +18824,12 @@ snapshots: validate-peer-dependencies@1.2.0: dependencies: resolve-package-path: 3.1.0 - semver: 7.7.3 + semver: 7.7.4 validate-peer-dependencies@2.2.0: dependencies: resolve-package-path: 4.0.3 - semver: 7.7.3 + semver: 7.7.4 vary@1.1.2: {} @@ -18858,7 +18868,7 @@ snapshots: '@types/minimatch': 3.0.5 ensure-posix-path: 1.1.1 matcher-collection: 2.0.1 - minimatch: 3.1.2 + minimatch: 3.1.5 walk-sync@3.0.0: dependencies: @@ -18867,6 +18877,13 @@ snapshots: matcher-collection: 2.0.1 minimatch: 3.1.2 + walk-sync@4.0.1: + dependencies: + '@types/minimatch': 5.1.2 + ensure-posix-path: 1.1.1 + matcher-collection: 2.0.1 + minimatch: 10.2.4 + walker@1.0.8: dependencies: makeerror: 1.0.12 diff --git a/test-apps/new-addon/config/ember-try.js b/test-apps/new-addon/config/ember-try.js index 03dfa652c..22e4124ef 100644 --- a/test-apps/new-addon/config/ember-try.js +++ b/test-apps/new-addon/config/ember-try.js @@ -7,16 +7,6 @@ module.exports = async function () { return { usePnpm: true, scenarios: [ - { - name: 'ember-lts-4.4', - npm: { - devDependencies: { - '@ember/test-helpers': '^2.5.0', - 'ember-cli-babel': '^7.26.11', - 'ember-source': '~4.4.0', - }, - }, - }, { name: 'ember-lts-4.8', npm: { diff --git a/tests/dummy/config/ember-try.js b/tests/dummy/config/ember-try.js index 03dfa652c..22e4124ef 100644 --- a/tests/dummy/config/ember-try.js +++ b/tests/dummy/config/ember-try.js @@ -7,16 +7,6 @@ module.exports = async function () { return { usePnpm: true, scenarios: [ - { - name: 'ember-lts-4.4', - npm: { - devDependencies: { - '@ember/test-helpers': '^2.5.0', - 'ember-cli-babel': '^7.26.11', - 'ember-source': '~4.4.0', - }, - }, - }, { name: 'ember-lts-4.8', npm: { From db295a62cb95dc8c3483f7a94b76bc6d7ca0ca7c Mon Sep 17 00:00:00 2001 From: Robert Wagner Date: Thu, 26 Mar 2026 09:50:30 -0400 Subject: [PATCH 2/5] Bump more deps --- package.json | 8 ++-- pnpm-lock.yaml | 127 +++++++++++++++++++------------------------------ 2 files changed, 53 insertions(+), 82 deletions(-) diff --git a/package.json b/package.json index 8bed9acc5..56b135ab7 100644 --- a/package.json +++ b/package.json @@ -37,9 +37,9 @@ "@csstools/postcss-sass": "^5.1.1", "@ember/render-modifiers": "^3.0.0", "@glimmer/component": "^1.1.2", - "@glimmer/syntax": "^0.87.1", + "@glimmer/syntax": "^0.95.0", "@glimmer/tracking": "^1.1.2", - "@handlebars/parser": "^2.2.1", + "@handlebars/parser": "^2.2.2", "@nullvoxpopuli/ember-composable-helpers": "^5.3.1", "@nullvoxpopuli/ember-router-scroll": "^0.0.2", "broccoli-bridge": "^1.0.0", @@ -61,7 +61,7 @@ "ember-cli-string-utils": "^1.1.0", "ember-cli-version-checker": "^5.1.2", "ember-code-snippet": "^3.0.0", - "ember-concurrency": "^5.1.0", + "ember-concurrency": "^5.2.0", "ember-keyboard": "^9.0.4", "ember-modal-dialog": "^5.0.0", "ember-router-generator": "^2.0.0", @@ -79,7 +79,7 @@ "jsdom": "^23.2.0", "json-api-serializer": "^2.6.6", "line-column": "^1.0.2", - "lodash": "^4.17.21", + "lodash": "^4.17.23", "lunr": "^2.3.9", "marked": "^11.2.0", "marked-highlight": "^2.2.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 598302819..a8252ccf2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -40,14 +40,14 @@ importers: specifier: ^1.1.2 version: 1.1.2(@babel/core@7.28.5) '@glimmer/syntax': - specifier: ^0.87.1 - version: 0.87.1 + specifier: ^0.95.0 + version: 0.95.0 '@glimmer/tracking': specifier: ^1.1.2 version: 1.1.2 '@handlebars/parser': - specifier: ^2.2.1 - version: 2.2.1 + specifier: ^2.2.2 + version: 2.2.2 '@nullvoxpopuli/ember-composable-helpers': specifier: ^5.3.1 version: 5.3.1(@babel/core@7.28.5) @@ -112,8 +112,8 @@ importers: specifier: ^3.0.0 version: 3.0.0(@babel/core@7.28.5) ember-concurrency: - specifier: ^5.1.0 - version: 5.1.0(@babel/core@7.28.5) + specifier: ^5.2.0 + version: 5.2.0(@babel/core@7.28.5) ember-keyboard: specifier: ^9.0.4 version: 9.0.4(@babel/core@7.28.5)(@ember/test-helpers@4.0.5(@babel/core@7.28.5)(ember-source@6.2.0(@glimmer/component@1.1.2(@babel/core@7.28.5))(rsvp@4.8.5)(webpack@5.103.0))) @@ -166,8 +166,8 @@ importers: specifier: ^1.0.2 version: 1.0.2 lodash: - specifier: ^4.17.21 - version: 4.17.21 + specifier: ^4.17.23 + version: 4.17.23 lunr: specifier: ^2.3.9 version: 2.3.9 @@ -1334,9 +1334,6 @@ packages: '@glimmer/interfaces@0.84.3': resolution: {integrity: sha512-dk32ykoNojt0mvEaIW6Vli5MGTbQo58uy3Epj7ahCgTHmWOKuw/0G83f2UmFprRwFx689YTXG38I/vbpltEjzg==} - '@glimmer/interfaces@0.87.1': - resolution: {integrity: sha512-2lbwLY4Bt9i2SvwT4hhY0TgEYKhOMQBgYvRiraq2BYHwO8iLKh3lC8iO3d+rQ3VgDtQ9i/sP6HG848VNRyVHxA==} - '@glimmer/interfaces@0.92.3': resolution: {integrity: sha512-QwQeA01N+0h+TAi/J7iUnZtRuJy+093hNyagxDQBA6b1wCBw+q+al9+O6gmbWlkWE7EifzmNE1nnrgcecJBlJQ==} @@ -1370,9 +1367,6 @@ packages: '@glimmer/syntax@0.84.3': resolution: {integrity: sha512-ioVbTic6ZisLxqTgRBL2PCjYZTFIwobifCustrozRU2xGDiYvVIL0vt25h2c1ioDsX59UgVlDkIK4YTAQQSd2A==} - '@glimmer/syntax@0.87.1': - resolution: {integrity: sha512-zYzZT6LgpSF0iv5iuxmMV5Pf52aE8dukNC2KfrHC6gXJfM4eLZMZcyk76NW5m+SEetZSOXX6AWv/KwLnoxiMfQ==} - '@glimmer/syntax@0.92.3': resolution: {integrity: sha512-7wPKQmULyXCYf0KvbPmfrs/skPISH2QGR9atCnmDWnHyLv5SSZVLm1P0Ctrpta6+Ci3uGQb7hGk0IjsLEavcYQ==} @@ -1388,9 +1382,6 @@ packages: '@glimmer/util@0.84.3': resolution: {integrity: sha512-qFkh6s16ZSRuu2rfz3T4Wp0fylFj3HBsONGXQcrAdZjdUaIS6v3pNj6mecJ71qRgcym9Hbaq/7/fefIwECUiKw==} - '@glimmer/util@0.87.1': - resolution: {integrity: sha512-Duxi2JutaIewfIWp8PJl7U5n12yasKWtZFHNLSrg+C8TKeMXdRyJtI7uqtqg0Z/6F9JwdJe/IPhTvdsTTfzAuA==} - '@glimmer/util@0.92.3': resolution: {integrity: sha512-K1oH93gGU36slycxJ9CcFpUTsdOc4XQ6RuZFu5oRsxFYtEF5PSu7ik11h58fyeoaWOr1ebfkyAMawbeI2AJ5GA==} @@ -1413,9 +1404,6 @@ packages: '@glimmer/vm@0.92.3': resolution: {integrity: sha512-DNMQz7nn2zRwKO1irVZ4alg1lH+VInwR3vkWVgobUs0yh7OoHVGXKMd5uxzIksqJEUw1XOX9Qgu/GYZB1PiH3w==} - '@glimmer/wire-format@0.87.1': - resolution: {integrity: sha512-O3W1HDfRGX7wHZqvP8UzI/nWyZ2GIMFolU7l6WcLGU9HIdzqfxsc7ae2Icob/fq2kV9meHti4yDEdTMlBVK9AQ==} - '@glimmer/wire-format@0.92.3': resolution: {integrity: sha512-gFz81Q9+V7Xs0X8mSq6y8qacHm0dPaGJo2/Bfcsdow1hLOKNgTCLr4XeDBhRML8f6I6Gk9ugH4QDxyIOXOpC4w==} @@ -1425,8 +1413,8 @@ packages: '@handlebars/parser@2.0.0': resolution: {integrity: sha512-EP9uEDZv/L5Qh9IWuMUGJRfwhXJ4h1dqKTT4/3+tY0eu7sPis7xh23j61SYUnNF4vqCQvvUXpDo9Bh/+q1zASA==} - '@handlebars/parser@2.2.1': - resolution: {integrity: sha512-D76vKOZFEGA9v6g0rZTYTQDUXNopCblW1Zeas3EEVrbdeh8gWrCEO9/goocKmcgtqAwv1Md76p58UQp7HeFTEw==} + '@handlebars/parser@2.2.2': + resolution: {integrity: sha512-n/SZW+12rwikx/f8YcSv9JCi5p9vn1Bnts9ZtVvfErG4h0gbjHI1H1ZMhVUnaOC7yzFc6PtsCKIK8XeTnL90Gw==} engines: {node: ^18 || ^20 || ^22 || >=24} '@humanfs/core@0.19.1': @@ -4069,8 +4057,8 @@ packages: resolution: {integrity: sha512-BtkjulweiXo9c3yVWrtexw2dTmBrvavD/xixNC6TKOBdrixUwU+6nuOO9dufDWsMxoid7MvtmDpzc9+mE8PdaA==} engines: {node: 10.* || >= 12.*} - ember-concurrency@5.1.0: - resolution: {integrity: sha512-cnudfQnW7soEN98uEwGgfmmMM5PP8L3pefpQ81FewAtTFZhYyYKyJsMtkk8R/7AHCbcuX5cvY44yndHVF6Vshw==} + ember-concurrency@5.2.0: + resolution: {integrity: sha512-NUptPzaxaF2XWqn3VQ5KqiLSRqPFIZhWXH3UkOMhiedmiolxGYjUV96maoHWdd5msxNgQBC0UkZ28m7pV7A0sQ==} engines: {node: 16.* || >= 18} peerDependencies: '@glint/template': '>= 1.0.0' @@ -5957,6 +5945,9 @@ packages: lodash@4.17.21: resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} + lodash@4.17.23: + resolution: {integrity: sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==} + log-symbols@2.2.0: resolution: {integrity: sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==} engines: {node: '>=4'} @@ -9683,7 +9674,7 @@ snapshots: babel-import-util: 3.0.1 ember-cli-babel: 8.2.0(@babel/core@7.28.5) find-up: 5.0.0 - lodash: 4.17.21 + lodash: 4.17.23 resolve: 1.22.11 semver: 7.7.4 transitivePeerDependencies: @@ -9703,7 +9694,7 @@ snapshots: fs-extra: 9.1.0 is-subdir: 1.2.0 js-string-escape: 1.0.1 - lodash: 4.17.21 + lodash: 4.17.23 minimatch: 3.1.2 pkg-entry-points: 1.1.1 resolve-package-path: 4.0.3 @@ -9720,7 +9711,7 @@ snapshots: fs-extra: 9.1.0 is-subdir: 1.2.0 js-string-escape: 1.0.1 - lodash: 4.17.21 + lodash: 4.17.23 minimatch: 3.1.5 pkg-entry-points: 1.1.1 resolve-package-path: 4.0.3 @@ -9732,7 +9723,7 @@ snapshots: '@embroider/test-setup@4.0.0': dependencies: - lodash: 4.17.21 + lodash: 4.17.23 resolve: 1.22.11 '@embroider/util@1.13.5(@babel/core@7.28.5)(ember-source@6.2.0(@glimmer/component@1.1.2(@babel/core@7.28.5))(rsvp@4.8.5)(webpack@5.103.0))': @@ -9863,10 +9854,6 @@ snapshots: dependencies: '@simple-dom/interface': 1.4.0 - '@glimmer/interfaces@0.87.1': - dependencies: - '@simple-dom/interface': 1.4.0 - '@glimmer/interfaces@0.92.3': dependencies: '@simple-dom/interface': 1.4.0 @@ -9961,14 +9948,6 @@ snapshots: '@handlebars/parser': 2.0.0 simple-html-tokenizer: 0.5.11 - '@glimmer/syntax@0.87.1': - dependencies: - '@glimmer/interfaces': 0.87.1 - '@glimmer/util': 0.87.1 - '@glimmer/wire-format': 0.87.1 - '@handlebars/parser': 2.0.0 - simple-html-tokenizer: 0.5.11 - '@glimmer/syntax@0.92.3': dependencies: '@glimmer/interfaces': 0.92.3 @@ -9982,7 +9961,7 @@ snapshots: '@glimmer/interfaces': 0.94.6 '@glimmer/util': 0.94.8 '@glimmer/wire-format': 0.94.8 - '@handlebars/parser': 2.2.1 + '@handlebars/parser': 2.2.2 simple-html-tokenizer: 0.5.11 '@glimmer/tracking@1.1.2': @@ -9998,11 +9977,6 @@ snapshots: '@glimmer/interfaces': 0.84.3 '@simple-dom/interface': 1.4.0 - '@glimmer/util@0.87.1': - dependencies: - '@glimmer/env': 0.1.7 - '@glimmer/interfaces': 0.87.1 - '@glimmer/util@0.92.3': dependencies: '@glimmer/env': 0.1.7 @@ -10037,11 +10011,6 @@ snapshots: '@glimmer/interfaces': 0.92.3 '@glimmer/util': 0.92.3 - '@glimmer/wire-format@0.87.1': - dependencies: - '@glimmer/interfaces': 0.87.1 - '@glimmer/util': 0.87.1 - '@glimmer/wire-format@0.92.3': dependencies: '@glimmer/interfaces': 0.92.3 @@ -10053,7 +10022,7 @@ snapshots: '@handlebars/parser@2.0.0': {} - '@handlebars/parser@2.2.1': {} + '@handlebars/parser@2.2.2': {} '@humanfs/core@0.19.1': {} @@ -10379,7 +10348,7 @@ snapshots: '@nodeutils/defaults-deep@1.1.0': dependencies: - lodash: 4.17.21 + lodash: 4.17.23 '@npmcli/fs@1.1.1': dependencies: @@ -10560,7 +10529,7 @@ snapshots: dependencies: execa: 5.1.1 lerna-changelog: 2.2.0 - lodash: 4.17.21 + lodash: 4.17.23 mdast-util-from-markdown: 2.0.2 release-it: 19.0.6(@types/node@24.10.1) tmp: 0.2.5 @@ -10964,7 +10933,7 @@ snapshots: applause@2.0.4: dependencies: - lodash: 4.17.21 + lodash: 4.17.23 optional-require: 1.1.10 optionalDependencies: cson-parser: 4.0.9 @@ -11095,7 +11064,7 @@ snapshots: async@2.6.4: dependencies: - lodash: 4.17.21 + lodash: 4.17.23 async@3.2.6: {} @@ -11154,7 +11123,7 @@ snapshots: convert-source-map: 1.9.0 debug: 2.6.9 json5: 0.5.1 - lodash: 4.17.21 + lodash: 4.17.23 minimatch: 3.1.5 path-is-absolute: 1.0.1 private: 0.1.8 @@ -11171,7 +11140,7 @@ snapshots: babel-types: 6.26.0 detect-indent: 4.0.0 jsesc: 1.3.0 - lodash: 4.17.21 + lodash: 4.17.23 source-map: 0.5.7 trim-right: 1.0.1 optional: true @@ -11275,7 +11244,7 @@ snapshots: babel-runtime: 6.26.0 core-js: 2.6.12 home-or-tmp: 2.0.0 - lodash: 4.17.21 + lodash: 4.17.23 mkdirp: 0.5.6 source-map-support: 0.4.18 transitivePeerDependencies: @@ -11303,7 +11272,7 @@ snapshots: babel-traverse: 6.26.0 babel-types: 6.26.0 babylon: 6.18.0 - lodash: 4.17.21 + lodash: 4.17.23 transitivePeerDependencies: - supports-color optional: true @@ -11318,7 +11287,7 @@ snapshots: debug: 2.6.9 globals: 9.18.0 invariant: 2.2.4 - lodash: 4.17.21 + lodash: 4.17.23 transitivePeerDependencies: - supports-color optional: true @@ -11327,7 +11296,7 @@ snapshots: dependencies: babel-runtime: 6.26.0 esutils: 2.0.3 - lodash: 4.17.21 + lodash: 4.17.23 to-fast-properties: 1.0.3 optional: true @@ -12403,13 +12372,13 @@ snapshots: ora: 3.4.0 through2: 3.0.2 - consolidate@0.16.0(babel-core@6.26.3)(handlebars@4.7.8)(lodash@4.17.21)(mustache@4.2.0)(underscore@1.13.7): + consolidate@0.16.0(babel-core@6.26.3)(handlebars@4.7.8)(lodash@4.17.23)(mustache@4.2.0)(underscore@1.13.7): dependencies: bluebird: 3.7.2 optionalDependencies: babel-core: 6.26.3 handlebars: 4.7.8 - lodash: 4.17.21 + lodash: 4.17.23 mustache: 4.2.0 underscore: 1.13.7 @@ -13079,7 +13048,7 @@ snapshots: dag-map: 2.0.2 dotenv: 1.2.0 ember-cli-deploy-progress: 1.3.0 - lodash: 4.17.21 + lodash: 4.17.23 rsvp: 3.6.2 silent-error: 1.1.1 transitivePeerDependencies: @@ -13148,7 +13117,7 @@ snapshots: debug: 2.6.9 exists-sync: 0.0.3 fs-extra: 0.30.0 - lodash: 4.17.21 + lodash: 4.17.23 rsvp: 3.6.2 symlink-or-copy: 1.3.1 through: 2.3.8 @@ -13443,7 +13412,7 @@ snapshots: - '@babel/core' - supports-color - ember-concurrency@5.1.0(@babel/core@7.28.5): + ember-concurrency@5.2.0(@babel/core@7.28.5): dependencies: '@babel/helper-module-imports': 7.27.1 '@babel/helper-plugin-utils': 7.27.1 @@ -13639,7 +13608,7 @@ snapshots: console-ui: 3.1.2 ember-cli-babel: 8.2.0(@babel/core@7.28.5) ember-cli-htmlbars: 6.3.0 - lodash: 4.17.21 + lodash: 4.17.23 safe-stable-stringify: 2.5.0 transitivePeerDependencies: - '@babel/core' @@ -13740,7 +13709,7 @@ snapshots: ember-try-config@4.0.0(encoding@0.1.13): dependencies: ember-source-channel-url: 3.0.0(encoding@0.1.13) - lodash: 4.17.21 + lodash: 4.17.23 package-json: 6.5.0 remote-git-tags: 3.0.0 semver: 7.7.4 @@ -14663,7 +14632,7 @@ snapshots: dependencies: glob: 7.2.3 iconv-lite: 0.4.24 - lodash: 4.17.21 + lodash: 4.17.23 mkdirp: 0.5.6 rimraf: 2.7.1 @@ -15288,7 +15257,7 @@ snapshots: cli-width: 2.2.1 external-editor: 3.1.0 figures: 2.0.0 - lodash: 4.17.21 + lodash: 4.17.23 mute-stream: 0.0.7 run-async: 2.4.1 rxjs: 6.6.7 @@ -15304,7 +15273,7 @@ snapshots: cli-width: 3.0.0 external-editor: 3.1.0 figures: 3.2.0 - lodash: 4.17.21 + lodash: 4.17.23 mute-stream: 0.0.8 run-async: 2.4.1 rxjs: 6.6.7 @@ -15917,6 +15886,8 @@ snapshots: lodash@4.17.21: {} + lodash@4.17.23: {} + log-symbols@2.2.0: dependencies: chalk: 2.4.2 @@ -16525,7 +16496,7 @@ snapshots: node-emoji@1.11.0: dependencies: - lodash: 4.17.21 + lodash: 4.17.23 node-fetch-native@1.6.7: {} @@ -17257,7 +17228,7 @@ snapshots: quibble@0.9.2: dependencies: - lodash: 4.17.21 + lodash: 4.17.23 resolve: 1.22.11 quick-temp@0.1.9: @@ -18318,7 +18289,7 @@ snapshots: detective: 5.2.1 fs-extra: 8.1.0 html-tags: 3.3.1 - lodash: 4.17.21 + lodash: 4.17.23 node-emoji: 1.11.0 normalize.css: 8.0.1 object-hash: 2.2.0 @@ -18372,7 +18343,7 @@ snapshots: testdouble@3.20.2: dependencies: - lodash: 4.17.21 + lodash: 4.17.23 quibble: 0.9.2 stringify-object-es5: 2.5.0 theredoc: 1.0.0 @@ -18385,14 +18356,14 @@ snapshots: charm: 1.0.2 commander: 2.20.3 compression: 1.8.1 - consolidate: 0.16.0(babel-core@6.26.3)(handlebars@4.7.8)(lodash@4.17.21)(mustache@4.2.0)(underscore@1.13.7) + consolidate: 0.16.0(babel-core@6.26.3)(handlebars@4.7.8)(lodash@4.17.23)(mustache@4.2.0)(underscore@1.13.7) execa: 1.0.0 express: 4.21.2 fireworm: 0.7.2 glob: 7.2.3 http-proxy: 1.18.1 js-yaml: 3.14.2 - lodash: 4.17.21 + lodash: 4.17.23 mkdirp: 3.0.1 mustache: 4.2.0 node-notifier: 10.0.1 From ea001faa49e17dbd3c9fd76cb4b26085439455ca Mon Sep 17 00:00:00 2001 From: Robert Wagner Date: Thu, 26 Mar 2026 09:54:13 -0400 Subject: [PATCH 3/5] Use cached from glimmer --- addon/-private/config.js | 2 +- addon/components/docs-header/search-result/index.js | 2 +- addon/components/docs-header/version-selector/index.js | 2 +- addon/services/docs-routes.js | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/addon/-private/config.js b/addon/-private/config.js index e0799d2bf..6b1b005d3 100644 --- a/addon/-private/config.js +++ b/addon/-private/config.js @@ -1,5 +1,5 @@ import { getOwner } from '@ember/application'; -import { cached } from 'tracked-toolbox'; +import { cached } from '@glimmer/tracking'; /** * Function to get the currently configured rootURL from the containers. diff --git a/addon/components/docs-header/search-result/index.js b/addon/components/docs-header/search-result/index.js index 3667f214f..892b3cdaa 100644 --- a/addon/components/docs-header/search-result/index.js +++ b/addon/components/docs-header/search-result/index.js @@ -1,5 +1,5 @@ import Component from '@glimmer/component'; -import { cached } from 'tracked-toolbox'; +import { cached } from '@glimmer/tracking'; import { bool } from '@ember/object/computed'; export default class DocsHeaderSearchResult extends Component { diff --git a/addon/components/docs-header/version-selector/index.js b/addon/components/docs-header/version-selector/index.js index 7db0771bb..c89e2cc5f 100644 --- a/addon/components/docs-header/version-selector/index.js +++ b/addon/components/docs-header/version-selector/index.js @@ -3,7 +3,7 @@ import { inject as service } from '@ember/service'; import { reads } from '@ember/object/computed'; import { action } from '@ember/object'; import { A } from '@ember/array'; -import { cached } from 'tracked-toolbox'; +import { cached } from '@glimmer/tracking'; import { addonDocsConfig } from 'ember-cli-addon-docs/-private/config'; export default class VersionSelector extends Component { diff --git a/addon/services/docs-routes.js b/addon/services/docs-routes.js index 9d906065c..31c4fab8f 100644 --- a/addon/services/docs-routes.js +++ b/addon/services/docs-routes.js @@ -1,8 +1,7 @@ import { A } from '@ember/array'; import Service, { inject as service } from '@ember/service'; import { assert } from '@ember/debug'; -import { tracked } from '@glimmer/tracking'; -import { cached } from 'tracked-toolbox'; +import { cached, tracked } from '@glimmer/tracking'; export default class DocsRoutesService extends Service { @service('-routing') router; From b33743407c69a6f4a5841bc0473bfdd033efb59b Mon Sep 17 00:00:00 2001 From: Robert Wagner Date: Thu, 26 Mar 2026 09:59:03 -0400 Subject: [PATCH 4/5] Revert "Use cached from glimmer" This reverts commit ea001faa49e17dbd3c9fd76cb4b26085439455ca. --- addon/-private/config.js | 2 +- addon/components/docs-header/search-result/index.js | 2 +- addon/components/docs-header/version-selector/index.js | 2 +- addon/services/docs-routes.js | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/addon/-private/config.js b/addon/-private/config.js index 6b1b005d3..e0799d2bf 100644 --- a/addon/-private/config.js +++ b/addon/-private/config.js @@ -1,5 +1,5 @@ import { getOwner } from '@ember/application'; -import { cached } from '@glimmer/tracking'; +import { cached } from 'tracked-toolbox'; /** * Function to get the currently configured rootURL from the containers. diff --git a/addon/components/docs-header/search-result/index.js b/addon/components/docs-header/search-result/index.js index 892b3cdaa..3667f214f 100644 --- a/addon/components/docs-header/search-result/index.js +++ b/addon/components/docs-header/search-result/index.js @@ -1,5 +1,5 @@ import Component from '@glimmer/component'; -import { cached } from '@glimmer/tracking'; +import { cached } from 'tracked-toolbox'; import { bool } from '@ember/object/computed'; export default class DocsHeaderSearchResult extends Component { diff --git a/addon/components/docs-header/version-selector/index.js b/addon/components/docs-header/version-selector/index.js index c89e2cc5f..7db0771bb 100644 --- a/addon/components/docs-header/version-selector/index.js +++ b/addon/components/docs-header/version-selector/index.js @@ -3,7 +3,7 @@ import { inject as service } from '@ember/service'; import { reads } from '@ember/object/computed'; import { action } from '@ember/object'; import { A } from '@ember/array'; -import { cached } from '@glimmer/tracking'; +import { cached } from 'tracked-toolbox'; import { addonDocsConfig } from 'ember-cli-addon-docs/-private/config'; export default class VersionSelector extends Component { diff --git a/addon/services/docs-routes.js b/addon/services/docs-routes.js index 31c4fab8f..9d906065c 100644 --- a/addon/services/docs-routes.js +++ b/addon/services/docs-routes.js @@ -1,7 +1,8 @@ import { A } from '@ember/array'; import Service, { inject as service } from '@ember/service'; import { assert } from '@ember/debug'; -import { cached, tracked } from '@glimmer/tracking'; +import { tracked } from '@glimmer/tracking'; +import { cached } from 'tracked-toolbox'; export default class DocsRoutesService extends Service { @service('-routing') router; From 62535df470fd4c10836da92593882387b2d6b852 Mon Sep 17 00:00:00 2001 From: Robert Wagner Date: Thu, 26 Mar 2026 09:59:07 -0400 Subject: [PATCH 5/5] Revert "Bump more deps" This reverts commit db295a62cb95dc8c3483f7a94b76bc6d7ca0ca7c. --- package.json | 8 ++-- pnpm-lock.yaml | 127 ++++++++++++++++++++++++++++++------------------- 2 files changed, 82 insertions(+), 53 deletions(-) diff --git a/package.json b/package.json index 56b135ab7..8bed9acc5 100644 --- a/package.json +++ b/package.json @@ -37,9 +37,9 @@ "@csstools/postcss-sass": "^5.1.1", "@ember/render-modifiers": "^3.0.0", "@glimmer/component": "^1.1.2", - "@glimmer/syntax": "^0.95.0", + "@glimmer/syntax": "^0.87.1", "@glimmer/tracking": "^1.1.2", - "@handlebars/parser": "^2.2.2", + "@handlebars/parser": "^2.2.1", "@nullvoxpopuli/ember-composable-helpers": "^5.3.1", "@nullvoxpopuli/ember-router-scroll": "^0.0.2", "broccoli-bridge": "^1.0.0", @@ -61,7 +61,7 @@ "ember-cli-string-utils": "^1.1.0", "ember-cli-version-checker": "^5.1.2", "ember-code-snippet": "^3.0.0", - "ember-concurrency": "^5.2.0", + "ember-concurrency": "^5.1.0", "ember-keyboard": "^9.0.4", "ember-modal-dialog": "^5.0.0", "ember-router-generator": "^2.0.0", @@ -79,7 +79,7 @@ "jsdom": "^23.2.0", "json-api-serializer": "^2.6.6", "line-column": "^1.0.2", - "lodash": "^4.17.23", + "lodash": "^4.17.21", "lunr": "^2.3.9", "marked": "^11.2.0", "marked-highlight": "^2.2.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a8252ccf2..598302819 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -40,14 +40,14 @@ importers: specifier: ^1.1.2 version: 1.1.2(@babel/core@7.28.5) '@glimmer/syntax': - specifier: ^0.95.0 - version: 0.95.0 + specifier: ^0.87.1 + version: 0.87.1 '@glimmer/tracking': specifier: ^1.1.2 version: 1.1.2 '@handlebars/parser': - specifier: ^2.2.2 - version: 2.2.2 + specifier: ^2.2.1 + version: 2.2.1 '@nullvoxpopuli/ember-composable-helpers': specifier: ^5.3.1 version: 5.3.1(@babel/core@7.28.5) @@ -112,8 +112,8 @@ importers: specifier: ^3.0.0 version: 3.0.0(@babel/core@7.28.5) ember-concurrency: - specifier: ^5.2.0 - version: 5.2.0(@babel/core@7.28.5) + specifier: ^5.1.0 + version: 5.1.0(@babel/core@7.28.5) ember-keyboard: specifier: ^9.0.4 version: 9.0.4(@babel/core@7.28.5)(@ember/test-helpers@4.0.5(@babel/core@7.28.5)(ember-source@6.2.0(@glimmer/component@1.1.2(@babel/core@7.28.5))(rsvp@4.8.5)(webpack@5.103.0))) @@ -166,8 +166,8 @@ importers: specifier: ^1.0.2 version: 1.0.2 lodash: - specifier: ^4.17.23 - version: 4.17.23 + specifier: ^4.17.21 + version: 4.17.21 lunr: specifier: ^2.3.9 version: 2.3.9 @@ -1334,6 +1334,9 @@ packages: '@glimmer/interfaces@0.84.3': resolution: {integrity: sha512-dk32ykoNojt0mvEaIW6Vli5MGTbQo58uy3Epj7ahCgTHmWOKuw/0G83f2UmFprRwFx689YTXG38I/vbpltEjzg==} + '@glimmer/interfaces@0.87.1': + resolution: {integrity: sha512-2lbwLY4Bt9i2SvwT4hhY0TgEYKhOMQBgYvRiraq2BYHwO8iLKh3lC8iO3d+rQ3VgDtQ9i/sP6HG848VNRyVHxA==} + '@glimmer/interfaces@0.92.3': resolution: {integrity: sha512-QwQeA01N+0h+TAi/J7iUnZtRuJy+093hNyagxDQBA6b1wCBw+q+al9+O6gmbWlkWE7EifzmNE1nnrgcecJBlJQ==} @@ -1367,6 +1370,9 @@ packages: '@glimmer/syntax@0.84.3': resolution: {integrity: sha512-ioVbTic6ZisLxqTgRBL2PCjYZTFIwobifCustrozRU2xGDiYvVIL0vt25h2c1ioDsX59UgVlDkIK4YTAQQSd2A==} + '@glimmer/syntax@0.87.1': + resolution: {integrity: sha512-zYzZT6LgpSF0iv5iuxmMV5Pf52aE8dukNC2KfrHC6gXJfM4eLZMZcyk76NW5m+SEetZSOXX6AWv/KwLnoxiMfQ==} + '@glimmer/syntax@0.92.3': resolution: {integrity: sha512-7wPKQmULyXCYf0KvbPmfrs/skPISH2QGR9atCnmDWnHyLv5SSZVLm1P0Ctrpta6+Ci3uGQb7hGk0IjsLEavcYQ==} @@ -1382,6 +1388,9 @@ packages: '@glimmer/util@0.84.3': resolution: {integrity: sha512-qFkh6s16ZSRuu2rfz3T4Wp0fylFj3HBsONGXQcrAdZjdUaIS6v3pNj6mecJ71qRgcym9Hbaq/7/fefIwECUiKw==} + '@glimmer/util@0.87.1': + resolution: {integrity: sha512-Duxi2JutaIewfIWp8PJl7U5n12yasKWtZFHNLSrg+C8TKeMXdRyJtI7uqtqg0Z/6F9JwdJe/IPhTvdsTTfzAuA==} + '@glimmer/util@0.92.3': resolution: {integrity: sha512-K1oH93gGU36slycxJ9CcFpUTsdOc4XQ6RuZFu5oRsxFYtEF5PSu7ik11h58fyeoaWOr1ebfkyAMawbeI2AJ5GA==} @@ -1404,6 +1413,9 @@ packages: '@glimmer/vm@0.92.3': resolution: {integrity: sha512-DNMQz7nn2zRwKO1irVZ4alg1lH+VInwR3vkWVgobUs0yh7OoHVGXKMd5uxzIksqJEUw1XOX9Qgu/GYZB1PiH3w==} + '@glimmer/wire-format@0.87.1': + resolution: {integrity: sha512-O3W1HDfRGX7wHZqvP8UzI/nWyZ2GIMFolU7l6WcLGU9HIdzqfxsc7ae2Icob/fq2kV9meHti4yDEdTMlBVK9AQ==} + '@glimmer/wire-format@0.92.3': resolution: {integrity: sha512-gFz81Q9+V7Xs0X8mSq6y8qacHm0dPaGJo2/Bfcsdow1hLOKNgTCLr4XeDBhRML8f6I6Gk9ugH4QDxyIOXOpC4w==} @@ -1413,8 +1425,8 @@ packages: '@handlebars/parser@2.0.0': resolution: {integrity: sha512-EP9uEDZv/L5Qh9IWuMUGJRfwhXJ4h1dqKTT4/3+tY0eu7sPis7xh23j61SYUnNF4vqCQvvUXpDo9Bh/+q1zASA==} - '@handlebars/parser@2.2.2': - resolution: {integrity: sha512-n/SZW+12rwikx/f8YcSv9JCi5p9vn1Bnts9ZtVvfErG4h0gbjHI1H1ZMhVUnaOC7yzFc6PtsCKIK8XeTnL90Gw==} + '@handlebars/parser@2.2.1': + resolution: {integrity: sha512-D76vKOZFEGA9v6g0rZTYTQDUXNopCblW1Zeas3EEVrbdeh8gWrCEO9/goocKmcgtqAwv1Md76p58UQp7HeFTEw==} engines: {node: ^18 || ^20 || ^22 || >=24} '@humanfs/core@0.19.1': @@ -4057,8 +4069,8 @@ packages: resolution: {integrity: sha512-BtkjulweiXo9c3yVWrtexw2dTmBrvavD/xixNC6TKOBdrixUwU+6nuOO9dufDWsMxoid7MvtmDpzc9+mE8PdaA==} engines: {node: 10.* || >= 12.*} - ember-concurrency@5.2.0: - resolution: {integrity: sha512-NUptPzaxaF2XWqn3VQ5KqiLSRqPFIZhWXH3UkOMhiedmiolxGYjUV96maoHWdd5msxNgQBC0UkZ28m7pV7A0sQ==} + ember-concurrency@5.1.0: + resolution: {integrity: sha512-cnudfQnW7soEN98uEwGgfmmMM5PP8L3pefpQ81FewAtTFZhYyYKyJsMtkk8R/7AHCbcuX5cvY44yndHVF6Vshw==} engines: {node: 16.* || >= 18} peerDependencies: '@glint/template': '>= 1.0.0' @@ -5945,9 +5957,6 @@ packages: lodash@4.17.21: resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} - lodash@4.17.23: - resolution: {integrity: sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==} - log-symbols@2.2.0: resolution: {integrity: sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==} engines: {node: '>=4'} @@ -9674,7 +9683,7 @@ snapshots: babel-import-util: 3.0.1 ember-cli-babel: 8.2.0(@babel/core@7.28.5) find-up: 5.0.0 - lodash: 4.17.23 + lodash: 4.17.21 resolve: 1.22.11 semver: 7.7.4 transitivePeerDependencies: @@ -9694,7 +9703,7 @@ snapshots: fs-extra: 9.1.0 is-subdir: 1.2.0 js-string-escape: 1.0.1 - lodash: 4.17.23 + lodash: 4.17.21 minimatch: 3.1.2 pkg-entry-points: 1.1.1 resolve-package-path: 4.0.3 @@ -9711,7 +9720,7 @@ snapshots: fs-extra: 9.1.0 is-subdir: 1.2.0 js-string-escape: 1.0.1 - lodash: 4.17.23 + lodash: 4.17.21 minimatch: 3.1.5 pkg-entry-points: 1.1.1 resolve-package-path: 4.0.3 @@ -9723,7 +9732,7 @@ snapshots: '@embroider/test-setup@4.0.0': dependencies: - lodash: 4.17.23 + lodash: 4.17.21 resolve: 1.22.11 '@embroider/util@1.13.5(@babel/core@7.28.5)(ember-source@6.2.0(@glimmer/component@1.1.2(@babel/core@7.28.5))(rsvp@4.8.5)(webpack@5.103.0))': @@ -9854,6 +9863,10 @@ snapshots: dependencies: '@simple-dom/interface': 1.4.0 + '@glimmer/interfaces@0.87.1': + dependencies: + '@simple-dom/interface': 1.4.0 + '@glimmer/interfaces@0.92.3': dependencies: '@simple-dom/interface': 1.4.0 @@ -9948,6 +9961,14 @@ snapshots: '@handlebars/parser': 2.0.0 simple-html-tokenizer: 0.5.11 + '@glimmer/syntax@0.87.1': + dependencies: + '@glimmer/interfaces': 0.87.1 + '@glimmer/util': 0.87.1 + '@glimmer/wire-format': 0.87.1 + '@handlebars/parser': 2.0.0 + simple-html-tokenizer: 0.5.11 + '@glimmer/syntax@0.92.3': dependencies: '@glimmer/interfaces': 0.92.3 @@ -9961,7 +9982,7 @@ snapshots: '@glimmer/interfaces': 0.94.6 '@glimmer/util': 0.94.8 '@glimmer/wire-format': 0.94.8 - '@handlebars/parser': 2.2.2 + '@handlebars/parser': 2.2.1 simple-html-tokenizer: 0.5.11 '@glimmer/tracking@1.1.2': @@ -9977,6 +9998,11 @@ snapshots: '@glimmer/interfaces': 0.84.3 '@simple-dom/interface': 1.4.0 + '@glimmer/util@0.87.1': + dependencies: + '@glimmer/env': 0.1.7 + '@glimmer/interfaces': 0.87.1 + '@glimmer/util@0.92.3': dependencies: '@glimmer/env': 0.1.7 @@ -10011,6 +10037,11 @@ snapshots: '@glimmer/interfaces': 0.92.3 '@glimmer/util': 0.92.3 + '@glimmer/wire-format@0.87.1': + dependencies: + '@glimmer/interfaces': 0.87.1 + '@glimmer/util': 0.87.1 + '@glimmer/wire-format@0.92.3': dependencies: '@glimmer/interfaces': 0.92.3 @@ -10022,7 +10053,7 @@ snapshots: '@handlebars/parser@2.0.0': {} - '@handlebars/parser@2.2.2': {} + '@handlebars/parser@2.2.1': {} '@humanfs/core@0.19.1': {} @@ -10348,7 +10379,7 @@ snapshots: '@nodeutils/defaults-deep@1.1.0': dependencies: - lodash: 4.17.23 + lodash: 4.17.21 '@npmcli/fs@1.1.1': dependencies: @@ -10529,7 +10560,7 @@ snapshots: dependencies: execa: 5.1.1 lerna-changelog: 2.2.0 - lodash: 4.17.23 + lodash: 4.17.21 mdast-util-from-markdown: 2.0.2 release-it: 19.0.6(@types/node@24.10.1) tmp: 0.2.5 @@ -10933,7 +10964,7 @@ snapshots: applause@2.0.4: dependencies: - lodash: 4.17.23 + lodash: 4.17.21 optional-require: 1.1.10 optionalDependencies: cson-parser: 4.0.9 @@ -11064,7 +11095,7 @@ snapshots: async@2.6.4: dependencies: - lodash: 4.17.23 + lodash: 4.17.21 async@3.2.6: {} @@ -11123,7 +11154,7 @@ snapshots: convert-source-map: 1.9.0 debug: 2.6.9 json5: 0.5.1 - lodash: 4.17.23 + lodash: 4.17.21 minimatch: 3.1.5 path-is-absolute: 1.0.1 private: 0.1.8 @@ -11140,7 +11171,7 @@ snapshots: babel-types: 6.26.0 detect-indent: 4.0.0 jsesc: 1.3.0 - lodash: 4.17.23 + lodash: 4.17.21 source-map: 0.5.7 trim-right: 1.0.1 optional: true @@ -11244,7 +11275,7 @@ snapshots: babel-runtime: 6.26.0 core-js: 2.6.12 home-or-tmp: 2.0.0 - lodash: 4.17.23 + lodash: 4.17.21 mkdirp: 0.5.6 source-map-support: 0.4.18 transitivePeerDependencies: @@ -11272,7 +11303,7 @@ snapshots: babel-traverse: 6.26.0 babel-types: 6.26.0 babylon: 6.18.0 - lodash: 4.17.23 + lodash: 4.17.21 transitivePeerDependencies: - supports-color optional: true @@ -11287,7 +11318,7 @@ snapshots: debug: 2.6.9 globals: 9.18.0 invariant: 2.2.4 - lodash: 4.17.23 + lodash: 4.17.21 transitivePeerDependencies: - supports-color optional: true @@ -11296,7 +11327,7 @@ snapshots: dependencies: babel-runtime: 6.26.0 esutils: 2.0.3 - lodash: 4.17.23 + lodash: 4.17.21 to-fast-properties: 1.0.3 optional: true @@ -12372,13 +12403,13 @@ snapshots: ora: 3.4.0 through2: 3.0.2 - consolidate@0.16.0(babel-core@6.26.3)(handlebars@4.7.8)(lodash@4.17.23)(mustache@4.2.0)(underscore@1.13.7): + consolidate@0.16.0(babel-core@6.26.3)(handlebars@4.7.8)(lodash@4.17.21)(mustache@4.2.0)(underscore@1.13.7): dependencies: bluebird: 3.7.2 optionalDependencies: babel-core: 6.26.3 handlebars: 4.7.8 - lodash: 4.17.23 + lodash: 4.17.21 mustache: 4.2.0 underscore: 1.13.7 @@ -13048,7 +13079,7 @@ snapshots: dag-map: 2.0.2 dotenv: 1.2.0 ember-cli-deploy-progress: 1.3.0 - lodash: 4.17.23 + lodash: 4.17.21 rsvp: 3.6.2 silent-error: 1.1.1 transitivePeerDependencies: @@ -13117,7 +13148,7 @@ snapshots: debug: 2.6.9 exists-sync: 0.0.3 fs-extra: 0.30.0 - lodash: 4.17.23 + lodash: 4.17.21 rsvp: 3.6.2 symlink-or-copy: 1.3.1 through: 2.3.8 @@ -13412,7 +13443,7 @@ snapshots: - '@babel/core' - supports-color - ember-concurrency@5.2.0(@babel/core@7.28.5): + ember-concurrency@5.1.0(@babel/core@7.28.5): dependencies: '@babel/helper-module-imports': 7.27.1 '@babel/helper-plugin-utils': 7.27.1 @@ -13608,7 +13639,7 @@ snapshots: console-ui: 3.1.2 ember-cli-babel: 8.2.0(@babel/core@7.28.5) ember-cli-htmlbars: 6.3.0 - lodash: 4.17.23 + lodash: 4.17.21 safe-stable-stringify: 2.5.0 transitivePeerDependencies: - '@babel/core' @@ -13709,7 +13740,7 @@ snapshots: ember-try-config@4.0.0(encoding@0.1.13): dependencies: ember-source-channel-url: 3.0.0(encoding@0.1.13) - lodash: 4.17.23 + lodash: 4.17.21 package-json: 6.5.0 remote-git-tags: 3.0.0 semver: 7.7.4 @@ -14632,7 +14663,7 @@ snapshots: dependencies: glob: 7.2.3 iconv-lite: 0.4.24 - lodash: 4.17.23 + lodash: 4.17.21 mkdirp: 0.5.6 rimraf: 2.7.1 @@ -15257,7 +15288,7 @@ snapshots: cli-width: 2.2.1 external-editor: 3.1.0 figures: 2.0.0 - lodash: 4.17.23 + lodash: 4.17.21 mute-stream: 0.0.7 run-async: 2.4.1 rxjs: 6.6.7 @@ -15273,7 +15304,7 @@ snapshots: cli-width: 3.0.0 external-editor: 3.1.0 figures: 3.2.0 - lodash: 4.17.23 + lodash: 4.17.21 mute-stream: 0.0.8 run-async: 2.4.1 rxjs: 6.6.7 @@ -15886,8 +15917,6 @@ snapshots: lodash@4.17.21: {} - lodash@4.17.23: {} - log-symbols@2.2.0: dependencies: chalk: 2.4.2 @@ -16496,7 +16525,7 @@ snapshots: node-emoji@1.11.0: dependencies: - lodash: 4.17.23 + lodash: 4.17.21 node-fetch-native@1.6.7: {} @@ -17228,7 +17257,7 @@ snapshots: quibble@0.9.2: dependencies: - lodash: 4.17.23 + lodash: 4.17.21 resolve: 1.22.11 quick-temp@0.1.9: @@ -18289,7 +18318,7 @@ snapshots: detective: 5.2.1 fs-extra: 8.1.0 html-tags: 3.3.1 - lodash: 4.17.23 + lodash: 4.17.21 node-emoji: 1.11.0 normalize.css: 8.0.1 object-hash: 2.2.0 @@ -18343,7 +18372,7 @@ snapshots: testdouble@3.20.2: dependencies: - lodash: 4.17.23 + lodash: 4.17.21 quibble: 0.9.2 stringify-object-es5: 2.5.0 theredoc: 1.0.0 @@ -18356,14 +18385,14 @@ snapshots: charm: 1.0.2 commander: 2.20.3 compression: 1.8.1 - consolidate: 0.16.0(babel-core@6.26.3)(handlebars@4.7.8)(lodash@4.17.23)(mustache@4.2.0)(underscore@1.13.7) + consolidate: 0.16.0(babel-core@6.26.3)(handlebars@4.7.8)(lodash@4.17.21)(mustache@4.2.0)(underscore@1.13.7) execa: 1.0.0 express: 4.21.2 fireworm: 0.7.2 glob: 7.2.3 http-proxy: 1.18.1 js-yaml: 3.14.2 - lodash: 4.17.23 + lodash: 4.17.21 mkdirp: 3.0.1 mustache: 4.2.0 node-notifier: 10.0.1