Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dependencies #247

Merged
merged 2 commits into from
Oct 4, 2024
Merged

Dependencies #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86445f0
chore: update dependencies
kelsos Oct 4, 2024
34329a2
chore: update rotki/eslint-config
kelsos Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/account/CountrySelect.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<script setup lang="ts">
const modelValue = defineModel<string>({ required: true });
withDefaults(
defineProps<{
disabled?: boolean;
Expand All @@ -11,8 +13,6 @@ withDefaults(
const { t } = useI18n();
const { countries } = useCountries();
const modelValue = defineModel<string>({ required: true });
</script>

<template>
Expand Down
4 changes: 2 additions & 2 deletions components/account/InputField.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ const slots = useSlots();
</template>

<style lang="scss" module>
@import '@/assets/css/media.scss';
@import '@/assets/css/main.scss';
@import '@/assets/css/media';
@import '@/assets/css/main';

.wrapper {
@apply flex flex-col pt-2.5;
Expand Down
4 changes: 2 additions & 2 deletions components/checkout/pay/SavedCardDisplay.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,6 @@ function submit() {
return get(submitPayload);
}

defineExpose({ submit });

const { deleteCard } = usePaymentCardsStore();

const deleteLoading = ref(false);
Expand All @@ -155,6 +153,8 @@ async function handleDeleteCard() {
await deleteCard(get(card).token);
set(deleteLoading, false);
}

defineExpose({ submit });
</script>

<template>
Expand Down
4 changes: 2 additions & 2 deletions components/common/BoxContainer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ const css = useCssModule();
</template>

<style lang="scss" module>
@import '@/assets/css/media.scss';
@import '@/assets/css/main.scss';
@import '@/assets/css/media';
@import '@/assets/css/main';

.box {
@apply border p-4 md:p-7 rounded-sm bg-white w-full md:w-96;
Expand Down
2 changes: 1 addition & 1 deletion components/common/LinkText.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const css = useCssModule();
</template>

<style lang="scss" module>
@import '@/assets/css/media.scss';
@import '@/assets/css/media';

.column {
@apply flex flex-col uppercase justify-center text-rui-text;
Expand Down
4 changes: 2 additions & 2 deletions components/common/PageContainer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ const slots = useSlots();
</template>

<style lang="scss" module>
@import '@/assets/css/media.scss';
@import '@/assets/css/main.scss';
@import '@/assets/css/media';
@import '@/assets/css/main';

.wrapper {
@apply flex flex-col min-h-full flex-grow py-12;
Expand Down
4 changes: 2 additions & 2 deletions components/common/TextHeading.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ const css = useCssModule();
</template>

<style lang="scss" module>
@import '@/assets/css/media.scss';
@import '@/assets/css/main.scss';
@import '@/assets/css/media';
@import '@/assets/css/main';

.heading {
@apply text-rui-text font-bold text-2xl;
Expand Down
4 changes: 2 additions & 2 deletions components/common/TextParagraph.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ const css = useCssModule();
</template>

<style lang="scss" module>
@import '@/assets/css/media.scss';
@import '@/assets/css/main.scss';
@import '@/assets/css/media';
@import '@/assets/css/main';

.text {
@apply text-rui-grey-800 text-justify;
Expand Down
5 changes: 3 additions & 2 deletions components/content/ProseH2.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ const props = withDefaults(
},
);

const { headings } = useRuntimeConfig().public.mdc;
const generate = computed(() => props.id && headings?.anchorLinks?.h2);
const { id } = toRefs(props);

const { generate } = useHeadings(id, 'h2');
const css = useCssModule();
</script>

Expand Down
5 changes: 3 additions & 2 deletions components/content/ProseH3.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ const props = withDefaults(
},
);

const { headings } = useRuntimeConfig().public.mdc;
const generate = computed(() => props.id && headings?.anchorLinks?.h3);
const { id } = toRefs(props);

const { generate } = useHeadings(id, 'h3');

const css = useCssModule();
</script>
Expand Down
4 changes: 2 additions & 2 deletions components/home/plans/details/CustomPlan.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ const css = useCssModule();
</template>

<style lang="scss" module>
@import '@/assets/css/main.scss';
@import '@/assets/css/media.scss';
@import '@/assets/css/main';
@import '@/assets/css/media';

.wrapper {
margin-top: 247px;
Expand Down
2 changes: 1 addition & 1 deletion composables/markdown.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { CONTENT_PREFIX, LOCAL_CONTENT_PREFIX } from '~/utils/constants';
import type {
MarkdownParsedContent,
QueryBuilderWhere,
} from '@nuxt/content/dist/runtime/types';
} from '@nuxt/content';

export interface JobMarkdownContent extends MarkdownParsedContent {
link?: string;
Expand Down
19 changes: 19 additions & 0 deletions composables/use-headings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { get } from '@vueuse/core';

interface UseHeadingsReturn {
generate: Ref<boolean>;
}

export function useHeadings(id: Ref<string | undefined>, anchor: 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6'): UseHeadingsReturn {
const { headings } = useRuntimeConfig().public.mdc;
const generate = computed<boolean>(() => {
if (!get(id))
return false;
if (!headings?.anchorLinks || typeof headings.anchorLinks !== 'object')
return false;
return headings.anchorLinks[anchor] ?? false;
});
return {
generate,
};
}
12 changes: 11 additions & 1 deletion nuxt.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ export default defineNuxtConfig({
defaultLocale: 'en',
langDir: 'locales',
lazy: true,
locales: [{ code: 'en', file: 'en.json', iso: 'en-US' }],
locales: [{ code: 'en', file: 'en.json', language: 'en-US' }],
strategy: 'no_prefix',
vueI18n: './i18n.config.ts',
},
Expand All @@ -140,6 +140,7 @@ export default defineNuxtConfig({
'@nuxtjs/sitemap',
'@nuxt/test-utils/module',
'./modules/ui-library/module.ts',
'@nuxt/image',
],

nitro: {
Expand Down Expand Up @@ -197,4 +198,13 @@ export default defineNuxtConfig({
exclude: nonIndexed,
},
ssr: true,
vite: {
css: {
preprocessorOptions: {
scss: {
api: 'modern',
},
},
},
},
});
83 changes: 42 additions & 41 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "rotki.com",
"version": "1.23.0",
"private": true,
"packageManager": "pnpm@9.7.0",
"packageManager": "pnpm@9.12.0",
"type": "module",
"scripts": {
"dev": "nuxi dev",
Expand All @@ -25,74 +25,75 @@
"release": "bumpp -r --no-push"
},
"optionalDependencies": {
"cypress": "13.13.2"
"cypress": "13.15.0"
},
"dependencies": {
"@metamask/detect-provider": "2.0.0",
"@nuxtjs/robots": "4.0.2",
"@nuxtjs/robots": "4.1.7",
"@nuxtjs/tailwindcss": "6.11.4",
"@pinia/nuxt": "0.5.3",
"@pinia/nuxt": "0.5.5",
"@vuelidate/core": "2.0.3",
"@vuelidate/validators": "2.0.4",
"@vueuse/core": "10.11.1",
"@vueuse/math": "10.11.1",
"@vueuse/nuxt": "10.11.1",
"@vueuse/shared": "10.11.1",
"braintree-web": "3.106.0",
"ethers": "6.13.2",
"pinia": "2.2.1",
"braintree-web": "3.109.0",
"ethers": "6.13.3",
"pinia": "2.2.4",
"qrcode": "1.5.4",
"swiper": "11.1.9",
"vue": "3.4.37",
"vue-router": "4.4.3",
"swiper": "11.1.14",
"vue": "3.5.11",
"vue-router": "4.4.5",
"zod": "3.23.8"
},
"devDependencies": {
"@commitlint/cli": "19.4.0",
"@commitlint/config-conventional": "19.2.2",
"@fontsource/roboto": "5.0.14",
"@nuxt/content": "2.12.1",
"@nuxt/devtools": "1.3.9",
"@nuxt/test-utils": "3.14.1",
"@nuxtjs/i18n": "8.3.3",
"@commitlint/cli": "19.5.0",
"@commitlint/config-conventional": "19.5.0",
"@fontsource/roboto": "5.1.0",
"@nuxt/content": "2.13.2",
"@nuxt/devtools": "1.5.2",
"@nuxt/image": "1.8.1",
"@nuxt/test-utils": "3.14.2",
"@nuxtjs/i18n": "8.5.5",
"@nuxtjs/sitemap": "5.3.5",
"@rotki/eslint-config": "3.0.0",
"@rotki/eslint-plugin": "0.4.0",
"@rotki/ui-library": "1.1.2",
"@types/braintree-web": "3.96.12",
"@rotki/eslint-config": "3.2.1",
"@rotki/eslint-plugin": "0.5.0",
"@rotki/ui-library": "1.3.0",
"@types/braintree-web": "3.96.15",
"@types/paypal-checkout-components": "4.0.8",
"@types/qrcode": "1.5.5",
"@vitest/coverage-v8": "2.0.5",
"@vitest/coverage-v8": "2.1.2",
"@vue/test-utils": "2.4.6",
"autoprefixer": "10.4.20",
"bumpp": "9.5.1",
"eslint": "9.9.0",
"bumpp": "9.6.1",
"eslint": "9.11.1",
"eslint-plugin-nuxt": "4.0.0",
"happy-dom": "14.12.3",
"husky": "9.1.4",
"lint-staged": "15.2.9",
"msw": "2.3.5",
"nuxt": "3.12.4",
"postcss": "8.4.41",
"husky": "9.1.6",
"lint-staged": "15.2.10",
"msw": "2.4.9",
"nuxt": "3.13.2",
"postcss": "8.4.47",
"postcss-html": "1.7.0",
"postcss-import": "16.1.0",
"postcss-url": "10.1.3",
"rollup": "4.20.0",
"sass": "1.77.8",
"sass-loader": "16.0.0",
"stylelint": "16.8.1",
"rollup": "4.24.0",
"sass": "1.79.4",
"sass-loader": "16.0.2",
"stylelint": "16.9.0",
"stylelint-config-recommended-vue": "1.5.0",
"stylelint-config-standard": "36.0.1",
"stylelint-config-standard-scss": "13.1.0",
"stylelint-order": "6.0.4",
"stylelint-scss": "6.5.0",
"tailwindcss": "3.4.9",
"typescript": "5.5.4",
"vite": "5.4.0",
"vitest": "2.0.5",
"vitest-environment-nuxt": "1.0.0",
"vue-tsc": "2.0.29",
"webpack": "5.93.0"
"stylelint-scss": "6.7.0",
"tailwindcss": "3.4.13",
"typescript": "5.6.2",
"vite": "5.4.8",
"vitest": "2.1.2",
"vitest-environment-nuxt": "1.0.1",
"vue-tsc": "2.1.6",
"webpack": "5.95.0"
},
"engines": {
"node": ">=20 <21",
Expand Down
4 changes: 2 additions & 2 deletions pages/account-deleted.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ useHead({
</template>

<style lang="scss">
@import '@/assets/css/media.scss';
@import '@/assets/css/main.scss';
@import '@/assets/css/media';
@import '@/assets/css/main';
</style>
4 changes: 2 additions & 2 deletions pages/refund-policy.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ useHead({
</template>

<style lang="scss">
@import '@/assets/css/media.scss';
@import '@/assets/css/main.scss';
@import '@/assets/css/media';
@import '@/assets/css/main';
</style>
Loading
Loading