Skip to content

Commit ff8372b

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/flatted-3.4.1
2 parents 76874b2 + 89daacb commit ff8372b

96 files changed

Lines changed: 4332 additions & 4205 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- name: Setup Node.js
5151
uses: actions/setup-node@v6.3.0
5252
with:
53-
node-version: '22.x'
53+
node-version: '24.x'
5454
cache: 'npm'
5555

5656
- name: Install dependencies

.github/workflows/migrations-preview.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
if: steps.gate.outputs.should_migrate == 'true'
100100
uses: actions/setup-node@v6.3.0
101101
with:
102-
node-version: '22.x'
102+
node-version: '24.x'
103103
cache: 'npm'
104104

105105
- name: Install dependencies

.github/workflows/migrations-production.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
if: steps.gate.outputs.should_migrate == 'true'
7979
uses: actions/setup-node@v6.3.0
8080
with:
81-
node-version: '22.x'
81+
node-version: '24.x'
8282
cache: 'npm'
8383

8484
- name: Install dependencies

.github/workflows/playwright.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
- name: Setup Node.js
5353
uses: actions/setup-node@v6.3.0
5454
with:
55-
node-version: '22.x'
55+
node-version: '24.x'
5656
cache: 'npm'
5757

5858
- name: Install dependencies

.github/workflows/search.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
if: steps.scope.outputs.should_index == 'true'
5151
uses: actions/setup-node@v6.3.0
5252
with:
53-
node-version: '22.x'
53+
node-version: '24.x'
5454

5555
- name: Validate Upstash credentials
5656
if: steps.scope.outputs.should_index == 'true'

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- name: Setup Node.js
5454
uses: actions/setup-node@v6.3.0
5555
with:
56-
node-version: '22.x'
56+
node-version: '24.x'
5757
cache: 'npm'
5858

5959
- name: Install dependencies

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# allow running `nvm use` to automatically use a supported Node version
2-
22.9.0
2+
24

_TODO.md

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,9 +280,32 @@ https://mermaid.js.org/config/directives.html
280280

281281
src/content/articles/internal-developer-portal-platform-self-service-actions/pdf.mdx
282282

283-
## Prompt for Mermaid Images
284-
285283
├──
286284
└──
287285

288-
jpg
286+
<span class="font-mono">
287+
</span>
288+
289+
<Highlighter>
290+
</Highlighter>
291+
292+
<Diagram
293+
magnifyButtonPosition="bottom-right"
294+
size="full"
295+
/>
296+
297+
[&>span]:
298+
[&>*:first-child]:
299+
300+
<List
301+
classes={{
302+
wrapper: "sm:ml-6 sm:mr-12 mb-6",
303+
}}
304+
/>
305+
306+
<Table
307+
fullWidth={false}
308+
classes={{
309+
figure: "sm:ml-8 sm:mr-12 mb-6",
310+
}}
311+
/>

astro.config.ts

Lines changed: 37 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import vtbot from 'astro-vtbot'
1010
import { defineConfig } from 'astro/config'
1111
import type { AstroUserConfig } from 'astro'
1212
import { fileURLToPath } from 'node:url'
13-
import type { PluginOption } from 'vite'
13+
import { createLogger, type LogOptions, type PluginOption } from 'vite'
1414
/**
1515
* You cannot use path aliases (`@lib`, `@components`, etc.) in files that are
1616
* imported by astro.config.ts, because the path alias resolution happens
@@ -40,6 +40,27 @@ import { createSerializeFunction, pagesJsonWriter } from './src/integrations/sit
4040

4141
// Ensure Vite's HMR websocket connects through the same exposed dev server port used by Astro.
4242
const devServerPort = Number(process.env['DEV_SERVER_PORT'] ?? 4321)
43+
const viteLogger = createLogger(undefined, { allowClearScreen: false })
44+
45+
const shouldSuppressViteWarning = (message: string): boolean => {
46+
return (
47+
/resolve\.alias.*customResolver option/i.test(message) ||
48+
(
49+
/externalized for browser compatibility/i.test(message) &&
50+
/node_modules\/(?:@astrojs\/vercel|@astrojs\/internal-helpers|@vercel\/|esbuild\/lib\/main\.js|@mapbox\/node-pre-gyp|node-gyp-build|detect-libc|graceful-fs|bindings|resolve-from|file-uri-to-path|nopt)\//i.test(message)
51+
)
52+
)
53+
}
54+
55+
const shouldSuppressRollupWarning = (warning: {
56+
code?: string | undefined
57+
plugin?: string | undefined
58+
}): boolean => {
59+
return (
60+
warning.code === 'SOURCEMAP_BROKEN' &&
61+
warning.plugin === '@tailwindcss/vite:generate:build'
62+
)
63+
}
4364

4465
const standardIntegrations = [
4566
AstroPWA(pwaConfig),
@@ -99,8 +120,8 @@ export default defineConfig({
99120
* unit testing integrations.
100121
*/
101122
integrations: standardIntegrations,
102-
/** API routes are marked in their files for SSR */
103-
output: 'static',
123+
/** Astro actions require server output in Astro 6. Individual routes can still opt into prerendering. */
124+
output: 'server',
104125
prefetch: true,
105126
image: {
106127
remotePatterns: [
@@ -115,6 +136,13 @@ export default defineConfig({
115136
site: getSiteUrl(),
116137
trailingSlash: 'never',
117138
vite: {
139+
customLogger: {
140+
...viteLogger,
141+
warn: (message: string, options?: LogOptions) => {
142+
if (shouldSuppressViteWarning(message)) return
143+
viteLogger.warn(message, options)
144+
},
145+
},
118146
server: {
119147
hmr: {
120148
clientPort: devServerPort,
@@ -135,6 +163,12 @@ export default defineConfig({
135163
build: {
136164
/** Source map generation must be turned on for Sentry. */
137165
sourcemap: true,
166+
rollupOptions: {
167+
onwarn(warning, warn) {
168+
if (shouldSuppressRollupWarning(warning)) return
169+
warn(warning)
170+
},
171+
},
138172
},
139173
define: {
140174
/**
@@ -156,10 +190,4 @@ export default defineConfig({
156190
},
157191
},
158192
},
159-
experimental: {
160-
/**
161-
* Generate your styles and scripts in the order they are defined, instead of reversing them
162-
*/
163-
preserveScriptOrder: true,
164-
},
165193
})

0 commit comments

Comments
 (0)