[autofix.ci] apply automated fixes

This commit is contained in:
autofix-ci[bot] 2025-01-09 14:46:41 +00:00 committed by GitHub
parent ef4f7f5b88
commit 0b4781e28e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 27 additions and 26 deletions

View File

@ -24,8 +24,9 @@ export function useNuxt (): Nuxt {
const fallbackInstance = fallbackNuxtCtx.tryUse() const fallbackInstance = fallbackNuxtCtx.tryUse()
if (fallbackInstance) { if (fallbackInstance) {
logger.warn('Using fallback global Nuxt instance. You may be using a @nuxt/kit composable outside of a Nuxt context, this behavior is deprecated and will be removed in v4.') logger.warn('Using fallback global Nuxt instance. You may be using a @nuxt/kit composable outside of a Nuxt context, this behavior is deprecated and will be removed in v4.')
return fallbackInstance } return fallbackInstance
}
throw new Error('Nuxt instance is unavailable!') throw new Error('Nuxt instance is unavailable!')
} }
return instance return instance
@ -45,7 +46,7 @@ export function useNuxt (): Nuxt {
*/ */
export function tryUseNuxt (): Nuxt | null { export function tryUseNuxt (): Nuxt | null {
const nuxt = nuxtCtx().tryUse() const nuxt = nuxtCtx().tryUse()
if(!nuxt) { if (!nuxt) {
logger.warn('Using fallback global Nuxt instance. You may be using a @nuxt/kit composable outside of a Nuxt context, this behavior is deprecated and will be removed in v4.') logger.warn('Using fallback global Nuxt instance. You may be using a @nuxt/kit composable outside of a Nuxt context, this behavior is deprecated and will be removed in v4.')
return fallbackNuxtCtx.tryUse() return fallbackNuxtCtx.tryUse()
} }

View File

@ -34,4 +34,4 @@ export { logger, useLogger } from './logger'
// Internal Utils // Internal Utils
export { resolveModule, tryResolveModule, importModule, tryImportModule, requireModule, tryRequireModule } from './internal/esm' export { resolveModule, tryResolveModule, importModule, tryImportModule, requireModule, tryRequireModule } from './internal/esm'
export type { ImportModuleOptions, ResolveModuleOptions } from './internal/esm' export type { ImportModuleOptions, ResolveModuleOptions } from './internal/esm'
export { asyncNameStorage } from './utils' export { asyncNameStorage } from './utils'

View File

@ -3,8 +3,8 @@ import { readPackageJSON, resolvePackageJSON } from 'pkg-types'
import type { Nuxt, NuxtConfig } from '@nuxt/schema' import type { Nuxt, NuxtConfig } from '@nuxt/schema'
import { resolve } from 'pathe' import { resolve } from 'pathe'
import { importModule, tryImportModule } from '../internal/esm' import { importModule, tryImportModule } from '../internal/esm'
import type { LoadNuxtConfigOptions } from './config'
import { asyncNameStorage } from '../utils' import { asyncNameStorage } from '../utils'
import type { LoadNuxtConfigOptions } from './config'
export interface LoadNuxtOptions extends LoadNuxtConfigOptions { export interface LoadNuxtOptions extends LoadNuxtConfigOptions {
/** Load nuxt with development mode */ /** Load nuxt with development mode */
@ -41,5 +41,5 @@ export async function buildNuxt (nuxt: Nuxt): Promise<any> {
const rootDir = pathToFileURL(nuxt.options.rootDir).href const rootDir = pathToFileURL(nuxt.options.rootDir).href
const { build } = await tryImportModule<typeof import('nuxt')>('nuxt-nightly', { paths: rootDir }) || await importModule<typeof import('nuxt')>('nuxt', { paths: rootDir }) const { build } = await tryImportModule<typeof import('nuxt')>('nuxt-nightly', { paths: rootDir }) || await importModule<typeof import('nuxt')>('nuxt', { paths: rootDir })
return asyncNameStorage.run(nuxt.__name, () => build(nuxt)) return asyncNameStorage.run(nuxt.__name, () => build(nuxt))
} }

View File

@ -1,4 +1,4 @@
import { AsyncLocalStorage } from "node:async_hooks" import { AsyncLocalStorage } from 'node:async_hooks'
/** @since 3.9.0 */ /** @since 3.9.0 */
export function toArray<T> (value: T | T[]): T[] { export function toArray<T> (value: T | T[]): T[] {
@ -10,4 +10,4 @@ export const MODE_RE = /\.(server|client)(\.\w+)*$/
* @internal * @internal
* async local storage for the name of the current nuxt instance * async local storage for the name of the current nuxt instance
*/ */
export const asyncNameStorage = new AsyncLocalStorage<string>() export const asyncNameStorage = new AsyncLocalStorage<string>()

View File

@ -429,7 +429,7 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) {
tsConfig.compilerOptions.paths[alias] = [absolutePath.replace(EXTENSION_RE, '')] /* remove extension */ tsConfig.compilerOptions.paths[alias] = [absolutePath.replace(EXTENSION_RE, '')] /* remove extension */
} }
} }
// Init nitro // Init nitro
const nitro = await createNitro(nitroConfig, { const nitro = await createNitro(nitroConfig, {
compatibilityDate: nuxt.options.compatibilityDate, compatibilityDate: nuxt.options.compatibilityDate,

View File

@ -4,7 +4,7 @@ import { join, normalize, relative, resolve } from 'pathe'
import { createDebugger, createHooks } from 'hookable' import { createDebugger, createHooks } from 'hookable'
import ignore from 'ignore' import ignore from 'ignore'
import type { LoadNuxtOptions } from '@nuxt/kit' import type { LoadNuxtOptions } from '@nuxt/kit'
import { addBuildPlugin, addComponent, addPlugin, addPluginTemplate, addRouteMiddleware, addServerPlugin, addTypeTemplate, addVitePlugin, addWebpackPlugin, installModule, loadNuxtConfig, nuxtCtx, resolveAlias, resolveFiles, resolveIgnorePatterns, resolvePath, tryResolveModule, useNitro, asyncNameStorage, fallbackNuxtCtx } from '@nuxt/kit' import { addBuildPlugin, addComponent, addPlugin, addPluginTemplate, addRouteMiddleware, addServerPlugin, addTypeTemplate, addVitePlugin, addWebpackPlugin, asyncNameStorage, fallbackNuxtCtx, installModule, loadNuxtConfig, nuxtCtx, resolveAlias, resolveFiles, resolveIgnorePatterns, resolvePath, tryResolveModule, useNitro } from '@nuxt/kit'
import type { Nuxt, NuxtHooks, NuxtModule, NuxtOptions } from 'nuxt/schema' import type { Nuxt, NuxtHooks, NuxtModule, NuxtOptions } from 'nuxt/schema'
import type { PackageJson } from 'pkg-types' import type { PackageJson } from 'pkg-types'
import { readPackageJSON } from 'pkg-types' import { readPackageJSON } from 'pkg-types'
@ -22,6 +22,7 @@ import { gt, satisfies } from 'semver'
import { hasTTY, isCI } from 'std-env' import { hasTTY, isCI } from 'std-env'
import { genImport } from 'knitwork' import { genImport } from 'knitwork'
import { randomUUID } from 'uncrypto'
import { installNuxtModule } from '../core/features' import { installNuxtModule } from '../core/features'
import pagesModule from '../pages/module' import pagesModule from '../pages/module'
import metaModule from '../head/module' import metaModule from '../head/module'
@ -47,9 +48,8 @@ import { ComposableKeysPlugin } from './plugins/composable-keys'
import { resolveDeepImportsPlugin } from './plugins/resolve-deep-imports' import { resolveDeepImportsPlugin } from './plugins/resolve-deep-imports'
import { PrehydrateTransformPlugin } from './plugins/prehydrate' import { PrehydrateTransformPlugin } from './plugins/prehydrate'
import { VirtualFSPlugin } from './plugins/virtual' import { VirtualFSPlugin } from './plugins/virtual'
import { randomUUID } from 'uncrypto'
export function createNuxt(options: NuxtOptions): Nuxt { export function createNuxt (options: NuxtOptions): Nuxt {
const hooks = createHooks<NuxtHooks>() const hooks = createHooks<NuxtHooks>()
const name = randomUUID() const name = randomUUID()
const nuxt: Nuxt = { const nuxt: Nuxt = {
@ -90,7 +90,7 @@ const keyDependencies = [
let warnedAboutCompatDate = false let warnedAboutCompatDate = false
async function initNuxt(nuxt: Nuxt) { async function initNuxt (nuxt: Nuxt) {
// Register user hooks // Register user hooks
for (const config of nuxt.options._layers.map(layer => layer.config).reverse()) { for (const config of nuxt.options._layers.map(layer => layer.config).reverse()) {
if (config.hooks) { if (config.hooks) {
@ -110,7 +110,7 @@ async function initNuxt(nuxt: Nuxt) {
logger.info(`Using \`${fallbackCompatibilityDate}\` as fallback compatibility date.`) logger.info(`Using \`${fallbackCompatibilityDate}\` as fallback compatibility date.`)
} }
async function promptAndUpdate() { async function promptAndUpdate () {
const result = await consola.prompt(`Do you want to update your ${colorize('cyan', 'nuxt.config')} to set ${colorize('cyan', `compatibilityDate: '${todaysDate}'`)}?`, { const result = await consola.prompt(`Do you want to update your ${colorize('cyan', 'nuxt.config')} to set ${colorize('cyan', `compatibilityDate: '${todaysDate}'`)}?`, {
type: 'confirm', type: 'confirm',
default: true, default: true,
@ -124,7 +124,7 @@ async function initNuxt(nuxt: Nuxt) {
const res = await updateConfig({ const res = await updateConfig({
configFile: 'nuxt.config', configFile: 'nuxt.config',
cwd: nuxt.options.rootDir, cwd: nuxt.options.rootDir,
async onCreate({ configFile }) { async onCreate ({ configFile }) {
const shallCreate = await consola.prompt(`Do you want to create ${colorize('cyan', relative(nuxt.options.rootDir, configFile))}?`, { const shallCreate = await consola.prompt(`Do you want to create ${colorize('cyan', relative(nuxt.options.rootDir, configFile))}?`, {
type: 'confirm', type: 'confirm',
default: true, default: true,
@ -134,7 +134,7 @@ async function initNuxt(nuxt: Nuxt) {
} }
return _getDefaultNuxtConfig() return _getDefaultNuxtConfig()
}, },
onUpdate(config) { onUpdate (config) {
config.compatibilityDate = todaysDate config.compatibilityDate = todaysDate
}, },
}) })
@ -731,7 +731,7 @@ export default defineNuxtPlugin({
await nuxt.callHook('ready', nuxt) await nuxt.callHook('ready', nuxt)
} }
export async function loadNuxt(opts: LoadNuxtOptions): Promise<Nuxt> { export async function loadNuxt (opts: LoadNuxtOptions): Promise<Nuxt> {
const options = await loadNuxtConfig(opts) const options = await loadNuxtConfig(opts)
// Temporary until finding better placement for each // Temporary until finding better placement for each
@ -804,7 +804,7 @@ export async function loadNuxt(opts: LoadNuxtOptions): Promise<Nuxt> {
configurable: false, configurable: false,
enumerable: true, enumerable: true,
get: () => nitroOptions, get: () => nitroOptions,
set(value) { set (value) {
Object.assign(nitroOptions, value) Object.assign(nitroOptions, value)
}, },
}, },
@ -832,7 +832,7 @@ export async function loadNuxt(opts: LoadNuxtOptions): Promise<Nuxt> {
return nuxt return nuxt
} }
async function checkDependencyVersion(name: string, nuxtVersion: string): Promise<void> { async function checkDependencyVersion (name: string, nuxtVersion: string): Promise<void> {
const path = await resolvePath(name, { fallbackToOriginal: true }).catch(() => null) const path = await resolvePath(name, { fallbackToOriginal: true }).catch(() => null)
if (!path || path === name) { return } if (!path || path === name) { return }
@ -845,7 +845,7 @@ async function checkDependencyVersion(name: string, nuxtVersion: string): Promis
const RESTART_RE = /^(?:app|error|app\.config)\.(?:js|ts|mjs|jsx|tsx|vue)$/i const RESTART_RE = /^(?:app|error|app\.config)\.(?:js|ts|mjs|jsx|tsx|vue)$/i
function deduplicateArray<T = unknown>(maybeArray: T): T { function deduplicateArray<T = unknown> (maybeArray: T): T {
if (!Array.isArray(maybeArray)) { return maybeArray } if (!Array.isArray(maybeArray)) { return maybeArray }
const fresh: any[] = [] const fresh: any[] = []
@ -860,7 +860,7 @@ function deduplicateArray<T = unknown>(maybeArray: T): T {
return fresh as T return fresh as T
} }
function createPortalProperties(sourceValue: any, options: NuxtOptions, paths: string[]) { function createPortalProperties (sourceValue: any, options: NuxtOptions, paths: string[]) {
let sharedValue = sourceValue let sharedValue = sourceValue
for (const path of paths) { for (const path of paths) {
@ -880,7 +880,7 @@ function createPortalProperties(sourceValue: any, options: NuxtOptions, paths: s
configurable: false, configurable: false,
enumerable: true, enumerable: true,
get: () => sharedValue, get: () => sharedValue,
set(value) { set (value) {
sharedValue = value sharedValue = value
}, },
}, },

View File

@ -35,7 +35,7 @@ describe('loadNuxt', () => {
ready: true, ready: true,
overrides: { overrides: {
hooks: { hooks: {
ready() { ready () {
hookRan = true hookRan = true
}, },
}, },
@ -48,10 +48,10 @@ describe('loadNuxt', () => {
await Promise.all([ await Promise.all([
loadNuxt({ loadNuxt({
cwd: repoRoot, cwd: repoRoot,
}), }),
loadNuxt({ loadNuxt({
cwd: repoRoot, cwd: repoRoot,
}) }),
]) ])
}) })
}) })

View File

@ -99,7 +99,7 @@ describe.skipIf(process.env.SKIP_BUNDLE_SIZE === 'true' || process.env.ECOSYSTEM
const serverDir = join(rootDir, '.output-inline/server') const serverDir = join(rootDir, '.output-inline/server')
const serverStats = await analyzeSizes(['**/*.mjs', '!node_modules'], serverDir) const serverStats = await analyzeSizes(['**/*.mjs', '!node_modules'], serverDir)
expect.soft(roundToKilobytes(serverStats.totalBytes)).toMatchInlineSnapshot(`"560k"`) expect.soft(roundToKilobytes(serverStats.totalBytes)).toMatchInlineSnapshot(`"561k"`)
const modules = await analyzeSizes(['node_modules/**/*'], serverDir) const modules = await analyzeSizes(['node_modules/**/*'], serverDir)
expect.soft(roundToKilobytes(modules.totalBytes)).toMatchInlineSnapshot(`"94.4k"`) expect.soft(roundToKilobytes(modules.totalBytes)).toMatchInlineSnapshot(`"94.4k"`)