Skip to content

Commit

Permalink
Merge pull request #161 from shopware/dependabot/npm_and_yarn/all-e18…
Browse files Browse the repository at this point in the history
…9f9530a

fix(deps): bump the all group across 1 directory with 9 updates
  • Loading branch information
cyl3x authored Jan 27, 2025
2 parents 4778b2b + 53e4b30 commit 23a6bf0
Show file tree
Hide file tree
Showing 7 changed files with 1,529 additions and 180 deletions.
2 changes: 1 addition & 1 deletion assets/admin.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'vite/modulepreload-polyfill';
import '@shopware-ag/meteor-component-library/dist/style.css';
import '@shopware-ag/meteor-component-library/styles.css';
import './css/shopware-reboot.scss';
import './src/main';

Expand Down
1 change: 0 additions & 1 deletion assets/src/component/base/sw-sales-channel-switch.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<mt-select
v-if='!loading'
class='sw-braintree-sales-channel-switch__select'
:label='$t("settings.salesChannelSwitch.label")'
:options='salesChannelOptions'
:model-value='value ?? undefined'
:is-loading='isLoading || loading'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
>
<i18n-t keypath='settings.currency.missingAccount' tag='span'>
<template #link>
<mt-external-link @click='onPaymentMethodOverview'>
<mt-link type='internal' @click='onPaymentMethodOverview'>
{{ $t("settings.currency.missingAccountLink") }}
</mt-external-link>
</mt-link>
</template>
</i18n-t>
</mt-banner>
Expand Down Expand Up @@ -62,7 +62,7 @@ import type { PropType } from 'vue';
import { defineComponent, inject } from 'vue';
import SwBraintreeAppTable from '../base/sw-braintree-app-table.vue';
import SwBraintreeAppCurrencyMappingSelect from './sw-braintree-app-settings-currency-mapping-select.vue';
import { MtCard, MtBanner, MtExternalLink } from '@shopware-ag/meteor-component-library';
import { MtCard, MtBanner, MtLink } from '@shopware-ag/meteor-component-library';
import * as sw from '@shopware-ag/meteor-admin-sdk';
import { DefaultCurrencyMappingEntity } from '@/resources/entities';
import { registerSaveHandler } from '@/resources/inject-keys';
Expand All @@ -81,7 +81,7 @@ export default defineComponent({
MtCard,
SwBraintreeAppCurrencyMappingSelect,
MtBanner,
MtExternalLink,
MtLink,
},
props: {
Expand Down
3 changes: 1 addition & 2 deletions assets/src/i18n/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ export function createI18n(locale: { locale: string; fallbackLocale: string }) {
messages: {
'en-GB': enGB,
},
// meteor depends on it
legacy: true,
legacy: false,
});
}
8 changes: 4 additions & 4 deletions assets/src/views/sw-braintree-app-config-page.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
>
<i18n-t keypath='configuration.missingCurrencyMapping' tag='span'>
<template #link>
<mt-external-link @click='onSettingsLinkCicked'>
<mt-link type='internal' @click='onSettingsLinkCicked'>
{{ $t("configuration.missingCurrencyMappingLink") }}
</mt-external-link>
</mt-link>
</template>
</i18n-t>
</mt-banner>
Expand Down Expand Up @@ -62,7 +62,7 @@ import * as sw from '@shopware-ag/meteor-admin-sdk';
import { defineComponent } from 'vue';
import SwBraintreeAppConfig from '@/component/sw-braintree-app-config.vue';
import SwBraintreeAppMerchantDetails from '@/component/sw-braintree-app-merchant-details.vue';
import { MtButton, MtBanner, MtExternalLink, MtLoader } from '@shopware-ag/meteor-component-library';
import { MtButton, MtBanner, MtLink, MtLoader } from '@shopware-ag/meteor-component-library';
export default defineComponent({
name: 'sw-braintree-app-config-page',
Expand All @@ -73,7 +73,7 @@ export default defineComponent({
MtButton,
MtLoader,
MtBanner,
MtExternalLink,
MtLink,
},
data(): {
Expand Down
Loading

0 comments on commit 23a6bf0

Please sign in to comment.