Skip to content

Commit c5723f9

Browse files
committed
refactor: imports
1 parent e9a90b6 commit c5723f9

40 files changed

+42
-45
lines changed

scripts/post-build.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,7 @@ function fixImportPaths(dir) {
4848
let content = readFileSync(fullPath, 'utf8')
4949
let modified = false
5050

51-
// Fix #nuxt-users/types alias imports to nuxt-users/utils
52-
const aliasImportRegex = /from\s+["']#nuxt-users\/types["']/g
53-
if (aliasImportRegex.test(content)) {
54-
content = content.replace(aliasImportRegex, 'from "nuxt-users/utils"')
55-
modified = true
56-
}
51+
// Note: #nuxt-users/types imports are now handled by TypeScript module resolution
5752

5853
// Fix relative imports to utils (../../../utils -> ../../../utils.js)
5954
const utilsImportRegex = /from\s+["'](\.\.[/\\]){2,}utils["']/g

src/cli/project-info.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { defineCommand } from 'citty'
22
import { loadNuxt } from '@nuxt/kit'
3-
import type { ModuleOptions } from '#nuxt-users/types'
3+
import type { ModuleOptions } from 'nuxt-users/utils'
44

55
export default defineCommand({
66
meta: {

src/cli/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { defaultOptions } from '../module'
2-
import type { DatabaseConfig, DatabaseType, ModuleOptions } from '#nuxt-users/types'
2+
import type { DatabaseConfig, DatabaseType, ModuleOptions } from 'nuxt-users/utils'
33
import { loadNuxt } from '@nuxt/kit'
44
import { defu } from 'defu'
55

src/module.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,6 @@ export default defineNuxtModule<RuntimeModuleOptions>({
269269
filePath: resolver.resolve('./runtime/components/NUsersUserForm.vue')
270270
})
271271

272-
// TODOAdd global CSS with color variables
273272
nuxt.options.css = nuxt.options.css || []
274273
nuxt.options.css.push(resolver.resolve('./runtime/assets/nuxt-users.css'))
275274
},

src/runtime/components/NUsersList.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script setup lang="ts">
22
import { ref, onMounted } from 'vue'
33
import { useRuntimeConfig } from '#imports'
4-
import { defaultDisplayFields, defaultFieldLabels, type DisplayFieldsProps, type User } from '#nuxt-users/types'
4+
import { defaultDisplayFields, defaultFieldLabels, type DisplayFieldsProps, type User } from 'nuxt-users/utils'
55
66
interface Pagination {
77
page: number

src/runtime/components/NUsersLoginForm.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script setup lang="ts">
22
import { ref, computed } from 'vue'
33
import { navigateTo } from '#app'
4-
import type { LoginFormData, LoginFormProps, UserWithoutPassword, ModuleOptions } from '#nuxt-users/types'
4+
import type { LoginFormData, LoginFormProps, UserWithoutPassword, ModuleOptions } from 'nuxt-users/utils'
55
import { useRuntimeConfig } from '#imports'
66
77
const { public: { nuxtUsers } } = useRuntimeConfig()

src/runtime/components/NUsersPasswordStrengthIndicator.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import { computed } from 'vue'
33
import type { PasswordValidationResult } from '../../utils'
44
import { useRuntimeConfig } from '#imports'
5-
import type { ModuleOptions } from '#nuxt-users/types'
5+
import type { ModuleOptions } from 'nuxt-users/utils'
66
77
interface Props {
88
password: string

src/runtime/components/NUsersUserCard.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import { computed } from 'vue'
33
import { useAuthentication } from '../composables/useAuthentication'
44
import { useRuntimeConfig } from '#imports'
5-
import { defaultDisplayFields, defaultFieldLabels, type DisplayFieldsProps, type User } from '#nuxt-users/types'
5+
import { defaultDisplayFields, defaultFieldLabels, type DisplayFieldsProps, type User } from 'nuxt-users/utils'
66
77
interface Props extends DisplayFieldsProps {
88
user: User

src/runtime/components/NUsersUserForm.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script setup lang="ts">
22
import { ref, computed, watch } from 'vue'
3-
import type { RuntimeModuleOptions, User } from '#nuxt-users/types'
3+
import type { RuntimeModuleOptions, User } from 'nuxt-users/utils'
44
import { usePasswordValidation } from '../composables/usePasswordValidation'
55
import { useRuntimeConfig } from '#imports'
66

src/runtime/composables/useAuthentication.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useState, useRuntimeConfig } from '#app'
22
import { computed, readonly } from 'vue'
3-
import type { User, UserWithoutPassword } from '#nuxt-users/types'
3+
import type { User, UserWithoutPassword } from 'nuxt-users/utils'
44

55
export const useAuthentication = () => {
66
const user = useState<UserWithoutPassword | null>('user', () => null)

0 commit comments

Comments
 (0)