Skip to content

Commit f3e3045

Browse files
harlan-zwharlan-zw
committed
fix: resolve CI issues
1 parent 162799b commit f3e3045

File tree

13 files changed

+45
-79
lines changed

13 files changed

+45
-79
lines changed

‎client/app.config.ts‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
export default {
2+
ui: {
3+
colors: {
4+
primary: 'green',
5+
neutral: 'neutral',
6+
},
7+
button: {
8+
defaultVariants: {
9+
color: 'neutral',
10+
variant: 'ghost',
11+
size: 'sm',
12+
},
13+
},
14+
badge: {
15+
defaultVariants: {
16+
color: 'neutral',
17+
variant: 'subtle',
18+
size: 'xs',
19+
},
20+
},
21+
tooltip: {
22+
defaultVariants: {
23+
delayDuration: 0,
24+
},
25+
},
26+
},
27+
}

‎client/app.vue‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ provide(RefetchPathDebugKey, refreshPathDebug)
9090
const {
9191
isDebugLoading,
9292
error,
93-
isPageScreenshot,
9493
refreshSources,
9594
resetProps,
9695
} = useOgImage()

‎client/pages/index.vue‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,9 +1070,6 @@ const productionHostname = computed(() => {
10701070
</Transition>
10711071
</div>
10721072
</div>
1073-
</Transition>
1074-
</div>
1075-
</div>
10761073
</template>
10771074

10781075
<style scoped>

‎pnpm-workspace.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,6 @@ catalog:
110110
wrangler: ^4.76.0
111111
yoga-wasm-web: ^0.3.3
112112
catalogs:
113-
conflicts_nuxtseo-shared_h0_1_3:
114-
nuxtseo-shared: ^0.1.5
115-
116113
devtools:
117114
'@iconify-json/simple-icons': ^1.2.74
118115
json-editor-vue: ^0.18.1

‎src/build/build.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { readdir, readFile, writeFile } from 'node:fs/promises'
88
import { resolvePath, useNuxt } from '@nuxt/kit'
99
import { parseAndWalk } from 'oxc-walker'
1010
import { dirname, join } from 'pathe'
11-
import { applyNitroPresetCompatibility, getPresetNitroPresetCompatibility, resolveNitroPreset } from '../compatibility'
11+
import { applyNitroPresetCompatibility, getPresetNitroPresetCompatibility, resolveOgImagePreset } from '../compatibility'
1212
import { RE_LEGACY_SUFFIX } from '../util'
1313

1414
const RE_REFLECT_HAS_MINIFIED = /Reflect\.has\(([\w$]+),([\w$]+)\)\?Reflect\.get\(\1,\2,([\w$]+)\):Reflect\.get\(([\w$]+),\2,\3\)/g
@@ -47,7 +47,7 @@ export async function setupBuildHandler(config: ModuleOptions, resolve: Resolver
4747

4848
// HACK: we need to patch the compiled output to fix the wasm resolutions using esmImport
4949
// TODO replace this once upstream is fixed
50-
const target = resolveNitroPreset(nitro.options)
50+
const target = resolveOgImagePreset(nitro.options)
5151
const normalizedTarget = target.replace(RE_LEGACY_SUFFIX, '')
5252
const isEdgePreset = ['cloudflare', 'cloudflare-pages', 'cloudflare-pages-static', 'cloudflare-module', 'cloudflare-durable', 'vercel-edge', 'netlify-edge'].includes(normalizedTarget)
5353
const isCloudflarePreset = normalizedTarget.startsWith('cloudflare')

‎src/build/dev.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import type { Nuxt } from '@nuxt/schema'
33
import type { ModuleOptions } from '../module'
44
import type { RendererType } from '../runtime/types'
55
import { useNuxt } from '@nuxt/kit'
6-
import { applyNitroPresetCompatibility, getPresetNitroPresetCompatibility, resolveNitroPreset } from '../compatibility'
6+
import { applyNitroPresetCompatibility, getPresetNitroPresetCompatibility, resolveOgImagePreset } from '../compatibility'
77
import { getMissingDependencies, getRecommendedBinding } from '../utils/dependencies'
88

99
// we need all of the runtime dependencies when using build
@@ -13,7 +13,7 @@ export function setupDevHandler(options: ModuleOptions, resolve: Resolver, getDe
1313
// In dev, expand detected renderers to include any with installed dependencies
1414
// This allows community templates to work for any renderer the user has deps for
1515
const detectedRenderers = new Set(getDetectedRenderers())
16-
const targetCompatibility = getPresetNitroPresetCompatibility(resolveNitroPreset(nitro.options))
16+
const targetCompatibility = getPresetNitroPresetCompatibility(resolveOgImagePreset(nitro.options))
1717
for (const renderer of (['satori', 'takumi', 'browser'] as const)) {
1818
if (!detectedRenderers.has(renderer)) {
1919
const binding = getRecommendedBinding(renderer, targetCompatibility)

‎src/compatibility.ts‎

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,10 @@ import type { NitroConfig } from 'nitropack/config'
44
import type { CompatibilityFlags, RendererType, RuntimeCompatibilitySchema } from './runtime/types'
55
import { addTemplate, useNuxt } from '@nuxt/kit'
66
import { defu } from 'defu'
7-
import { env, provider } from 'std-env'
7+
import { resolveNitroPreset } from './kit'
88
import { logger } from './runtime/logger'
99
import { RE_LEGACY_SUFFIX } from './util'
1010

11-
const autodetectableProviders = {
12-
azure_static: 'azure',
13-
cloudflare_pages: 'cloudflare-pages',
14-
netlify: 'netlify',
15-
stormkit: 'stormkit',
16-
vercel: 'vercel',
17-
cleavr: 'cleavr',
18-
stackblitz: 'stackblitz',
19-
}
20-
21-
const autodetectableStaticProviders = {
22-
netlify: 'netlify-static',
23-
vercel: 'vercel-static',
24-
}
25-
2611
export const NodeRuntime: RuntimeCompatibilitySchema = {
2712
// node-server runtime
2813
browser: 'on-demand', // this gets changed build start
@@ -122,26 +107,13 @@ export const RuntimeCompatibility: Record<string, RuntimeCompatibilitySchema> =
122107
'cloudflare-durable': cloudflare,
123108
} as const
124109

125-
export function detectTarget(options: { static?: boolean } = {}) {
126-
// @ts-expect-error untyped
127-
return options?.static ? autodetectableStaticProviders[provider] : autodetectableProviders[provider]
128-
}
129-
130-
export function resolveNitroPreset(nitroConfig?: NitroConfig): string {
131-
if (provider === 'stackblitz' || provider === 'codesandbox')
132-
return provider
110+
export function resolveOgImagePreset(nitroConfig?: NitroConfig): string {
133111
const nuxt = useNuxt()
134112
if (nuxt.options.dev)
135113
return 'nitro-dev'
136-
// check for prerendering
137114
if (nuxt.options.nitro.static)
138115
return 'nitro-prerender'
139-
let preset
140-
if (nitroConfig && nitroConfig?.preset)
141-
preset = nitroConfig.preset
142-
if (!preset)
143-
preset = env.NITRO_PRESET || env.SERVER_PRESET || detectTarget() || 'node-server'
144-
return preset.replace('_', '-') // sometimes they are different
116+
return resolveNitroPreset(nitroConfig)
145117
}
146118

147119
export function getPresetNitroPresetCompatibility(target: string) {
@@ -156,7 +128,7 @@ export function getPresetNitroPresetCompatibility(target: string) {
156128
}
157129

158130
export async function applyNitroPresetCompatibility(nitroConfig: NitroConfig, options: { compatibility?: CompatibilityFlags, resolve: Resolver, overrides?: RuntimeCompatibilitySchema, detectedRenderers: Set<RendererType> }): Promise<Partial<Omit<RuntimeCompatibilitySchema, 'wasm'>>> {
159-
const target = resolveNitroPreset(nitroConfig)
131+
const target = resolveOgImagePreset(nitroConfig)
160132
const compatibility: RuntimeCompatibilitySchema = getPresetNitroPresetCompatibility(target)
161133

162134
const { resolve, detectedRenderers } = options

‎src/kit.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { getNuxtModuleOptions, isNuxtGenerate } from 'nuxtseo-shared/kit'
1+
export { detectTarget, getNuxtModuleOptions, isNuxtGenerate, resolveNitroPreset } from 'nuxtseo-shared/kit'

‎src/module.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import { ComponentImportRewritePlugin } from './build/vite-component-import-rewr
4141
import {
4242
ensureDependencies,
4343
getPresetNitroPresetCompatibility,
44-
resolveNitroPreset,
44+
resolveOgImagePreset,
4545
} from './compatibility'
4646
import { getNuxtModuleOptions, isNuxtGenerate } from './kit'
4747
import { addComponentWarning, addConfigWarning, emitWarnings, hasWarnings, REMOVED_CONFIG } from './migrations/warnings'
@@ -330,7 +330,7 @@ export default defineNuxtModule<ModuleOptions>({
330330
nuxt.options.alias['#og-image-cache'] = resolve('./runtime/server/og-image/cache/lru')
331331

332332
// Resolve preset early to check compatibility settings
333-
const preset = resolveNitroPreset(nuxt.options.nitro)
333+
const preset = resolveOgImagePreset(nuxt.options.nitro)
334334
const targetCompatibility = getPresetNitroPresetCompatibility(preset)
335335

336336
// Cloudflare Workers-specific checks

‎src/onboarding.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { existsSync, readdirSync } from 'node:fs'
55
import { mkdir, writeFile } from 'node:fs/promises'
66
import { join } from 'pathe'
77
import { isCI } from 'std-env'
8-
import { getPresetNitroPresetCompatibility, resolveNitroPreset } from './compatibility'
8+
import { getPresetNitroPresetCompatibility, resolveOgImagePreset } from './compatibility'
99
import { promptFontsMigration } from './migrations/fonts'
1010
import { logger } from './runtime/logger'
1111
import { getRendererFromFilename, hasResolvableDependency } from './util'
@@ -299,7 +299,7 @@ export async function onUpgrade(
299299
if (detectedRenderers.size === 0)
300300
detectedRenderers.add('satori')
301301

302-
const preset = resolveNitroPreset()
302+
const preset = resolveOgImagePreset()
303303
const compatibility = getPresetNitroPresetCompatibility(preset)
304304
for (const renderer of detectedRenderers) {
305305
const validation = await validateProviderSetup(renderer, compatibility)

0 commit comments

Comments
 (0)