From fa0b6d9a09a41bbe7fc54fb4b478207a5f89268e Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Thu, 5 Sep 2024 16:43:46 -0400 Subject: [PATCH 1/3] npx ember-resources-codemod --- .../besluit-topic-toolbar-dropdown.ts | 2 +- .../besluit-type-plugin/toolbar-dropdown.ts | 2 +- addon/components/citation-plugin/citation-card.ts | 2 +- .../citations/legal-document-detail.ts | 2 +- .../citation-plugin/citations/search-modal.ts | 2 +- addon/components/lmb-plugin/search-modal.ts | 2 +- addon/components/location-plugin/edit.gts | 2 +- addon/components/lpdc-plugin/lpdc-modal.ts | 2 +- .../roadsign-regulation-plugin/measure-template.ts | 2 +- addon/components/snippet-plugin/search-modal.ts | 2 +- .../snippet-plugin/snippet-list/snippet-list-modal.ts | 2 +- addon/components/variable-plugin/address/edit.ts | 2 +- addon/components/variable-plugin/codelist/edit.ts | 2 +- addon/components/variable-plugin/codelist/insert.ts | 2 +- addon/components/variable-plugin/location/edit.ts | 2 +- addon/components/worship-plugin/search-modal.ts | 2 +- package.json | 11 ++++++----- 17 files changed, 22 insertions(+), 21 deletions(-) diff --git a/addon/components/besluit-topic-plugin/besluit-topic-toolbar-dropdown.ts b/addon/components/besluit-topic-plugin/besluit-topic-toolbar-dropdown.ts index 260d876b9..2427f681f 100644 --- a/addon/components/besluit-topic-plugin/besluit-topic-toolbar-dropdown.ts +++ b/addon/components/besluit-topic-plugin/besluit-topic-toolbar-dropdown.ts @@ -2,7 +2,7 @@ import { tracked } from '@glimmer/tracking'; import Component from '@glimmer/component'; import { action } from '@ember/object'; import { SayController } from '@lblod/ember-rdfa-editor'; -import { trackedFunction } from 'ember-resources/util/function'; +import { trackedFunction } from 'reactiveweb/function'; import { ELI } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants'; import { AlertTriangleIcon } from '@appuniversum/ember-appuniversum/components/icons/alert-triangle'; import { CrossIcon } from '@appuniversum/ember-appuniversum/components/icons/cross'; diff --git a/addon/components/besluit-type-plugin/toolbar-dropdown.ts b/addon/components/besluit-type-plugin/toolbar-dropdown.ts index efe635acf..b36ce2b33 100644 --- a/addon/components/besluit-type-plugin/toolbar-dropdown.ts +++ b/addon/components/besluit-type-plugin/toolbar-dropdown.ts @@ -7,7 +7,7 @@ import { sayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory'; import fetchBesluitTypes, { BesluitType, } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-type-plugin/utils/fetchBesluitTypes'; -import { trackedFunction } from 'ember-resources/util/function'; +import { trackedFunction } from 'reactiveweb/function'; import { unwrap } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option'; import { BesluitTypePluginOptions } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-type-plugin'; import { RDF } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants'; diff --git a/addon/components/citation-plugin/citation-card.ts b/addon/components/citation-plugin/citation-card.ts index c6a169726..baae488e9 100644 --- a/addon/components/citation-plugin/citation-card.ts +++ b/addon/components/citation-plugin/citation-card.ts @@ -3,7 +3,7 @@ import { tracked } from '@glimmer/tracking'; import { restartableTask, timeout } from 'ember-concurrency'; import { action } from '@ember/object'; import { capitalize } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/strings'; -import { task as trackedTask } from 'ember-resources/util/ember-concurrency'; +import { task as trackedTask } from 'reactiveweb/ember-concurrency'; import { Option, unwrap, diff --git a/addon/components/citation-plugin/citations/legal-document-detail.ts b/addon/components/citation-plugin/citations/legal-document-detail.ts index fa94fc042..b1bc1d375 100644 --- a/addon/components/citation-plugin/citations/legal-document-detail.ts +++ b/addon/components/citation-plugin/citations/legal-document-detail.ts @@ -2,7 +2,7 @@ import Component from '@glimmer/component'; import { restartableTask, timeout } from 'ember-concurrency'; import { tracked } from '@glimmer/tracking'; import { action } from '@ember/object'; -import { task as trackedTask } from 'ember-resources/util/ember-concurrency'; +import { task as trackedTask } from 'reactiveweb/ember-concurrency'; import { CalendarIcon } from '@appuniversum/ember-appuniversum/components/icons/calendar'; import { PlusTextIcon } from '@appuniversum/ember-appuniversum/components/icons/plus-text'; import { LinkExternalIcon } from '@appuniversum/ember-appuniversum/components/icons/link-external'; diff --git a/addon/components/citation-plugin/citations/search-modal.ts b/addon/components/citation-plugin/citations/search-modal.ts index 826991481..c61dd691b 100644 --- a/addon/components/citation-plugin/citations/search-modal.ts +++ b/addon/components/citation-plugin/citations/search-modal.ts @@ -4,7 +4,7 @@ import { action } from '@ember/object'; import { restartableTask, timeout } from 'ember-concurrency'; import { service } from '@ember/service'; import { capitalize } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/strings'; -import { task as trackedTask } from 'ember-resources/util/ember-concurrency'; +import { task as trackedTask } from 'reactiveweb/ember-concurrency'; import { isGemeenteBesluitType, LEGISLATION_TYPE_CONCEPTS, diff --git a/addon/components/lmb-plugin/search-modal.ts b/addon/components/lmb-plugin/search-modal.ts index 018a2afab..ff53675db 100644 --- a/addon/components/lmb-plugin/search-modal.ts +++ b/addon/components/lmb-plugin/search-modal.ts @@ -3,7 +3,7 @@ import { tracked } from '@glimmer/tracking'; import { assert } from '@ember/debug'; import { action } from '@ember/object'; import { restartableTask } from 'ember-concurrency'; -import { task as trackedTask } from 'ember-resources/util/ember-concurrency'; +import { task as trackedTask } from 'reactiveweb/ember-concurrency'; import { LmbPluginConfig } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/lmb-plugin'; import Mandatee from '@lblod/ember-rdfa-editor-lblod-plugins/models/mandatee'; diff --git a/addon/components/location-plugin/edit.gts b/addon/components/location-plugin/edit.gts index 583412288..e23fb3825 100644 --- a/addon/components/location-plugin/edit.gts +++ b/addon/components/location-plugin/edit.gts @@ -3,7 +3,7 @@ import Component from '@glimmer/component'; import { restartableTask, timeout } from 'ember-concurrency'; import perform from 'ember-concurrency/helpers/perform'; import { trackedReset } from 'tracked-toolbox'; -import { trackedTask } from 'ember-resources/util/ember-concurrency'; +import { trackedTask } from 'reactiveweb/ember-concurrency'; import { service } from '@ember/service'; import { on } from '@ember/modifier'; import type { SafeString } from '@ember/template/-private/handlebars'; diff --git a/addon/components/lpdc-plugin/lpdc-modal.ts b/addon/components/lpdc-plugin/lpdc-modal.ts index 7055e0852..bac09fee6 100644 --- a/addon/components/lpdc-plugin/lpdc-modal.ts +++ b/addon/components/lpdc-plugin/lpdc-modal.ts @@ -1,7 +1,7 @@ import Component from '@glimmer/component'; import { action } from '@ember/object'; import { restartableTask, timeout } from 'ember-concurrency'; -import { task as trackedTask } from 'ember-resources/util/ember-concurrency'; +import { task as trackedTask } from 'reactiveweb/ember-concurrency'; import { tracked } from '@glimmer/tracking'; diff --git a/addon/components/roadsign-regulation-plugin/measure-template.ts b/addon/components/roadsign-regulation-plugin/measure-template.ts index 015ff0055..cefb5d329 100644 --- a/addon/components/roadsign-regulation-plugin/measure-template.ts +++ b/addon/components/roadsign-regulation-plugin/measure-template.ts @@ -2,7 +2,7 @@ import Component from '@glimmer/component'; import { service } from '@ember/service'; import includeInstructions from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/utils/includeInstructions'; import RoadsignRegistryService from '@lblod/ember-rdfa-editor-lblod-plugins/services/roadsign-registry'; -import { trackedFunction } from 'ember-resources/util/function'; +import { trackedFunction } from 'reactiveweb/function'; type Args = { template: string; diff --git a/addon/components/snippet-plugin/search-modal.ts b/addon/components/snippet-plugin/search-modal.ts index e8888d677..7a5beb352 100644 --- a/addon/components/snippet-plugin/search-modal.ts +++ b/addon/components/snippet-plugin/search-modal.ts @@ -2,7 +2,7 @@ import Component from '@glimmer/component'; import { assert } from '@ember/debug'; import { action } from '@ember/object'; import { restartableTask, timeout } from 'ember-concurrency'; -import { task as trackedTask } from 'ember-resources/util/ember-concurrency'; +import { task as trackedTask } from 'reactiveweb/ember-concurrency'; import { tracked } from '@glimmer/tracking'; diff --git a/addon/components/snippet-plugin/snippet-list/snippet-list-modal.ts b/addon/components/snippet-plugin/snippet-list/snippet-list-modal.ts index 3f598fbdd..50d72db74 100644 --- a/addon/components/snippet-plugin/snippet-list/snippet-list-modal.ts +++ b/addon/components/snippet-plugin/snippet-list/snippet-list-modal.ts @@ -1,7 +1,7 @@ import Component from '@glimmer/component'; import { action } from '@ember/object'; import { restartableTask, timeout } from 'ember-concurrency'; -import { task as trackedTask } from 'ember-resources/util/ember-concurrency'; +import { task as trackedTask } from 'reactiveweb/ember-concurrency'; import { tracked } from '@glimmer/tracking'; diff --git a/addon/components/variable-plugin/address/edit.ts b/addon/components/variable-plugin/address/edit.ts index 0be396fc8..4854f9934 100644 --- a/addon/components/variable-plugin/address/edit.ts +++ b/addon/components/variable-plugin/address/edit.ts @@ -11,7 +11,7 @@ import { } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/address-helpers'; import { restartableTask, timeout } from 'ember-concurrency'; import { trackedReset } from 'tracked-toolbox'; -import { trackedTask } from 'ember-resources/util/ember-concurrency'; +import { trackedTask } from 'reactiveweb/ember-concurrency'; import { service } from '@ember/service'; import IntlService from 'ember-intl/services/intl'; import { AlertTriangleIcon } from '@appuniversum/ember-appuniversum/components/icons/alert-triangle'; diff --git a/addon/components/variable-plugin/codelist/edit.ts b/addon/components/variable-plugin/codelist/edit.ts index 88f14b40f..396f17a03 100644 --- a/addon/components/variable-plugin/codelist/edit.ts +++ b/addon/components/variable-plugin/codelist/edit.ts @@ -7,7 +7,7 @@ import { } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/fetch-data'; import { MULTI_SELECT_CODELIST_TYPE } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/constants'; import { NodeSelection } from '@lblod/ember-rdfa-editor'; -import { trackedFunction } from 'ember-resources/util/function'; +import { trackedFunction } from 'reactiveweb/function'; import { trackedReset } from 'tracked-toolbox'; import { updateCodelistVariable } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/codelist-utils'; import { getOutgoingTriple } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace'; diff --git a/addon/components/variable-plugin/codelist/insert.ts b/addon/components/variable-plugin/codelist/insert.ts index 66748381b..754ddaecd 100644 --- a/addon/components/variable-plugin/codelist/insert.ts +++ b/addon/components/variable-plugin/codelist/insert.ts @@ -9,7 +9,7 @@ import { } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/fetch-data'; import { service } from '@ember/service'; import IntlService from 'ember-intl/services/intl'; -import { trackedFunction } from 'ember-resources/util/function'; +import { trackedFunction } from 'reactiveweb/function'; import { v4 as uuidv4 } from 'uuid'; import { DCT, diff --git a/addon/components/variable-plugin/location/edit.ts b/addon/components/variable-plugin/location/edit.ts index ee435604c..72e39a7b6 100644 --- a/addon/components/variable-plugin/location/edit.ts +++ b/addon/components/variable-plugin/location/edit.ts @@ -10,7 +10,7 @@ import { findParentNodeOfType } from '@curvenote/prosemirror-utils'; import { NodeSelection } from '@lblod/ember-rdfa-editor'; import { ZONAL_URI } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/utils/constants'; import { unwrap } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option'; -import { trackedFunction } from 'ember-resources/util/function'; +import { trackedFunction } from 'reactiveweb/function'; import { trackedReset } from 'tracked-toolbox'; import { updateCodelistVariable } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/codelist-utils'; diff --git a/addon/components/worship-plugin/search-modal.ts b/addon/components/worship-plugin/search-modal.ts index 7ddafe4ec..9244be982 100644 --- a/addon/components/worship-plugin/search-modal.ts +++ b/addon/components/worship-plugin/search-modal.ts @@ -3,7 +3,7 @@ import { tracked } from '@glimmer/tracking'; import { assert } from '@ember/debug'; import { action } from '@ember/object'; import { restartableTask, timeout } from 'ember-concurrency'; -import { task as trackedTask } from 'ember-resources/util/ember-concurrency'; +import { task as trackedTask } from 'reactiveweb/ember-concurrency'; import { WorshipPluginConfig } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/worship-plugin'; import { fetchWorshipServices, diff --git a/package.json b/package.json index 2381b0fbc..0b73879b5 100644 --- a/package.json +++ b/package.json @@ -65,12 +65,12 @@ "codemirror": "^6.0.1", "crypto-browserify": "^3.12.0", "date-fns": "^2.30.0", - "ember-auto-import": "~2.6.3", + "ember-auto-import": "~2.7.0", "ember-cli-babel": "^8.2.0", "ember-cli-htmlbars": "^6.3.0", "ember-concurrency": "^3.1.1", "ember-mu-transform-helpers": "^2.1.2", - "ember-resources": "^6.5.1", + "ember-resources": "^7.0.2", "ember-template-imports": "^4.1.1", "ember-velcro": "^2.2.0", "fetch-sparql-endpoint": "^3.3.3", @@ -82,7 +82,8 @@ "stream-browserify": "^3.0.0", "tracked-built-ins": "^3.3.0", "tracked-toolbox": "^2.0.0", - "uuid": "^9.0.1" + "uuid": "^9.0.1", + "reactiveweb": "^1.3.0" }, "devDependencies": { "@appuniversum/ember-appuniversum": "~3.4.2", @@ -219,7 +220,7 @@ "node": ">= 18" }, "volta": { - "node": "20.11.0" + "node": "22.8.0" }, "ember": { "edition": "octane" @@ -228,4 +229,4 @@ "configPath": "tests/dummy/config" }, "packageManager": "pnpm@9.4.0" -} +} \ No newline at end of file From 8f2ac29b2d572f63836377c83a9e5de6c7eac46f Mon Sep 17 00:00:00 2001 From: Rich Date: Tue, 17 Sep 2024 18:13:45 +0200 Subject: [PATCH 2/3] Update pnpm-lock and add changeset for ember-resources upgrade --- .changeset/funny-houses-add.md | 5 ++ pnpm-lock.yaml | 144 +++++++++++++++++---------------- 2 files changed, 79 insertions(+), 70 deletions(-) create mode 100644 .changeset/funny-houses-add.md diff --git a/.changeset/funny-houses-add.md b/.changeset/funny-houses-add.md new file mode 100644 index 000000000..62ddee95a --- /dev/null +++ b/.changeset/funny-houses-add.md @@ -0,0 +1,5 @@ +--- +'@lblod/ember-rdfa-editor-lblod-plugins': patch +--- + +Internal: update to latest ember-resources 7.0.2 diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 44ba347b9..b33bfd4e7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -54,8 +54,8 @@ importers: specifier: ^2.30.0 version: 2.30.0 ember-auto-import: - specifier: ~2.6.3 - version: 2.6.3(@glint/template@1.4.0)(webpack@5.92.1) + specifier: ~2.7.0 + version: 2.7.4(@glint/template@1.4.0)(webpack@5.92.1) ember-cli-babel: specifier: ^8.2.0 version: 8.2.0(@babel/core@7.24.7) @@ -69,8 +69,8 @@ importers: specifier: ^2.1.2 version: 2.1.2 ember-resources: - specifier: ^6.5.1 - version: 6.5.1(@ember/test-waiters@3.1.0)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glimmer/tracking@1.1.2)(@glint/template@1.4.0)(ember-concurrency@3.1.1(@babel/core@7.24.7)(ember-source@4.12.0(@babel/core@7.24.7)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glint/template@1.4.0)(webpack@5.92.1)))(ember-source@4.12.0(@babel/core@7.24.7)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glint/template@1.4.0)(webpack@5.92.1)) + specifier: ^7.0.2 + version: 7.0.2(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glimmer/tracking@1.1.2)(@glint/template@1.4.0)(ember-source@4.12.0(@babel/core@7.24.7)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glint/template@1.4.0)(webpack@5.92.1)) ember-template-imports: specifier: ^4.1.1 version: 4.1.1 @@ -95,6 +95,9 @@ importers: rdf-validate-shacl: specifier: ^0.4.5 version: 0.4.5 + reactiveweb: + specifier: ^1.3.0 + version: 1.3.0(@babel/core@7.24.7)(@ember/test-waiters@3.1.0)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glimmer/tracking@1.1.2)(@glint/template@1.4.0)(ember-source@4.12.0(@babel/core@7.24.7)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glint/template@1.4.0)(webpack@5.92.1)) stream-browserify: specifier: ^3.0.0 version: 3.0.0 @@ -3762,6 +3765,9 @@ packages: resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==} engines: {node: '>=10'} + decorator-transforms@1.2.1: + resolution: {integrity: sha512-UUtmyfdlHvYoX3VSG1w5rbvBQ2r5TX1JsE4hmKU9snleFymadA3VACjl6SRfi9YgBCSjBbfQvR1bs9PRW9yBKw==} + deep-extend@0.6.0: resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==} engines: {node: '>=4.0.0'} @@ -3950,10 +3956,6 @@ packages: resolution: {integrity: sha512-gLqML2k77AuUiXxWNon1FSzuG1DV7PEPpCLCU5aJvf6fdL6rmFfElsZRh+8ELEB/qP9dT+LHjNEunVzd2dYc8A==} engines: {node: '>= 10.*'} - ember-auto-import@2.6.3: - resolution: {integrity: sha512-uLhrRDJYWCRvQ4JQ1e64XlSrqAKSd6PXaJ9ZsZI6Tlms9T4DtQFxNXasqji2ZRJBVrxEoLCRYX3RTldsQ0vNGQ==} - engines: {node: 12.* || 14.* || >= 16} - ember-auto-import@2.7.4: resolution: {integrity: sha512-6CdXSegJJc8nwwK7+1lIcBUnMVrJRNd4ZdMgcKbCAwPvcGxMgRVBddSzrX/+q/UuflvTEO26Dk1g7Z6KHMXUhw==} engines: {node: 12.* || 14.* || >= 16} @@ -3968,6 +3970,12 @@ packages: resolution: {integrity: sha512-hSPcvIKarA8wad2/b6jDd/eU+OtKmi6uP+iYQbzi5TQpjsqV6b4QdRqrLk7ClSRRKBAtdTuutx+m+X+WlEd2lw==} engines: {node: 10.* || >= 12} + ember-cached-decorator-polyfill@1.0.2: + resolution: {integrity: sha512-hUX6OYTKltAPAu8vsVZK02BfMTV0OUXrPqvRahYPhgS7D0I6joLjlskd7mhqJMcaXLywqceIy8/s+x8bxF8bpQ==} + engines: {node: 14.* || >= 16} + peerDependencies: + ember-source: ^3.13.0 || ^4.0.0 || >= 5.0.0 + ember-changeset@4.1.2: resolution: {integrity: sha512-tHQTFOHz1BAUG5taVZJadECm9QsZdZkj59XIRdHnwyG8cOKFnFQamhJFY+Zu2yU7/sAksYtgbr71kFm57Unz9w==} engines: {node: 12.* || 14.* || >= 16} @@ -4255,22 +4263,16 @@ packages: ember-source: optional: true - ember-resources@6.5.1: - resolution: {integrity: sha512-8eEdbSE0sioqjpB2CWw/dKF4Ftfe9tbebuSUfMDBmP3xxTIvxTDbvDnbd8A0IbQ0z/iQt6Va+/5cadzvkbMZtg==} + ember-resources@7.0.2: + resolution: {integrity: sha512-WbTdfgMn2bIuuWIXl8PlS4wj3zBO1+plRI63XF9pUhk1ltE31P53ns28+e0EYdYyN9KtZ9di7ZsRLEWO2dHJGw==} peerDependencies: - '@ember/test-waiters': ^3.0.0 - '@glimmer/component': ^1.1.2 - '@glimmer/tracking': ^1.1.2 - '@glint/template': ^1.0.0-beta.3 || ^1.0.0 - ember-concurrency: ^2.0.0 || ^3.0.0 - ember-source: ^3.28.0 || ^4.0.0 || ^5.0.0 + '@glimmer/component': '>= 1.1.2' + '@glimmer/tracking': '>= 1.1.2' + '@glint/template': '>= 1.0.0' + ember-source: ^3.28.0 || ^4.0.0 || >= 5.0.0 peerDependenciesMeta: - '@ember/test-waiters': - optional: true '@glimmer/component': optional: true - ember-concurrency: - optional: true ember-rfc176-data@0.3.18: resolution: {integrity: sha512-JtuLoYGSjay1W3MQAxt3eINWXNYYQliK90tLwtb8aeCuQK8zKGCRbBodVIrkcTqshULMnRuTOS6t1P7oQk3g6Q==} @@ -7468,6 +7470,12 @@ packages: resolution: {integrity: sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==} engines: {node: '>=0.10.0'} + reactiveweb@1.3.0: + resolution: {integrity: sha512-+HIF4nW2iiHrZYvMyaFJopL/ljEW8e8s9HS+I6kAtSeJqtJtox577qviywU8ffHRmHPZP4owTlSWg3F4nAj4Vg==} + peerDependencies: + '@ember/test-waiters': '>= 3.1.0' + ember-source: '>= 3.28.0' + read-yaml-file@1.1.0: resolution: {integrity: sha512-VIMnQi/Z4HT2Fxuwg5KrY174U1VdUIASQVWXXyqtNRtxSr9IYkn1rsI6Tb6HsrHCmB7gVpNwX6JxPTHcH6IoTA==} engines: {node: '>=6'} @@ -9007,7 +9015,7 @@ snapshots: '@floating-ui/dom': 1.6.7 '@glimmer/component': 1.1.2(@babel/core@7.24.7) '@glimmer/tracking': 1.1.2 - ember-auto-import: 2.6.3(@glint/template@1.4.0)(webpack@5.92.1) + ember-auto-import: 2.7.4(@glint/template@1.4.0)(webpack@5.92.1) ember-cli-babel: 8.2.0(@babel/core@7.24.7) ember-cli-htmlbars: 6.3.0 ember-concurrency: 3.1.1(@babel/core@7.24.7)(ember-source@4.12.0(@babel/core@7.24.7)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glint/template@1.4.0)(webpack@5.92.1)) @@ -13653,6 +13661,13 @@ snapshots: dependencies: mimic-response: 3.1.0 + decorator-transforms@1.2.1(@babel/core@7.24.7): + dependencies: + '@babel/plugin-syntax-decorators': 7.24.7(@babel/core@7.24.7) + babel-import-util: 2.1.1 + transitivePeerDependencies: + - '@babel/core' + deep-extend@0.6.0: {} deep-is@0.1.4: {} @@ -13872,44 +13887,6 @@ snapshots: - webpack-cli - webpack-command - ember-auto-import@2.6.3(@glint/template@1.4.0)(webpack@5.92.1): - dependencies: - '@babel/core': 7.24.7 - '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.24.7) - '@babel/plugin-proposal-decorators': 7.24.7(@babel/core@7.24.7) - '@babel/preset-env': 7.24.7(@babel/core@7.24.7) - '@embroider/macros': 1.16.5(@glint/template@1.4.0) - '@embroider/shared-internals': 2.6.2 - babel-loader: 8.3.0(@babel/core@7.24.7)(webpack@5.92.1) - babel-plugin-ember-modules-api-polyfill: 3.5.0 - babel-plugin-ember-template-compilation: 2.2.5 - babel-plugin-htmlbars-inline-precompile: 5.3.1 - babel-plugin-syntax-dynamic-import: 6.18.0 - broccoli-debug: 0.6.5 - broccoli-funnel: 3.0.8 - broccoli-merge-trees: 4.2.0 - broccoli-plugin: 4.0.7 - broccoli-source: 3.0.1 - css-loader: 5.2.7(webpack@5.92.1) - debug: 4.3.5 - fs-extra: 10.1.0 - fs-tree-diff: 2.0.1 - handlebars: 4.7.8 - js-string-escape: 1.0.1 - lodash: 4.17.21 - mini-css-extract-plugin: 2.9.0(webpack@5.92.1) - parse5: 6.0.1 - resolve: 1.22.8 - resolve-package-path: 4.0.3 - semver: 7.6.2 - style-loader: 2.0.0(webpack@5.92.1) - typescript-memoize: 1.1.1 - walk-sync: 3.0.0 - transitivePeerDependencies: - - '@glint/template' - - supports-color - - webpack - ember-auto-import@2.7.4(@glint/template@1.4.0)(webpack@5.92.1): dependencies: '@babel/core': 7.24.7 @@ -13957,7 +13934,7 @@ snapshots: '@embroider/util': 1.13.1(@glint/environment-ember-loose@1.4.0(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glint/template@1.4.0)(@types/ember__array@4.0.10(@babel/core@7.24.7))(@types/ember__component@4.0.22(@babel/core@7.24.7))(@types/ember__controller@4.0.12(@babel/core@7.24.7))(@types/ember__object@4.0.12(@babel/core@7.24.7))(@types/ember__routing@4.0.22(@babel/core@7.24.7))(ember-cli-htmlbars@6.3.0)(ember-modifier@4.1.0(ember-source@4.12.0(@babel/core@7.24.7)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glint/template@1.4.0)(webpack@5.92.1))))(@glint/template@1.4.0)(ember-source@4.12.0(@babel/core@7.24.7)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glint/template@1.4.0)(webpack@5.92.1)) '@glimmer/component': 1.1.2(@babel/core@7.24.7) '@glimmer/tracking': 1.1.2 - ember-auto-import: 2.6.3(@glint/template@1.4.0)(webpack@5.92.1) + ember-auto-import: 2.7.4(@glint/template@1.4.0)(webpack@5.92.1) ember-cli-babel: 7.26.11 ember-cli-htmlbars: 6.3.0 ember-cli-typescript: 5.3.0 @@ -13985,11 +13962,25 @@ snapshots: - '@babel/core' - supports-color + ember-cached-decorator-polyfill@1.0.2(@babel/core@7.24.7)(@glint/template@1.4.0)(ember-source@4.12.0(@babel/core@7.24.7)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glint/template@1.4.0)(webpack@5.92.1)): + dependencies: + '@embroider/macros': 1.16.5(@glint/template@1.4.0) + '@glimmer/tracking': 1.1.2 + babel-import-util: 1.4.1 + ember-cache-primitive-polyfill: 1.0.1(@babel/core@7.24.7) + ember-cli-babel: 7.26.11 + ember-cli-babel-plugin-helpers: 1.1.1 + ember-source: 4.12.0(@babel/core@7.24.7)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glint/template@1.4.0)(webpack@5.92.1) + transitivePeerDependencies: + - '@babel/core' + - '@glint/template' + - supports-color + ember-changeset@4.1.2(@glint/template@1.4.0)(webpack@5.92.1): dependencies: '@embroider/macros': 1.16.5(@glint/template@1.4.0) '@glimmer/tracking': 1.1.2 - ember-auto-import: 2.6.3(@glint/template@1.4.0)(webpack@5.92.1) + ember-auto-import: 2.7.4(@glint/template@1.4.0)(webpack@5.92.1) ember-cli-babel: 7.26.11 validated-changeset: 1.3.4 transitivePeerDependencies: @@ -14460,7 +14451,7 @@ snapshots: '@babel/core': 7.24.7 '@ember/render-modifiers': 2.1.0(@babel/core@7.24.7)(@glint/template@1.4.0)(ember-source@4.12.0(@babel/core@7.24.7)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glint/template@1.4.0)(webpack@5.92.1)) '@glimmer/component': 1.1.2(@babel/core@7.24.7) - ember-auto-import: 2.6.3(@glint/template@1.4.0)(webpack@5.92.1) + ember-auto-import: 2.7.4(@glint/template@1.4.0)(webpack@5.92.1) ember-cli-babel: 8.2.0(@babel/core@7.24.7) ember-cli-htmlbars: 6.3.0 ember-element-helper: 0.8.6(@glint/environment-ember-loose@1.4.0(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glint/template@1.4.0)(@types/ember__array@4.0.10(@babel/core@7.24.7))(@types/ember__component@4.0.22(@babel/core@7.24.7))(@types/ember__controller@4.0.12(@babel/core@7.24.7))(@types/ember__object@4.0.12(@babel/core@7.24.7))(@types/ember__routing@4.0.22(@babel/core@7.24.7))(ember-cli-htmlbars@6.3.0)(ember-modifier@4.1.0(ember-source@4.12.0(@babel/core@7.24.7)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glint/template@1.4.0)(webpack@5.92.1))))(@glint/template@1.4.0)(ember-source@4.12.0(@babel/core@7.24.7)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glint/template@1.4.0)(webpack@5.92.1)) @@ -14551,7 +14542,7 @@ snapshots: '@embroider/macros': 1.16.5(@glint/template@1.4.0) '@glimmer/component': 1.1.2(@babel/core@7.24.7) '@glimmer/tracking': 1.1.2 - ember-auto-import: 2.6.3(@glint/template@1.4.0)(webpack@5.92.1) + ember-auto-import: 2.7.4(@glint/template@1.4.0)(webpack@5.92.1) ember-modifier: 4.1.0(ember-source@4.12.0(@babel/core@7.24.7)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glint/template@1.4.0)(webpack@5.92.1)) tracked-built-ins: 3.3.0 transitivePeerDependencies: @@ -14738,7 +14729,7 @@ snapshots: broccoli-funnel: 3.0.8 broccoli-merge-trees: 3.0.2 common-tags: 1.8.2 - ember-auto-import: 2.6.3(@glint/template@1.4.0)(webpack@5.92.1) + ember-auto-import: 2.7.4(@glint/template@1.4.0)(webpack@5.92.1) ember-cli-babel: 7.26.11 ember-cli-test-loader: 3.1.0 ember-source: 4.12.0(@babel/core@7.24.7)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glint/template@1.4.0)(webpack@5.92.1) @@ -14766,19 +14757,15 @@ snapshots: transitivePeerDependencies: - supports-color - ember-resources@6.5.1(@ember/test-waiters@3.1.0)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glimmer/tracking@1.1.2)(@glint/template@1.4.0)(ember-concurrency@3.1.1(@babel/core@7.24.7)(ember-source@4.12.0(@babel/core@7.24.7)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glint/template@1.4.0)(webpack@5.92.1)))(ember-source@4.12.0(@babel/core@7.24.7)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glint/template@1.4.0)(webpack@5.92.1)): + ember-resources@7.0.2(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glimmer/tracking@1.1.2)(@glint/template@1.4.0)(ember-source@4.12.0(@babel/core@7.24.7)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glint/template@1.4.0)(webpack@5.92.1)): dependencies: - '@babel/runtime': 7.24.7 '@embroider/addon-shim': 1.8.9 '@embroider/macros': 1.16.5(@glint/template@1.4.0) '@glimmer/tracking': 1.1.2 '@glint/template': 1.4.0 - ember-async-data: 1.0.3(ember-source@4.12.0(@babel/core@7.24.7)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glint/template@1.4.0)(webpack@5.92.1)) ember-source: 4.12.0(@babel/core@7.24.7)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glint/template@1.4.0)(webpack@5.92.1) optionalDependencies: - '@ember/test-waiters': 3.1.0 '@glimmer/component': 1.1.2(@babel/core@7.24.7) - ember-concurrency: 3.1.1(@babel/core@7.24.7)(ember-source@4.12.0(@babel/core@7.24.7)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glint/template@1.4.0)(webpack@5.92.1)) transitivePeerDependencies: - supports-color @@ -14813,7 +14800,7 @@ snapshots: broccoli-funnel: 3.0.8 broccoli-merge-trees: 4.2.0 chalk: 4.1.2 - ember-auto-import: 2.6.3(@glint/template@1.4.0)(webpack@5.92.1) + ember-auto-import: 2.7.4(@glint/template@1.4.0)(webpack@5.92.1) ember-cli-babel: 7.26.11 ember-cli-get-component-path-option: 1.0.0 ember-cli-is-package-missing: 1.0.0 @@ -18602,6 +18589,23 @@ snapshots: dependencies: loose-envify: 1.4.0 + reactiveweb@1.3.0(@babel/core@7.24.7)(@ember/test-waiters@3.1.0)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glimmer/tracking@1.1.2)(@glint/template@1.4.0)(ember-source@4.12.0(@babel/core@7.24.7)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glint/template@1.4.0)(webpack@5.92.1)): + dependencies: + '@ember/test-waiters': 3.1.0 + '@embroider/addon-shim': 1.8.9 + '@embroider/macros': 1.16.5(@glint/template@1.4.0) + decorator-transforms: 1.2.1(@babel/core@7.24.7) + ember-async-data: 1.0.3(ember-source@4.12.0(@babel/core@7.24.7)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glint/template@1.4.0)(webpack@5.92.1)) + ember-cached-decorator-polyfill: 1.0.2(@babel/core@7.24.7)(@glint/template@1.4.0)(ember-source@4.12.0(@babel/core@7.24.7)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glint/template@1.4.0)(webpack@5.92.1)) + ember-resources: 7.0.2(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glimmer/tracking@1.1.2)(@glint/template@1.4.0)(ember-source@4.12.0(@babel/core@7.24.7)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glint/template@1.4.0)(webpack@5.92.1)) + ember-source: 4.12.0(@babel/core@7.24.7)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glint/template@1.4.0)(webpack@5.92.1) + transitivePeerDependencies: + - '@babel/core' + - '@glimmer/component' + - '@glimmer/tracking' + - '@glint/template' + - supports-color + read-yaml-file@1.1.0: dependencies: graceful-fs: 4.2.11 From 11c1fa8569f004adb1cb299a20d951ad8d4f131e Mon Sep 17 00:00:00 2001 From: Rich Date: Tue, 17 Sep 2024 19:08:38 +0200 Subject: [PATCH 3/3] Tweaks to package.json to undo unnecessary changes --- .changeset/funny-houses-add.md | 5 +++-- package.json | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.changeset/funny-houses-add.md b/.changeset/funny-houses-add.md index 62ddee95a..988a028d3 100644 --- a/.changeset/funny-houses-add.md +++ b/.changeset/funny-houses-add.md @@ -1,5 +1,6 @@ --- -'@lblod/ember-rdfa-editor-lblod-plugins': patch +'@lblod/ember-rdfa-editor-lblod-plugins': minor --- -Internal: update to latest ember-resources 7.0.2 +Internal: update to latest ember-resources 7.0.2. Requires an upgrade only if consumer app uses +ember dependency-lint to maintain matching versions. diff --git a/package.json b/package.json index 4f698e806..5eb250250 100644 --- a/package.json +++ b/package.json @@ -79,11 +79,11 @@ "proj4": "^2.11.0", "rdf-ext": "^2.5.2", "rdf-validate-shacl": "^0.4.5", + "reactiveweb": "^1.3.0", "stream-browserify": "^3.0.0", "tracked-built-ins": "^3.3.0", "tracked-toolbox": "^2.0.0", - "uuid": "^9.0.1", - "reactiveweb": "^1.3.0" + "uuid": "^9.0.1" }, "devDependencies": { "@appuniversum/ember-appuniversum": "~3.4.2", @@ -220,7 +220,7 @@ "node": ">= 18" }, "volta": { - "node": "22.8.0" + "node": "20.11.0" }, "ember": { "edition": "octane" @@ -229,4 +229,4 @@ "configPath": "tests/dummy/config" }, "packageManager": "pnpm@9.4.0" -} \ No newline at end of file +}