refactor: update imports

ivodolenc · ivodolenc · commit 07e6512bbd88 · 2023-11-27T21:38:37.000+01:00
diff --git a/src/meta.ts b/src/meta.ts
diff --git a/src/module.ts b/src/module.ts
@@ -1,7 +1,7 @@
 import { defineNuxtModule, createResolver, addImports } from '@nuxt/kit'
-import { generateStyles, parseFormat } from './utils'
-import { name, version, configKey, compatibility } from './meta'
-import type { ModuleOptions } from './types/module'
+import { generateStyles, parseFormat } from './utils/index.js'
+import { name, version, configKey, compatibility } from './meta.js'
+import type { ModuleOptions } from './types/module.js'
 
 export default defineNuxtModule<ModuleOptions>({
   meta: {
diff --git a/src/runtime/composables/index.ts b/src/runtime/composables/index.ts
@@ -1,2 +1,2 @@
-export * from './use-external-font'
-export * from './use-local-font'
+export * from './use-external-font.js'
+export * from './use-local-font.js'
diff --git a/src/runtime/composables/use-external-font.ts b/src/runtime/composables/use-external-font.ts
@@ -1,6 +1,6 @@
 import { useHead } from '#imports'
-import { generateStyles } from '../../utils'
-import type { ExternalOptions } from '../../types/options'
+import { generateStyles } from '../../utils/index.js'
+import type { ExternalOptions } from '../../types/options/index.js'
 
 export const useExternalFont = (external: ExternalOptions[]) => {
   const { classes, root } = generateStyles(external)
diff --git a/src/runtime/composables/use-local-font.ts b/src/runtime/composables/use-local-font.ts
@@ -1,6 +1,6 @@
 import { useHead } from '#imports'
-import { generateStyles, parseFormat } from '../../utils'
-import type { LocalOptions } from '../../types/options'
+import { generateStyles, parseFormat } from '../../utils/index.js'
+import type { LocalOptions } from '../../types/options/index.js'
 
 export const useLocalFont = (local: LocalOptions[]) => {
   const { fontFace, classes, root } = generateStyles(local)
diff --git a/src/types/module.ts b/src/types/module.ts
@@ -1,5 +1,5 @@
 import type { NuxtModule } from '@nuxt/schema'
-import type { LocalOptions, ExternalOptions } from './options'
+import type { LocalOptions, ExternalOptions } from './options/index.js'
 
 export interface ModuleOptions {
   /**
diff --git a/src/types/options/index.ts b/src/types/options/index.ts
@@ -1,2 +1,2 @@
-export * from './external'
-export * from './local'
+export * from './external.js'
+export * from './local.js'
diff --git a/src/types/runtime/composables/index.ts b/src/types/runtime/composables/index.ts
@@ -1,2 +1,2 @@
-export * from './use-external-font'
-export * from './use-local-font'
+export * from './use-external-font.js'
+export * from './use-local-font.js'
diff --git a/src/types/runtime/composables/use-external-font.ts b/src/types/runtime/composables/use-external-font.ts
@@ -1,4 +1,4 @@
-import type { ExternalOptions } from '../../options'
+import type { ExternalOptions } from '../../options/index.js'
 
 /**
  * Loads fonts directly from third-party servers.
diff --git a/src/types/runtime/composables/use-local-font.ts b/src/types/runtime/composables/use-local-font.ts
@@ -1,4 +1,4 @@
-import type { LocalOptions } from '../../options'
+import type { LocalOptions } from '../../options/index.js'
 
 /**
  * Loads fonts from the same domain as your deployment.
diff --git a/src/utils/generate-styles.ts b/src/utils/generate-styles.ts
@@ -1,5 +1,5 @@
-import { parseFormat } from './parse-format'
-import type { LocalOptions, ExternalOptions } from '../types/options'
+import { parseFormat } from './parse-format.js'
+import type { LocalOptions, ExternalOptions } from '../types/options/index.js'
 
 /**
  * Generates head styles from options entered by the user.
diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -1,2 +1,2 @@
-export * from './generate-styles'
-export * from './parse-format'
+export * from './generate-styles.js'
+export * from './parse-format.js'
diff --git a/src/utils/templates.js b/src/utils/templates.js
diff --git a/src/utils/templates.ts b/src/utils/templates.ts
@@ -0,0 +1,54 @@
+import { name, description, version, homepage } from '../../package.json'
+import { configKey, compatibility } from '../meta.js'
+
+/**
+ * Generates `module.json` meta template.
+ */
+export function nuxtMetaTemplate() {
+  const metaContent = JSON.stringify(
+    {
+      name,
+      version,
+      configKey,
+      compatibility,
+    },
+    null,
+    2,
+  )
+
+  return metaContent
+}
+
+/**
+ * Generates `shims` for `nuxt.config` auto-completion.
+ */
+export function nuxtTypesTemplate() {
+  const comment = `/**
+     * Nuxt Font Loader
+     *
+     * ${description}
+     *
+     * @see [Repository](${homepage})
+     */`
+
+  const typesContent = `import { ModuleOptions } from './module'
+
+declare module '@nuxt/schema' {
+  interface NuxtConfig {
+    ${comment}
+    ['${configKey}']?: Partial<ModuleOptions>
+  }
+  interface NuxtOptions {
+    ${comment}
+    ['${configKey}']?: ModuleOptions
+  }
+}
+declare module 'nuxt/schema' {
+  interface NuxtConfig { ['${configKey}']?: Partial<ModuleOptions> }
+  interface NuxtOptions { ['${configKey}']?: ModuleOptions }
+}
+
+export { ModuleOptions, default } from './module'`
+
+  return typesContent
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { ExternalOptions } from '../../options'`
	`1`	`+import type { ExternalOptions } from '../../options/index.js'`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* Loads fonts directly from third-party servers.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { LocalOptions } from '../../options'`
	`1`	`+import type { LocalOptions } from '../../options/index.js'`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* Loads fonts from the same domain as your deployment.`