From f1b0fa77cc724346a5dc60e0633dc1ea47966725 Mon Sep 17 00:00:00 2001 From: ijlee2 Date: Wed, 10 Jul 2024 11:48:17 +0200 Subject: [PATCH 1/3] chore: Tested compatibilities with ember-intl@v6 and ember-intl@v7 --- .github/workflows/ci.yml | 1 + README.md | 2 +- package.json | 4 ++-- tests/dummy/config/ember-try.js | 10 ++++++++++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2ba34e8..46e6c61 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -67,6 +67,7 @@ jobs: fail-fast: false matrix: scenario: + - 'ember-intl-6' - 'ember-lts-3.28' - 'ember-lts-4.12' - 'ember-lts-5.4' diff --git a/README.md b/README.md index 0eee98e..f5989dc 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Adds support for [ember-intl](https://github.com/yahoo/ember-intl) in ember-cp-v * Ember.js v3.28 or above * Node.js v18 or above * `ember-cp-validations` v6 -* `ember-intl` v6 +* `ember-intl` v6 or above ## Installation diff --git a/package.json b/package.json index 7d09d1a..18d6a65 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", "ember-cp-validations": "^6.0.1", - "ember-intl": "^6.1.0", + "ember-intl": "^7.0.4", "ember-load-initializers": "^2.1.2", "ember-page-title": "^8.2.3", "ember-qunit": "^8.0.2", @@ -84,7 +84,7 @@ }, "peerDependencies": { "ember-cp-validations": "^6.0.0", - "ember-intl": "^6.1.0" + "ember-intl": "^6.1.0 || ^7.0.0" }, "peerDependenciesMeta": { "ember-intl": { diff --git a/tests/dummy/config/ember-try.js b/tests/dummy/config/ember-try.js index 61af16b..5331c18 100644 --- a/tests/dummy/config/ember-try.js +++ b/tests/dummy/config/ember-try.js @@ -8,6 +8,16 @@ module.exports = async function () { return { usePnpm: true, scenarios: [ + { + name: 'ember-intl-6', + npm: { + devDependencies: { + 'ember-intl': await latestVersion('ember-intl', { + version: '6', + }), + }, + }, + }, { name: 'ember-lts-3.28', npm: { From 9ceaeafbd2827fb439704fa7fc3d7ba41a8d7e1e Mon Sep 17 00:00:00 2001 From: ijlee2 Date: Wed, 10 Jul 2024 11:48:45 +0200 Subject: [PATCH 2/3] chore: Added lockfile --- pnpm-lock.yaml | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0b269c0..65926f4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -71,8 +71,8 @@ devDependencies: specifier: ^6.0.1 version: 6.0.1(ember-source@5.10.0) ember-intl: - specifier: ^6.1.0 - version: 6.5.5(webpack@5.92.1) + specifier: ^7.0.4 + version: 7.0.4(webpack@5.92.1) ember-load-initializers: specifier: ^2.1.2 version: 2.1.2(@babel/core@7.24.7) @@ -3885,8 +3885,8 @@ packages: static-extend: 0.1.2 dev: true - /cldr-core@44.1.0: - resolution: {integrity: sha512-ssbJaXu3pCkc4YqNC6xHhgleZG7YqnOFZ9laMlJfHOfnspoA9waI4AH54gKB3Fe/+wI4i3cVxKFdCTVGTRw+UA==} + /cldr-core@45.0.0: + resolution: {integrity: sha512-gQVxy3gzOQpXiTRGmlKiRQFLYimrr1RgvqGKZCS61JgmdkeNm7+LZGx+Lhw5/AW0t8WMM/uZhf4CMva6LuUobQ==} dev: true /clean-base-url@1.0.0: @@ -5216,11 +5216,11 @@ packages: - eslint dev: true - /ember-intl@6.5.5(webpack@5.92.1): - resolution: {integrity: sha512-ce+SyhrnzHMgxuX7eIv1PSs5GY0uJpG/33QxGMvrRqavDEzvhhAq9G56dedoMygFT6bKPr/dZuLpDmz7hhk8Kg==} - engines: {node: 16.* || >= 18} + /ember-intl@7.0.4(webpack@5.92.1): + resolution: {integrity: sha512-EKIEV24BiUTx05+zi1Y37+qaOwVO/bFMZtsHPzndMDJcj6wjC1e3aMm5nvs4+jldh1TVwnIMVs9ivEoUNeijHQ==} + engines: {node: 18.* || >= 20} peerDependencies: - typescript: ^4.8.0 || ^5.0.0 + typescript: ^5.0.0 peerDependenciesMeta: typescript: optional: true @@ -5232,19 +5232,16 @@ packages: broccoli-funnel: 3.0.8 broccoli-merge-trees: 4.2.0 broccoli-source: 3.0.1 - broccoli-stew: 3.0.0 calculate-cache-key-for-tree: 2.0.0 - cldr-core: 44.1.0 + cldr-core: 45.0.0 ember-auto-import: 2.7.4(webpack@5.92.1) ember-cli-babel: 8.2.0(@babel/core@7.24.7) ember-cli-typescript: 5.3.0 eventemitter3: 5.0.1 extend: 3.0.2 - fast-memoize: 2.5.2 intl-messageformat: 10.5.14 js-yaml: 4.1.0 json-stable-stringify: 1.1.1 - silent-error: 1.1.1 transitivePeerDependencies: - '@glint/template' - supports-color @@ -6234,10 +6231,6 @@ packages: resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==} dev: true - /fast-memoize@2.5.2: - resolution: {integrity: sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==} - dev: true - /fast-ordered-set@1.0.3: resolution: {integrity: sha512-MxBW4URybFszOx1YlACEoK52P6lE3xiFcPaGCUZ7QQOZ6uJXKo++Se8wa31SjcZ+NC/fdAWX7UtKEfaGgHS2Vg==} dependencies: From 1fb96bf993ab45c18ecd5442be7a5429a4282720 Mon Sep 17 00:00:00 2001 From: ijlee2 Date: Wed, 10 Jul 2024 11:49:54 +0200 Subject: [PATCH 3/3] chore: Added changeset --- .changeset/nasty-fireants-prove.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/nasty-fireants-prove.md diff --git a/.changeset/nasty-fireants-prove.md b/.changeset/nasty-fireants-prove.md new file mode 100644 index 0000000..0b6ddac --- /dev/null +++ b/.changeset/nasty-fireants-prove.md @@ -0,0 +1,5 @@ +--- +"@ember-intl/cp-validations": patch +--- + +Tested compatibilities with ember-intl@v6 and ember-intl@v7