Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
/nuxtPublic

Commitf171385

Browse files
committed
refactor(kit,nitro,nuxt,schema): reduce barrels + move<> toas
1 parent80778c0 commitf171385

File tree

12 files changed

+19
-18
lines changed

12 files changed

+19
-18
lines changed

‎packages/kit/src/module/define.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ function _defineNuxtModule<
6363
constoptionsDefaults:TOptionsDefaults=
6464
module.defaultsinstanceofFunction
6565
?awaitmodule.defaults(nuxt)
66-
:module.defaults??<TOptionsDefaults>{}
66+
:module.defaults??{}asTOptionsDefaults
6767

6868
letoptions=defu(inlineOptions,nuxtConfigOptions,optionsDefaults)
6969

@@ -138,11 +138,11 @@ function _defineNuxtModule<
138138
if(res===false){returnfalse}
139139

140140
// Return module install result
141-
returndefu(res,<ModuleSetupInstallResult>{
141+
returndefu(res,{
142142
timings:{
143143
setup:setupTime,
144144
},
145-
})
145+
}asModuleSetupInstallResult)
146146
}
147147

148148
// Define getters for options and meta
@@ -153,5 +153,5 @@ function _defineNuxtModule<
153153
normalizedModule.onInstall=module.onInstall
154154
normalizedModule.onUpgrade=module.onUpgrade
155155

156-
return<NuxtModule<TOptions,TOptionsDefaults,TWith>>normalizedModule
156+
returnnormalizedModuleasNuxtModule<TOptions,TOptionsDefaults,TWith>
157157
}

‎packages/kit/test/load-nuxt.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { afterAll, beforeAll, describe, expect, it } from 'vitest'
33
import{join}from'pathe'
44
import{x}from'tinyexec'
55

6-
import{loadNuxt}from'../src/index.ts'
6+
import{loadNuxt}from'../src/loader/nuxt.ts'
77
import{findWorkspaceDir}from'pkg-types'
88

99
constrepoRoot=awaitfindWorkspaceDir()

‎packages/nitro-server/src/index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { ImpoundPlugin } from 'impound'
2020
import{resolveModulePath}from'exsolve'
2121
import'./augments.ts'
2222

