Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 11 additions & 9 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
/**
* @type {import('@myparcel/eslint-config').ESLintConfig}
*/
/** @type {import('eslint').Linter.Config} */
module.exports = {
root: true,
overrides: [
{
files: ['./**/*.vue'],
extends: ['@myparcel-eslint/eslint-config-prettier-typescript-vue', '@myparcel-eslint/eslint-config-import'],
extends: ['@myparcel-dev/eslint-config-prettier-typescript-vue', '@myparcel-dev/eslint-config-import'],
rules: {
'@typescript-eslint/no-misused-promises': 'off',
'vue/no-bare-strings-in-template': 'off',
Expand All @@ -20,7 +18,11 @@ module.exports = {
},
{
files: ['./**/*.ts', './**/*.tsx'],
extends: ['@myparcel-eslint/eslint-config-prettier-typescript', '@myparcel-eslint/eslint-config-import'],
extends: ['@myparcel-dev/eslint-config-prettier-typescript', '@myparcel-dev/eslint-config-import'],
// typescript-eslint reuses one program across the run, so .vue has to be known here too
parserOptions: {
extraFileExtensions: ['.vue'],
},
rules: {
'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/no-misused-promises': 'off',
Expand All @@ -33,10 +35,10 @@ module.exports = {
sourceType: 'module',
},
extends: [
'@myparcel-eslint/eslint-config-node',
'@myparcel-eslint/eslint-config-esnext',
'@myparcel-eslint/eslint-config-prettier',
'@myparcel-eslint/eslint-config-import',
'@myparcel-dev/eslint-config-node',
'@myparcel-dev/eslint-config-esnext',
'@myparcel-dev/eslint-config-prettier',
'@myparcel-dev/eslint-config-import',
],
},
{
Expand Down
1 change: 0 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ updates:
exclude:
- '@myparcel/*'
- '@myparcel-dev/*'
- '@myparcel-eslint/*'
- '@myparcel-pdk/*'
groups:
minor-js-updates:
Expand Down
15 changes: 8 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"src/**/*.svg": "svgo --multipass --final-newline",
"**/*.{md,mdx,html,css,scss}": "prettier --write"
},
"prettier": "@myparcel/prettier-config",
"prettier": "@myparcel-dev/prettier-config",
"resolutions": {
"axios": "1.15.0",
"tar": "7.5.11",
Expand All @@ -52,12 +52,13 @@
"vuepress": "2.0.0-beta.67"
},
"devDependencies": {
"@myparcel-eslint/eslint-config-esnext": "^1.2.3",
"@myparcel-eslint/eslint-config-import": "^1.2.1",
"@myparcel-eslint/eslint-config-node": "^1.2.3",
"@myparcel-eslint/eslint-config-prettier": "^1.2.3",
"@myparcel-eslint/eslint-config-prettier-typescript": "^1.2.4",
"@myparcel-eslint/eslint-config-prettier-typescript-vue": "^1.2.6",
"@myparcel-dev/eslint-config-esnext": "^1.4.0",
"@myparcel-dev/eslint-config-import": "^1.3.0",
"@myparcel-dev/eslint-config-node": "^1.4.0",
"@myparcel-dev/eslint-config-prettier": "^1.4.0",
"@myparcel-dev/eslint-config-prettier-typescript": "^1.4.0",
"@myparcel-dev/eslint-config-prettier-typescript-vue": "^1.4.0",
"@myparcel-dev/prettier-config": "^2.0.1",
"@myparcel/constants": "2.6.0",
"@tsconfig/node18": "^18.2.2",
"@types/flat": "^5.0.2",
Expand Down
2 changes: 1 addition & 1 deletion src/.vuepress/config/createBottomFooter.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable max-len,vue/max-len */
import {MyPaNavLink} from '@mptheme/config.types';
import {type MyPaNavLink} from '@mptheme/config.types';

export const createBottomFooter = (): MyPaNavLink[] => [
{
Expand Down
2 changes: 1 addition & 1 deletion src/.vuepress/config/createNavbar.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {MyPaNavLink, MyPaNavbarConfigArray} from '@mptheme/config.types';
import {type MyPaNavLink, type MyPaNavbarConfigArray} from '@mptheme/config.types';

const pages: MyPaNavLink[] = [
{
Expand Down
2 changes: 1 addition & 1 deletion src/.vuepress/config/head.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable max-len,vue/max-len */
import {HeadConfig} from 'vuepress';
import {type HeadConfig} from 'vuepress';

const faviconUrl = 'https://assets.myparcel.nl/skin/images/favicon';

Expand Down
2 changes: 1 addition & 1 deletion src/.vuepress/config/routes.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {MyPaNavLink} from '@mptheme/config.types';
import {type MyPaNavLink} from '@mptheme/config.types';

export const STATUS: MyPaNavLink = {
text: 'Status',
Expand Down
8 changes: 4 additions & 4 deletions src/.vuepress/config/sidebar/addPageToSidebar.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {MyPaResolvedSidebarItem, MyPaSidebarConfig} from '@mptheme/config.types';
import {Language} from '../../plugins/parseTranslations/shared';
import {Page} from 'vuepress';
import {calculateSidebarItemSpots} from './calculateSidebarItemSpots';
import {type Page} from 'vuepress';
import {type MyPaResolvedSidebarItem, type MyPaSidebarConfig} from '@mptheme/config.types';
import {type Language} from '../../plugins/parseTranslations/shared';
import {deepSet} from './deepSet';
import {calculateSidebarItemSpots} from './calculateSidebarItemSpots';

export const addPageToSidebar = (
page: Page,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {MyPaSidebarConfig} from '@mptheme/config.types';
import {type MyPaSidebarConfig} from '@mptheme/config.types';
import {getChildIndices} from './getChildIndices';

export const calculateSidebarItemSpots = (
Expand Down
6 changes: 3 additions & 3 deletions src/.vuepress/config/sidebar/createSidebar.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {App} from 'vuepress';
import {Language} from '../../plugins/parseTranslations/shared';
import {MyPaSidebarConfig} from '@mptheme/config.types';
import {type App} from 'vuepress';
import {type MyPaSidebarConfig} from '@mptheme/config.types';
import {type Language} from '../../plugins/parseTranslations/shared';
import {createSidebarFromPages} from './createSidebarFromPages';

export const createSidebar = (app: App): MyPaSidebarConfig => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {type Page} from 'vuepress';
import {describe, expect} from 'vitest';
import {Page} from 'vuepress';
import {createSidebarFromPages} from './createSidebarFromPages';

const languages = [
Expand Down
6 changes: 3 additions & 3 deletions src/.vuepress/config/sidebar/createSidebarFromPages.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {Language} from '../../plugins/parseTranslations/shared';
import {MyPaSidebarConfig} from '@mptheme/config.types';
import {Page} from 'vuepress';
import {type Page} from 'vuepress';
import {type MyPaSidebarConfig} from '@mptheme/config.types';
import {type Language} from '../../plugins/parseTranslations/shared';
import {addPageToSidebar} from './addPageToSidebar';

export const createSidebarFromPages = (
Expand Down
2 changes: 1 addition & 1 deletion src/.vuepress/config/sidebar/getChildIndices.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {MyPaSidebarConfig} from '@mptheme/config.types';
import {get} from 'lodash-unified';
import {type MyPaSidebarConfig} from '@mptheme/config.types';

const KEY_CHILDREN = 'children';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type {GoogleTagManagerPluginOptions} from '../../shared';
import {type GoogleTagManagerPluginOptions} from '../../shared';

export const useSetupGoogleTagManager = (options: GoogleTagManagerPluginOptions): void => {
// avoid duplicated import
Expand Down
2 changes: 1 addition & 1 deletion src/.vuepress/plugins/gtm/client/config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {GoogleTagManagerPluginOptions} from '../shared';
import {defineClientConfig} from '@vuepress/client';
import {type GoogleTagManagerPluginOptions} from '../shared';
import {useSetupGoogleTagManager} from './composables';

// eslint-disable-next-line @typescript-eslint/naming-convention,no-underscore-dangle
Expand Down
4 changes: 2 additions & 2 deletions src/.vuepress/plugins/gtm/node/googleTagManagerPlugin.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type {Plugin, PluginObject} from '@vuepress/core';
import {logger, path} from '@vuepress/utils';
import type {GoogleTagManagerPluginOptions} from '../shared';
import {type Plugin, type PluginObject} from '@vuepress/core';
import {type GoogleTagManagerPluginOptions} from '../shared';

export const googleTagManagerPlugin =
(options: GoogleTagManagerPluginOptions): Plugin =>
Expand Down
2 changes: 1 addition & 1 deletion src/.vuepress/plugins/gtm/node/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ export * from './googleTagManagerPlugin';

export default googleTagManagerPlugin;

export {GoogleTagManagerPluginOptions} from '../shared/types';
export type {GoogleTagManagerPluginOptions} from '../shared/types';
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/no-magic-numbers */
import {Language, ParseTranslationsPluginOptions} from '../shared';
import {Locale, getLocalePathPrefix} from './getLocalePathPrefix';
import {type Language, type ParseTranslationsPluginOptions} from '../shared';
import {type Locale, getLocalePathPrefix} from './getLocalePathPrefix';

export const getAvailableLanguages = (translations: Locale[], options: ParseTranslationsPluginOptions): Language[] => {
return translations.map((translation) => ({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {Locale} from './getLocalePathPrefix';
import path from 'node:path';
import fs from 'node:fs';
import grayMatter from 'gray-matter';
import {logger} from '@vuepress/utils';
import path from 'node:path';
import {type Locale} from './getLocalePathPrefix';

export const getConfiguration = async (dir: string): Promise<Locale[]> => {
return Promise.all(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Language, ParseTranslationsPluginOptions} from '../shared';
import {type Language, type ParseTranslationsPluginOptions} from '../shared';

/**
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {Locale} from './getLocalePathPrefix';
import {ParseTranslationsPluginOptions} from '../shared';
import path from 'node:path';
import fs from 'node:fs';
import {logger} from '@vuepress/utils';
import path from 'node:path';
import {type ParseTranslationsPluginOptions} from '../shared';
import {type Locale} from './getLocalePathPrefix';

export const getTranslations = async (options: ParseTranslationsPluginOptions): Promise<Locale[]> => {
return Promise.all(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import {ParseTranslationsPluginOptions} from '../shared';
import {Plugin} from '@vuepress/core/lib/types/plugin';
import {merge} from 'lodash-unified';
import {type Plugin} from '@vuepress/core/lib/types/plugin';
import {type ParseTranslationsPluginOptions} from '../shared';
import {createSidebar} from '../../../config/sidebar/createSidebar';
import {getAvailableLanguages} from './getAvailableLanguages';
import {getConfiguration} from './getConfiguration';
import {getDefaultLanguage} from './getDefaultLanguage';
import {getLocalePathPrefix} from './getLocalePathPrefix';
import {getTranslations} from './getTranslations';
import {merge} from 'lodash-unified';
import {getLocalePathPrefix} from './getLocalePathPrefix';
import {getDefaultLanguage} from './getDefaultLanguage';
import {getConfiguration} from './getConfiguration';
import {getAvailableLanguages} from './getAvailableLanguages';

export const parseTranslationsPlugin = (options: ParseTranslationsPluginOptions): Plugin => {
return {
Expand Down
4 changes: 2 additions & 2 deletions src/.vuepress/plugins/parseTranslations/shared/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export {Language} from './types';
export type {Language} from './types';

export {ParseTranslationsPluginOptions} from './types';
export type {ParseTranslationsPluginOptions} from './types';
4 changes: 2 additions & 2 deletions src/.vuepress/theme/client/components/common/LinkTree.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
</template>

<script lang="ts">
import {PropType, defineComponent} from 'vue';
import {type PropType, defineComponent} from 'vue';
import {type MyPaNavbarConfigArray} from '@mptheme/config.types';
import AutoLink from '../global/AutoLink.vue';
import {MyPaNavbarConfigArray} from '@mptheme/config.types';

export default defineComponent({
name: 'LinkTree',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
</template>

<script lang="ts">
import Icon from '@mptheme/client/components/common/icon/Icon.vue';
import {defineComponent} from 'vue';
import Icon from '@mptheme/client/components/common/icon/Icon.vue';

export default defineComponent({
name: 'ToggleChevron',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
</template>

<script lang="ts">
import {PropType, computed, defineComponent} from 'vue';
import Icon from '@mptheme/client/components/common/icon/Icon.vue';
import {MyPaNavLink} from '@mptheme/config.types';
import {type PropType, computed, defineComponent} from 'vue';
import {type MyPaNavLink} from '@mptheme/config.types';
import {buttonVariant} from '@mptheme/client/services/tailwind/variants/buttonVariant';
import {useTailwindVariant} from '@mptheme/client/composables/useTailwindVariant';
import Icon from '@mptheme/client/components/common/icon/Icon.vue';

const {createVariantProp, getVariantClasses} = useTailwindVariant(buttonVariant);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import MPButton from './MPButton.vue';
import {shallowMount} from '@vue/test-utils';
import {vTest} from '@mptheme/client/services/directives/vTest';
import MPButton from './MPButton.vue';

const config = {
global: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {VueWrapper, shallowMount} from '@vue/test-utils';
import {type VueWrapper, shallowMount} from '@vue/test-utils';
import Icon from './Icon.vue';

let wrapper: VueWrapper;
Expand Down
6 changes: 3 additions & 3 deletions src/.vuepress/theme/client/components/global/ApiLink.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
</template>

<script lang="ts">
import {ComputedRef, computed, defineComponent} from 'vue';
import AutoLink from '@mptheme/client/components/global/AutoLink.vue';
import {MyPaNavbarItem} from '@mptheme/config.types';
import {useRouter} from 'vue-router';
import {type ComputedRef, computed, defineComponent} from 'vue';
import {type MyPaNavbarItem} from '@mptheme/config.types';
import AutoLink from '@mptheme/client/components/global/AutoLink.vue';

export default defineComponent({
name: 'ApiLink',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {VNode, defineComponent, h, onBeforeUpdate, ref} from 'vue';
import {type VNode, defineComponent, h, onBeforeUpdate, ref} from 'vue';

// eslint-disable-next-line @typescript-eslint/naming-convention
const CodeGroup = defineComponent({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
</template>

<script setup lang="ts">
import CodeBlock from './CodeBlock.vue';
import {computed} from 'vue';
import {useVModel} from '@vueuse/core';
import CodeBlock from './CodeBlock.vue';

const props = defineProps<{
items: {
Expand Down
4 changes: 2 additions & 2 deletions src/.vuepress/theme/client/components/global/CodeLink.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
</template>

<script setup lang="ts">
import AutoLink from './AutoLink.vue';
import {MyPaNavLink} from '../../../config.types';
import {computed} from 'vue';
import {type MyPaNavLink} from '../../../config.types';
import AutoLink from './AutoLink.vue';

const props = defineProps<{
to: string;
Expand Down
24 changes: 12 additions & 12 deletions src/.vuepress/theme/client/components/global/ContactForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
:label="translate('contactForm.email')" />

<FormInput
id="phone"
v-model.trim="refs.phone"
type="phone"
optional
:label="translate('contactForm.phone')" />
id="phone"
v-model.trim="refs.phone"
type="phone"
optional
:label="translate('contactForm.phone')" />

<FormSelect
id="subject"
Expand Down Expand Up @@ -57,16 +57,16 @@

<script lang="ts">
import {defineComponent, ref} from 'vue';
import FormField from '@mptheme/client/components/global/FormField.vue';
import FormInput from '@mptheme/client/components/global/FormInput.vue';
import FormSelect from '@mptheme/client/components/global/FormSelect.vue';
import {type MessageItem} from '@mptheme/client/services/tailwind/variants/messageTextVariant';
import {useContactForm} from '@mptheme/client/composables/useContactForm';
import {useTranslate} from '@mptheme/client/composables';
import Message from '@mptheme/client/components/global/Message.vue';
import FormTextArea from '@mptheme/client/components/global/FormTextArea.vue';
import FormSelect from '@mptheme/client/components/global/FormSelect.vue';
import FormInput from '@mptheme/client/components/global/FormInput.vue';
import FormField from '@mptheme/client/components/global/FormField.vue';
import MPButton from '@mptheme/client/components/common/button/MPButton.vue';
import Message from '@mptheme/client/components/global/Message.vue';
import {MessageItem} from '@mptheme/client/services/tailwind/variants/messageTextVariant';
import ReCaptcha from '@mptheme/client/components/common/ReCaptcha.vue';
import {useContactForm} from '@mptheme/client/composables/useContactForm';
import {useTranslate} from '@mptheme/client/composables';

export default defineComponent({
name: 'ContactForm',
Expand Down
4 changes: 2 additions & 2 deletions src/.vuepress/theme/client/components/global/Cta.vue
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@
</template>

<script lang="ts">
import {defineComponent} from 'vue';
import MPImg from '@mptheme/client/components/global/MPImg.vue';
import Icon from '@mptheme/client/components/common/icon/Icon.vue';
import MPButton from '@mptheme/client/components/common/button/MPButton.vue';
import MPImg from '@mptheme/client/components/global/MPImg.vue';
import {defineComponent} from 'vue';

export default defineComponent({
name: 'Cta',
Expand Down
Loading
Loading