mirror of
https://github.com/nuxt/nuxt.git
synced 2025-01-22 11:22:43 +00:00
[autofix.ci] apply automated fixes
This commit is contained in:
parent
8b2b968977
commit
f22ef4f137
@ -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()
|
||||||
}
|
}
|
||||||
|
@ -2,8 +2,8 @@ import { pathToFileURL } from 'node:url'
|
|||||||
import { readPackageJSON, resolvePackageJSON } from 'pkg-types'
|
import { readPackageJSON, resolvePackageJSON } from 'pkg-types'
|
||||||
import type { Nuxt } from '@nuxt/schema'
|
import type { Nuxt } from '@nuxt/schema'
|
||||||
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 */
|
||||||
@ -82,5 +82,5 @@ export async function buildNuxt (nuxt: Nuxt): Promise<any> {
|
|||||||
|
|
||||||
// Nuxt 2
|
// Nuxt 2
|
||||||
const { build } = await tryImportModule<{ build: any }>('nuxt-edge', { paths: rootDir }) || await importModule<{ build: any }>('nuxt', { paths: rootDir })
|
const { build } = await tryImportModule<{ build: any }>('nuxt-edge', { paths: rootDir }) || await importModule<{ build: any }>('nuxt', { paths: rootDir })
|
||||||
return asyncNameStorage.run(nuxt.__name, () => build(nuxt))
|
return asyncNameStorage.run(nuxt.__name, () => build(nuxt))
|
||||||
}
|
}
|
||||||
|
@ -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>()
|
||||||
|
@ -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,
|
||||||
|
@ -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 pagesModule from '../pages/module'
|
import pagesModule from '../pages/module'
|
||||||
import metaModule from '../head/module'
|
import metaModule from '../head/module'
|
||||||
import componentsModule from '../components/module'
|
import componentsModule from '../components/module'
|
||||||
@ -46,9 +47,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 = {
|
||||||
@ -88,7 +88,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) {
|
||||||
@ -108,7 +108,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,
|
||||||
@ -122,7 +122,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,
|
||||||
@ -132,7 +132,7 @@ async function initNuxt(nuxt: Nuxt) {
|
|||||||
}
|
}
|
||||||
return _getDefaultNuxtConfig()
|
return _getDefaultNuxtConfig()
|
||||||
},
|
},
|
||||||
onUpdate(config) {
|
onUpdate (config) {
|
||||||
config.compatibilityDate = todaysDate
|
config.compatibilityDate = todaysDate
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
@ -730,7 +730,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
|
||||||
@ -803,7 +803,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)
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -831,7 +831,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 }
|
||||||
@ -844,7 +844,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[] = []
|
||||||
@ -859,7 +859,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) {
|
||||||
@ -879,7 +879,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
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -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,
|
||||||
})
|
}),
|
||||||
])
|
])
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
Loading…
Reference in New Issue
Block a user