Skip to content

Commit aedb496

Browse files
Merge branch 'main' into huy/2026/fd-135-cli-package-escape
2 parents 87098e5 + ed97068 commit aedb496

9 files changed

Lines changed: 776 additions & 162 deletions

File tree

.github/workflows/branch-markdown.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
echo; echo "PNPM install"
8888
pnpm install
8989
90-
- uses: DavidAnson/markdownlint-cli2-action@v23
90+
- uses: DavidAnson/markdownlint-cli2-action@v24
9191
if: steps.changed-files.outputs.count > 0
9292
with:
9393
config: '.markdownlint.json'

astro.config.mjs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
import remarkDirective from 'remark-directive';
22
import remarkHeading from 'remark-heading-id';
33
import { defineConfig } from 'astro/config';
4+
import { unified } from '@astrojs/markdown-remark';
45
import mdx from '@astrojs/mdx';
56
import { attributeMarkdown, wrapTables } from '/src/themes/octopus/utilities/custom-markdown.mjs';
67
import llmMdEmitter from './src/integrations/llm-md-emitter.ts';
78

89
// https://astro.build/config
910
export default defineConfig({
1011
site: 'https://octopus.com',
12+
compressHTML: true, // preserve astro v6 behavior - https://docs.astro.build/en/guides/upgrade-to/v7/
1113
integrations: [
1214
mdx(),
1315
llmMdEmitter()
@@ -16,14 +18,14 @@ export default defineConfig({
1618
shikiConfig: {
1719
theme: 'light-plus'
1820
},
19-
remarkPlugins: [
20-
remarkDirective,
21-
remarkHeading,
22-
attributeMarkdown,
23-
wrapTables
24-
],
25-
trailingSlash: 'never',
26-
extendDefaultPlugins: true,
21+
processor: unified({
22+
remarkPlugins: [
23+
remarkDirective,
24+
remarkHeading,
25+
attributeMarkdown,
26+
wrapTables
27+
],
28+
}),
2729
},
2830
server: {
2931
port: 3000

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@
2828
"watch": "onchange 'src/**/*.{js,mjs,ts,astro,css}' 'public/docs/js/**/*.js' 'public/docs/css/**/*.css' -- prettier --write --plugin=prettier-plugin-astro {{changed}}"
2929
},
3030
"dependencies": {
31-
"@astrojs/mdx": "^5.0.4",
32-
"astro": "^6.3.1",
31+
"@astrojs/markdown-remark": "7.2.1",
32+
"@astrojs/mdx": "^7.0.3",
33+
"astro": "^7.0.9",
3334
"astro-accelerator-utils": "^0.3.84",
3435
"glob": "^13.0.6",
3536
"gray-matter": "^4.0.3",

0 commit comments

Comments
 (0)