Merge pull request #6212 from mcdmaster/fix/ts424

Fix/ts424

components/AppLink.vue

@@ -19,7 +19,7 @@
 import { mdiOpenInNew } from '@mdi/js'
 import Vue from 'vue'
 
-import { isExternal } from '@/utils/urls.ts'
+import { isExternal } from '@/utils/urls'
 
 type InternalAttr = {
   to: String

components/CardsTab.vue

@@ -22,7 +22,7 @@
 import { mdiChartTimelineVariant } from '@mdi/js'
 import Vue from 'vue'
 
-import { EventBus, TOGGLE_EVENT } from '@/utils/tab-event-bus.ts'
+import { EventBus, TOGGLE_EVENT } from '@/utils/tab-event-bus'
 
 const CardsMonitoring = () => import('@/components/CardsMonitoring.vue')
 const CardsReference = () => import('@/components/CardsReference.vue')

components/ScrollableChart.vue

@@ -14,7 +14,7 @@ import Vue, { PropType } from 'vue'
 import { ThisTypedComponentOptionsWithRecordProps } from 'vue/types/options'
 
 import { DisplayData } from '@/plugins/vue-chart'
-import { EventBus, TOGGLE_EVENT } from '@/utils/tab-event-bus.ts'
+import { EventBus, TOGGLE_EVENT } from '@/utils/tab-event-bus'
 
 type Data = {
   chartWidth: number

nuxt-i18n.config.ts

@@ -1,4 +1,5 @@
-import type { NuxtVueI18n } from 'nuxt-i18n'
+import { NuxtConfig } from '@nuxt/types'
+import { NuxtVueI18n } from 'nuxt-i18n/types'
 
 const dateTimeFormatsCommon = {
   dateTime: {
@@ -29,21 +30,24 @@ const dateTimeFormatsCommon = {
   },
 }
 
-const options: NuxtVueI18n.Options.AllOptionsInterface = {
+const options: NuxtConfig = {
   strategy: 'prefix_except_default',
   detectBrowserLanguage: false,
   defaultLocale: 'ja',
+
   vueI18n: {
     fallbackLocale: 'ja',
+    formatFallbackMessages: true,
     dateTimeFormats: {
-      ja: dateTimeFormatsCommon,
-      en: dateTimeFormatsCommon,
-      'zh-cn': dateTimeFormatsCommon,
-      'zh-tw': dateTimeFormatsCommon,
-      ko: dateTimeFormatsCommon,
-      'ja-basic': dateTimeFormatsCommon,
+      ...[
+        { ja: dateTimeFormatsCommon },
+        { en: dateTimeFormatsCommon },
+        { 'zh-cn': dateTimeFormatsCommon },
+        { 'zh-tw': dateTimeFormatsCommon },
+        { ko: dateTimeFormatsCommon },
+        { 'ja-basic': dateTimeFormatsCommon },
+      ],
     },
-    formatFallbackMessages: true,
   },
   // vueI18nLoader: true,
   lazy: true,
@@ -104,4 +108,4 @@ const options: NuxtVueI18n.Options.AllOptionsInterface = {
   seo: false,
 }
 
-export default options
+export default options as NuxtVueI18n.Options.AllOptionsInterface

package.json

@@ -85,7 +85,7 @@
     "stylelint-scss": "3.19.0",
     "ts-loader": "8.1.0",
     "ts-node": "9.1.1",
-    "typescript": "4.1.5",
+    "typescript": "4.2.4",
     "vue-axe": "2.4.4",
     "vue-template-compiler": "2.6.12"
   }