Skip to content

Commit e8170a6

Browse files
Merge branch 'main' into joco/new_og_images
2 parents 6bfa344 + 1c86c19 commit e8170a6

File tree

13 files changed

+1066
-73
lines changed

13 files changed

+1066
-73
lines changed

_includes/renderCommand.tsx

Lines changed: 64 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -52,56 +52,60 @@ export default function renderCommand(
5252

5353
const toc: TableOfContentsItem_[] = [];
5454

55-
let about = command.about!.replaceAll(
56-
SUBSEQUENT_ENCAPSULATED_ANSI_RE,
57-
function (
58-
_,
59-
_opening1,
60-
text1,
61-
_closing1,
62-
space,
63-
opening2,
64-
text2,
65-
closing2,
66-
) {
67-
return `${opening2}${text1}${space}${text2}${closing2}`;
68-
},
69-
).replaceAll(SUBSEQUENT_ANSI_RE, "");
70-
let aboutLines = about.split("\n");
71-
const aboutLinesReadMoreIndex = aboutLines.findLastIndex((line) =>
72-
line.toLowerCase().replaceAll(ANSI_RE, "").trim().startsWith("read more:")
73-
);
74-
if (aboutLinesReadMoreIndex !== -1) {
75-
aboutLines = aboutLines.slice(0, aboutLinesReadMoreIndex);
76-
}
77-
78-
about = aboutLines.join("\n").replaceAll(
79-
ENCAPSULATED_ANSI_RE,
80-
(_, opening, text, _closing, offset, string) => {
81-
if (opening === "\u001b[32m") { // green, used as heading
82-
return `### ${text}`;
83-
} else if (
84-
opening === "\u001b[38;5;245m" || opening === "\u001b[36m" ||
85-
opening === "\u001b[1m" || opening === "\u001b[22m"
86-
) { // gray and cyan used for code and snippets, and we treat yellow and bold as well as such
87-
const lines = string.split("\n");
88-
let line = "";
89-
90-
while (offset > 0) {
91-
line = lines.shift();
92-
offset -= line.length + 1;
93-
}
55+
// Add null check for command.about
56+
let about = "";
57+
if (command.about) {
58+
about = command.about.replaceAll(
59+
SUBSEQUENT_ENCAPSULATED_ANSI_RE,
60+
function (
61+
_,
62+
_opening1,
63+
text1,
64+
_closing1,
65+
space,
66+
opening2,
67+
text2,
68+
closing2,
69+
) {
70+
return `${opening2}${text1}${space}${text2}${closing2}`;
71+
},
72+
).replaceAll(SUBSEQUENT_ANSI_RE, "");
73+
let aboutLines = about.split("\n");
74+
const aboutLinesReadMoreIndex = aboutLines.findLastIndex((line) =>
75+
line.toLowerCase().replaceAll(ANSI_RE, "").trim().startsWith("read more:")
76+
);
77+
if (aboutLinesReadMoreIndex !== -1) {
78+
aboutLines = aboutLines.slice(0, aboutLinesReadMoreIndex);
79+
}
9480

95-
if (START_AND_END_ANSI_RE.test(line.trim())) {
96-
return "\n```\n" + text + "\n```\n\n";
81+
about = aboutLines.join("\n").replaceAll(
82+
ENCAPSULATED_ANSI_RE,
83+
(_, opening, text, _closing, offset, string) => {
84+
if (opening === "\u001b[32m") { // green, used as heading
85+
return `### ${text}`;
86+
} else if (
87+
opening === "\u001b[38;5;245m" || opening === "\u001b[36m" ||
88+
opening === "\u001b[1m" || opening === "\u001b[22m"
89+
) { // gray and cyan used for code and snippets, and we treat yellow and bold as well as such
90+
const lines = string.split("\n");
91+
let line = "";
92+
93+
while (offset > 0) {
94+
line = lines.shift();
95+
offset -= line.length + 1;
96+
}
97+
98+
if (START_AND_END_ANSI_RE.test(line.trim())) {
99+
return "\n```\n" + text + "\n```\n\n";
100+
} else {
101+
return "`" + text + "`";
102+
}
97103
} else {
98-
return "`" + text + "`";
104+
return text;
99105
}
100-
} else {
101-
return text;
102-
}
103-
},
104-
);
106+
},
107+
);
108+
}
105109

106110
const args = [];
107111
const options: Record<string, ArgType[]> = {};
@@ -171,16 +175,19 @@ function renderOption(group: string, arg: ArgType, helpers: Lume.Helpers) {
171175
const id = `${group}-${arg.name}`;
172176

173177
let docsLink = null;
174-
let help = arg.help.replaceAll(ANSI_RE, "");
175-
const helpLines = help.split("\n");
176-
const helpLinesDocsIndex = helpLines.findLastIndex((line) =>
177-
line.toLowerCase()
178-
.trim()
179-
.startsWith("docs:")
180-
);
181-
if (helpLinesDocsIndex !== -1) {
182-
help = helpLines.slice(0, helpLinesDocsIndex).join("\n");
183-
docsLink = helpLines[helpLinesDocsIndex].trim().slice("docs:".length);
178+
// Add null check for arg.help
179+
let help = arg.help ? arg.help.replaceAll(ANSI_RE, "") : "";
180+
if (help) {
181+
const helpLines = help.split("\n");
182+
const helpLinesDocsIndex = helpLines.findLastIndex((line) =>
183+
line.toLowerCase()
184+
.trim()
185+
.startsWith("docs:")
186+
);
187+
if (helpLinesDocsIndex !== -1) {
188+
help = helpLines.slice(0, helpLinesDocsIndex).join("\n");
189+
docsLink = helpLines[helpLinesDocsIndex].trim().slice("docs:".length);
190+
}
184191
}
185192

186193
return (

deploy/early-access/changelog.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,26 @@ Deploy Classic documentation? [View it here](/deploy/).
1010

1111
:::
1212

13+
## June 24th, 2025
14+
15+
### Features
16+
17+
- The playground now has live streaming logs and traces panels
18+
- Logs and traces for the current revision are displayed for the past hour
19+
- Logs and traces can be filtered, just like in the dedicated observability
20+
pages
21+
- Framework auto-detection now works for more projects out of the box, including
22+
many Vite-based projects
23+
- The organization dropdown now highlights the currently selected organization
24+
more clearly
25+
26+
### Bug fixes
27+
28+
- The sparklines in the metrics overview are now working correctly
29+
- The error rate metric now functions properly
30+
- GitHub-triggered builds no longer run multiple times
31+
- Next.js builds now work more reliably on older Next.js versions
32+
1333
## June 12th, 2025
1434

1535
### Features

examples/_data.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,11 @@ export const sidebar = [
375375
href: "/examples/otel_span_propagation_tutorial/",
376376
type: "tutorial",
377377
},
378+
{
379+
title: "OpenTelemetry with Deno Deploy",
380+
href: "/examples/deploy_otel_tutorial/",
381+
type: "tutorial",
382+
},
378383
],
379384
},
380385
{

examples/tutorials/astro.md

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ can start from scratch, and skip installing dependencies so we can install them
3131
with Deno later:
3232

3333
```jsx
34-
deno -A npm:create-astro@latest
34+
deno init --npm astro@latest
3535

3636
astro Launch sequence initiated.
3737

@@ -104,6 +104,23 @@ We can start the Astro server with `deno task dev`:
104104
105105
![Getting the Astro app to work](./images/how-to/astro/hello-astro.png)
106106
107+
## Configure the formatter
108+
109+
`deno fmt` supports Astro files with the
110+
[`--unstable-component`](https://docs.deno.com/runtime/reference/cli/fmt/#formatting-options-unstable-component)
111+
flag. To use it, run this command:
112+
113+
```sh
114+
deno fmt --unstable-component
115+
```
116+
117+
To configure `deno fmt` to always format your Astro files, add this at the top
118+
level of your `deno.json` file:
119+
120+
```json
121+
"unstable": ["fmt-component"]
122+
```
123+
107124
## Update index page to list all dinosaurs
108125
109126
Our app will display facts about a variety of dinosaurs. The first page to

0 commit comments

Comments
 (0)