From 0c819d6d12fa33955c244ef82f261c00a2ae8f1a Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Mon, 7 Nov 2022 16:18:02 -0800 Subject: [PATCH] Chore upgrade ember intl (#1425) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: 💡 explicitly inject the store service - icu-6770 ✅ Closes: icu-6770 * refactor: 💡 upgrade to ember-intl 6.0.1 includes locale initialization and smoke tests * refactor: 💡 migrate admin and desktop to ember-intl 6.x ✅ Closes: icu-6771 * chore: 🤖 exclude cldr-core@38.1.0 from license checking this license was manually checked * fix: 🐛 fix text naming and linting * chore: 🤖 update to ember-intl beta --- addons/core/package.json | 2 +- addons/core/tests/acceptance/index-test.js | 12 + addons/core/tests/acceptance/smoke-test.js | 13 + .../controllers/{application.js => index.js} | 2 +- addons/core/tests/dummy/app/router.js | 4 +- .../tests/dummy/app/routes/application.js | 10 + addons/core/tests/dummy/app/routes/smoke.js | 3 + .../tests/dummy/app/templates/application.hbs | 3 +- .../core/tests/dummy/app/templates/index.hbs | 2 + .../tests/dummy/app/templates/smoke-test.hbs | 8 + .../components/error/message-test.js | 2 + package.json | 2 +- ui/admin/app/routes/application.js | 2 + .../form/worker/create-worker-led-test.js | 2 + ui/desktop/app/routes/application.js | 2 + .../components/hidden-secret-test.js | 2 + yarn.lock | 224 +++++++++++------- 17 files changed, 203 insertions(+), 92 deletions(-) create mode 100644 addons/core/tests/acceptance/index-test.js create mode 100644 addons/core/tests/acceptance/smoke-test.js rename addons/core/tests/dummy/app/controllers/{application.js => index.js} (73%) create mode 100644 addons/core/tests/dummy/app/routes/application.js create mode 100644 addons/core/tests/dummy/app/routes/smoke.js create mode 100644 addons/core/tests/dummy/app/templates/index.hbs create mode 100644 addons/core/tests/dummy/app/templates/smoke-test.hbs diff --git a/addons/core/package.json b/addons/core/package.json index 691c0dc0f..965e3f1e9 100644 --- a/addons/core/package.json +++ b/addons/core/package.json @@ -39,7 +39,7 @@ "ember-cli-babel": "^7.26.8", "ember-cli-htmlbars": "^6.1.0", "ember-feature-flags": "^6.0.0", - "ember-intl": "^5.7.0", + "ember-intl": "^6.0.0-beta.4", "ember-loading": "^2.0.0", "ember-route-action-helper": "^2.0.8", "ember-truth-helpers": "^3.0.0" diff --git a/addons/core/tests/acceptance/index-test.js b/addons/core/tests/acceptance/index-test.js new file mode 100644 index 000000000..1525c5f7e --- /dev/null +++ b/addons/core/tests/acceptance/index-test.js @@ -0,0 +1,12 @@ +import { module, test } from 'qunit'; +import { visit, currentURL } from '@ember/test-helpers'; +import { setupApplicationTest } from 'ember-qunit'; + +module('Acceptance | index test', function (hooks) { + setupApplicationTest(hooks); + + test('visiting /', async function (assert) { + await visit('/'); + assert.deepEqual(currentURL(), '/'); + }); +}); diff --git a/addons/core/tests/acceptance/smoke-test.js b/addons/core/tests/acceptance/smoke-test.js new file mode 100644 index 000000000..d59815839 --- /dev/null +++ b/addons/core/tests/acceptance/smoke-test.js @@ -0,0 +1,13 @@ +import { module, test } from 'qunit'; +import { visit, currentURL } from '@ember/test-helpers'; +import { setupApplicationTest } from 'ember-qunit'; + +module('Acceptance | smoke test', function (hooks) { + setupApplicationTest(hooks); + + test('visiting /smoke', async function (assert) { + await visit('/smoke'); + + assert.deepEqual(currentURL(), '/smoke'); + }); +}); diff --git a/addons/core/tests/dummy/app/controllers/application.js b/addons/core/tests/dummy/app/controllers/index.js similarity index 73% rename from addons/core/tests/dummy/app/controllers/application.js rename to addons/core/tests/dummy/app/controllers/index.js index 9cecc9ac3..0d0039ae7 100644 --- a/addons/core/tests/dummy/app/controllers/application.js +++ b/addons/core/tests/dummy/app/controllers/index.js @@ -1,7 +1,7 @@ import Controller from '@ember/controller'; import { inject as service } from '@ember/service'; -export default class ApplicationController extends Controller { +export default class IndexController extends Controller { // =services @service clockTick; diff --git a/addons/core/tests/dummy/app/router.js b/addons/core/tests/dummy/app/router.js index 64e543ab2..adb5bef7f 100644 --- a/addons/core/tests/dummy/app/router.js +++ b/addons/core/tests/dummy/app/router.js @@ -6,4 +6,6 @@ export default class Router extends EmberRouter { rootURL = config.rootURL; } -Router.map(function () {}); +Router.map(function () { + this.route('smoke'); +}); diff --git a/addons/core/tests/dummy/app/routes/application.js b/addons/core/tests/dummy/app/routes/application.js new file mode 100644 index 000000000..5fd2243dc --- /dev/null +++ b/addons/core/tests/dummy/app/routes/application.js @@ -0,0 +1,10 @@ +import Route from '@ember/routing/route'; +import { inject as service } from '@ember/service'; + +export default class ApplicationRoute extends Route { + @service intl; + + beforeModel() { + this.intl.setLocale(['en-us']); + } +} diff --git a/addons/core/tests/dummy/app/routes/smoke.js b/addons/core/tests/dummy/app/routes/smoke.js new file mode 100644 index 000000000..af0b4efd4 --- /dev/null +++ b/addons/core/tests/dummy/app/routes/smoke.js @@ -0,0 +1,3 @@ +import Route from '@ember/routing/route'; + +export default class SmokeRoute extends Route {} diff --git a/addons/core/tests/dummy/app/templates/application.hbs b/addons/core/tests/dummy/app/templates/application.hbs index a1973e25c..e2147cab0 100644 --- a/addons/core/tests/dummy/app/templates/application.hbs +++ b/addons/core/tests/dummy/app/templates/application.hbs @@ -1,2 +1 @@ -

Welcome to Ember

-

{{relative-datetime-live this.now}}

\ No newline at end of file +{{outlet}} \ No newline at end of file diff --git a/addons/core/tests/dummy/app/templates/index.hbs b/addons/core/tests/dummy/app/templates/index.hbs new file mode 100644 index 000000000..a1973e25c --- /dev/null +++ b/addons/core/tests/dummy/app/templates/index.hbs @@ -0,0 +1,2 @@ +

Welcome to Ember

+

{{relative-datetime-live this.now}}

\ No newline at end of file diff --git a/addons/core/tests/dummy/app/templates/smoke-test.hbs b/addons/core/tests/dummy/app/templates/smoke-test.hbs new file mode 100644 index 000000000..4a05ee58a --- /dev/null +++ b/addons/core/tests/dummy/app/templates/smoke-test.hbs @@ -0,0 +1,8 @@ +

Smoke Test

+

+ This template is used by the smoke-test acceptance tests, which validate that + Ember can start up and basic features work as intended. +

+ +

{{t 'resources.account.title'}}

+

{{t 'resources.account.description'}}

\ No newline at end of file diff --git a/addons/core/tests/integration/components/error/message-test.js b/addons/core/tests/integration/components/error/message-test.js index 90a97a9ce..158590575 100644 --- a/addons/core/tests/integration/components/error/message-test.js +++ b/addons/core/tests/integration/components/error/message-test.js @@ -2,9 +2,11 @@ import { module, test } from 'qunit'; import { setupRenderingTest } from 'ember-qunit'; import { render, find } from '@ember/test-helpers'; import { hbs } from 'ember-cli-htmlbars'; +import { setupIntl } from 'ember-intl/test-support'; module('Integration | Component | error/message', function (hooks) { setupRenderingTest(hooks); + setupIntl(hooks); test('it renders predefined message for known error status', async function (assert) { await render(hbs``); diff --git a/package.json b/package.json index 66d2c52d5..67cce2a4a 100755 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "test:addons-rose": "cd addons/rose && yarn test", "test:ui-admin": "cd ui/admin && yarn test", "test:ui-desktop": "cd ui/desktop && yarn test", - "compliance:licenses": "license-checker --onlyAllow 'Apache*;Apache License, Version 2.0;Apache-2.0;Apache 2.0;Artistic-2.0;BSD;BSD-3-Clause;CC-BY-3.0;CC-BY-4.0;CC0-1.0;ISC;MIT;MPL-2.0;Public Domain;Python-2.0;Unicode-TOU;Unlicense;WTFPL' --excludePackages 'boundary-ui;admin@0.0.0;desktop@0.0.0;base64-js@0.0.2;cycle@1.0.3'", + "compliance:licenses": "license-checker --onlyAllow 'Apache*;Apache License, Version 2.0;Apache-2.0;Apache 2.0;Artistic-2.0;BSD;BSD-3-Clause;CC-BY-3.0;CC-BY-4.0;CC0-1.0;ISC;MIT;MPL-2.0;Public Domain;Python-2.0;Unicode-TOU;Unlicense;WTFPL' --excludePackages 'boundary-ui;admin@0.0.0;desktop@0.0.0;base64-js@0.0.2;cycle@1.0.3;cldr-core@41.0.0'", "doc:toc": "doctoc README.md", "prepare": "husky install" }, diff --git a/ui/admin/app/routes/application.js b/ui/admin/app/routes/application.js index c10da153f..e29140447 100644 --- a/ui/admin/app/routes/application.js +++ b/ui/admin/app/routes/application.js @@ -14,6 +14,7 @@ export default class ApplicationRoute extends Route { @service session; @service confirm; @service router; + @service intl; // =attributes @@ -48,6 +49,7 @@ export default class ApplicationRoute extends Route { } async beforeModel() { + this.intl.setLocale(['en-us']); await this.session.setup(); const theme = this.session.get('data.theme'); this.toggleTheme(theme); diff --git a/ui/admin/tests/integration/components/form/worker/create-worker-led-test.js b/ui/admin/tests/integration/components/form/worker/create-worker-led-test.js index 91e5e0e32..5fa750d17 100644 --- a/ui/admin/tests/integration/components/form/worker/create-worker-led-test.js +++ b/ui/admin/tests/integration/components/form/worker/create-worker-led-test.js @@ -3,11 +3,13 @@ import { setupRenderingTest } from 'ember-qunit'; import { render } from '@ember/test-helpers'; import { hbs } from 'ember-cli-htmlbars'; import { v1 } from 'ember-uuid'; +import { setupIntl } from 'ember-intl/test-support'; module( 'Integration | Component | form/worker/create-worker-led', function (hooks) { setupRenderingTest(hooks); + setupIntl(hooks); hooks.beforeEach(function () { const featuresService = this.owner.lookup('service:features'); diff --git a/ui/desktop/app/routes/application.js b/ui/desktop/app/routes/application.js index 5d9786bba..d6d394bcf 100644 --- a/ui/desktop/app/routes/application.js +++ b/ui/desktop/app/routes/application.js @@ -11,6 +11,7 @@ export default class ApplicationRoute extends Route { @service session; @service clusterUrl; @service ipc; + @service intl; // =attributes @@ -25,6 +26,7 @@ export default class ApplicationRoute extends Route { * clusterUrl so that the renderer's CSP can be rewritten to allow requests. */ async beforeModel() { + this.intl.setLocale(['en-us']); await this.session.setup(); const theme = this.session.get('data.theme'); this.toggleTheme(theme); diff --git a/ui/desktop/tests/integration/components/hidden-secret-test.js b/ui/desktop/tests/integration/components/hidden-secret-test.js index cd9a73d7f..ec9457660 100644 --- a/ui/desktop/tests/integration/components/hidden-secret-test.js +++ b/ui/desktop/tests/integration/components/hidden-secret-test.js @@ -2,9 +2,11 @@ import { module, test } from 'qunit'; import { setupRenderingTest } from 'ember-qunit'; import { render, find } from '@ember/test-helpers'; import { hbs } from 'ember-cli-htmlbars'; +import { setupIntl } from 'ember-intl/test-support'; module('Integration | Component | hidden-secret', function (hooks) { setupRenderingTest(hooks); + setupIntl(hooks); test('it renders with a secret', async function (assert) { assert.expect(2); diff --git a/yarn.lock b/yarn.lock index d2d680380..df11ac861 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4227,51 +4227,75 @@ resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-7.3.0.tgz#a508df35ded585c4e071cb5d9d7c89623c837fae" integrity sha512-1W0PZezq2rxlAssoWemi9gFRD8IQxvf0FPL5Km3TOmGHFG7ib0TbFBJ0yC7D/1NsxunjNTK6WjUXV8ao/mKZ5w== -"@formatjs/ecma402-abstract@1.6.4": - version "1.6.4" - resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.6.4.tgz#cff5ef03837fb6bae70b16d04940213c17e87884" - integrity sha512-ukFjGD9dLsxcD9D5AEshJqQElPQeUAlTALT/lzIV6OcYojyuU81gw/uXDUOrs6XW79jtOJwQDkLqHbCJBJMOTw== +"@formatjs/ecma402-abstract@1.13.0": + version "1.13.0" + resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.13.0.tgz#df6db3cbee0182bbd2fd6217103781c802aee819" + integrity sha512-CQ8Ykd51jYD1n05dtoX6ns6B9n/+6ZAxnWUAonvHC4kkuAemROYBhHkEB4tm1uVrRlE7gLDqXkAnY51Y0pRCWQ== dependencies: - tslib "^2.1.0" + "@formatjs/intl-localematcher" "0.2.31" + tslib "2.4.0" -"@formatjs/ecma402-abstract@1.9.6": - version "1.9.6" - resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.9.6.tgz#f7301096a585c5823180f76acc4a26e984913e3e" - integrity sha512-fgXUydhzng3JCSm3HB1bt01m1otnMybX4b/CEI/fJRPvzgtq5XwV2qW/WQQdOLTr29/ttRHCEk2Mb9IP5K/PjQ== +"@formatjs/fast-memoize@1.2.6": + version "1.2.6" + resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-1.2.6.tgz#a442970db7e9634af556919343261a7bbe5e88c3" + integrity sha512-9CWZ3+wCkClKHX+i5j+NyoBVqGf0pIskTo6Xl6ihGokYM2yqSSS68JIgeo+99UIHc+7vi9L3/SDSz/dWI9SNlA== dependencies: - "@formatjs/intl-localematcher" "0.2.19" - tslib "^2.1.0" + tslib "2.4.0" -"@formatjs/fast-memoize@1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-1.1.2.tgz#09c8771484095c07c752b824b142d6c2e2c8264f" - integrity sha512-HfN6D9yd9vhypWwTVpJHqoSb50KFuoxZ2ZS6AM1XNSyihWk7JJXjZ3mgvboJU4eNSsdxAWwR1ke5KIOobEVwBA== +"@formatjs/icu-messageformat-parser@2.1.10", "@formatjs/icu-messageformat-parser@^2.1.3": + version "2.1.10" + resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.1.10.tgz#d11114343fcb4c6d5ccabdeac50badf49c83fd9e" + integrity sha512-KkRMxhifWkRC45dhM9tqm0GXbb6NPYTGVYY3xx891IKc6p++DQrZTnmkVSNNO47OEERLfuP2KkPFPJBuu8z/wg== dependencies: - tslib "^2.1.0" + "@formatjs/ecma402-abstract" "1.13.0" + "@formatjs/icu-skeleton-parser" "1.3.14" + tslib "2.4.0" -"@formatjs/icu-messageformat-parser@2.0.9": - version "2.0.9" - resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.0.9.tgz#8b9898d8b8f451c048820a438f1f7283e591cefc" - integrity sha512-L1a4W7Tbk41EjENYLLeYy1B9mX85kP6Wx2bzF/VLkGOk2bkFSEFzyb2XtYuklMzWhgka665LhxyPyJy3Ktpq6A== +"@formatjs/icu-skeleton-parser@1.3.14": + version "1.3.14" + resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.14.tgz#b99ef7f855f8a58cab2519ec4f921f11c2bf74a7" + integrity sha512-7bv60HQQcBb3+TSj+45tOb/CHV5z1hOpwdtS50jsSBXfB+YpGhnoRsZxSRksXeCxMy6xn6tA6VY2601BrrK+OA== dependencies: - "@formatjs/ecma402-abstract" "1.9.6" - "@formatjs/icu-skeleton-parser" "1.2.10" - tslib "^2.1.0" + "@formatjs/ecma402-abstract" "1.13.0" + tslib "2.4.0" -"@formatjs/icu-skeleton-parser@1.2.10": - version "1.2.10" - resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.2.10.tgz#4febdf9dc96e9b06fa25a0f1c590b3e35e44956e" - integrity sha512-S96jf8V2SLBhjN7zTJ9xsroOOxS+STKtrjKKmF84+PAEGYAn5qlP62k9mbR0ir2cY80WNB5ehUmeDbo0plAkqg== +"@formatjs/intl-displaynames@6.1.4": + version "6.1.4" + resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-6.1.4.tgz#26b2c7b814f5132b2e6d781bf4af7bce86f46852" + integrity sha512-sEbziGLsWQo6nA8ZUBcsDRlZzPg+uMVjDmbTalgGqRWLbdXuxMldTYdaCK+UptyJhkmNVM/erz3csTiyqamXHQ== dependencies: - "@formatjs/ecma402-abstract" "1.9.6" - tslib "^2.1.0" + "@formatjs/ecma402-abstract" "1.13.0" + "@formatjs/intl-localematcher" "0.2.31" + tslib "2.4.0" -"@formatjs/intl-localematcher@0.2.19": - version "0.2.19" - resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.2.19.tgz#a4ade690b122cc719b669808063e2a04414622f7" - integrity sha512-eyrTiqciBSBfwx6PyyVJCEhXeAOXVJWWlvyR0Lx7OkTikWIrqhl8VIifyq3wwBiCMPOyCDN1ccik9VBdGcDiHA== +"@formatjs/intl-listformat@7.1.3": + version "7.1.3" + resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-7.1.3.tgz#e2bda750a46d2a90d7fa023b02a984588978829c" + integrity sha512-rs0Kxl78PeRCedx2cmFoBqcun2Kf0bCQrF8ycna54sfePpDhMskvODWeI4G/xBioW01FjK7CJSvtJJ87hrr79A== dependencies: - tslib "^2.1.0" + "@formatjs/ecma402-abstract" "1.13.0" + "@formatjs/intl-localematcher" "0.2.31" + tslib "2.4.0" + +"@formatjs/intl-localematcher@0.2.31": + version "0.2.31" + resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.2.31.tgz#aada2b1e58211460cedba56889e3c489117eb6eb" + integrity sha512-9QTjdSBpQ7wHShZgsNzNig5qT3rCPvmZogS/wXZzKotns5skbXgs0I7J8cuN0PPqXyynvNVuN+iOKhNS2eb+ZA== + dependencies: + tslib "2.4.0" + +"@formatjs/intl@^2.3.0": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-2.5.1.tgz#7a743c3f5ca70b7c7881d6e67e5ce14e2fffac2a" + integrity sha512-P01ZGuDDlcN8bHHBCEHspJPvs8WJeO8SXlUIcVGWhS3IN5vUgz0QKUXcKBFnJbEHhONJ+azlObVwvlDKsE+kUg== + dependencies: + "@formatjs/ecma402-abstract" "1.13.0" + "@formatjs/fast-memoize" "1.2.6" + "@formatjs/icu-messageformat-parser" "2.1.10" + "@formatjs/intl-displaynames" "6.1.4" + "@formatjs/intl-listformat" "7.1.3" + intl-messageformat "10.2.1" + tslib "2.4.0" "@gar/promisify@^1.0.1": version "1.1.3" @@ -9905,9 +9929,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001157, caniuse-lite@^1.0.30001400: - version "1.0.30001429" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001429.tgz#70cdae959096756a85713b36dd9cb82e62325639" - integrity sha512-511ThLu1hF+5RRRt0zYCf2U2yRr9GPF6m5y90SBCWsvSoYoW7yAGlv/elyPaNfvGCkp6kj/KFZWU0BMA69Prsg== + version "1.0.30001431" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz#e7c59bd1bc518fae03a4656be442ce6c4887a795" + integrity sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ== capture-exit@^2.0.0: version "2.0.0" @@ -10160,10 +10184,10 @@ classnames@^2.2.5: resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e" integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA== -cldr-core@^36.0.0: - version "36.0.0" - resolved "https://registry.yarnpkg.com/cldr-core/-/cldr-core-36.0.0.tgz#1d2148ed6802411845baeeb21432d7bbfde7d4f7" - integrity sha512-QLnAjt20rZe38c8h8OJ9jPND+O4o5O8Nw0TK/P3KpNn1cmOhMu0rk6Kc3ap96c5OStQ9gAngs9+Be2sum26NOw== +cldr-core@^41.0.0: + version "41.0.0" + resolved "https://registry.yarnpkg.com/cldr-core/-/cldr-core-41.0.0.tgz#a2235b53d4a06e241bdbc4616eb22f68b29a4f3d" + integrity sha512-8UL/NVueD9BeyrYGjZWrAvhowmQt4THriUB04jxRHWST9Lmc9K1pISPjnbh0kIfRueslZ37EvQ53dxOm5w8pjQ== clean-base-url@^1.0.0: version "1.0.0" @@ -11310,7 +11334,7 @@ debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: dependencies: ms "2.1.2" -debuglog@^1.0.1: +debuglog@*, debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= @@ -11950,7 +11974,7 @@ ember-a11y-testing@^4.2.0: fs-extra "^10.0.0" validate-peer-dependencies "^2.0.0" -ember-auto-import@^1.11.2, ember-auto-import@^1.2.15, ember-auto-import@^1.2.19, ember-auto-import@^1.5.3: +ember-auto-import@^1.11.2, ember-auto-import@^1.2.15, ember-auto-import@^1.2.19: version "1.11.3" resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.11.3.tgz#6e3384a7fbb163384a34546f2e902cd297b0e683" integrity sha512-ekq/XCvsonESobFU30zjZ0I4XMy2E/2ZILCYWuQ1JdhcCSTYhnXDZcqRW8itUG7kbsPqAHT/XZ1LEZYm3seVwQ== @@ -12489,6 +12513,22 @@ ember-cli-typescript@^5.0.0: stagehand "^1.0.0" walk-sync "^2.2.0" +ember-cli-typescript@^5.1.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-5.2.1.tgz#553030f1ce3e8958b8e4fc34909acd1218cb35f2" + integrity sha512-qqp5TAIuPHxHiGXJKL+78Euyhy0zSKQMovPh8sJpN/ZBYx0H90pONufHR3anaMcp1snVfx4B+mb9+7ijOik8ZA== + dependencies: + ansi-to-html "^0.6.15" + broccoli-stew "^3.0.0" + debug "^4.0.0" + execa "^4.0.0" + fs-extra "^9.0.1" + resolve "^1.5.0" + rsvp "^4.8.1" + semver "^7.3.2" + stagehand "^1.0.0" + walk-sync "^2.2.0" + ember-cli-version-checker@^2.1.0, ember-cli-version-checker@^2.1.2: version "2.2.0" resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-2.2.0.tgz#47771b731fe0962705e27c8199a9e3825709f3b3" @@ -12880,11 +12920,13 @@ ember-inline-svg@^1.0.1: svgo "~1.2.2" walk-sync "~2.0.2" -ember-intl@^5.7.0: - version "5.7.0" - resolved "https://registry.yarnpkg.com/ember-intl/-/ember-intl-5.7.0.tgz#2381a6a210e39bcf1e879308538ec72903b0da7a" - integrity sha512-NcQFPeV9wxyOX7Tb0y+84CXHPt5XleYUlszywx5aQgJQ4yE6in3kHjI804CRKtLz6OY0rzVfTa5Jc/y8CtI+0Q== +ember-intl@^6.0.0-beta.4: + version "6.0.0-beta.4" + resolved "https://registry.yarnpkg.com/ember-intl/-/ember-intl-6.0.0-beta.4.tgz#a0fb1a7b2583b39101044c683494d23d49f87697" + integrity sha512-NOMorZqUlJRyMSjYzYm6jEB8QEfYBfjAi4v/eByxAxwVwPE7QlnWa6wXG1djh2MLy13N/FVWWGTLC0giKfs84g== dependencies: + "@formatjs/icu-messageformat-parser" "^2.1.3" + "@formatjs/intl" "^2.3.0" broccoli-caching-writer "^3.0.3" broccoli-funnel "^3.0.3" broccoli-merge-files "^0.8.0" @@ -12892,16 +12934,16 @@ ember-intl@^5.7.0: broccoli-source "^3.0.0" broccoli-stew "^3.0.0" calculate-cache-key-for-tree "^2.0.0" - cldr-core "^36.0.0" - ember-auto-import "^1.5.3" - ember-cli-babel "^7.23.0" - ember-cli-typescript "^4.0.0" + cldr-core "^41.0.0" + ember-auto-import "^2.4.1" + ember-cli-babel "^7.26.11" + ember-cli-typescript "^5.1.0" + eventemitter3 "^4.0.7" extend "^3.0.2" fast-memoize "^2.5.2" has-unicode "^2.0.1" - intl-messageformat "^9.3.6" - intl-messageformat-parser "^6.0.5" - js-yaml "^3.13.1" + intl-messageformat "^10.1.0" + js-yaml "4" json-stable-stringify "^1.0.1" locale-emoji "^0.3.0" lodash.castarray "^4.4.0" @@ -13968,7 +14010,7 @@ event-emitter@~0.3.5: d "1" es5-ext "~0.10.14" -eventemitter3@^4.0.0: +eventemitter3@^4.0.0, eventemitter3@^4.0.7: version "4.0.7" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== @@ -16462,7 +16504,7 @@ import-local@^3.0.2: pkg-dir "^4.2.0" resolve-cwd "^3.0.0" -imurmurhash@^0.1.4: +imurmurhash@*, imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= @@ -16643,22 +16685,15 @@ interpret@^2.2.0: resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== -intl-messageformat-parser@^6.0.5: - version "6.4.4" - resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-6.4.4.tgz#abbd94e96dc4ff41607376bfab024553450cc1e0" - integrity sha512-7AaFKNZEfzLQR6+jivOuz9e7yA8ka5KrmLebgY4QHTRLf8r64dp3LjnW98LkBWjdk8GK0sawD2dHDqW++A/pXA== +intl-messageformat@10.2.1, intl-messageformat@^10.1.0: + version "10.2.1" + resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-10.2.1.tgz#2f5626db773c82f3038d355f56ac4736ceef362b" + integrity sha512-1lrJG2qKzcC1TVzYu1VuB1yiY68LU5rwpbHa2THCzA67Vutkz7+1lv5U20K3Lz5RAiH78zxNztMEtchokMWv8A== dependencies: - "@formatjs/ecma402-abstract" "1.6.4" - tslib "^2.1.0" - -intl-messageformat@^9.3.6: - version "9.8.2" - resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-9.8.2.tgz#5528334506f9af660ec3f7ea8f3584bba77af8d4" - integrity sha512-Qjefia3jFUML9XWRl0G3VAeiMUX7GiWvKcY9EQZJCkX8eLbe1HvLOPQvMQ5UlQLrnis1qk1BcQqbpPPvWnM2iw== - dependencies: - "@formatjs/fast-memoize" "1.1.2" - "@formatjs/icu-messageformat-parser" "2.0.9" - tslib "^2.1.0" + "@formatjs/ecma402-abstract" "1.13.0" + "@formatjs/fast-memoize" "1.2.6" + "@formatjs/icu-messageformat-parser" "2.1.10" + tslib "2.4.0" invariant@^2.2.2, invariant@^2.2.3, invariant@^2.2.4: version "2.2.4" @@ -17949,6 +17984,13 @@ js-tokens@^3.0.2: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= +js-yaml@4, js-yaml@^4.0.0, js-yaml@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== + dependencies: + argparse "^2.0.1" + js-yaml@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f" @@ -17964,13 +18006,6 @@ js-yaml@^3.13.1, js-yaml@^3.14.0, js-yaml@^3.2.5, js-yaml@^3.2.7, js-yaml@^3.4.6 argparse "^1.0.7" esprima "^4.0.0" -js-yaml@^4.0.0, js-yaml@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" - integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== - dependencies: - argparse "^2.0.1" - jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" @@ -18741,6 +18776,11 @@ lodash._baseflatten@^3.0.0: lodash.isarguments "^3.0.0" lodash.isarray "^3.0.0" +lodash._baseindexof@*: + version "3.1.0" + resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c" + integrity sha512-bSYo8Pc/f0qAkr8fPJydpJjtrHiSynYfYBjtANIgXv5xEf1WlTC63dIDlgu0s9dmTvzRu1+JJTxcIAHe+sH0FQ== + lodash._baseuniq@~4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8" @@ -18749,11 +18789,16 @@ lodash._baseuniq@~4.6.0: lodash._createset "~4.0.0" lodash._root "~3.0.0" -lodash._bindcallback@^3.0.0: +lodash._bindcallback@*, lodash._bindcallback@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" integrity sha512-2wlI0JRAGX8WEf4Gm1p/mv/SZ+jLijpj0jyaE/AXeuQphzCgD8ZQW4oSpoN8JAopujOFGU3KMuq7qfHBWlGpjQ== +lodash._cacheindexof@*: + version "3.0.2" + resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92" + integrity sha512-S8dUjWr7SUT/X6TBIQ/OYoCHo1Stu1ZRy6uMUSKqzFnZp5G5RyQizSm6kvxD2Ewyy6AVfMg4AToeZzKfF99T5w== + lodash._createassigner@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11" @@ -18763,12 +18808,19 @@ lodash._createassigner@^3.0.0: lodash._isiterateecall "^3.0.0" lodash.restparam "^3.0.0" +lodash._createcache@*: + version "3.1.2" + resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093" + integrity sha512-ev5SP+iFpZOugyab/DEUQxUeZP5qyciVTlgQ1f4Vlw7VUcCD8fVnyIqVUEIaoFH9zjAqdgi69KiofzvVmda/ZQ== + dependencies: + lodash._getnative "^3.0.0" + lodash._createset@~4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26" integrity sha512-GTkC6YMprrJZCYU3zcqZj+jkXkrXzq3IPBcF/fIPpNEAB4hZEtXU8zp/RwKOvZl43NUmwDbyRk3+ZTbeRdEBXA== -lodash._getnative@^3.0.0: +lodash._getnative@*, lodash._getnative@^3.0.0: version "3.9.1" resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" integrity sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA== @@ -18986,7 +19038,7 @@ lodash.pick@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM= -lodash.restparam@^3.0.0: +lodash.restparam@*, lodash.restparam@^3.0.0: version "3.6.1" resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" integrity sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw== @@ -25864,6 +25916,11 @@ ts-pnp@^1.1.6: resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92" integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw== +tslib@2.4.0, tslib@^2.3.1: + version "2.4.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" + integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== + tslib@^1.8.1, tslib@^1.9.0: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" @@ -25879,11 +25936,6 @@ tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e" integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== -tslib@^2.3.1: - version "2.4.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" - integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== - tsutils@^3.21.0: version "3.21.0" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"