23-
import{versionasnitroBuilderVersion}from'../package.json'
23+
importnitroBuilderfrom'../package.json'with{type:'json'}
2424
import{distDir,toArray}from'./utils.ts'
2525
import{templateasdefaultSpaLoadingTemplate}from'../../ui-templates/dist/templates/spa-loading-icon.ts'
2626
// TODO: figure out a good way to share this
@@ -142,7 +142,7 @@ export async function bundle (nuxt: Nuxt & { _nitro?: Nitro }): Promise<void> {
142142
},
143143
framework:{
144144
name:'nuxt',
145-
version:nuxtVersion||nitroBuilderVersion,
145+
version:nuxtVersion||nitroBuilder.version,
146146
},
147147
imports:{
148148
autoImport:nuxt.options.imports.autoImportasboolean,

‎packages/nuxt/src/app/components/nuxt-link.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { cancelIdleCallback, requestIdleCallback } from '../compat/idle-callback
2323
//@ts-expect-error virtual file
2424
import{nuxtLinkDefaults}from'#build/nuxt.config.mjs'
2525

26-
import{hashMode}from'#build/router.options'
26+
import{hashMode}from'#build/router.options.mjs'
2727

2828
constfirstNonUndefined=<T>(...args:(T|undefined)[])=>args.find(arg=>arg!==undefined)
2929

‎packages/nuxt/src/core/nuxt.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import componentsModule from '../components/module.ts'
3232
importimportsModulefrom'../imports/module.ts'
3333

3434
import{distDir,pkgDir}from'../dirs.ts'
35-
import{version}from'../../package.json'
35+
importpkgfrom'../../package.json'with{type:'json'}
3636
import{scriptsStubsPreset}from'../imports/presets.ts'
3737
import{logger}from'../utils.ts'
3838
import{resolveTypePath}from'./utils/types.ts'
@@ -64,7 +64,7 @@ export function createNuxt (options: NuxtOptions): Nuxt {
6464

6565
constnuxt:Nuxt={
6666
__name:randomUUID(),
67-
_version:version,
67+
_version:pkg.version,
6868
_asyncLocalStorageModule:options.experimental.debugModuleMutation ?newAsyncLocalStorage() :undefined,
6969
hooks,
7070
callHook:hooks.callHook,

‎packages/nuxt/src/core/plugins/plugin-metadata.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import type { Nuxt } from '@nuxt/schema'
55
import{createUnplugin}from'unplugin'
66
importMagicStringfrom'magic-string'
77
import{normalize}from'pathe'
8-
importtype{ObjectPlugin,PluginMeta}from'nuxt/app'
8+
importtype{NuxtAppLiterals,ObjectPlugin,PluginMeta}from'nuxt/app'
99

1010
import{parseAndWalk}from'oxc-walker'
1111
importtype{IdentifierName,ObjectPropertyKind}from'oxc-parser'
@@ -107,7 +107,7 @@ function extractMetaFromObject (properties: Array<ObjectPropertyKind>) {
107107
if(property.value.elements.some(e=>!e||e.type!=='Literal'||typeofe.value!=='string')){
108108
thrownewError('dependsOn must take an array of string literals')
109109
}
110-
meta[propertyKey]=property.value.elements.map(e=>(easLiteral)!.valueasstring)
110+
meta[propertyKey]=property.value.elements.map(e=>(easLiteral)!.valueasNuxtAppLiterals['pluginName'])
111111
}
112112
}
113113
returnmeta

‎packages/nuxt/src/pages/build.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
declare module'#build/router.options'{
1+
declare module'#build/router.options.mjs'{
22
importtype{RouterOptions}from'@nuxt/schema'
33

44
exportconsthashMode:boolean

‎packages/nuxt/src/pages/runtime/plugins/prerender.server.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { defu } from 'defu'
66
import{defineNuxtPlugin,useRuntimeConfig}from'#app/nuxt'
77
import{prerenderRoutes}from'#app/composables/ssr'
88
import_routesfrom'#build/routes'
9-
importrouterOptions,{hashMode}from'#build/router.options'
9+
importrouterOptions,{hashMode}from'#build/router.options.mjs'
1010
//@ts-expect-error virtual file
1111
import{crawlLinks}from'#build/nuxt.config.mjs'
1212

‎packages/nuxt/src/pages/runtime/plugins/router.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { navigateTo } from '#app/composables/router'
1717
//@ts-expect-error virtual file
1818
import{appManifestasisAppManifestEnabled}from'#build/nuxt.config.mjs'
1919
import_routes,{handleHotUpdate}from'#build/routes'
20-
importrouterOptions,{hashMode}from'#build/router.options'
20+
importrouterOptions,{hashMode}from'#build/router.options.mjs'
2121
//@ts-expect-error virtual file
2222
import{globalMiddleware,namedMiddleware}from'#build/middleware'
2323

‎packages/schema/src/types/hooks.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import type { Nitro, NitroConfig, NitroRouteConfig } from 'nitropack/types'
1010
importtype{Schema,SchemaDefinition}from'untyped'
1111
importtype{RouteLocationRaw,RouteRecordRaw}from'vue-router'
1212
importtype{RawVueCompilerOptions}from'@vue/language-core'
13-
importtype{NuxtCompatibility,NuxtCompatibilityIssues,ViteConfig}from'..'
13+
importtype{ViteConfig}from'./config.ts'
14+
importtype{NuxtCompatibility,NuxtCompatibilityIssues}from'./compatibility.ts'
1415
importtype{Component,ComponentsOptions}from'./components.ts'
1516
importtype{Nuxt,NuxtApp,ResolvedNuxtTemplate}from'./nuxt.ts'
1617

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp