From 2d93cc1d599f3604c5ebd141400c5c5f29230c19 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Thu, 17 Sep 2026 14:29:44 -0400 Subject: [PATCH] Resolve ember-primitives and decorator-transforms to one version each The build had three versions of each package: nvp.ui asks for ember-primitives ^0.51.0, ember-container-query for ^0.57.0, and the workspace for ^0.61.1. For a 0.x version, a caret range covers one minor only, so `pnpm dedupe` cannot merge them. ember-primitives and ember-repl also pin decorator-transforms to exact versions. Co-Authored-By: Claude Fable 5.1 --- pnpm-lock.yaml | 217 ++++++-------------------------------------- pnpm-workspace.yaml | 2 + 2 files changed, 29 insertions(+), 190 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 834d57907..a571beefc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -33,6 +33,8 @@ overrides: reactiveweb: 1.9.1 rollup-plugin-dts: ^6.5.1 '@codemirror/view': 6.39.12 + decorator-transforms: ^2.4.0 + ember-primitives: ^0.62.0 kolay: github:universal-ember/kolay#dist kolay>ember-repl: ^8.0.0 side-channel: npm:@nolyfill/side-channel@^1 @@ -145,8 +147,8 @@ importers: specifier: ^4.2.0 version: 4.3.0(@babel/core@7.29.0) ember-primitives: - specifier: ^0.61.1 - version: 0.61.1(922b54560422b182b8c6636cb395c3a1) + specifier: ^0.62.0 + version: 0.62.0(922b54560422b182b8c6636cb395c3a1) ember-repl: specifier: workspace:* version: link:../../packages/ember-repl @@ -344,7 +346,7 @@ importers: specifier: ^9.2.1 version: 9.2.1 decorator-transforms: - specifier: 2.4.0 + specifier: ^2.4.0 version: 2.4.0(@babel/core@7.29.0) ember-async-data: specifier: 2.0.1 @@ -458,7 +460,7 @@ importers: specifier: ^3.21.0 version: 3.23.0 decorator-transforms: - specifier: 2.4.0 + specifier: ^2.4.0 version: 2.4.0(@babel/core@7.29.0) ember-async-data: specifier: 2.0.1 @@ -467,8 +469,8 @@ importers: specifier: ^4.2.0 version: 4.3.0(@babel/core@7.29.0) ember-primitives: - specifier: ^0.61.1 - version: 0.61.1(922b54560422b182b8c6636cb395c3a1) + specifier: ^0.62.0 + version: 0.62.0(922b54560422b182b8c6636cb395c3a1) ember-repl: specifier: latest version: 8.2.3(e7a9b940d7739cd3326a1d5abe83e4ab) @@ -724,7 +726,7 @@ importers: specifier: ^6.7.2 version: 6.7.2 decorator-transforms: - specifier: 2.4.0 + specifier: ^2.4.0 version: 2.4.0(@babel/core@7.29.0) oniguruma-parser: specifier: ^0.12.2 @@ -800,8 +802,8 @@ importers: specifier: ^4.2.0 version: 4.3.0(@babel/core@7.29.0) ember-primitives: - specifier: ^0.61.1 - version: 0.61.1(922b54560422b182b8c6636cb395c3a1) + specifier: ^0.62.0 + version: 0.62.0(922b54560422b182b8c6636cb395c3a1) ember-resources: specifier: ^7.1.0 version: 7.1.0(26b86c1b73200152d68c973d8eccec8d) @@ -915,11 +917,11 @@ importers: specifier: ^4.0.0 version: 4.2.0 decorator-transforms: - specifier: 2.4.0 + specifier: ^2.4.0 version: 2.4.0(@babel/core@7.29.0) ember-primitives: - specifier: ^0.61.1 - version: 0.61.1(922b54560422b182b8c6636cb395c3a1) + specifier: ^0.62.0 + version: 0.62.0(922b54560422b182b8c6636cb395c3a1) ember-resolver: specifier: ^13.1.0 version: 13.1.1 @@ -1150,7 +1152,7 @@ importers: specifier: ^2.1.1 version: 2.1.1 decorator-transforms: - specifier: 2.4.0 + specifier: ^2.4.0 version: 2.4.0(@babel/core@7.29.0) ember-modifier: specifier: ^4.2.2 @@ -1211,8 +1213,8 @@ importers: specifier: ^0.2.0 version: 0.2.0(3fa0481db89aaed2f211bc8818b55de5) ember-primitives: - specifier: ^0.61.1 - version: 0.61.1(922b54560422b182b8c6636cb395c3a1) + specifier: ^0.62.0 + version: 0.62.0(922b54560422b182b8c6636cb395c3a1) ember-resources: specifier: ^7.1.0 version: 7.1.0(26b86c1b73200152d68c973d8eccec8d) @@ -1404,7 +1406,7 @@ importers: specifier: ^1.8.2 version: 1.8.2 decorator-transforms: - specifier: 2.4.0 + specifier: ^2.4.0 version: 2.4.0(@babel/core@7.29.0) eslint: specifier: ^9.39.1 @@ -5390,12 +5392,6 @@ packages: resolution: {integrity: sha512-2copPaWQFUrzooJVIVZA/Oppx/S/KOoZ4Uhr+XWEQDMZ8Rvq/0SNQpbdIyMBJ8IELWt10dewuJw+tX4XjOo7Rg==} engines: {node: '>= 12.*'} - babel-plugin-debug-macros@0.2.0: - resolution: {integrity: sha512-Wpmw4TbhR3Eq2t3W51eBAQSdKlr+uAyF0GI4GtPfMCD12Y4cIdpKC9l0RjNTH/P9isFypSqqewMPm7//fnZlNA==} - engines: {node: '>=4'} - peerDependencies: - '@babel/core': ^7.0.0-beta.42 - babel-plugin-debug-macros@0.3.4: resolution: {integrity: sha512-wfel/vb3pXfwIDZUrkoDrn5FHmlWI96PCJ3UCDv2a86poJ3EQrnArNW5KfHSVJ9IOgxHbo748cQt7sDU+0KCEw==} engines: {node: '>=6'} @@ -6491,12 +6487,6 @@ packages: decode-named-character-reference@1.3.0: resolution: {integrity: sha512-GtpQYB283KrPp6nRw50q3U9/VfOutZOe103qlN7BPP6Ad27xYnOIWv4lPzo8HCAL+mMZofJ9KEy30fq6MfaK6Q==} - decorator-transforms@2.3.1: - resolution: {integrity: sha512-PDOk74Zqqy0946Lx4ckXxbgG6uhPScOICtrxL/pXmfznxchqNee0TaJISClGJQe6FeT8ohGqsOgdjfahm4FwEw==} - - decorator-transforms@2.3.2: - resolution: {integrity: sha512-XcErcjlmCzG5ODgYjt6ZTXwd6S8fPKln/sJmw15ZXkWG2JpoQNwszis+AwF6XSGlOoG7g8MCEO97g+Yw3fk5OQ==} - decorator-transforms@2.4.0: resolution: {integrity: sha512-IB+0RqnJpuS7ndH4dVY5dfWTZsrCzN3avWFdjSiET0uT2U24jKywjpVEK97TflnZkZgiSRfmeqc1WfS+1CI23w==} peerDependencies: @@ -6652,10 +6642,6 @@ packages: ember-async-data@2.0.1: resolution: {integrity: sha512-yCQlVR3NLgjGA09LMc1NYX0XiAd0tHTM4/AmIHD0wq87QpHGmWcpMxyKGEe/TBczyCwBEJifaZNtAjMDsW1YdA==} - ember-cache-primitive-polyfill@1.0.1: - resolution: {integrity: sha512-hSPcvIKarA8wad2/b6jDd/eU+OtKmi6uP+iYQbzi5TQpjsqV6b4QdRqrLk7ClSRRKBAtdTuutx+m+X+WlEd2lw==} - engines: {node: 10.* || >= 12} - ember-cli-babel-plugin-helpers@1.1.1: resolution: {integrity: sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==} engines: {node: 6.* || 8.* || >= 10.*} @@ -6697,10 +6683,6 @@ packages: resolution: {integrity: sha512-rk7GY+FmLn/2e22HsZs0Ycrz8HQ1W3Fv+2TFOuEFW9optnDXDgkntPBIl6gact/LHsfBM5RKbM3dHsIIeLgl0Q==} engines: {node: 10.* || >= 12.*} - ember-compatibility-helpers@1.2.7: - resolution: {integrity: sha512-BtkjulweiXo9c3yVWrtexw2dTmBrvavD/xixNC6TKOBdrixUwU+6nuOO9dufDWsMxoid7MvtmDpzc9+mE8PdaA==} - engines: {node: 10.* || >= 12.*} - ember-container-query@7.0.3: resolution: {integrity: sha512-3l4oRZR/68kxeMJcqM4s10SLJfffcvdVLPZR/gCnXQNLZdtAIhOrS13KXR3XavzQ+j+QFhJd5JLswtYzOH0C3w==} engines: {node: 22.* || >= 24} @@ -6757,40 +6739,8 @@ packages: resolution: {integrity: sha512-fedRHUsvq8tIZgOii8jTrfAyeq+la/9H5eAzhNNwEyzo7nDMmqK2SxsyBUGXprd8fOacsPabLlzlucMi/4mUpA==} engines: {node: 16.* || >= 18} - ember-primitives@0.51.0: - resolution: {integrity: sha512-XYb/kiRc08AbIJOPNyP+EABs6TCVCO9VhOXcJ60TC5mTwg0F5nAp8zLzGZVCpyp2EjZ/pS+EtzCTShCIW4ITIQ==} - hasBin: true - peerDependencies: - '@ember/test-helpers': '>= 3.2.0' - '@ember/test-waiters': '>= 3.0.2' - '@glimmer/component': ^2.0.0 - '@glint/template': 1.8.0 - ember-modifier: '>= 4.1.0' - ember-resources: '>= 6.1.0' - peerDependenciesMeta: - '@ember/test-helpers': - optional: true - '@glint/template': - optional: true - - ember-primitives@0.57.0: - resolution: {integrity: sha512-bZIQLhTHEBI7/v/5GA8k3MqrR89Vo0AE1IXXuGMEW9Xy8AK3Ia8zwyd7Scezn1AwLJmtQbucjp1Xc/eP2vwlQw==} - hasBin: true - peerDependencies: - '@ember/test-helpers': '>= 3.2.0' - '@ember/test-waiters': '>= 3.0.2' - '@glimmer/component': ^2.0.0 - '@glint/template': 1.8.0 - ember-modifier: '>= 4.1.0' - ember-resources: '>= 6.1.0' - peerDependenciesMeta: - '@ember/test-helpers': - optional: true - '@glint/template': - optional: true - - ember-primitives@0.61.1: - resolution: {integrity: sha512-bnr9XEQCqYb86a0yBn9hP5xDuWZwmyT12oPzZrNR8GZJmRjVanlvk64NjVbYVKs56/xxs/zYk4/oct5S9MmsIw==} + ember-primitives@0.62.0: + resolution: {integrity: sha512-olo9BdIyXkKleEKjQGq6Ya94iM7+Dr6TtT4+QLFyAzFQtHTENgy5rbEqFnbjw4qQmnibXR2s+jXxSDyPAQczhA==} hasBin: true peerDependencies: '@ember/test-helpers': '>= 3.2.0' @@ -10381,9 +10331,6 @@ packages: tracked-built-ins@4.1.2: resolution: {integrity: sha512-KiiV/Pzi7VNKTn9Fip6Ic54AjKgFfqows1Jq3L0WLVqZcvfswdhVxQ9yqqhTXsmgLhVzIgtdzNBH4ExqWf34BQ==} - tracked-toolbox@2.2.0: - resolution: {integrity: sha512-YknotXj74U0nCqBk9nh1Uv1IWTnVOgt8sXIecNkyEq4oFOU70niQUlozO4E3kMKx7ae/rNlOtoF+1ALcHYzCrQ==} - tracked-toolbox@3.0.0: resolution: {integrity: sha512-9Q5SH+0jevfB07oL2bsjxIDv0jQ2A6IgminkvnMMzGLc2EqCFm/yKuqNeUFvN3n+TOAQk+PZcePtIaxIo/1now==} @@ -11111,12 +11058,6 @@ packages: whatwg-url@5.0.0: resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==} - which-heading-do-i-need@0.2.4: - resolution: {integrity: sha512-OS4TyybQkx3HOWqPgw6Xx3ss8U/2U35enMquCbTooT2qEl0bvNFHicwk8V3bhWh3E+WD27NlCNPaXmUXYuafqg==} - - which-heading-do-i-need@0.2.7: - resolution: {integrity: sha512-YWMZUOoxOgq/SEcd0bnDjgTFrJQ8quz31RZ9IRxeyjWYsakrT3F3iOKoEhValp4WZ8Ybt0DqpIrwtL0fEwMe4A==} - which-heading-do-i-need@0.4.1: resolution: {integrity: sha512-NUwKC7rjs6hFqdr6Yu+4Hd9muQEL5XW3QvV8hj/uHSBo8o9FRsWOqArgWcL4IIvUDpS+KCoaRW/8+jHhNL8itQ==} @@ -15236,11 +15177,6 @@ snapshots: babel-import-util@3.0.1: {} - babel-plugin-debug-macros@0.2.0(@babel/core@7.29.0): - dependencies: - '@babel/core': 7.29.0 - semver: 5.7.2 - babel-plugin-debug-macros@0.3.4(@babel/core@7.29.0): dependencies: '@babel/core': 7.29.0 @@ -16480,20 +16416,6 @@ snapshots: dependencies: character-entities: 2.0.2 - decorator-transforms@2.3.1(@babel/core@7.29.0): - dependencies: - '@babel/plugin-syntax-decorators': 7.29.7(@babel/core@7.29.0) - babel-import-util: 3.0.1 - transitivePeerDependencies: - - '@babel/core' - - decorator-transforms@2.3.2(@babel/core@7.29.0): - dependencies: - '@babel/plugin-syntax-decorators': 7.29.7(@babel/core@7.29.0) - babel-import-util: 3.0.1 - transitivePeerDependencies: - - '@babel/core' - decorator-transforms@2.4.0(@babel/core@7.29.0): dependencies: '@babel/core': 7.29.0 @@ -16642,16 +16564,6 @@ snapshots: - '@babel/core' - supports-color - ember-cache-primitive-polyfill@1.0.1(@babel/core@7.29.0): - dependencies: - ember-cli-babel: 7.26.11 - ember-cli-version-checker: 5.1.2 - ember-compatibility-helpers: 1.2.7(@babel/core@7.29.0) - silent-error: 1.1.1 - transitivePeerDependencies: - - '@babel/core' - - supports-color - ember-cli-babel-plugin-helpers@1.1.1: {} ember-cli-babel@7.26.11: @@ -16779,24 +16691,13 @@ snapshots: transitivePeerDependencies: - supports-color - ember-compatibility-helpers@1.2.7(@babel/core@7.29.0): - dependencies: - babel-plugin-debug-macros: 0.2.0(@babel/core@7.29.0) - ember-cli-version-checker: 5.1.2 - find-up: 5.0.0 - fs-extra: 9.1.0 - semver: 5.7.2 - transitivePeerDependencies: - - '@babel/core' - - supports-color - ember-container-query@7.0.3(03bcf2c7449a3ac8cdd170059002a3e4): dependencies: '@embroider/addon-shim': 1.10.3 decorator-transforms: 2.4.0(@babel/core@7.29.0) ember-element-helper: 0.8.8 ember-modifier: 4.3.0(@babel/core@7.29.0) - ember-primitives: 0.57.0(922b54560422b182b8c6636cb395c3a1) + ember-primitives: 0.62.0(922b54560422b182b8c6636cb395c3a1) transitivePeerDependencies: - '@babel/core' - '@ember/test-helpers' @@ -16947,12 +16848,11 @@ snapshots: transitivePeerDependencies: - supports-color - ember-primitives@0.51.0(922b54560422b182b8c6636cb395c3a1): + ember-primitives@0.62.0(922b54560422b182b8c6636cb395c3a1): dependencies: - '@babel/runtime': 7.29.2 + '@babel/runtime': 7.29.7 '@ember/test-waiters': 4.1.2 '@embroider/addon-shim': 1.10.3 - '@embroider/macros': 1.20.6(610c1e3f48061deebb0da741b6baa0c9) '@floating-ui/dom': 1.7.5 '@glimmer/component': 2.1.1 decorator-transforms: 2.4.0(@babel/core@7.29.0) @@ -16964,56 +16864,6 @@ snapshots: should-handle-link: 1.3.0 tabster: 8.7.0 tracked-built-ins: 4.1.2(@babel/core@7.29.0) - tracked-toolbox: 2.2.0(@babel/core@7.29.0) - which-heading-do-i-need: 0.2.4 - optionalDependencies: - '@ember/test-helpers': 5.4.1(610c1e3f48061deebb0da741b6baa0c9) - '@glint/template': 1.8.0 - transitivePeerDependencies: - - '@babel/core' - - supports-color - - ember-primitives@0.57.0(922b54560422b182b8c6636cb395c3a1): - dependencies: - '@babel/runtime': 7.29.2 - '@ember/test-waiters': 4.1.2 - '@embroider/addon-shim': 1.10.3 - '@floating-ui/dom': 1.7.5 - '@glimmer/component': 2.1.1 - decorator-transforms: 2.3.1(@babel/core@7.29.0) - ember-element-helper: 0.8.8 - ember-modifier: 4.3.0(@babel/core@7.29.0) - ember-resources: 7.1.0(26b86c1b73200152d68c973d8eccec8d) - form-data-utils: 0.6.0 - reactiveweb: 1.9.1(d41a7bae60c14a4edce62c2c55c80806) - should-handle-link: 1.3.0 - tabster: 8.7.0 - tracked-built-ins: 4.1.2(@babel/core@7.29.0) - tracked-toolbox: 3.0.0(@babel/core@7.29.0) - which-heading-do-i-need: 0.2.7 - optionalDependencies: - '@ember/test-helpers': 5.4.1(610c1e3f48061deebb0da741b6baa0c9) - '@glint/template': 1.8.0 - transitivePeerDependencies: - - '@babel/core' - - supports-color - - ember-primitives@0.61.1(922b54560422b182b8c6636cb395c3a1): - dependencies: - '@babel/runtime': 7.29.2 - '@ember/test-waiters': 4.1.2 - '@embroider/addon-shim': 1.10.3 - '@floating-ui/dom': 1.7.5 - '@glimmer/component': 2.1.1 - decorator-transforms: 2.3.2(@babel/core@7.29.0) - ember-element-helper: 0.8.8 - ember-modifier: 4.3.0(@babel/core@7.29.0) - ember-resources: 7.1.0(26b86c1b73200152d68c973d8eccec8d) - form-data-utils: 0.6.0 - reactiveweb: 1.9.1(d41a7bae60c14a4edce62c2c55c80806) - should-handle-link: 1.3.0 - tabster: 8.7.0 - tracked-built-ins: 4.1.2(@babel/core@7.29.0) tracked-toolbox: 3.0.0(@babel/core@7.29.0) which-heading-do-i-need: 0.4.1 optionalDependencies: @@ -17041,8 +16891,8 @@ snapshots: '@ember/test-waiters': 4.1.2 codemirror: 6.0.2 content-tag: 4.2.0 - decorator-transforms: 2.3.1(@babel/core@7.29.0) - ember-primitives: 0.61.1(922b54560422b182b8c6636cb395c3a1) + decorator-transforms: 2.4.0(@babel/core@7.29.0) + ember-primitives: 0.62.0(922b54560422b182b8c6636cb395c3a1) ember-resolver: 13.1.1 ember-resources: 7.1.0(26b86c1b73200152d68c973d8eccec8d) repl-sdk: 2.0.0(93d4969b5698d0d4464d33ccc0660007) @@ -18781,7 +18631,7 @@ snapshots: content-tag: 4.2.0 decorator-transforms: 2.4.0(@babel/core@7.29.0) ember-modifier: 4.3.0(@babel/core@7.29.0) - ember-primitives: 0.61.1(922b54560422b182b8c6636cb395c3a1) + ember-primitives: 0.62.0(922b54560422b182b8c6636cb395c3a1) ember-repl: 8.2.3(e7a9b940d7739cd3326a1d5abe83e4ab) ember-resources: 7.1.0(26b86c1b73200152d68c973d8eccec8d) globby: 16.2.3 @@ -19726,7 +19576,7 @@ snapshots: '@glint/template': 1.8.0 decorator-transforms: 2.4.0(@babel/core@7.29.0) ember-modifier: 4.3.0(@babel/core@7.29.0) - ember-primitives: 0.51.0(922b54560422b182b8c6636cb395c3a1) + ember-primitives: 0.62.0(922b54560422b182b8c6636cb395c3a1) ember-resources: 7.1.0(26b86c1b73200152d68c973d8eccec8d) transitivePeerDependencies: - '@babel/core' @@ -21574,15 +21424,6 @@ snapshots: - '@babel/core' - supports-color - tracked-toolbox@2.2.0(@babel/core@7.29.0): - dependencies: - '@embroider/addon-shim': 1.10.3 - decorator-transforms: 2.4.0(@babel/core@7.29.0) - ember-cache-primitive-polyfill: 1.0.1(@babel/core@7.29.0) - transitivePeerDependencies: - - '@babel/core' - - supports-color - tracked-toolbox@3.0.0(@babel/core@7.29.0): dependencies: '@embroider/addon-shim': 1.10.3 @@ -22365,10 +22206,6 @@ snapshots: tr46: 0.0.3 webidl-conversions: 3.0.1 - which-heading-do-i-need@0.2.4: {} - - which-heading-do-i-need@0.2.7: {} - which-heading-do-i-need@0.4.1: {} which@1.3.1: diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 15e717b15..a8cfb6604 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -94,6 +94,8 @@ overrides: "reactiveweb": "1.9.1" "rollup-plugin-dts": "^6.5.1" "@codemirror/view": "6.39.12" + "decorator-transforms": "^2.4.0" + "ember-primitives": "^0.62.0" "kolay": "github:universal-ember/kolay#dist" "kolay>ember-repl": "^8.0.0" "side-channel": "npm:@nolyfill/side-channel@^1"