diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5b7ca5843..d31c997e0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,7 +45,7 @@ check: - end_section - start_section "Type checking" - - pnpm nuxi typecheck || record_failure + - pnpm nuxt typecheck || record_failure - end_section - start_section "Unit Tests" @@ -112,7 +112,6 @@ build: artifacts: access: developer paths: - - '.nuxt/tsconfig.json' - '.output' - 'locale' - 'migrations' @@ -121,7 +120,7 @@ build: - 'public/logo/logo-primary.svg' - 'public/bg.png' - 'server' - - 'src' + - 'shared' - '.npmrc' - '.nvmrc' - 'LICENSE.md' @@ -129,7 +128,6 @@ build: - 'package.json' - 'pnpm-lock.yaml' - 'run-wrapper.sh' - - 'tsconfig.json' exclude: - 'locale/*/docs/*' - 'locale/*/img/*' diff --git a/app.vue b/app/app.vue similarity index 97% rename from app.vue rename to app/app.vue index 882239f65..2944c01c9 100644 --- a/app.vue +++ b/app/app.vue @@ -2,10 +2,10 @@ import { useNuxtApp } from 'nuxt/app'; import { useHead, useSeoMeta } from '#imports'; +import { formatFonts } from '#shared/fonts.ts'; import useConfig from '~/composables/useConfig.ts'; import { getDefaultSeo } from '~/composables/useSimpleHead.ts'; import { getUrlForLocale } from '~/src/domain.ts'; -import { formatFonts } from '~/src/fonts.ts'; const { $translator: translator } = useNuxtApp(); const config = useConfig(); diff --git a/assets/dark.scss b/app/assets/dark.scss similarity index 100% rename from assets/dark.scss rename to app/assets/dark.scss diff --git a/assets/fonts.scss b/app/assets/fonts.scss similarity index 100% rename from assets/fonts.scss rename to app/assets/fonts.scss diff --git a/assets/glass.scss b/app/assets/glass.scss similarity index 100% rename from assets/glass.scss rename to app/assets/glass.scss diff --git a/assets/languages.tsv b/app/assets/languages.tsv similarity index 100% rename from assets/languages.tsv rename to app/assets/languages.tsv diff --git a/assets/nouns.scss b/app/assets/nouns.scss similarity index 100% rename from assets/nouns.scss rename to app/assets/nouns.scss diff --git a/assets/print.scss b/app/assets/print.scss similarity index 100% rename from assets/print.scss rename to app/assets/print.scss diff --git a/assets/style.scss b/app/assets/style.scss similarity index 100% rename from assets/style.scss rename to app/assets/style.scss diff --git a/assets/variables.scss b/app/assets/variables.scss similarity index 100% rename from assets/variables.scss rename to app/assets/variables.scss diff --git a/assets/workarounds.scss b/app/assets/workarounds.scss similarity index 100% rename from assets/workarounds.scss rename to app/assets/workarounds.scss diff --git a/components/AbuseReports.vue b/app/components/AbuseReports.vue similarity index 100% rename from components/AbuseReports.vue rename to app/components/AbuseReports.vue diff --git a/components/AcademicLinks.vue b/app/components/AcademicLinks.vue similarity index 100% rename from components/AcademicLinks.vue rename to app/components/AcademicLinks.vue diff --git a/components/AcademicReference.vue b/app/components/AcademicReference.vue similarity index 96% rename from components/AcademicReference.vue rename to app/components/AcademicReference.vue index f5ece3894..4b2dfe8e8 100644 --- a/components/AcademicReference.vue +++ b/app/components/AcademicReference.vue @@ -1,5 +1,5 @@