chore(deps): update all dependencies (#84)

myparcelnl · Oct 11, 2023 · c55e5a9 · c55e5a9
1 parent d006b4e
commit c55e5a9
Show file tree

Hide file tree

Showing 78 changed files with 4,170 additions and 3,066 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -6,21 +6,21 @@ module.exports = {
   overrides: [
     {
       files: ['./**/*.vue'],
-      extends: '@myparcel-eslint/eslint-config-prettier-typescript-vue',
+      extends: ['@myparcel-eslint/eslint-config-prettier-typescript-vue', '@myparcel-eslint/eslint-config-import'],
       rules: {
         '@typescript-eslint/no-misused-promises': 'off',
         'vue/no-bare-strings-in-template': 'off',
         'vue/no-undef-components': [
           'error',
           {
-            ignorePatterns: ['NavbarSearch'],
+            ignorePatterns: ['Content', 'ExternalLinkIcon', 'Layout', 'NavbarSearch', 'RouterLink', 'RouterView'],
           },
         ],
       },
     },
     {
       files: ['./**/*.ts', './**/*.tsx'],
-      extends: '@myparcel-eslint/eslint-config-prettier-typescript',
+      extends: ['@myparcel-eslint/eslint-config-prettier-typescript', '@myparcel-eslint/eslint-config-import'],
       rules: {
         '@typescript-eslint/explicit-function-return-type': 'off',
         '@typescript-eslint/no-misused-promises': 'off',
@@ -36,6 +36,7 @@ module.exports = {
         '@myparcel-eslint/eslint-config-node',
         '@myparcel-eslint/eslint-config-esnext',
         '@myparcel-eslint/eslint-config-prettier',
+        '@myparcel-eslint/eslint-config-import',
       ],
     },
     {

diff --git a/package.json b/package.json
@@ -7,6 +7,7 @@
   "bugs": {
     "url": "https://github.com/myparcelnl/developer/issues"
   },
+  "type": "module",
   "repository": "github:myparcelnl/developer",
   "license": "MIT",
   "author": "Edie Lemoine <[email protected]>",
@@ -16,13 +17,11 @@
     "postinstall": "yarn translations:init && (is-ci || husky install)",
     "optimize:svg": "svgo -r --multipass --final-newline --folder src/.vuepress/public",
     "preview": "http-server src/.vuepress/dist -s --port 9599",
-    "test": "concurrently yarn:test:node yarn:test:vue yarn:test:links",
-    "test:dev:node": "vitest --config vitest-node.config.ts",
-    "test:dev:vue": "vitest --config vitest-vue.config.ts",
+    "test": "concurrently test:vitest:run yarn:test:links",
+    "test:vitest": "vitest",
+    "test:vitest:run": "vitest run",
     "test:links": "WAIT_ON_TIMEOUT=30000 start-server-and-test preview http://127.0.0.1:9599 test:links:run",
     "test:links:run": "hyperlink -ir --root src/.vuepress/dist http://127.0.0.1:9599",
-    "test:node": "vitest run --config vitest-node.config.ts",
-    "test:vue": "vitest run --config vitest-vue.config.ts",
     "translations:import": "echo 'Importing translations...' && google-docs-importer -d 1q_las2AW8vZqhyiymXnPtrCsNQsye9W0Aqi3aWymjuU -o src/.vuepress/public/translations && echo 'Done!'",
     "translations:init": "test -f src/.vuepress/public/translations/en.json || yarn translations:import",
     "watch": "nodemon --ext ts,vue,md --watch src --exec 'vuepress build src --debug'"
@@ -36,60 +35,65 @@
   },
   "prettier": "@myparcel/prettier-config",
   "resolutions": {
-    "vite": "^2"
+    "vite": "^4.0.0"
   },
   "dependencies": {
     "@vue/runtime-core": "^3.2.37",
-    "@vuepress/plugin-docsearch": "2.0.0-beta.49",
-    "@vuepress/plugin-google-analytics": "^2.0.0-beta.49",
-    "@vuepress/plugin-register-components": "2.0.0-beta.49",
-    "@vueuse/core": "^8.9.4",
+    "@vuepress/plugin-docsearch": "2.0.0-beta.67",
+    "@vuepress/plugin-google-analytics": "2.0.0-beta.67",
+    "@vuepress/plugin-register-components": "2.0.0-beta.67",
+    "@vueuse/core": "^10.5.0",
     "lodash": "^4.17.21",
     "lodash-es": "^4.17.21",
     "tailwindcss": "^3.1.6",
     "vue-recaptcha": "^2.0.2",
-    "vuepress": "2.0.0-beta.49"
+    "vuepress": "2.0.0-beta.67"
   },
   "devDependencies": {
     "@edielemoine/google-docs-importer": "^1.0.2",
     "@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/sdk": "^2.10.1",
-    "@tsconfig/node16": "^1.0.3",
+    "@tsconfig/node18": "^18.2.2",
     "@types/flat": "^5.0.2",
     "@types/lodash-es": "^4.17.6",
     "@types/mock-fs": "^4.13.1",
-    "@vitejs/plugin-vue": "^2.3.3",
+    "@vitejs/plugin-vue": "^4.4.0",
     "@vue/test-utils": "^2.0.2",
     "autoprefixer": "^10.4.8",
-    "concurrently": "^7.3.0",
-    "cssnano": "^5.1.12",
-    "dayjs": "^1.11.4",
+    "concurrently": "^8.2.1",
+    "cssnano": "^6.0.1",
+    "dayjs": "^2.0.0-alpha.4",
     "eslint": "^8.40.0",
-    "flat": "^5.0.2",
+    "flat": "^6.0.1",
     "gray-matter": ">= 4.0",
-    "happy-dom": "^6.0.4",
+    "happy-dom": "^12.6.0",
     "http-server": "^14.1.1",
     "husky": "^8.0.3",
     "hyperlink": "^5.0.4",
     "is-ci": "^3.0.1",
-    "lint-staged": "^13.1.2",
+    "lint-staged": "^14.0.1",
     "lodash-unified": "^1.0.2",
     "markdown-it-multimd-table": "^4.1.3",
     "mock-fs": "^5.1.2",
     "only-allow": "^1.1.1",
-    "plop": "^3.1.1",
+    "plop": "^4.0.0",
+    "postcss-import": "^15.1.0",
     "prettier": "^2.8.8",
     "rollup-plugin-visualizer": "^5.7.1",
-    "start-server-and-test": "^1.14.0",
-    "svgo": "^2.8.0",
+    "start-server-and-test": "^2.0.1",
+    "svgo": "^3.0.2",
     "ts-node": "^10.9.1",
-    "typescript": "^4.7.4",
-    "vite-svg-loader": "3.4.0",
-    "vitest": "^0.18.1"
+    "typescript": "^5.2.2",
+    "vite-svg-loader": "^4.0.0",
+    "vitest": "^0.34.6"
   },
-  "packageManager": "[email protected]"
+  "packageManager": "[email protected]",
+  "volta": {
+    "node": "18.18.0"
+  }
 }
diff --git a/postcss.config.js b/postcss.config.js
@@ -0,0 +1,8 @@
+export default {
+  plugins: {
+    'postcss-import': {},
+    tailwindcss: {},
+    autoprefixer: {},
+    cssnano: {},
+  },
+};
diff --git a/private/importTranslations.mjs b/private/importTranslations.mjs
@@ -1,6 +1,5 @@
 import {fileURLToPath} from 'url';
-import fs from 'node:fs';
-import path from 'node:path';
+import {fs, path} from '@vuepress/utils';
 
 // eslint-disable-next-line no-underscore-dangle
 const __dirname = fileURLToPath(path.dirname(import.meta.url));

diff --git a/src/.vuepress/config.ts b/src/.vuepress/config.ts
@@ -1,14 +1,14 @@
-import {DIR_CONFIG, DIR_VUEPRESS} from './dirs';
 import {defineUserConfig, viteBundler} from 'vuepress';
+import {path} from '@vuepress/utils';
 import {docsearchPlugin} from '@vuepress/plugin-docsearch';
-import {googleTagManagerPlugin} from './plugins/gtm/node';
-import {head} from './config/head';
-import {myParcelTheme} from './theme';
-import {parseTranslationsPlugin} from './plugins/parseTranslations';
-import path from 'path';
-import {sitemapPlugin} from './plugins/sitemap';
 import {slugify} from '@mdit-vue/shared';
 import {viteConfig} from './viteConfig';
+import {myParcelTheme} from './theme';
+import {sitemapPlugin} from './plugins/sitemap';
+import {parseTranslationsPlugin} from './plugins/parseTranslations';
+import {googleTagManagerPlugin} from './plugins/gtm/node';
+import {DIR_CONFIG, DIR_VUEPRESS} from './dirs';
+import {head} from './config/head';
 
 const DEV_SERVER_PORT = 8955;
 

diff --git a/src/.vuepress/dirs.ts b/src/.vuepress/dirs.ts
@@ -1,6 +1,6 @@
 // noinspection UnnecessaryLocalVariableJS
 
-import path from 'path';
+import {path} from '@vuepress/utils';
 
 export const DIR_VUEPRESS = __dirname;
 

diff --git a/src/.vuepress/plugins/sitemap.ts b/src/.vuepress/plugins/sitemap.ts
@@ -1,10 +1,8 @@
-import {GitPluginPageData} from '@vuepress/plugin-git';
-import {Plugin} from 'vuepress';
+import {type Plugin} from 'vuepress';
 import dayjs from 'dayjs';
-import fs from 'fs';
+import {fs, logger, path} from '@vuepress/utils';
+import {type GitPluginPageData} from '@vuepress/plugin-git';
 import {isOfType} from '../theme/shared/utils';
-import {logger} from '@vuepress/utils';
-import path from 'path';
 
 interface SitemapPluginConfig {
   baseUrl: string;

diff --git a/src/.vuepress/theme/client/clientConfig.ts b/src/.vuepress/theme/client/clientConfig.ts
@@ -1,10 +1,17 @@
 import './styles/index.scss';
-import {defineClientConfig} from '@vuepress/client';
 import {h} from 'vue';
-import {setupSidebarItems} from '@mptheme/client/composables';
+import {defineClientConfig} from '@vuepress/client';
 import {vTest} from '@mptheme/client/services/directives/vTest';
+import {setupSidebarItems} from '@mptheme/client/composables';
+import NotFound from './views/not-found/NotFoundPage.vue';
+import Layout from './views/layout/layout/Layout.vue';
 
 export default defineClientConfig({
+  layouts: {
+    Layout,
+    NotFound,
+  },
+
   enhance(context) {
     const {app, router} = context;
 

diff --git a/src/.vuepress/theme/client/components/common/index.ts b/src/.vuepress/theme/client/components/common/index.ts
@@ -0,0 +1,11 @@
+export {default as Icon} from './icon/Icon.vue';
+
+export {default as LinkTree} from './LinkTree.vue';
+
+export {default as MPButtonGroup} from './MPButtonGroup.vue';
+
+export {default as MPButton} from './button/MPButton.vue';
+
+export {default as ReCaptcha} from './ReCaptcha.vue';
+
+export {default as ToggleChevron} from './ToggleChevron.vue';
diff --git a/src/.vuepress/theme/client/components/global/AutoLink.vue b/src/.vuepress/theme/client/components/global/AutoLink.vue
@@ -27,13 +27,14 @@
 </template>
 
 <script lang="ts">
-import {MyPaNavLink, MyPaSidebarItem} from '@mptheme/config.types';
-import {PropType, computed, defineComponent, toRefs} from 'vue';
-import {NavLink} from '@vuepress/theme-default/lib/shared/nav';
-import {isOfType} from '../../../shared/utils';
-import {useLink} from '@mptheme/client/composables/useLink';
 import {useRouter} from 'vue-router';
+import {computed, defineComponent, type PropType, toRefs} from 'vue';
+import {get} from '@vueuse/core';
+import {type NavLink} from '@vuepress/theme-default/lib/shared/nav';
 import {useSiteData} from '@vuepress/client';
+import {type MyPaNavLink, type MyPaSidebarItem} from '@mptheme/config.types';
+import {useLink} from '@mptheme/client/composables/useLink';
+import {isOfType} from '../../../shared/utils';
 
 export default defineComponent({
   name: 'AutoLink',
@@ -75,7 +76,13 @@ export default defineComponent({
     });
 
     const isActiveInSubpath = computed(() => {
-      return !shouldBeActiveInSubpath.value || (linkItem.value.link && route.path.startsWith(linkItem.value.link));
+      const {link} = get(linkItem);
+
+      const resolvedLink: undefined | string = typeof link === 'function' ? link(route.path) : link;
+
+      return (
+        !shouldBeActiveInSubpath.value || (linkItem.value.link && resolvedLink && route.path.startsWith(resolvedLink))
+      );
     });
 
     const isActive = computed(() => {

diff --git a/src/.vuepress/theme/client/components/global/DataType.vue b/src/.vuepress/theme/client/components/global/DataType.vue
@@ -9,11 +9,16 @@
 </template>
 
 <script lang="ts">
-import {DataType, DataTypeWithId, DataTypeWithName, useDataTypes} from '@mptheme/client/composables/useDataTypes';
 import {computed, defineComponent, ref} from 'vue';
-import AutoLink from '@mptheme/client/components/global/AutoLink.vue';
-import {MyPaNavbarItem} from '@mptheme/config.types';
 import {isOfType} from '@mptheme/shared/utils';
+import {type MyPaNavbarItem} from '@mptheme/config.types';
+import {
+  type DataTypeGroup,
+  type DataTypeWithId,
+  type DataTypeWithName,
+  useDataTypes,
+} from '@mptheme/client/composables/useDataTypes';
+import AutoLink from '@mptheme/client/components/global/AutoLink.vue';
 
 export default defineComponent({
   name: 'DataType',
@@ -39,11 +44,11 @@ export default defineComponent({
     const dataTypes = useDataTypes();
     const classes = ref<string[]>([]);
 
-    const dataType = computed<DataType | null>(() => {
+    const dataType = computed<DataTypeGroup | null>(() => {
       return dataTypes.find((type) => type.name === props.type) ?? null;
     });
 
-    const childType = computed<DataType['children'][number] | null>(() => {
+    const childType = computed<DataTypeGroup['children'][number] | null>(() => {
       return (
         dataType.value?.children.find((child) => {
           if (props.id && isOfType<DataTypeWithId>(child, 'ID')) {

diff --git a/src/.vuepress/theme/client/components/global/Integration.vue b/src/.vuepress/theme/client/components/global/Integration.vue
@@ -71,12 +71,12 @@
 </template>
 
 <script lang="ts">
-import {ComputedRef, PropType, computed, defineComponent} from 'vue';
-import {Integration, useIntegrations} from '@mptheme/client/composables/useIntegrations';
+import {computed, type ComputedRef, defineComponent, type PropType} from 'vue';
+import {type IntegrationDefinition, useIntegrations} from '@mptheme/client/composables/useIntegrations';
+import {useTranslate} from '@mptheme/client/composables';
+import MPImg from '@mptheme/client/components/global/MPImg.vue';
 import AutoLink from '@mptheme/client/components/global/AutoLink.vue';
 import Icon from '@mptheme/client/components/common/icon/Icon.vue';
-import MPImg from '@mptheme/client/components/global/MPImg.vue';
-import {useTranslate} from '@mptheme/client/composables';
 
 export default defineComponent({
   name: 'Integration',
@@ -93,7 +93,7 @@ export default defineComponent({
     },
 
     integration: {
-      type: Object as PropType<Integration>,
+      type: Object as PropType<IntegrationDefinition>,
       default: null,
     },
   },
@@ -106,7 +106,7 @@ export default defineComponent({
     const translate = useTranslate();
     const integrations = useIntegrations();
 
-    const data: ComputedRef<Integration> = computed(() => {
+    const data: ComputedRef<IntegrationDefinition> = computed(() => {
       return props.integration ?? integrations.value.find(({name}) => name === props.name);
     });
 

diff --git a/src/.vuepress/theme/client/components/global/Shield.ts b/src/.vuepress/theme/client/components/global/Shield.ts
@@ -1,6 +1,6 @@
-import {FunctionalComponent, h} from 'vue';
-import AutoLink from '@mptheme/client/components/global/AutoLink.vue';
+import {type FunctionalComponent, h} from 'vue';
 import MPImg from '@mptheme/client/components/global/MPImg.vue';
+import AutoLink from '@mptheme/client/components/global/AutoLink.vue';
 
 const BASE_URL = 'https://img.shields.io/';
 
@@ -42,7 +42,7 @@ const Shield: FunctionalComponent<Props> = (props) => {
   const image = h(MPImg, {
     src: `${BASE_URL}${props.path}?${params}`,
     alt: props.alt ?? '',
-    class: 'rounded-sm overflow-hidden h-7',
+    class: 'rounded-sm overflow-hidden',
   });
 
   if (props.href) {