nuxtseo-shared 5.3.15 → 6.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/kit.d.ts CHANGED
@@ -1,8 +1,9 @@
1
1
  import { Nuxt } from '@nuxt/schema';
2
2
  import { Nitro } from 'nitropack';
3
3
  import { NitroConfig } from 'nitropack/types';
4
- import { NuxtPage, NuxtModule } from 'nuxt/schema';
4
+ import { Nuxt as Nuxt$1, NuxtPage, NuxtModule } from 'nuxt/schema';
5
5
  import { useLogger } from '@nuxt/kit';
6
+ export { isAgent, isCI } from 'std-env';
6
7
 
7
8
  type NitroRuntimeCompatibility = {
8
9
  _tag: 'nitro-v2';
@@ -27,8 +28,21 @@ interface NitroTypeAugmentations {
27
28
  declare function renderNitroTypeAugmentations(compatibility: NitroRuntimeCompatibility, augmentations: NitroTypeAugmentations): string;
28
29
  declare function setupNitroRuntimeCompatibility(nuxt?: Nuxt): NitroRuntimeCompatibility;
29
30
 
31
+ type RuntimeAliasOptions = {
32
+ namespace: `#${string}`;
33
+ } & ({
34
+ app: string;
35
+ server?: string;
36
+ } | {
37
+ app?: string;
38
+ server: string;
39
+ });
40
+ /** Register curated directory entry points with separate app and server types. */
41
+ declare function setupRuntimeAliases(options: RuntimeAliasOptions, nuxt?: Nuxt$1): void;
42
+
30
43
  interface NuxtSeoModuleDetection {
31
44
  name: string;
45
+ disabled?: boolean;
32
46
  version?: string;
33
47
  entryPath?: string;
34
48
  features?: Record<string, boolean | string | number>;
@@ -83,20 +97,6 @@ declare function resolveNuxtContentVersion(): Promise<false | NuxtContentVersion
83
97
  * `undefined` when the package can't be resolved or has no parseable version.
84
98
  */
85
99
  declare function resolvePackageMajor(id: string, rootDir: string): Promise<number | undefined>;
86
- type UnheadMajor = 2 | 3;
87
- /**
88
- * Resolve the major of the unhead the host app renders with.
89
- *
90
- * `@unhead/vue` is what the head-stack packages peer-depend on, so it's the
91
- * primary signal; falls back to the core `unhead` package, then to `3` (the
92
- * current default major) when neither resolves.
93
- *
94
- * Used to keep head-stack dependencies on a compatible major. For example,
95
- * `@unhead/schema-org` v3 attaches an object `_resolver` to every graph node
96
- * that unhead v2's `walkResolver` invokes as a thunk, crashing render; a module
97
- * that ships both majors can use this to alias to the matching one.
98
- */
99
- declare function resolveHostUnheadMajor(rootDir: string): Promise<UnheadMajor>;
100
100
  declare const COMARK_CONTENT_MODULE = "@harlan-zw/comark-content";
101
101
  /**
102
102
  * The Markdown content module backing this app, if any.
@@ -139,5 +139,5 @@ declare function hasContentFileHooks(provider: ContentProvider): boolean;
139
139
  */
140
140
  declare function setupContentRuntime(provider: ContentProvider, nuxt?: Nuxt): void;
141
141
 
142
- export { COMARK_CONTENT_MODULE, createNitroPromise, createPagesPromise, detectNuxtSeoModules, detectTarget, extendTypes, getNuxtModuleOptions, hasContentFileHooks, isNuxtGenerate, renderNitroTypeAugmentations, resolveContentProvider, resolveHostUnheadMajor, resolveNitroPreset, resolveNuxtContentVersion, resolvePackageMajor, setupContentRuntime, setupNitroRuntimeCompatibility, useModuleLogger };
143
- export type { ContentProvider, NitroRuntimeCompatibility, NitroTypeAugmentations, NuxtContentVersion, NuxtSeoModuleDetection, UnheadMajor };
142
+ export { COMARK_CONTENT_MODULE, createNitroPromise, createPagesPromise, detectNuxtSeoModules, detectTarget, extendTypes, getNuxtModuleOptions, hasContentFileHooks, isNuxtGenerate, renderNitroTypeAugmentations, resolveContentProvider, resolveNitroPreset, resolveNuxtContentVersion, resolvePackageMajor, setupContentRuntime, setupNitroRuntimeCompatibility, setupRuntimeAliases, useModuleLogger };
143
+ export type { ContentProvider, NitroRuntimeCompatibility, NitroTypeAugmentations, NuxtContentVersion, NuxtSeoModuleDetection, RuntimeAliasOptions };
package/dist/kit.mjs CHANGED
@@ -1,8 +1,10 @@
1
+ import { readFile } from 'node:fs/promises';
2
+ import { findPackageJSON } from 'node:module';
3
+ import { isAbsolute, resolve, relative, sep, join } from 'node:path';
1
4
  import { pathToFileURL } from 'node:url';
2
- import { getNuxtVersion, addTypeTemplate, useNuxt, useLogger, resolveModule, directoryToURL, createResolver, addTemplate, loadNuxtModuleInstance, hasNuxtModule, tryUseNuxt, hasNuxtModuleCompatibility } from '@nuxt/kit';
3
- import { relative, dirname } from 'pathe';
4
- import { resolvePackageJSON, readPackageJSON } from 'pkg-types';
5
+ import { getNitroVersion, addTypeTemplate, useNuxt, useLogger, resolveModule, directoryToURL, createResolver, addTemplate, loadNuxtModuleInstance, hasNuxtModule, tryUseNuxt, hasNuxtModuleCompatibility } from '@nuxt/kit';
5
6
  import { provider, env } from 'std-env';
7
+ export { isAgent, isCI } from 'std-env';
6
8
 
7
9
  const NITRO_RUNTIME_MODULE = "#nuxtseo/nitro";
8
10
  const H3_RUNTIME_MODULE = "#nuxtseo/h3";
@@ -25,7 +27,8 @@ const nitroV3Compatibility = {
25
27
  eventType: `import('nitro/h3').H3Event`,
26
28
  nitroTypesModule: "nitro/types"
27
29
  };
28
- const nitroV2Runtime = `export {
30
+ const nitroV2Runtime = `import { useNitroApp as _useNitroApp } from 'nitropack/runtime'
31
+ export {
29
32
  defineNitroPlugin,
30
33
  useNitroApp,
31
34
  useEvent,
@@ -36,6 +39,9 @@ const nitroV2Runtime = `export {
36
39
  defineTask,
37
40
  runTask,
38
41
  } from 'nitropack/runtime'
42
+ export function localFetch(request, init, context) {
43
+ return _useNitroApp().localFetch(request, { ...init, context: context ? { _platform: context } : undefined })
44
+ }
39
45
  export function fetchWithEvent(event, request, options) {
40
46
  return event.$fetch(request, options)
41
47
  }
@@ -54,6 +60,7 @@ const nitroV2RuntimeTypes = `export {
54
60
  defineTask,
55
61
  runTask,
56
62
  } from 'nitropack/runtime'
63
+ export function localFetch(request: string | URL | Request, init?: RequestInit, context?: Record<string, unknown>): Promise<Response>
57
64
  export function fetchWithEvent<T>(event: import('h3').H3Event, request: import('ofetch').FetchRequest, options?: import('ofetch').FetchOptions): Promise<T>
58
65
  export function fetchRawWithEvent(event: import('h3').H3Event, request: RequestInfo | URL, init?: RequestInit): Promise<Response>
59
66
  `;
@@ -61,7 +68,7 @@ const nitroV3Runtime = `import { createFetch } from '${OFETCH_RUNTIME_MODULE}'
61
68
  import { fetchWithEvent as fetchH3WithEvent, getProxyRequestHeaders } from 'nitro/h3'
62
69
  import { useNitroApp as _useNitroApp } from 'nitro/app'
63
70
  export { definePlugin as defineNitroPlugin } from 'nitro'
64
- export { useNitroApp } from 'nitro/app'
71
+ export { useNitroApp, fetch as localFetch } from 'nitro/app'
65
72
  export { useRequest as useEvent } from 'nitro/context'
66
73
  import { useRuntimeConfig as _useRuntimeConfig } from 'nitro/runtime-config'
67
74
  export function useRuntimeConfig(_event) { return _useRuntimeConfig() }
@@ -69,6 +76,8 @@ export { defineCachedFunction, defineCachedHandler as defineCachedEventHandler }
69
76
  export { useStorage } from 'nitro/storage'
70
77
  export { defineTask, runTask } from 'nitro/task'
71
78
  function fetchRaw(event, input, init) {
79
+ if (typeof input === 'string' && input.startsWith('//'))
80
+ return fetchH3WithEvent(event, new URL(input, event.url), init)
72
81
  if (typeof input !== 'string' || !input.startsWith('/'))
73
82
  return fetchH3WithEvent(event, input, init)
74
83
  const headers = new Headers(getProxyRequestHeaders(event, { host: true }))
@@ -91,7 +100,7 @@ export function fetchWithEvent(event, request, options) {
91
100
  }
92
101
  `;
93
102
  const nitroV3RuntimeTypes = `export { definePlugin as defineNitroPlugin } from 'nitro'
94
- export { useNitroApp } from 'nitro/app'
103
+ export { useNitroApp, fetch as localFetch } from 'nitro/app'
95
104
  export { useRequest as useEvent } from 'nitro/context'
96
105
  export function useRuntimeConfig(event?: import('nitro/h3').H3Event): ReturnType<typeof import('nitro/runtime-config').useRuntimeConfig>
97
106
  export { defineCachedFunction, defineCachedHandler as defineCachedEventHandler } from 'nitro/cache'
@@ -126,26 +135,40 @@ ${indent(h3Runtime.trim(), 2)}
126
135
  `;
127
136
  }
128
137
  function resolveRuntimeModule(nuxt, id) {
138
+ const urls = [...nuxt.options.modulesDir.map(directoryToURL), new URL(import.meta.url)];
129
139
  try {
130
140
  return {
131
141
  _tag: "resolved",
132
142
  path: resolveModule(id, {
133
- url: [...nuxt.options.modulesDir.map(directoryToURL), new URL(import.meta.url)]
143
+ url: urls
134
144
  })
135
145
  };
136
146
  } catch (cause) {
137
- return { _tag: "unresolved", cause };
147
+ try {
148
+ const nuxtEntry = resolveModule("nuxt", { url: urls });
149
+ const builder = resolveModule(id === "h3" ? "nitropack" : "nitro", { url: [pathToFileURL(nuxtEntry), ...urls] });
150
+ return { _tag: "resolved", path: resolveModule(id, { url: [pathToFileURL(builder), ...urls] }) };
151
+ } catch (nativeCause) {
152
+ return { _tag: "unresolved", cause: new AggregateError([cause, nativeCause], `Could not resolve the native server module '${id}'.`) };
153
+ }
138
154
  }
139
155
  }
140
156
  function applyNitroRuntimeCompatibility(nuxt, compatibility, reportResolutionFailure = false) {
141
157
  const nuxtOptions = nuxt.options;
142
158
  const nitroOptions = nuxtOptions.nitro ||= {};
143
159
  nitroOptions.alias ||= {};
144
- nitroOptions.externals ||= {};
145
- nitroOptions.externals.inline ||= [];
146
160
  nitroOptions.virtual ||= {};
147
- if (!nitroOptions.externals.inline.includes("nuxtseo-shared"))
148
- nitroOptions.externals.inline.push("nuxtseo-shared");
161
+ if (compatibility._tag === "nitro-v2") {
162
+ nitroOptions.externals ||= {};
163
+ nitroOptions.externals.inline ||= [];
164
+ if (!nitroOptions.externals.inline.includes("nuxtseo-shared"))
165
+ nitroOptions.externals.inline.push("nuxtseo-shared");
166
+ } else if (nitroOptions.noExternals !== true) {
167
+ const inline = Array.isArray(nitroOptions.noExternals) ? nitroOptions.noExternals : [];
168
+ if (!inline.includes("nuxtseo-shared"))
169
+ inline.push("nuxtseo-shared");
170
+ nitroOptions.noExternals = inline;
171
+ }
149
172
  const h3RuntimeModule = compatibility._tag === "nitro-v3" ? "nitro/h3" : "h3";
150
173
  nitroOptions.alias[H3_RUNTIME_MODULE] = h3RuntimeModule;
151
174
  const h3Resolution = resolveRuntimeModule(nuxt, h3RuntimeModule);
@@ -180,6 +203,9 @@ ${nitroInterfaces.join("\n")}
180
203
  }`));
181
204
  }
182
205
  if (augmentations.eventContext?.trim()) {
206
+ declarations.push(`declare module '@nuxt/schema' {
207
+ ${renderInterface("RequestEventContext", augmentations.eventContext)}
208
+ }`);
183
209
  declarations.push(`declare module '${compatibility.eventContextModule}' {
184
210
  ${renderInterface(compatibility.eventContextType, augmentations.eventContext)}
185
211
  }`);
@@ -187,8 +213,10 @@ ${renderInterface(compatibility.eventContextType, augmentations.eventContext)}
187
213
  return declarations.join("\n\n");
188
214
  }
189
215
  function setupNitroRuntimeCompatibility(nuxt = useNuxt()) {
190
- const major = Number.parseInt(getNuxtVersion(nuxt), 10);
191
- const compatibility = major >= 5 ? nitroV3Compatibility : nitroV2Compatibility;
216
+ const major = getNitroVersion(nuxt);
217
+ if (major !== 2 && major !== 3)
218
+ throw new Error("Nuxt SEO requires a Nitro 2 or Nitro 3 server builder.");
219
+ const compatibility = major === 3 ? nitroV3Compatibility : nitroV2Compatibility;
192
220
  applyNitroRuntimeCompatibility(nuxt, compatibility);
193
221
  const nuxtWithLegacyMarker = nuxt;
194
222
  nuxtWithLegacyMarker[legacySetupMarker] = true;
@@ -208,10 +236,56 @@ function setupNitroRuntimeCompatibility(nuxt = useNuxt()) {
208
236
  return compatibility;
209
237
  }
210
238
 
239
+ function setupRuntimeAliases(options, nuxt = useNuxt()) {
240
+ const entries = [
241
+ { runtime: "app", directory: options.app },
242
+ { runtime: "server", directory: options.server }
243
+ ].filter((entry) => entry.directory !== void 0);
244
+ for (const { runtime, directory } of entries) {
245
+ if (!isAbsolute(directory))
246
+ throw new Error(`Runtime alias ${options.namespace}/${runtime} requires an absolute directory.`);
247
+ const alias = `${options.namespace}/${runtime}`;
248
+ nuxt.options.alias[alias] = directory;
249
+ if (runtime === "app" && !nuxt.options.build.transpile.includes(directory))
250
+ nuxt.options.build.transpile.push(directory);
251
+ if (runtime === "server") {
252
+ const options2 = nuxt.options;
253
+ const nitro = options2.nitro ||= {};
254
+ nitro.alias ||= {};
255
+ nitro.alias[alias] = directory;
256
+ }
257
+ }
258
+ nuxt.hook("prepare:types", ({ tsConfig, serverTsConfig }) => {
259
+ const typesDir = nuxt.options.typesDir || nuxt.options.buildDir;
260
+ for (const { runtime, directory } of entries) {
261
+ const alias = `${options.namespace}/${runtime}`;
262
+ const config = runtime === "app" ? tsConfig : serverTsConfig;
263
+ config.compilerOptions ||= {};
264
+ config.compilerOptions.paths ||= {};
265
+ const base = resolve(typesDir, config.compilerOptions.baseUrl || ".");
266
+ const path = relative(base, directory).split(sep).join("/");
267
+ const prefix = path.startsWith(".") ? path : `./${path}`;
268
+ config.compilerOptions.paths[alias] = [join(prefix, "index").split(sep).join("/")];
269
+ config.compilerOptions.paths[`${alias}/*`] = [`${prefix}/*`];
270
+ }
271
+ });
272
+ }
273
+
211
274
  function normalizePackageUrl(rootDir) {
212
275
  const url = rootDir.startsWith("file:") ? rootDir : pathToFileURL(rootDir.endsWith("/") ? rootDir : `${rootDir}/`).href;
213
276
  return url.endsWith("/") ? url : `${url}/`;
214
277
  }
278
+ async function readPackageVersion(id, rootDir) {
279
+ const path = await Promise.resolve().then(() => findPackageJSON(id, new URL("package.json", normalizePackageUrl(rootDir)))).catch((error) => {
280
+ if (error && typeof error === "object" && "code" in error && (error.code === "ERR_MODULE_NOT_FOUND" || error.code === "ENOENT"))
281
+ return void 0;
282
+ throw error;
283
+ });
284
+ if (!path)
285
+ return void 0;
286
+ const metadata = JSON.parse(await readFile(path, "utf8"));
287
+ return metadata && typeof metadata === "object" && "version" in metadata && typeof metadata.version === "string" ? metadata.version : void 0;
288
+ }
215
289
  const NUXT_SEO_MODULES = /* @__PURE__ */ new Set([
216
290
  "@nuxtjs/robots",
217
291
  "@nuxtjs/sitemap",
@@ -223,12 +297,28 @@ const NUXT_SEO_MODULES = /* @__PURE__ */ new Set([
223
297
  "nuxt-skew-protection",
224
298
  "nuxt-ai-ready"
225
299
  ]);
300
+ const SEO_CONFIG_KEYS = {
301
+ "@nuxtjs/robots": "robots",
302
+ "@nuxtjs/sitemap": "sitemap",
303
+ "nuxt-og-image": "ogImage",
304
+ "nuxt-schema-org": "schemaOrg",
305
+ "nuxt-seo-utils": "seo",
306
+ "nuxt-link-checker": "linkChecker",
307
+ "nuxt-site-config": "site",
308
+ "nuxt-skew-protection": "skewProtection",
309
+ "nuxt-ai-ready": "aiReady"
310
+ };
226
311
  function detectNuxtSeoModules(nuxt = useNuxt()) {
227
- return nuxt.options._installedModules.filter((m) => m.meta?.name && NUXT_SEO_MODULES.has(m.meta.name)).map((m) => ({
228
- name: m.meta.name,
229
- version: m.meta.version,
230
- entryPath: m.entryPath
231
- }));
312
+ return nuxt.options._installedModules.filter((m) => m.meta?.name && NUXT_SEO_MODULES.has(m.meta.name)).map((m) => {
313
+ const configKey = SEO_CONFIG_KEYS[m.meta.name];
314
+ const config = configKey ? nuxt.options[configKey] : void 0;
315
+ return {
316
+ name: m.meta.name,
317
+ disabled: m.meta.disabled || config === false || config?.enabled === false,
318
+ version: m.meta.version,
319
+ entryPath: m.entryPath
320
+ };
321
+ });
232
322
  }
233
323
  function useModuleLogger(name, options, nuxt = useNuxt()) {
234
324
  const logger = useLogger(name);
@@ -294,7 +384,7 @@ function extendTypes(module, template) {
294
384
  addTemplate({
295
385
  filename: `module/${module}.d.ts`,
296
386
  getContents: async () => {
297
- const typesPath = relative(resolve(nuxt.options.rootDir, nuxt.options.buildDir, "module"), resolve("runtime/types"));
387
+ const typesPath = relative(resolve(nuxt.options.rootDir, nuxt.options.buildDir, "module"), resolve("runtime/types")).split(sep).join("/");
298
388
  const s = await template({ typesPath });
299
389
  return `// Generated by ${module}
300
390
  ${s}
@@ -331,42 +421,15 @@ async function resolveNuxtContentVersion() {
331
421
  return false;
332
422
  }
333
423
  async function resolvePackageMajor(id, rootDir) {
334
- const url = normalizePackageUrl(rootDir);
335
- const version = await readPackageJSON(id, { url }).then((pkg) => pkg.version).catch(() => {
336
- return void 0;
337
- });
424
+ const version = await readPackageVersion(id, rootDir);
338
425
  const major = version ? Number.parseInt(version, 10) : Number.NaN;
339
426
  return Number.isFinite(major) ? major : void 0;
340
427
  }
341
- async function resolveHostUnheadMajor(rootDir) {
342
- const rootUrl = normalizePackageUrl(rootDir);
343
- const searchUrls = [];
344
- for (const id of ["@nuxt/nitro-server", "nuxt"]) {
345
- const pkgJson = await resolvePackageJSON(id, { url: rootUrl }).catch(() => {
346
- return void 0;
347
- });
348
- if (pkgJson)
349
- searchUrls.push(`${dirname(pkgJson)}/`);
350
- }
351
- searchUrls.push(rootUrl);
352
- for (const id of ["@unhead/vue", "unhead"]) {
353
- for (const url of searchUrls) {
354
- const major = await resolvePackageMajor(id, url);
355
- if (major === 2)
356
- return 2;
357
- if (major !== void 0 && major >= 3)
358
- return 3;
359
- }
360
- }
361
- return 3;
362
- }
363
428
  const COMARK_CONTENT_MODULE = "@harlan-zw/comark-content";
364
429
  const COMARK_CONTENT_MINIMUM = [0, 1, 2];
365
430
  async function comarkSatisfiesMinimum(nuxt) {
366
- const pkg = await readPackageJSON(COMARK_CONTENT_MODULE, { url: normalizePackageUrl(nuxt.options.rootDir) }).catch(() => {
367
- return null;
368
- });
369
- const parts = pkg?.version?.split(".").map((part) => Number.parseInt(part, 10));
431
+ const version = await readPackageVersion(COMARK_CONTENT_MODULE, nuxt.options.rootDir);
432
+ const parts = version?.split(".").map((part) => Number.parseInt(part, 10));
370
433
  if (!parts || parts.length < 3 || parts.some((part) => !Number.isFinite(part)))
371
434
  return false;
372
435
  for (const [index, minimum] of COMARK_CONTENT_MINIMUM.entries()) {
@@ -392,9 +455,11 @@ function setupContentRuntime(provider2, nuxt = useNuxt()) {
392
455
  const nitro = nuxt.options.nitro ??= {};
393
456
  nitro.alias ??= {};
394
457
  nitro.alias["#nuxtseo/content"] = resolver.resolve(`./runtime/content/${shim}`);
395
- nitro.externals ??= {};
396
- nitro.externals.inline ??= [];
397
- nitro.externals.inline.push(resolver.resolve("./runtime/content/"));
458
+ if (getNitroVersion(nuxt) === 2) {
459
+ nitro.externals ??= {};
460
+ nitro.externals.inline ??= [];
461
+ nitro.externals.inline.push(resolver.resolve("./runtime/content/"));
462
+ }
398
463
  }
399
464
 
400
- export { COMARK_CONTENT_MODULE, createNitroPromise, createPagesPromise, detectNuxtSeoModules, detectTarget, extendTypes, getNuxtModuleOptions, hasContentFileHooks, isNuxtGenerate, renderNitroTypeAugmentations, resolveContentProvider, resolveHostUnheadMajor, resolveNitroPreset, resolveNuxtContentVersion, resolvePackageMajor, setupContentRuntime, setupNitroRuntimeCompatibility, useModuleLogger };
465
+ export { COMARK_CONTENT_MODULE, createNitroPromise, createPagesPromise, detectNuxtSeoModules, detectTarget, extendTypes, getNuxtModuleOptions, hasContentFileHooks, isNuxtGenerate, renderNitroTypeAugmentations, resolveContentProvider, resolveNitroPreset, resolveNuxtContentVersion, resolvePackageMajor, setupContentRuntime, setupNitroRuntimeCompatibility, setupRuntimeAliases, useModuleLogger };
package/dist/module.d.mts CHANGED
@@ -4,6 +4,7 @@ import 'nitropack';
4
4
  import 'nitropack/types';
5
5
  import 'nuxt/schema';
6
6
  import '@nuxt/kit';
7
+ import 'std-env';
7
8
 
8
9
  interface ModuleHooks {
9
10
  'nuxt-seo-pro:modules': (modules: NuxtSeoModuleDetection[]) => Promise<void> | void;
package/dist/module.d.ts CHANGED
@@ -4,6 +4,7 @@ import 'nitropack';
4
4
  import 'nitropack/types';
5
5
  import 'nuxt/schema';
6
6
  import '@nuxt/kit';
7
+ import 'std-env';
7
8
 
8
9
  interface ModuleHooks {
9
10
  'nuxt-seo-pro:modules': (modules: NuxtSeoModuleDetection[]) => Promise<void> | void;
package/dist/module.json CHANGED
@@ -2,9 +2,9 @@
2
2
  "name": "nuxtseo-shared",
3
3
  "configKey": "nuxtSeoShared",
4
4
  "compatibility": {
5
- "nuxt": ">=3.16.0"
5
+ "nuxt": "^4.6.0 || ^5.0.0"
6
6
  },
7
- "version": "5.3.15",
7
+ "version": "6.0.0",
8
8
  "builder": {
9
9
  "@nuxt/module-builder": "1.0.3",
10
10
  "unbuild": "3.6.1"
package/dist/module.mjs CHANGED
@@ -1,19 +1,19 @@
1
1
  import { defineNuxtModule } from '@nuxt/kit';
2
2
  import { hookNuxtSeoProDataUpload } from './pro.mjs';
3
- import 'nuxt-site-config/kit';
4
3
  import 'ofetch';
5
4
  import 'std-env';
6
5
  import './kit.mjs';
6
+ import 'node:fs/promises';
7
+ import 'node:module';
8
+ import 'node:path';
7
9
  import 'node:url';
8
- import 'pathe';
9
- import 'pkg-types';
10
10
 
11
11
  const module$1 = defineNuxtModule({
12
12
  meta: {
13
13
  name: "nuxtseo-shared",
14
14
  configKey: "nuxtSeoShared",
15
15
  compatibility: {
16
- nuxt: ">=3.16.0"
16
+ nuxt: "^4.6.0 || ^5.0.0"
17
17
  }
18
18
  },
19
19
  setup() {
@@ -0,0 +1,22 @@
1
+ import { $Fetch } from 'ofetch';
2
+
3
+ interface Renderer {
4
+ options: {
5
+ builder?: string | false;
6
+ output: {
7
+ serverDir: string;
8
+ };
9
+ rollupConfig?: {
10
+ output?: {
11
+ entryFileNames?: unknown;
12
+ };
13
+ };
14
+ };
15
+ }
16
+ /** Open the generated prerender app after Nitro 3 has closed its own worker. */
17
+ declare function createPrerenderFetch(renderer: Renderer, nitroMajor: 2 | 3): {
18
+ fetch: $Fetch;
19
+ close: () => Promise<void>;
20
+ };
21
+
22
+ export { createPrerenderFetch };
@@ -0,0 +1,22 @@
1
+ import { $Fetch } from 'ofetch';
2
+
3
+ interface Renderer {
4
+ options: {
5
+ builder?: string | false;
6
+ output: {
7
+ serverDir: string;
8
+ };
9
+ rollupConfig?: {
10
+ output?: {
11
+ entryFileNames?: unknown;
12
+ };
13
+ };
14
+ };
15
+ }
16
+ /** Open the generated prerender app after Nitro 3 has closed its own worker. */
17
+ declare function createPrerenderFetch(renderer: Renderer, nitroMajor: 2 | 3): {
18
+ fetch: $Fetch;
19
+ close: () => Promise<void>;
20
+ };
21
+
22
+ export { createPrerenderFetch };
@@ -0,0 +1,74 @@
1
+ import { resolve } from 'node:path';
2
+ import { pathToFileURL } from 'node:url';
3
+ import { createFetch } from 'ofetch';
4
+
5
+ const groups = /* @__PURE__ */ new WeakMap();
6
+ function parseResponse(value) {
7
+ if (!(value instanceof Response))
8
+ throw new Error("The Nitro prerender app returned an invalid response.");
9
+ return value;
10
+ }
11
+ function createPrerenderFetch(renderer, nitroMajor) {
12
+ const group = groups.get(renderer) ?? { _tag: "open", users: 0, major: nitroMajor, transport: void 0 };
13
+ if (group._tag === "closed")
14
+ throw new Error("The prerender app has already closed.");
15
+ if (group.major !== nitroMajor)
16
+ throw new Error("Modules must use the same prerender builder.");
17
+ group.users++;
18
+ groups.set(renderer, group);
19
+ let lease = "active";
20
+ const open = async () => {
21
+ if (renderer.options.builder === false)
22
+ throw new Error("Prerender requests require a compiled Nitro app.");
23
+ const entryFileNames = renderer.options.rollupConfig?.output?.entryFileNames;
24
+ const entry = resolve(renderer.options.output.serverDir, typeof entryFileNames === "string" ? entryFileNames : "index.mjs");
25
+ const exports = await import(pathToFileURL(entry).href);
26
+ if (typeof exports !== "object" || exports === null)
27
+ throw new Error("The prerender app has invalid exports.");
28
+ const module = exports;
29
+ if (nitroMajor === 2) {
30
+ const localFetch = module.localFetch;
31
+ if (typeof localFetch !== "function")
32
+ throw new Error("The Nitro 2 prerender app does not export localFetch.");
33
+ return { fetch: async (input, init) => parseResponse(await localFetch(input, init)), close: async () => {
34
+ } };
35
+ }
36
+ const app = module.default;
37
+ if (typeof app !== "object" || app === null || !("fetch" in app) || !("close" in app))
38
+ throw new Error("The Nitro 3 prerender app does not export fetch and close.");
39
+ const fetch2 = app.fetch;
40
+ const close = app.close;
41
+ if (typeof fetch2 !== "function" || typeof close !== "function")
42
+ throw new Error("The Nitro 3 prerender app does not export fetch and close.");
43
+ return {
44
+ fetch: async (input) => parseResponse(await fetch2(input)),
45
+ close: async () => {
46
+ await close();
47
+ }
48
+ };
49
+ };
50
+ const fetch = createFetch({
51
+ fetch: async (input, init) => {
52
+ if (lease === "released")
53
+ throw new Error("This prerender client has already closed.");
54
+ if (typeof input !== "string" || (!input.startsWith("/") || input.startsWith("//")))
55
+ return globalThis.fetch(input, init);
56
+ group.transport ||= open();
57
+ const app = await group.transport;
58
+ return nitroMajor === 2 ? app.fetch(input, init) : app.fetch(new Request(new URL(input, "http://localhost"), init));
59
+ }
60
+ });
61
+ return { fetch, close: async () => {
62
+ if (lease === "released")
63
+ return;
64
+ lease = "released";
65
+ group.users--;
66
+ if (group.users === 0) {
67
+ groups.set(renderer, { _tag: "closed" });
68
+ if (group.transport)
69
+ await (await group.transport).close();
70
+ }
71
+ } };
72
+ }
73
+
74
+ export { createPrerenderFetch };
package/dist/pro.mjs CHANGED
@@ -1,11 +1,11 @@
1
- import { useNuxt, useLogger } from '@nuxt/kit';
2
- import { useSiteConfig } from 'nuxt-site-config/kit';
1
+ import { useNuxt, useLogger, hasNuxtModule } from '@nuxt/kit';
3
2
  import { $fetch } from 'ofetch';
4
3
  import { isTest } from 'std-env';
5
4
  import { detectNuxtSeoModules } from './kit.mjs';
5
+ import 'node:fs/promises';
6
+ import 'node:module';
7
+ import 'node:path';
6
8
  import 'node:url';
7
- import 'pathe';
8
- import 'pkg-types';
9
9
 
10
10
  function hookNuxtSeoProDataUpload() {
11
11
  const nuxt = useNuxt();
@@ -18,9 +18,10 @@ function hookNuxtSeoProDataUpload() {
18
18
  }
19
19
  nuxt._isNuxtSeoProUploading = true;
20
20
  nuxt.hooks.hook("build:before", async () => {
21
- const siteConfig = useSiteConfig();
22
- const siteUrl = siteConfig.url?.startsWith("http") ? siteConfig.url : void 0;
23
- const siteName = siteConfig.name || void 0;
21
+ const siteConfigKit = hasNuxtModule("nuxt-site-config", nuxt) ? await import('nuxt-site-config/kit') : void 0;
22
+ const resolvedSiteConfig = siteConfigKit ? nuxt.runWithContext(() => siteConfigKit.useSiteConfig()) : void 0;
23
+ const siteUrl = resolvedSiteConfig?.url?.startsWith("http") ? resolvedSiteConfig.url : void 0;
24
+ const siteName = resolvedSiteConfig?.name || void 0;
24
25
  const modules = detectNuxtSeoModules(nuxt);
25
26
  await nuxt.hooks.callHook("nuxt-seo-pro:modules", modules);
26
27
  await $fetch("https://nuxtseo.com/api/pro/verify", {