Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
316 changes: 225 additions & 91 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ catalog:
nuxt: ^4.5.0
nuxt-site-config: ^4.1.1
nuxtseo-layer-devtools: ^5.3.2
nuxtseo-shared: ^5.3.2
nuxtseo-shared: ^5.3.6
pathe: ^2.0.3
pkg-types: ^2.3.1
radix3: ^1.1.2
Expand Down
3 changes: 0 additions & 3 deletions src/logger.ts

This file was deleted.

4 changes: 2 additions & 2 deletions src/module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ import {
hasNuxtModule,
} from '@nuxt/kit'
import { installNuxtSiteConfig, updateSiteConfig } from 'nuxt-site-config/kit'
import { useModuleLogger } from 'nuxtseo-shared/kit'
import { relative } from 'pathe'
import { readPackageJSON } from 'pkg-types'
import { withoutTrailingSlash, withTrailingSlash } from 'ufo'
import { AiBots, NonHelpfulBots } from './const'
import { setupDevToolsUI } from './devtools'
import { mapPathForI18nPages, resolveI18nConfig, splitPathForI18nLocales } from './i18n'
import { isNuxtGenerate, resolveNitroPreset, resolveNuxtContentVersion } from './kit'
import { logger } from './logger'
import { registerTypeTemplates } from './templates'
import {
asArray,
Expand Down Expand Up @@ -237,7 +237,7 @@ export default defineNuxtModule<ModuleOptions>({
async setup(config, nuxt) {
const { resolve } = createResolver(import.meta.url)
const { version } = await readPackageJSON(resolve('../package.json'))
logger.level = (config.debug || nuxt.options.debug) ? 4 : 3
const logger = useModuleLogger('@nuxt/robots', config, nuxt)
if (config.enabled === false) {
logger.debug('The module is disabled, skipping setup.')
// need to mock the composables to allow module still to work when disabled
Expand Down
4 changes: 2 additions & 2 deletions src/runtime/server/composables/getPathRobotConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import type { RobotsContext } from '../../types'
import { matchPathToRule, normaliseRobotsRouteRule } from '@nuxtjs/robots/util'
import { getRequestHeader } from 'h3'
import { useNitroApp, useRuntimeConfig } from 'nitropack/runtime'
import { createNitroRouteRuleMatcher } from 'nuxtseo-shared/server'
import { withoutTrailingSlash } from 'ufo'
import { createNitroRouteRuleMatcher } from '../kit'
import { getSiteRobotConfig } from './getSiteRobotConfig'
import { useRuntimeConfigNuxtRobots } from './useRuntimeConfigNuxtRobots'

Expand Down Expand Up @@ -109,7 +109,7 @@ export function getPathRobotConfig(e: H3Event, options?: { userAgent?: string, s
}

// 4. nitro route rules
nitroApp._robotsRuleMatcher = nitroApp._robotsRuleMatcher || createNitroRouteRuleMatcher(e)
nitroApp._robotsRuleMatcher = nitroApp._robotsRuleMatcher || createNitroRouteRuleMatcher(runtimeConfig)
let robotRouteRules = nitroApp._robotsRuleMatcher(path)
let routeRulesPath = path
// if we're using i18n we need to strip leading prefixes so the rule will match
Expand Down
27 changes: 0 additions & 27 deletions src/runtime/server/kit.ts

This file was deleted.

6 changes: 2 additions & 4 deletions src/runtime/server/logger.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import { createConsola } from 'consola'
import { createModuleLogger } from 'nuxtseo-shared/utils'

export const logger = createConsola({
defaults: { tag: '@nuxtjs/robots' },
})
export const logger = createModuleLogger('@nuxtjs/robots')
Loading