Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,796 changes: 1,114 additions & 682 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions site/dolt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@
"generate-api-v2": "node ../../scripts/generate-api-v2.mjs"
},
"dependencies": {
"@astrojs/react": "^5.0.1",
"@astrojs/tailwind": "^6.0.2",
"@astrojs/markdown-remark": "^7.2.2",
"@astrojs/react": "^6.0.2",
"@dolthub/react-components": "^0.4.3",
"@dolthub/react-hooks": "^0.3.1",
"astro": "^6.1.10",
"astro": "^7.2.0",
"autoprefixer": "^10.4.21",
"github-markdown-css": "^5.0.0",
"pagefind": "^1.5.2",
"postcss": "^8.5.3",
"react": "^19.2.8",
"react-dom": "^19.2.8",
"react-icons": "^5.7.0",
Expand Down
7 changes: 7 additions & 0 deletions site/dolt/postcss.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { fileURLToPath } from "url";
import path from "path";
import { buildPostcssConfig } from "../shared/config/postcss.mjs";

const __dirname = path.dirname(fileURLToPath(import.meta.url));

export default buildPostcssConfig(__dirname);
8 changes: 5 additions & 3 deletions site/doltgres/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@
"preview": "astro preview --port 4323"
},
"dependencies": {
"@astrojs/react": "^5.0.1",
"@astrojs/tailwind": "^6.0.2",
"@astrojs/markdown-remark": "^7.2.2",
"@astrojs/react": "^6.0.2",
"@dolthub/react-components": "^0.4.3",
"@dolthub/react-hooks": "^0.3.1",
"astro": "^6.1.10",
"astro": "^7.2.0",
"autoprefixer": "^10.4.21",
"github-markdown-css": "^5.0.0",
"pagefind": "^1.5.2",
"postcss": "^8.5.3",
"react": "^19.2.8",
"react-dom": "^19.2.8",
"react-icons": "^5.7.0",
Expand Down
7 changes: 7 additions & 0 deletions site/doltgres/postcss.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { fileURLToPath } from "url";
import path from "path";
import { buildPostcssConfig } from "../shared/config/postcss.mjs";

const __dirname = path.dirname(fileURLToPath(import.meta.url));

export default buildPostcssConfig(__dirname);
8 changes: 5 additions & 3 deletions site/doltlab/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@
"preview": "astro preview --port 4322"
},
"dependencies": {
"@astrojs/react": "^5.0.1",
"@astrojs/tailwind": "^6.0.2",
"@astrojs/markdown-remark": "^7.2.2",
"@astrojs/react": "^6.0.2",
"@dolthub/react-components": "^0.4.3",
"@dolthub/react-hooks": "^0.3.1",
"astro": "^6.1.10",
"astro": "^7.2.0",
"autoprefixer": "^10.4.21",
"github-markdown-css": "^5.0.0",
"pagefind": "^1.5.2",
"postcss": "^8.5.3",
"react": "^19.2.8",
"react-dom": "^19.2.8",
"react-icons": "^5.7.0",
Expand Down
7 changes: 7 additions & 0 deletions site/doltlab/postcss.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { fileURLToPath } from "url";
import path from "path";
import { buildPostcssConfig } from "../shared/config/postcss.mjs";

const __dirname = path.dirname(fileURLToPath(import.meta.url));

export default buildPostcssConfig(__dirname);
8 changes: 6 additions & 2 deletions site/shared/config/astro.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Workspaces hoist deps to the root, so this file can import the plugins
// directly (resolution walks up from shared/ to the hoisted root).
import { defineConfig } from "astro/config";
import tailwind from "@astrojs/tailwind";
import react from "@astrojs/react";
import { unified } from "@astrojs/markdown-remark";
import rehypeSlug from "rehype-slug";
Expand Down Expand Up @@ -52,7 +51,12 @@ export function buildAstroConfig(site, siteDir) {
site,
base,
outDir: `./dist${base}`,
integrations: [tailwind(), react()],
integrations: [react()],
// Astro 7 changed the default to 'jsx', which strips whitespace between
// inline elements the way React does — so prose like `<em>x</em> <code>y</code>`
// would lose the space between them. Docs pages are almost entirely prose,
// so keep the HTML-aware compression Astro 6 did.
compressHTML: true,
markdown: {
shikiConfig,
processor: unified({
Expand Down
21 changes: 21 additions & 0 deletions site/shared/config/postcss.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Shared PostCSS config, one per site via each site's postcss.config.mjs.
//
// This replaces @astrojs/tailwind, which was removed in the Astro 7 migration:
// its latest release (6.0.2) declares `astro: ^3 || ^4 || ^5`, so it never
// supported Astro 6 or 7 and is effectively unmaintained. Astro processes
// <style> blocks and imported CSS through PostCSS on its own, so wiring
// Tailwind here does the same job the integration did.
//
// The integration also injected the `@tailwind` directives (applyBaseStyles).
// Those now live in shared/styles/global.css, imported by DocsLayout.
//
// siteDir is the absolute site path — Tailwind's config is resolved relative
// to it so each site keeps its own content globs.
export function buildPostcssConfig(siteDir) {
return {
plugins: {
tailwindcss: { config: `${siteDir}/tailwind.config.mjs` },
autoprefixer: {},
},
};
}
3 changes: 3 additions & 0 deletions site/shared/layouts/DocsLayout.astro
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
---
// Tailwind's base/components/utilities layers. @astrojs/tailwind used to inject
// these; it was dropped in the Astro 7 migration, so they're imported here.
import "../styles/global.css";
// Components that use react-icons (CJS) must stay client:only
import { Navbar, Footer, ThemeInit } from "../components";
// Components safe for SSR — import directly to avoid pulling in react-icons via barrel
Expand Down
8 changes: 8 additions & 0 deletions site/shared/styles/global.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/* Tailwind's base, component, and utility layers.
*
* @astrojs/tailwind used to inject these automatically (applyBaseStyles). That
* integration was dropped in the Astro 7 migration, so the directives live here
* and DocsLayout imports this file once for every page. */
@tailwind base;
@tailwind components;
@tailwind utilities;
Loading