From f08c91dfa57dd9c6edf02ee3dcaef8e975143104 Mon Sep 17 00:00:00 2001 From: Noelle Daley Date: Mon, 22 Apr 2024 12:03:44 -0700 Subject: [PATCH] [Embroider] fix imports to unblock Embroider adoption (#26296) * chore: use ember-cli-babel for TS compliation instead of ember-cli-typescript * chore: fix import paths to be ES module compatible * chore(test): fix setupControlGroup helper import * chore: fix engine definitions and swagger-ui imports * update lockfile * chore: remove babel inline-json-import --------- Co-authored-by: Matthew Irish --- ui/app/app.js | 4 +- ui/app/lib/path-to-tree.js | 3 +- .../cluster/secrets/backend/edit-metadata.js | 8 -- ui/app/serializers/pki/certificate.js | 2 +- ui/ember-cli-build.js | 5 +- .../helpers/replication-mode-description.js | 2 +- ui/lib/core/app/helpers/is-active-route.js | 2 +- .../helpers/replication-mode-description.js | 6 +- ui/lib/core/app/helpers/set-flash-message.js | 2 +- ui/lib/core/app/utils/advanced-secret.js | 2 +- ui/lib/kv/app/utils/kv-breadcrumbs.js | 2 +- ui/lib/kv/app/utils/kv-deleted.js | 2 +- .../{templates => }/components/swagger-ui.hbs | 0 .../addon/components/swagger-ui.js | 3 +- ui/lib/open-api-explorer/index.js | 3 - .../replication/addon/routes/mode/manage.js | 2 +- ui/package.json | 1 - .../backend/kv/kv-v2-workflow-delete-test.js | 8 +- ui/yarn.lock | 119 +++++++++--------- 19 files changed, 77 insertions(+), 99 deletions(-) delete mode 100644 ui/app/routes/vault/cluster/secrets/backend/edit-metadata.js rename ui/lib/open-api-explorer/addon/{templates => }/components/swagger-ui.hbs (100%) diff --git a/ui/app/app.js b/ui/app/app.js index 05cf1683bc..5422336c16 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -13,12 +13,12 @@ export default class App extends Application { podModulePrefix = config.podModulePrefix; Resolver = Resolver; engines = { - configUi: { + 'config-ui': { dependencies: { services: ['auth', 'flash-messages', 'namespace', 'router', 'store', 'version', 'customMessages'], }, }, - openApiExplorer: { + 'open-api-explorer': { dependencies: { services: ['auth', 'flash-messages', 'namespace', 'router', 'version'], }, diff --git a/ui/app/lib/path-to-tree.js b/ui/app/lib/path-to-tree.js index c9f45b808f..424b56c010 100644 --- a/ui/app/lib/path-to-tree.js +++ b/ui/app/lib/path-to-tree.js @@ -3,10 +3,9 @@ * SPDX-License-Identifier: BUSL-1.1 */ -import flat from 'flat'; +import { unflatten } from 'flat'; import deepmerge from 'deepmerge'; -const { unflatten } = flat; const DOT_REPLACEMENT = '☃'; //function that takes a list of path and returns a deeply nested object diff --git a/ui/app/routes/vault/cluster/secrets/backend/edit-metadata.js b/ui/app/routes/vault/cluster/secrets/backend/edit-metadata.js deleted file mode 100644 index 3f3e2d3b28..0000000000 --- a/ui/app/routes/vault/cluster/secrets/backend/edit-metadata.js +++ /dev/null @@ -1,8 +0,0 @@ -/** - * Copyright (c) HashiCorp, Inc. - * SPDX-License-Identifier: BUSL-1.1 - */ - -import Metadata from './metadata'; - -export default class EditMetadataRoute extends Metadata {} diff --git a/ui/app/serializers/pki/certificate.js b/ui/app/serializers/pki/certificate.js index 9e8dc461a3..62ee58582b 100644 --- a/ui/app/serializers/pki/certificate.js +++ b/ui/app/serializers/pki/certificate.js @@ -3,6 +3,6 @@ * SPDX-License-Identifier: BUSL-1.1 */ -import CertSerializer from './cert'; +import CertSerializer from './certificate/base'; export default class PkiCertificateSerializer extends CertSerializer {} diff --git a/ui/ember-cli-build.js b/ui/ember-cli-build.js index 4a4f412f25..d2c6855ad2 100644 --- a/ui/ember-cli-build.js +++ b/ui/ember-cli-build.js @@ -34,8 +34,9 @@ const appConfig = { return `${config.rootURL.replace(/\/$/, '')}${filePath}`; }, }, - babel: { - plugins: [['inline-json-import', {}]], + 'ember-cli-babel': { + enableTypeScriptTransform: true, + throwUnlessParallelizable: true, }, hinting: isTest, tests: isTest, diff --git a/ui/lib/core/addon/helpers/replication-mode-description.js b/ui/lib/core/addon/helpers/replication-mode-description.js index 17d8596c9c..461ee44e53 100644 --- a/ui/lib/core/addon/helpers/replication-mode-description.js +++ b/ui/lib/core/addon/helpers/replication-mode-description.js @@ -11,7 +11,7 @@ const REPLICATION_MODE_DESCRIPTIONS = { 'Performance Replication scales workloads horizontally across clusters to make requests faster. Local secondaries handle read requests but forward writes to the primary to be handled.', }; -export function replicationModeDescription([mode]) { +function replicationModeDescription([mode]) { return REPLICATION_MODE_DESCRIPTIONS[mode]; } diff --git a/ui/lib/core/app/helpers/is-active-route.js b/ui/lib/core/app/helpers/is-active-route.js index b1dd65bcd9..924e003c99 100644 --- a/ui/lib/core/app/helpers/is-active-route.js +++ b/ui/lib/core/app/helpers/is-active-route.js @@ -3,4 +3,4 @@ * SPDX-License-Identifier: BUSL-1.1 */ -export { default, isActiveRoute } from 'core/helpers/is-active-route'; +export { default } from 'core/helpers/is-active-route'; diff --git a/ui/lib/core/app/helpers/replication-mode-description.js b/ui/lib/core/app/helpers/replication-mode-description.js index 39b5a7b124..4b26b9509f 100644 --- a/ui/lib/core/app/helpers/replication-mode-description.js +++ b/ui/lib/core/app/helpers/replication-mode-description.js @@ -3,8 +3,4 @@ * SPDX-License-Identifier: BUSL-1.1 */ -export { - default, - replicationModeDescription, - REPLICATION_MODE_DESCRIPTIONS, -} from 'core/helpers/replication-mode-description'; +export { default } from 'core/helpers/replication-mode-description'; diff --git a/ui/lib/core/app/helpers/set-flash-message.js b/ui/lib/core/app/helpers/set-flash-message.js index 804d8186c8..e8b68a261f 100644 --- a/ui/lib/core/app/helpers/set-flash-message.js +++ b/ui/lib/core/app/helpers/set-flash-message.js @@ -3,4 +3,4 @@ * SPDX-License-Identifier: BUSL-1.1 */ -export { default, setFlashMessage } from 'core/helpers/set-flash-message'; +export { default } from 'core/helpers/set-flash-message'; diff --git a/ui/lib/core/app/utils/advanced-secret.js b/ui/lib/core/app/utils/advanced-secret.js index 0975476278..1c558d34d3 100644 --- a/ui/lib/core/app/utils/advanced-secret.js +++ b/ui/lib/core/app/utils/advanced-secret.js @@ -3,4 +3,4 @@ * SPDX-License-Identifier: BUSL-1.1 */ -export { default } from 'core/utils/advanced-secret'; +export { isAdvancedSecret, obfuscateData } from 'core/utils/advanced-secret'; diff --git a/ui/lib/kv/app/utils/kv-breadcrumbs.js b/ui/lib/kv/app/utils/kv-breadcrumbs.js index f3392c257a..05d6c51700 100644 --- a/ui/lib/kv/app/utils/kv-breadcrumbs.js +++ b/ui/lib/kv/app/utils/kv-breadcrumbs.js @@ -3,4 +3,4 @@ * SPDX-License-Identifier: BUSL-1.1 */ -export { default } from 'kv/utils/kv-breadcrumbs'; +export { breadcrumbsForSecret as default } from 'kv/utils/kv-breadcrumbs'; diff --git a/ui/lib/kv/app/utils/kv-deleted.js b/ui/lib/kv/app/utils/kv-deleted.js index 7b305de0d8..b1705c363a 100644 --- a/ui/lib/kv/app/utils/kv-deleted.js +++ b/ui/lib/kv/app/utils/kv-deleted.js @@ -3,4 +3,4 @@ * SPDX-License-Identifier: BUSL-1.1 */ -export { default } from 'kv/utils/kv-deleted'; +export { isDeleted as default } from 'kv/utils/kv-deleted'; diff --git a/ui/lib/open-api-explorer/addon/templates/components/swagger-ui.hbs b/ui/lib/open-api-explorer/addon/components/swagger-ui.hbs similarity index 100% rename from ui/lib/open-api-explorer/addon/templates/components/swagger-ui.hbs rename to ui/lib/open-api-explorer/addon/components/swagger-ui.hbs diff --git a/ui/lib/open-api-explorer/addon/components/swagger-ui.js b/ui/lib/open-api-explorer/addon/components/swagger-ui.js index 648520cd37..4910ac6bf1 100644 --- a/ui/lib/open-api-explorer/addon/components/swagger-ui.js +++ b/ui/lib/open-api-explorer/addon/components/swagger-ui.js @@ -10,6 +10,7 @@ import { tracked } from '@glimmer/tracking'; import parseURL from 'core/utils/parse-url'; import config from 'open-api-explorer/config/environment'; import { guidFor } from '@ember/object/internals'; +import SwaggerUIBundle from 'swagger-ui-dist/swagger-ui-bundle.js'; const { APP } = config; @@ -84,8 +85,6 @@ export default class SwaggerUiComponent extends Component { // using an action to bind the correct "this" context @action async swaggerInit() { - const { default: SwaggerUIBundle } = await import('swagger-ui-dist/swagger-ui-bundle.js'); - // trim any slashes on the filter value const configSettings = this.CONFIG(SwaggerUIBundle, this); SwaggerUIBundle(configSettings); } diff --git a/ui/lib/open-api-explorer/index.js b/ui/lib/open-api-explorer/index.js index 4e712bf4f3..49fec69f95 100644 --- a/ui/lib/open-api-explorer/index.js +++ b/ui/lib/open-api-explorer/index.js @@ -13,9 +13,6 @@ const EngineAddon = require('ember-engines/lib/engine-addon'); module.exports = EngineAddon.extend({ name: 'open-api-explorer', - babel: { - plugins: [require.resolve('ember-auto-import/babel-plugin')], - }, included() { this._super.included && this._super.included.apply(this, arguments); // we want to lazy load the CSS deps, importing them here will result in them being added to the diff --git a/ui/lib/replication/addon/routes/mode/manage.js b/ui/lib/replication/addon/routes/mode/manage.js index f02148b0f0..def9962868 100644 --- a/ui/lib/replication/addon/routes/mode/manage.js +++ b/ui/lib/replication/addon/routes/mode/manage.js @@ -7,7 +7,7 @@ import { camelize } from '@ember/string'; import { all } from 'rsvp'; import { service } from '@ember/service'; import Route from '@ember/routing/route'; -import { replicationActionForMode } from 'replication/helpers/replication-action-for-mode'; +import { replicationActionForMode } from 'core/helpers/replication-action-for-mode'; const pathForAction = (action, replicationMode, clusterMode) => { let path; diff --git a/ui/package.json b/ui/package.json index 587fdcbaef..c178dbd80c 100644 --- a/ui/package.json +++ b/ui/package.json @@ -137,7 +137,6 @@ "ember-cli-sri": "meirish/ember-cli-sri#rooturl", "ember-cli-string-helpers": "6.1.0", "ember-cli-terser": "^4.0.2", - "ember-cli-typescript": "^5.2.1", "ember-composable-helpers": "5.0.0", "ember-concurrency": "^3.1.1", "ember-data": "~4.12.4", diff --git a/ui/tests/acceptance/secrets/backend/kv/kv-v2-workflow-delete-test.js b/ui/tests/acceptance/secrets/backend/kv/kv-v2-workflow-delete-test.js index d026dc2756..20f7226b92 100644 --- a/ui/tests/acceptance/secrets/backend/kv/kv-v2-workflow-delete-test.js +++ b/ui/tests/acceptance/secrets/backend/kv/kv-v2-workflow-delete-test.js @@ -9,12 +9,8 @@ import { setupApplicationTest } from 'vault/tests/helpers'; import authPage from 'vault/tests/pages/auth'; import { deleteEngineCmd, mountEngineCmd, runCmd, tokenWithPolicyCmd } from 'vault/tests/helpers/commands'; import { personas } from 'vault/tests/helpers/kv/policy-generator'; -import { - clearRecords, - deleteLatestCmd, - setupControlGroup, - writeVersionedSecret, -} from 'vault/tests/helpers/kv/kv-run-commands'; +import { clearRecords, deleteLatestCmd, writeVersionedSecret } from 'vault/tests/helpers/kv/kv-run-commands'; +import { setupControlGroup } from 'vault/tests/helpers/control-groups'; import { click, currentURL, visit } from '@ember/test-helpers'; import { PAGE } from 'vault/tests/helpers/kv/kv-selectors'; diff --git a/ui/yarn.lock b/ui/yarn.lock index 83eaa49daa..2afbf98f46 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -1969,8 +1969,8 @@ __metadata: linkType: hard "@embroider/macros@npm:^1.15.0": - version: 1.15.1 - resolution: "@embroider/macros@npm:1.15.1" + version: 1.16.0 + resolution: "@embroider/macros@npm:1.16.0" dependencies: "@babel/core": ^7.24.0 "@embroider/shared-internals": 2.6.0 @@ -1986,7 +1986,7 @@ __metadata: peerDependenciesMeta: "@glint/template": optional: true - checksum: 2a0c059adb292a3c67581984f8635c9da3cc2b689158430321feed7710277c22def84752648b2ff102903de423ff101ffeaf3ebe6bfe7bb6eef436b9d5d34c7c + checksum: baa164f16a4e7f9e0b6ec5f84eaff2c567ff46b13be7ca1fa6205e0bcf957f63905934ec593246df5c2b1e6c4025e71d03528c4668f24ec973b745ffa5a0941a languageName: node linkType: hard @@ -3059,12 +3059,12 @@ __metadata: linkType: hard "@types/eslint@npm:*, @types/eslint@npm:^8.4.2, @types/eslint@npm:^8.4.9": - version: 8.56.9 - resolution: "@types/eslint@npm:8.56.9" + version: 8.56.10 + resolution: "@types/eslint@npm:8.56.10" dependencies: "@types/estree": "*" "@types/json-schema": "*" - checksum: c0c033fc724774b791bf97465cfe246814eda1f82460aff2daa64dfce1b1a01626c75f4281d2ab10dcd9176446df0b4bf57e8ac542da6476902e28683e89137d + checksum: fb7137dd263ce1130b42d14452bdd0266ef81f52cb55ba1a5e9750e65da1f0596dc598c88bffc7e415458b6cb611a876dcc132bcf40ea48701c6d05b40c57be5 languageName: node linkType: hard @@ -3256,9 +3256,9 @@ __metadata: linkType: hard "@types/qs@npm:*": - version: 6.9.14 - resolution: "@types/qs@npm:6.9.14" - checksum: d3b76021d36b86c0063ec4b7373e9fa470754914e486fbfe54b3a8866dad037800a2c2068ecbcaa9399ae3ed15772a26b07e67793ed2519cf2de199104014716 + version: 6.9.15 + resolution: "@types/qs@npm:6.9.15" + checksum: 97d8208c2b82013b618e7a9fc14df6bd40a73e1385ac479b6896bafc7949a46201c15f42afd06e86a05e914f146f495f606b6fb65610cc60cf2e0ff743ec38a2 languageName: node linkType: hard @@ -4558,9 +4558,9 @@ __metadata: linkType: hard "babel-import-util@npm:^2.0.0, babel-import-util@npm:^2.0.1": - version: 2.0.2 - resolution: "babel-import-util@npm:2.0.2" - checksum: f70c4df57ac84e391b11c8254fac39d24eb739a8f079b442ef8bf83a815d8721cc4bcf10bf6adf18de01021852915150e986eed16bbd93107816f4a495bece8d + version: 2.0.3 + resolution: "babel-import-util@npm:2.0.3" + checksum: 4e3da6178f9f327ad2590e3e8a3cca168f135d85b4ddaac0f71e3f8a010108270769e88ce65307c764c1d0bb4974199a3117957dce0f13b7cf1456e2b20bca41 languageName: node linkType: hard @@ -4654,12 +4654,12 @@ __metadata: linkType: hard "babel-plugin-ember-template-compilation@npm:^2.0.0, babel-plugin-ember-template-compilation@npm:^2.0.1": - version: 2.2.1 - resolution: "babel-plugin-ember-template-compilation@npm:2.2.1" + version: 2.2.2 + resolution: "babel-plugin-ember-template-compilation@npm:2.2.2" dependencies: "@glimmer/syntax": ^0.84.3 babel-import-util: ^2.0.0 - checksum: 1c3ea32ac3cb83afe53d50aa34cc0e9bb37eab6d8f62f80b392b57cd29b55dd0d101fc88a60cbacd40281e27348e85591bbd569bac0c0dcf399dd26957d9104a + checksum: b12f057ddc367b5765c29b2ba7c29ef18dc87511f784c2d554ff394250a113f35c77375fbb7cbe0e7dce87ba603af170b2a1eab6ebd13efb7d375174e43b9617 languageName: node linkType: hard @@ -4729,15 +4729,15 @@ __metadata: linkType: hard "babel-plugin-module-resolver@npm:^5.0.0": - version: 5.0.0 - resolution: "babel-plugin-module-resolver@npm:5.0.0" + version: 5.0.2 + resolution: "babel-plugin-module-resolver@npm:5.0.2" dependencies: - find-babel-config: ^2.0.0 - glob: ^8.0.3 + find-babel-config: ^2.1.1 + glob: ^9.3.3 pkg-up: ^3.1.0 reselect: ^4.1.7 - resolve: ^1.22.1 - checksum: d6880e49fc8e7bac509a2c183b4303ee054a47a80032a59a6f7844bb468ebe5e333b5dc5378443afdab5839e2da2b31a6c8d9a985a0047cd076b82bb9161cc78 + resolve: ^1.22.8 + checksum: f1d198acbbbd0b76c9c0c4aacbf9f1ef90f8d36b3d5209d9e7a75cadee2113a73711550ebddeb9464d143b71df19adc75e165dff99ada2614d7ea333affe3b5a languageName: node linkType: hard @@ -6538,9 +6538,9 @@ __metadata: linkType: hard "caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30000792, caniuse-lite@npm:^1.0.30000805, caniuse-lite@npm:^1.0.30000844, caniuse-lite@npm:^1.0.30001304, caniuse-lite@npm:^1.0.30001587": - version: 1.0.30001609 - resolution: "caniuse-lite@npm:1.0.30001609" - checksum: 462f38b5c33ce544dcfa65cc3940fca7fe2d3d916ec2d9c9905ea7becf6930c540774a1278f901fe44d3b85f7d7a2f05523d27602c6ce93bb2b3806e9f3e9989 + version: 1.0.30001611 + resolution: "caniuse-lite@npm:1.0.30001611" + checksum: c5beb4a0aaabe24b01a577122c61e20ca0614d2e3adfd2e4de8dbdb8529eb9dba9922be8fd8be9eba48b6cadaada0b338aa3e0d0a17f42f6b3e9a614492c029a languageName: node linkType: hard @@ -7258,11 +7258,11 @@ __metadata: linkType: hard "core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.36.1": - version: 3.36.1 - resolution: "core-js-compat@npm:3.36.1" + version: 3.37.0 + resolution: "core-js-compat@npm:3.37.0" dependencies: browserslist: ^4.23.0 - checksum: c9109bd599a97b5d20f25fc8b8339b8c7f3fca5f9a1bebd397805383ff7699e117786c7ffe0f7a95058a6fa5e0e1435d4c10e5cda6ad86ce1957986bb6580562 + checksum: cab5078e98625f889fd9bbbb19e84cb408f31c87e68302d380db0d26ae8e35c1b38cde084358ff345d4aa461af5f3c60d8a913a5b30bff3a83b4b7859374db36 languageName: node linkType: hard @@ -7274,9 +7274,9 @@ __metadata: linkType: hard "core-js@npm:^3.16.2, core-js@npm:^3.24.1": - version: 3.36.1 - resolution: "core-js@npm:3.36.1" - checksum: 6f6c152179bd0673da34e67a82c6a5c37f31f9fbe908e9caf93749dc62a25b6e07fbff2411de3b74bb2d0661b7f9fb247115ba8efabf9904f5fef26edead515e + version: 3.37.0 + resolution: "core-js@npm:3.37.0" + checksum: 212c3e9b3fc277dbb63739ef58a61c5709ccd0b36f09c3ce6946aa91fa180c60f57f976d4a5fdb9cda0c6cb55417379ba5a008fc3a1384ec94ec8ec61826469d languageName: node linkType: hard @@ -7733,12 +7733,12 @@ __metadata: linkType: hard "decorator-transforms@npm:^1.0.1": - version: 1.1.0 - resolution: "decorator-transforms@npm:1.1.0" + version: 1.2.1 + resolution: "decorator-transforms@npm:1.2.1" dependencies: "@babel/plugin-syntax-decorators": ^7.23.3 babel-import-util: ^2.0.1 - checksum: 9595f23d83742a7b566e255e5a6ff682515876ca58641e19a1bc7c9aab7f99f7c9b6ee03fcfe29e5793cc468e32e9b8cc8ecaf104fe0af3a88ac721eca213ce6 + checksum: af060a1258bd138a5c0da197378c57bbc48076cfde51cbc2f2186a243634ec5f0ea827b540b7365faaaa2593ea1670dc1f531ba0a7131ad97edb80a7502fdaec languageName: node linkType: hard @@ -8103,9 +8103,9 @@ __metadata: linkType: hard "electron-to-chromium@npm:^1.3.30, electron-to-chromium@npm:^1.3.47, electron-to-chromium@npm:^1.4.668": - version: 1.4.736 - resolution: "electron-to-chromium@npm:1.4.736" - checksum: dcba6d43ffbc40e5d3decb3a0de67b9721a257fefde4eceac0d75202029c62ace7b377d217f49d1ba9cfbad61f89a14514e85a4de77b7205cee336f2e1f0baee + version: 1.4.744 + resolution: "electron-to-chromium@npm:1.4.744" + checksum: 917a178500bd8a78ae73c2ad9e71981922ec47e443ca1dfdfbc7a343334e6dfbbaa28e612313710c35b6538b1332dc4d14dd533eb274a587ffad79b3f9908989 languageName: node linkType: hard @@ -8775,7 +8775,7 @@ __metadata: languageName: node linkType: hard -"ember-cli-typescript@npm:^5.0.0, ember-cli-typescript@npm:^5.2.1": +"ember-cli-typescript@npm:^5.0.0": version: 5.3.0 resolution: "ember-cli-typescript@npm:5.3.0" dependencies: @@ -10904,22 +10904,22 @@ __metadata: linkType: hard "find-babel-config@npm:^1.1.0, find-babel-config@npm:^1.2.0": - version: 1.2.0 - resolution: "find-babel-config@npm:1.2.0" + version: 1.2.1 + resolution: "find-babel-config@npm:1.2.1" dependencies: - json5: ^0.5.1 + json5: ^2.2.3 path-exists: ^3.0.0 - checksum: 0a1785d3da9f38637885d9d65f183aaa072f51a834f733035e9694e4d0f6983ae8c8e75cd4e08b92af6f595b3b490ee813a1c5a9b14740685aa836fa1e878583 + checksum: 0928073766b024b06ea4d00db21c55e8ab240ac7a5995ba4d62d8d00a717fe034d88d1123b39e5852a8863c4c559f04c5f94f4475880179ef09f8a43aa681461 languageName: node linkType: hard -"find-babel-config@npm:^2.0.0": - version: 2.0.0 - resolution: "find-babel-config@npm:2.0.0" +"find-babel-config@npm:^2.1.1": + version: 2.1.1 + resolution: "find-babel-config@npm:2.1.1" dependencies: - json5: ^2.1.1 + json5: ^2.2.3 path-exists: ^4.0.0 - checksum: d110308b02fe6a6411a0cfb7fd50af6740fbf5093eada3d6ddacf99b07fc8eea4aa3475356484710a0032433029a21ce733bb3ef88fda1d6e35c29a3e4983014 + checksum: 4be54397339520e0cd49870acb10366684ffc001fd0b7bffedd0fe9d3e1d82234692d3cb4e5ba95280a35887238ba6f82dc79569a13a3749ae3931c23e0b3a99 languageName: node linkType: hard @@ -11666,7 +11666,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:^8.0.3, glob@npm:^8.1.0": +"glob@npm:^8.1.0": version: 8.1.0 resolution: "glob@npm:8.1.0" dependencies: @@ -11679,7 +11679,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:^9.3.4": +"glob@npm:^9.3.3, glob@npm:^9.3.4": version: 9.3.5 resolution: "glob@npm:9.3.5" dependencies: @@ -13998,11 +13998,11 @@ __metadata: linkType: hard "magic-string@npm:^0.30.0": - version: 0.30.9 - resolution: "magic-string@npm:0.30.9" + version: 0.30.10 + resolution: "magic-string@npm:0.30.10" dependencies: "@jridgewell/sourcemap-codec": ^1.4.15 - checksum: a97b9a706b39e9569781dcb662b15ab085ca3af8b916cd69d8485e8565108917c17e4eb03b6b1013389387d827bb3025711ebeafe237f742bc95a90708416147 + checksum: 456fd47c39b296c47dff967e1965121ace35417eab7f45a99e681e725b8661b48e1573c366ee67a27715025b3740773c46b088f115421c7365ea4ea6fa10d399 languageName: node linkType: hard @@ -14566,14 +14566,14 @@ __metadata: linkType: hard "mini-css-extract-plugin@npm:^2.5.2": - version: 2.8.1 - resolution: "mini-css-extract-plugin@npm:2.8.1" + version: 2.9.0 + resolution: "mini-css-extract-plugin@npm:2.9.0" dependencies: schema-utils: ^4.0.0 tapable: ^2.2.1 peerDependencies: webpack: ^5.0.0 - checksum: 209f15a18cc304b0f12911927ea7e6ca4f0c3168dcc95d741811c933c4610fdb02a8486fc1a7782a6cde75c8e1880e175b7acf04e5ddfba2b8ed045d306ef04f + checksum: ae192c67ba85ac8bffeab66774635bf90181f00d5dd6cf95412426192599ddf5506fb4b1550acbd7a5476476e39db53c770dd40f8378f7baf5de96e3fec4e6e9 languageName: node linkType: hard @@ -16833,7 +16833,7 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.11.1, resolve@npm:^1.13.1, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.20.0, resolve@npm:^1.22.0, resolve@npm:^1.22.1, resolve@npm:^1.22.3, resolve@npm:^1.3.3, resolve@npm:^1.4.0, resolve@npm:^1.5.0": +"resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.11.1, resolve@npm:^1.13.1, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.20.0, resolve@npm:^1.22.0, resolve@npm:^1.22.1, resolve@npm:^1.22.3, resolve@npm:^1.22.8, resolve@npm:^1.3.3, resolve@npm:^1.4.0, resolve@npm:^1.5.0": version: 1.22.8 resolution: "resolve@npm:1.22.8" dependencies: @@ -16846,7 +16846,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@^1.1.7#~builtin, resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.11.1#~builtin, resolve@patch:resolve@^1.13.1#~builtin, resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.17.0#~builtin, resolve@patch:resolve@^1.20.0#~builtin, resolve@patch:resolve@^1.22.0#~builtin, resolve@patch:resolve@^1.22.1#~builtin, resolve@patch:resolve@^1.22.3#~builtin, resolve@patch:resolve@^1.3.3#~builtin, resolve@patch:resolve@^1.4.0#~builtin, resolve@patch:resolve@^1.5.0#~builtin": +"resolve@patch:resolve@^1.1.7#~builtin, resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.11.1#~builtin, resolve@patch:resolve@^1.13.1#~builtin, resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.17.0#~builtin, resolve@patch:resolve@^1.20.0#~builtin, resolve@patch:resolve@^1.22.0#~builtin, resolve@patch:resolve@^1.22.1#~builtin, resolve@patch:resolve@^1.22.3#~builtin, resolve@patch:resolve@^1.22.8#~builtin, resolve@patch:resolve@^1.3.3#~builtin, resolve@patch:resolve@^1.4.0#~builtin, resolve@patch:resolve@^1.5.0#~builtin": version: 1.22.8 resolution: "resolve@patch:resolve@npm%3A1.22.8#~builtin::version=1.22.8&hash=c3c19d" dependencies: @@ -18335,9 +18335,9 @@ __metadata: linkType: hard "swagger-ui-dist@npm:^5.9.0": - version: 5.15.1 - resolution: "swagger-ui-dist@npm:5.15.1" - checksum: 3fda9cf68f6454d3d2d5bfc7e463864d409695401684b7733f25ef0868987b27d6975770f5437b940270c406bf602ca16c2b1d9d8359b852ff4c07c48365e2ed + version: 5.16.2 + resolution: "swagger-ui-dist@npm:5.16.2" + checksum: 63cd817928c99e0bd12b893eca577f93521979bd7a7a886d3a808daa5773523a78cac2e34a2e5100106f844080d413996162efbaaf744e6337b6b1458c1184b7 languageName: node linkType: hard @@ -19453,7 +19453,6 @@ __metadata: ember-cli-sri: "meirish/ember-cli-sri#rooturl" ember-cli-string-helpers: 6.1.0 ember-cli-terser: ^4.0.2 - ember-cli-typescript: ^5.2.1 ember-composable-helpers: 5.0.0 ember-concurrency: ^3.1.1 ember-data: ~4.12.4