From 206bd8e0ca6d784402ef7e706249817b39a6fdff Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 07:42:17 +0000 Subject: [PATCH 1/2] Update dependency @ember/string to v4 --- package.json | 2 +- pnpm-lock.yaml | 85 ++++++++++++++++++++++++-------------------------- 2 files changed, 41 insertions(+), 46 deletions(-) diff --git a/package.json b/package.json index f458b7c88b..bda1ee3331 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "@babel/plugin-proposal-decorators": "7.24.7", "@ember/optional-features": "2.1.0", "@ember/render-modifiers": "2.1.0", - "@ember/string": "3.1.1", + "@ember/string": "4.0.0", "@ember/test-helpers": "3.3.1", "@ember/test-waiters": "3.1.0", "@embroider/compat": "3.6.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e4a2cc9fd8..b342def3c1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -67,8 +67,8 @@ importers: specifier: 2.1.0 version: 2.1.0(@babel/core@7.24.9)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)) '@ember/string': - specifier: 3.1.1 - version: 3.1.1 + specifier: 4.0.0 + version: 4.0.0 '@ember/test-helpers': specifier: 3.3.1 version: 3.3.1(@babel/core@7.24.9)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0))(webpack@5.93.0) @@ -158,7 +158,7 @@ importers: version: 2.1.0 ember-cli-mirage: specifier: 3.0.3 - version: 3.0.3(ooojis3tp2qmtyjxj6l5rairfu) + version: 3.0.3(fjtkeh4va46d4talrdcrucfk3m) ember-cli-notifications: specifier: 9.0.0 version: 9.0.0 @@ -173,7 +173,7 @@ importers: version: 2.1.0 ember-data: specifier: 4.12.8 - version: 4.12.8(@babel/core@7.24.9)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0))(webpack@5.93.0) + version: 4.12.8(@babel/core@7.24.9)(@ember/string@4.0.0)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0))(webpack@5.93.0) ember-disable-prototype-extensions: specifier: 1.1.3 version: 1.1.3 @@ -1353,9 +1353,8 @@ packages: '@glint/template': optional: true - '@ember/string@3.1.1': - resolution: {integrity: sha512-UbXJ+k3QOrYN4SRPHgXCqYIJ+yWWUg1+vr0H4DhdQPTy8LJfyqwZ2tc5uqpSSnEXE+/1KopHBE5J8GDagAg5cg==} - engines: {node: 12.* || 14.* || >= 16} + '@ember/string@4.0.0': + resolution: {integrity: sha512-IMVyVE72twuAMSYcHzWSgtgYTtzlHlKSGW8vEbztnnmkU6uo7kVHmiqSN9R4RkBhzvh0VD4G76Eph+55t3iNIA==} '@ember/test-helpers@3.3.1': resolution: {integrity: sha512-h4uFBy4pquBtHsHI+tx9S0wtMmn1L+8dkXiDiyoqG1+3e0Awk6GBujiFM9s4ANq6wC8uIhC3wEFyts10h2OAoQ==} @@ -10360,11 +10359,11 @@ snapshots: dependencies: postcss: 8.4.39 - '@ember-data/adapter@4.12.8(@ember-data/store@4.12.8(@babel/core@7.24.9)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/model@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)))(@ember/string@3.1.1)(ember-inflector@4.0.3(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)))': + '@ember-data/adapter@4.12.8(@ember-data/store@4.12.8(@babel/core@7.24.9)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/model@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@4.0.0)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)))(@ember/string@4.0.0)(ember-inflector@4.0.3(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)))': dependencies: '@ember-data/private-build-infra': 4.12.8 - '@ember-data/store': 4.12.8(@babel/core@7.24.9)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/model@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)) - '@ember/string': 3.1.1 + '@ember-data/store': 4.12.8(@babel/core@7.24.9)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/model@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@4.0.0)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)) + '@ember/string': 4.0.0 '@embroider/macros': 1.16.5 ember-cli-babel: 7.26.11 ember-cli-test-info: 1.0.0 @@ -10373,12 +10372,12 @@ snapshots: - '@glint/template' - supports-color - '@ember-data/debug@4.12.8(@ember-data/store@4.12.8)(@ember/string@3.1.1)(webpack@5.93.0)': + '@ember-data/debug@4.12.8(@ember-data/store@4.12.8)(@ember/string@4.0.0)(webpack@5.93.0)': dependencies: '@ember-data/private-build-infra': 4.12.8 - '@ember-data/store': 4.12.8(@babel/core@7.24.9)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/model@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)) + '@ember-data/store': 4.12.8(@babel/core@7.24.9)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/model@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@4.0.0)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)) '@ember/edition-utils': 1.2.0 - '@ember/string': 3.1.1 + '@ember/string': 4.0.0 '@embroider/macros': 1.16.5 ember-auto-import: 2.7.4(webpack@5.93.0) ember-cli-babel: 7.26.11 @@ -10390,7 +10389,7 @@ snapshots: '@ember-data/graph@4.12.8(@ember-data/store@4.12.8)': dependencies: '@ember-data/private-build-infra': 4.12.8 - '@ember-data/store': 4.12.8(@babel/core@7.24.9)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/model@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)) + '@ember-data/store': 4.12.8(@babel/core@7.24.9)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/model@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@4.0.0)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)) '@ember/edition-utils': 1.2.0 '@embroider/macros': 1.16.5 ember-cli-babel: 7.26.11 @@ -10402,7 +10401,7 @@ snapshots: dependencies: '@ember-data/graph': 4.12.8(@ember-data/store@4.12.8) '@ember-data/private-build-infra': 4.12.8 - '@ember-data/store': 4.12.8(@babel/core@7.24.9)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/model@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)) + '@ember-data/store': 4.12.8(@babel/core@7.24.9)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/model@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@4.0.0)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)) '@ember/edition-utils': 1.2.0 '@embroider/macros': 1.16.5 ember-cli-babel: 7.26.11 @@ -10410,10 +10409,10 @@ snapshots: - '@glint/template' - supports-color - '@ember-data/legacy-compat@4.12.8(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember/string@3.1.1)': + '@ember-data/legacy-compat@4.12.8(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember/string@4.0.0)': dependencies: '@ember-data/private-build-infra': 4.12.8 - '@ember/string': 3.1.1 + '@ember/string': 4.0.0 '@embroider/macros': 1.16.5 ember-cli-babel: 7.26.11 optionalDependencies: @@ -10423,14 +10422,14 @@ snapshots: - '@glint/template' - supports-color - '@ember-data/model@4.12.8(@babel/core@7.24.9)(@ember-data/debug@4.12.8)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/store@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@3.1.1)(ember-inflector@4.0.3(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)))(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0))': + '@ember-data/model@4.12.8(@babel/core@7.24.9)(@ember-data/debug@4.12.8)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/store@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@4.0.0)(ember-inflector@4.0.3(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)))(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0))': dependencies: - '@ember-data/legacy-compat': 4.12.8(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember/string@3.1.1) + '@ember-data/legacy-compat': 4.12.8(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember/string@4.0.0) '@ember-data/private-build-infra': 4.12.8 - '@ember-data/store': 4.12.8(@babel/core@7.24.9)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/model@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)) + '@ember-data/store': 4.12.8(@babel/core@7.24.9)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/model@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@4.0.0)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)) '@ember-data/tracking': 4.12.8 '@ember/edition-utils': 1.2.0 - '@ember/string': 3.1.1 + '@ember/string': 4.0.0 '@embroider/macros': 1.16.5 ember-cached-decorator-polyfill: 1.0.2(@babel/core@7.24.9)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)) ember-cli-babel: 7.26.11 @@ -10439,7 +10438,7 @@ snapshots: ember-inflector: 4.0.3(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)) inflection: 2.0.1 optionalDependencies: - '@ember-data/debug': 4.12.8(@ember-data/store@4.12.8)(@ember/string@3.1.1)(webpack@5.93.0) + '@ember-data/debug': 4.12.8(@ember-data/store@4.12.8)(@ember/string@4.0.0)(webpack@5.93.0) '@ember-data/graph': 4.12.8(@ember-data/store@4.12.8) '@ember-data/json-api': 4.12.8(@ember-data/graph@4.12.8)(@ember-data/store@4.12.8) transitivePeerDependencies: @@ -10491,11 +10490,11 @@ snapshots: '@ember-data/rfc395-data@0.0.4': {} - '@ember-data/serializer@4.12.8(@ember-data/store@4.12.8(@babel/core@7.24.9)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/model@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)))(@ember/string@3.1.1)(ember-inflector@4.0.3(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)))': + '@ember-data/serializer@4.12.8(@ember-data/store@4.12.8(@babel/core@7.24.9)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/model@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@4.0.0)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)))(@ember/string@4.0.0)(ember-inflector@4.0.3(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)))': dependencies: '@ember-data/private-build-infra': 4.12.8 - '@ember-data/store': 4.12.8(@babel/core@7.24.9)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/model@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)) - '@ember/string': 3.1.1 + '@ember-data/store': 4.12.8(@babel/core@7.24.9)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/model@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@4.0.0)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)) + '@ember/string': 4.0.0 '@embroider/macros': 1.16.5 ember-cli-babel: 7.26.11 ember-cli-test-info: 1.0.0 @@ -10504,11 +10503,11 @@ snapshots: - '@glint/template' - supports-color - '@ember-data/store@4.12.8(@babel/core@7.24.9)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/model@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0))': + '@ember-data/store@4.12.8(@babel/core@7.24.9)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/model@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@4.0.0)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0))': dependencies: '@ember-data/private-build-infra': 4.12.8 '@ember-data/tracking': 4.12.8 - '@ember/string': 3.1.1 + '@ember/string': 4.0.0 '@embroider/macros': 1.16.5 '@glimmer/tracking': 1.1.2 ember-cached-decorator-polyfill: 1.0.2(@babel/core@7.24.9)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)) @@ -10516,8 +10515,8 @@ snapshots: optionalDependencies: '@ember-data/graph': 4.12.8(@ember-data/store@4.12.8) '@ember-data/json-api': 4.12.8(@ember-data/graph@4.12.8)(@ember-data/store@4.12.8) - '@ember-data/legacy-compat': 4.12.8(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember/string@3.1.1) - '@ember-data/model': 4.12.8(@babel/core@7.24.9)(@ember-data/debug@4.12.8)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/store@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@3.1.1)(ember-inflector@4.0.3(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)))(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)) + '@ember-data/legacy-compat': 4.12.8(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember/string@4.0.0) + '@ember-data/model': 4.12.8(@babel/core@7.24.9)(@ember-data/debug@4.12.8)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/store@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@4.0.0)(ember-inflector@4.0.3(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)))(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)) transitivePeerDependencies: - '@babel/core' - '@glint/template' @@ -10556,11 +10555,7 @@ snapshots: - '@babel/core' - supports-color - '@ember/string@3.1.1': - dependencies: - ember-cli-babel: 7.26.11 - transitivePeerDependencies: - - supports-color + '@ember/string@4.0.0': {} '@ember/test-helpers@3.3.1(@babel/core@7.24.9)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0))(webpack@5.93.0)': dependencies: @@ -14432,7 +14427,7 @@ snapshots: ember-cli-lodash-subset@2.0.1: {} - ember-cli-mirage@3.0.3(ooojis3tp2qmtyjxj6l5rairfu): + ember-cli-mirage@3.0.3(fjtkeh4va46d4talrdcrucfk3m): dependencies: '@babel/core': 7.24.9 '@embroider/macros': 1.16.5 @@ -14446,9 +14441,9 @@ snapshots: ember-source: 5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0) miragejs: 0.1.48 optionalDependencies: - '@ember-data/model': 4.12.8(@babel/core@7.24.9)(@ember-data/debug@4.12.8)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/store@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@3.1.1)(ember-inflector@4.0.3(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)))(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)) + '@ember-data/model': 4.12.8(@babel/core@7.24.9)(@ember-data/debug@4.12.8)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/store@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@4.0.0)(ember-inflector@4.0.3(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)))(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)) '@ember/test-helpers': 3.3.1(@babel/core@7.24.9)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0))(webpack@5.93.0) - ember-data: 4.12.8(@babel/core@7.24.9)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0))(webpack@5.93.0) + ember-data: 4.12.8(@babel/core@7.24.9)(@ember/string@4.0.0)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0))(webpack@5.93.0) ember-qunit: 8.1.0(@ember/test-helpers@3.3.1(@babel/core@7.24.9)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0))(webpack@5.93.0))(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0))(qunit@2.21.1) transitivePeerDependencies: - '@glint/template' @@ -14780,21 +14775,21 @@ snapshots: transitivePeerDependencies: - supports-color - ember-data@4.12.8(@babel/core@7.24.9)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0))(webpack@5.93.0): + ember-data@4.12.8(@babel/core@7.24.9)(@ember/string@4.0.0)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0))(webpack@5.93.0): dependencies: - '@ember-data/adapter': 4.12.8(@ember-data/store@4.12.8(@babel/core@7.24.9)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/model@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)))(@ember/string@3.1.1)(ember-inflector@4.0.3(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0))) - '@ember-data/debug': 4.12.8(@ember-data/store@4.12.8)(@ember/string@3.1.1)(webpack@5.93.0) + '@ember-data/adapter': 4.12.8(@ember-data/store@4.12.8(@babel/core@7.24.9)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/model@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@4.0.0)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)))(@ember/string@4.0.0)(ember-inflector@4.0.3(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0))) + '@ember-data/debug': 4.12.8(@ember-data/store@4.12.8)(@ember/string@4.0.0)(webpack@5.93.0) '@ember-data/graph': 4.12.8(@ember-data/store@4.12.8) '@ember-data/json-api': 4.12.8(@ember-data/graph@4.12.8)(@ember-data/store@4.12.8) - '@ember-data/legacy-compat': 4.12.8(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember/string@3.1.1) - '@ember-data/model': 4.12.8(@babel/core@7.24.9)(@ember-data/debug@4.12.8)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/store@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@3.1.1)(ember-inflector@4.0.3(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)))(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)) + '@ember-data/legacy-compat': 4.12.8(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember/string@4.0.0) + '@ember-data/model': 4.12.8(@babel/core@7.24.9)(@ember-data/debug@4.12.8)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/store@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@4.0.0)(ember-inflector@4.0.3(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)))(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)) '@ember-data/private-build-infra': 4.12.8 '@ember-data/request': 4.12.8 - '@ember-data/serializer': 4.12.8(@ember-data/store@4.12.8(@babel/core@7.24.9)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/model@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)))(@ember/string@3.1.1)(ember-inflector@4.0.3(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0))) - '@ember-data/store': 4.12.8(@babel/core@7.24.9)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/model@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)) + '@ember-data/serializer': 4.12.8(@ember-data/store@4.12.8(@babel/core@7.24.9)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/model@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@4.0.0)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)))(@ember/string@4.0.0)(ember-inflector@4.0.3(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0))) + '@ember-data/store': 4.12.8(@babel/core@7.24.9)(@ember-data/graph@4.12.8)(@ember-data/json-api@4.12.8)(@ember-data/legacy-compat@4.12.8)(@ember-data/model@4.12.8)(@ember-data/tracking@4.12.8)(@ember/string@4.0.0)(@glimmer/tracking@1.1.2)(ember-source@5.9.0(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)) '@ember-data/tracking': 4.12.8 '@ember/edition-utils': 1.2.0 - '@ember/string': 3.1.1 + '@ember/string': 4.0.0 '@embroider/macros': 1.16.5 '@glimmer/env': 0.1.7 broccoli-merge-trees: 4.2.0 From 1b28daac3bab85aa3111aa84a867d06ebe06a0e1 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Wed, 24 Jul 2024 11:34:10 +0200 Subject: [PATCH 2/2] mirage: Vendor relevant `@ember/string` functions ... instead of relying on the package itself which is causing build issues again and again --- mirage/factories/category.js | 4 ++-- mirage/factories/user.js | 4 ++-- mirage/utils/strings.js | 9 +++++++++ 3 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 mirage/utils/strings.js diff --git a/mirage/factories/category.js b/mirage/factories/category.js index c7bcad7dd1..729abcde01 100644 --- a/mirage/factories/category.js +++ b/mirage/factories/category.js @@ -1,7 +1,7 @@ -import { dasherize } from '@ember/string'; - import { Factory } from 'miragejs'; +import { dasherize } from '../utils/strings'; + export default Factory.extend({ category: i => `Category ${i}`, diff --git a/mirage/factories/user.js b/mirage/factories/user.js index dfabbf777e..ebacd8f55d 100644 --- a/mirage/factories/user.js +++ b/mirage/factories/user.js @@ -1,7 +1,7 @@ -import { dasherize } from '@ember/string'; - import { Factory } from 'miragejs'; +import { dasherize } from '../utils/strings'; + export default Factory.extend({ name: i => `User ${i + 1}`, diff --git a/mirage/utils/strings.js b/mirage/utils/strings.js new file mode 100644 index 0000000000..503d753aff --- /dev/null +++ b/mirage/utils/strings.js @@ -0,0 +1,9 @@ +// Imported from the `@ember/string` package to avoid build issues... + +export function decamelize(str) { + return str.replace(/([\da-z])([A-Z])/g, '$1_$2').toLowerCase(); +} + +export function dasherize(str) { + return decamelize(str).replace(/[ _]/g, '-'); +}