diff --git a/.prettierrc b/.prettierrc index 1898fddc4e..447d931a3b 100644 --- a/.prettierrc +++ b/.prettierrc @@ -3,5 +3,13 @@ "@ianvs/prettier-plugin-sort-imports", "prettier-plugin-astro" ], + "overrides": [ + { + "files": "*.astro", + "options": { + "parser": "astro" + } + } + ], "trailingComma": "all" } diff --git a/bun.lock b/bun.lock index 33a767968e..c8aae248d6 100644 --- a/bun.lock +++ b/bun.lock @@ -39,7 +39,7 @@ "liquidjs": "^10.27.2", "markdownlint-cli": "^0.33.0", "prettier": "^3.9.5", - "prettier-plugin-astro": "^0.14.1", + "prettier-plugin-astro": "^1.0.0", "semver": "^7.7.2", "stylelint": "^14.9.0", "stylelint-config-standard-scss": "^4.0.0", @@ -330,6 +330,8 @@ "@pkgr/core": ["@pkgr/core@0.1.2", "", {}, "sha512-fdDH1LSGfZdTH2sxdpVMw31BanV28K/Gry0cVFxaNP77neJSkd82mM8ErPNYs9e+0O7SdHBLTDzDgwUuy18RnQ=="], + "@prettier/parse-srcset": ["@prettier/parse-srcset@3.1.0", "", {}, "sha512-FIRv2rZotO9NP/r66taYqD1zICpPiBbrECqjKV/xqNotqDxF7fLzzUeK+1RSRx9Tenk0DajR/GcRmTJ2qtHaKQ=="], + "@rolldown/binding-android-arm64": ["@rolldown/binding-android-arm64@1.1.5", "", { "os": "android", "cpu": "arm64" }, "sha512-lZg8fqIv2v7FF237bwMgzGZEJvGL79/s5knJ/i6FmsGF4XXlzccZ4jb+TrFIxtSSxFtIpdsgrPZeMk1I9AFcyQ=="], "@rolldown/binding-darwin-arm64": ["@rolldown/binding-darwin-arm64@1.1.5", "", { "os": "darwin", "cpu": "arm64" }, "sha512-51Bnx9pNiMRKSUNtBfySkNJ9vMU9Hh3I1ozDd6gyPPYzaXCfnptUcEZxXGYFn+ul2dtcMUiqGR1Yai2K10uoTw=="], @@ -1432,7 +1434,7 @@ "prettier": ["prettier@3.9.5", "", { "bin": { "prettier": "bin/prettier.cjs" } }, "sha512-/FVl766LpUfB5vXgCYOYa0MeV/441Ia99AeICQIQFTY/Nw0roZwULcXpku5i1/m5kt/baz+s4Zogspd839HSMg=="], - "prettier-plugin-astro": ["prettier-plugin-astro@0.14.1", "", { "dependencies": { "@astrojs/compiler": "^2.9.1", "prettier": "^3.0.0", "sass-formatter": "^0.7.6" } }, "sha512-RiBETaaP9veVstE4vUwSIcdATj6dKmXljouXc/DDNwBSPTp8FRkLGDSGFClKsAFeeg+13SB0Z1JZvbD76bigJw=="], + "prettier-plugin-astro": ["prettier-plugin-astro@1.0.0", "", { "dependencies": { "@astrojs/compiler-rs": "^0.4.0", "@prettier/parse-srcset": "^3.1.0", "sass-formatter": "^0.8.0" }, "peerDependencies": { "prettier": "^3.5.3" } }, "sha512-xOlwKNSaPkPPiJeOhiFk8/MA2eH5A+in99dID+weTJhPcq+FBdIaB/3UNFdy9ckmc8/bT7QNyxSb78cnopgElQ=="], "pretty-bytes": ["pretty-bytes@1.0.4", "", { "dependencies": { "get-stdin": "^4.0.1", "meow": "^3.1.0" }, "bin": { "pretty-bytes": "cli.js" } }, "sha512-LNisJvAjy+hruxp3GV4IkZZscTI34+ISfeM1hesB9V6ezIDfXYrBi9TIXVjjMcEB4QFN7tL+dFDEk4s8jMBMyA=="], @@ -1550,7 +1552,7 @@ "safer-buffer": ["safer-buffer@2.1.2", "", {}, "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="], - "sass-formatter": ["sass-formatter@0.7.9", "", { "dependencies": { "suf-log": "^2.5.3" } }, "sha512-CWZ8XiSim+fJVG0cFLStwDvft1VI7uvXdCNJYXhDvowiv+DsbD1nXLiQ4zrE5UBvj5DWZJ93cwN0NX5PMsr1Pw=="], + "sass-formatter": ["sass-formatter@0.8.0", "", { "dependencies": { "suf-log": "^2.5.3" }, "bin": { "sass-formatter": "dist/cli.js" } }, "sha512-Nf4eMGE2O5vnJG7KPCRyksWS9gVKSYoUWtPeMXRRxwZSPVQhSGtL602xVYS65LvMkHmkvKa7xpauF0+/5pPwrg=="], "satteri": ["satteri@0.9.5", "", { "dependencies": { "@types/estree-jsx": "^1.0.5", "@types/hast": "^3.0.4", "@types/mdast": "^4.0.4", "@types/unist": "^3.0.3" }, "optionalDependencies": { "@bruits/satteri-darwin-arm64": "0.9.5", "@bruits/satteri-darwin-x64": "0.9.5", "@bruits/satteri-linux-arm64-gnu": "0.9.5", "@bruits/satteri-linux-arm64-musl": "0.9.5", "@bruits/satteri-linux-x64-gnu": "0.9.5", "@bruits/satteri-linux-x64-musl": "0.9.5", "@bruits/satteri-wasm32-wasi": "0.9.5", "@bruits/satteri-win32-arm64-msvc": "0.9.5", "@bruits/satteri-win32-x64-msvc": "0.9.5" } }, "sha512-ZuWVl+vnM64y+/TtX8Kosv2c00W+hLQiiwnEL6H0UKVVrxFqMw4D2CJHHQaouVd89OAhtBBfjWLqhKi3TVUV4w=="], @@ -2096,6 +2098,8 @@ "peek-stream/through2": ["through2@2.0.5", "", { "dependencies": { "readable-stream": "~2.3.6", "xtend": "~4.0.1" } }, "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="], + "prettier-plugin-astro/@astrojs/compiler-rs": ["@astrojs/compiler-rs@0.4.0", "", { "dependencies": { "@astrojs/compiler-binding": "0.4.0" } }, "sha512-koVikeon1kreEy+/JzLQRy3vzHHQVOjycs4degg4vFufKApZOwMZvSSAEztYNhmcQVfNVsVZZI4cEge3cexAbQ=="], + "pretty-bytes/get-stdin": ["get-stdin@4.0.1", "", {}, "sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw=="], "pretty-bytes/meow": ["meow@3.7.0", "", { "dependencies": { "camelcase-keys": "^2.0.0", "decamelize": "^1.1.2", "loud-rejection": "^1.0.0", "map-obj": "^1.0.1", "minimist": "^1.1.3", "normalize-package-data": "^2.3.4", "object-assign": "^4.0.1", "read-pkg-up": "^1.0.1", "redent": "^1.0.0", "trim-newlines": "^1.0.0" } }, "sha512-TNdwZs0skRlpPpCUK25StC4VH+tP5GgeY1HQOOGP+lQ2xtdkN2VtT/5tiX9k3IWpkBPV9b3LsAWXn4GGi/PrSA=="], @@ -2332,6 +2336,8 @@ "peek-stream/through2/readable-stream": ["readable-stream@2.3.8", "", { "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", "isarray": "~1.0.0", "process-nextick-args": "~2.0.0", "safe-buffer": "~5.1.1", "string_decoder": "~1.1.1", "util-deprecate": "~1.0.1" } }, "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="], + "prettier-plugin-astro/@astrojs/compiler-rs/@astrojs/compiler-binding": ["@astrojs/compiler-binding@0.4.0", "", { "optionalDependencies": { "@astrojs/compiler-binding-darwin-arm64": "0.4.0", "@astrojs/compiler-binding-darwin-x64": "0.4.0", "@astrojs/compiler-binding-linux-arm64-gnu": "0.4.0", "@astrojs/compiler-binding-linux-arm64-musl": "0.4.0", "@astrojs/compiler-binding-linux-x64-gnu": "0.4.0", "@astrojs/compiler-binding-linux-x64-musl": "0.4.0", "@astrojs/compiler-binding-wasm32-wasi": "0.4.0", "@astrojs/compiler-binding-win32-arm64-msvc": "0.4.0", "@astrojs/compiler-binding-win32-x64-msvc": "0.4.0" } }, "sha512-x2RjDUuWfwLNtc3mjAdSRInwqh/rqbLar9cm/5FOMbHvmYZB7yfKewzSclAxWjIZsypJDXv1lhaP2WG+P8TK3g=="], + "pretty-bytes/meow/camelcase-keys": ["camelcase-keys@2.1.0", "", { "dependencies": { "camelcase": "^2.0.0", "map-obj": "^1.0.0" } }, "sha512-bA/Z/DERHKqoEOrp+qeGKw1QlvEQkGZSc0XaY6VnTxZr+Kv1G5zFwttpjv8qxZ/sBPT4nthwZaAcsAZTJlSKXQ=="], "pretty-bytes/meow/map-obj": ["map-obj@1.0.1", "", {}, "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg=="], @@ -2442,6 +2448,24 @@ "peek-stream/through2/readable-stream/string_decoder": ["string_decoder@1.1.1", "", { "dependencies": { "safe-buffer": "~5.1.0" } }, "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="], + "prettier-plugin-astro/@astrojs/compiler-rs/@astrojs/compiler-binding/@astrojs/compiler-binding-darwin-arm64": ["@astrojs/compiler-binding-darwin-arm64@0.4.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-ZVUwHundaQyFNjE6uoa0usaC0WOCitDCLS/4mdb4rOiJXwVUuKJBMxI5WMzXLWmamsXtK/Z//ifLXvV5Yeh4Hw=="], + + "prettier-plugin-astro/@astrojs/compiler-rs/@astrojs/compiler-binding/@astrojs/compiler-binding-darwin-x64": ["@astrojs/compiler-binding-darwin-x64@0.4.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-FI6G8AY8u6fR1SI/QRR5yGMwtvZwP34CDmZpZ5HwJGa50UM1VISTLhqkhV4a476pmgd25X1Aur2dqw6hUnrlKA=="], + + "prettier-plugin-astro/@astrojs/compiler-rs/@astrojs/compiler-binding/@astrojs/compiler-binding-linux-arm64-gnu": ["@astrojs/compiler-binding-linux-arm64-gnu@0.4.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-lB9gLFJK7m82EnjaU8nlRBEfcwGNeHidW3sSjODTUjMNaoewVuUz9fwwdY5M4jiSXIqWLH3yl6TX8FTDKA74Sw=="], + + "prettier-plugin-astro/@astrojs/compiler-rs/@astrojs/compiler-binding/@astrojs/compiler-binding-linux-arm64-musl": ["@astrojs/compiler-binding-linux-arm64-musl@0.4.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-HPbvWqbxFxyaoQJhLxCaSjtYBx9KBo7JGVzEFZCmMl968a2PsSH0UfiODYgYPXofTOIsIH2aoCcrHXML0IA3ig=="], + + "prettier-plugin-astro/@astrojs/compiler-rs/@astrojs/compiler-binding/@astrojs/compiler-binding-linux-x64-gnu": ["@astrojs/compiler-binding-linux-x64-gnu@0.4.0", "", { "os": "linux", "cpu": "x64" }, "sha512-tQKolMxoJ/+0AmLWm1PmJ/i+z3i10ZU1bNuVjEDulCf48azEMtUNjTZgHJ5MPtpYRNc7dlETr8QujUfduzoC7Q=="], + + "prettier-plugin-astro/@astrojs/compiler-rs/@astrojs/compiler-binding/@astrojs/compiler-binding-linux-x64-musl": ["@astrojs/compiler-binding-linux-x64-musl@0.4.0", "", { "os": "linux", "cpu": "x64" }, "sha512-5v5YymudsxMHp3NBLCS8BUlu5CRqeLtWD9cKS/4nIhIEHCbpz9okmVV6I0HWqmBAPhWYcDa3vw/vltYPrOQCTA=="], + + "prettier-plugin-astro/@astrojs/compiler-rs/@astrojs/compiler-binding/@astrojs/compiler-binding-wasm32-wasi": ["@astrojs/compiler-binding-wasm32-wasi@0.4.0", "", { "dependencies": { "@napi-rs/wasm-runtime": "^1.2.2" }, "cpu": "none" }, "sha512-m/phuH3x3PREvv1OnkM44NoPh4MatUadix1fB1u5SvMLCyDTUZykDJbKnWf1cjnYmHdlB8HcjTjl6JrCqAIXcw=="], + + "prettier-plugin-astro/@astrojs/compiler-rs/@astrojs/compiler-binding/@astrojs/compiler-binding-win32-arm64-msvc": ["@astrojs/compiler-binding-win32-arm64-msvc@0.4.0", "", { "os": "win32", "cpu": "arm64" }, "sha512-B9zYf3okEY83kM8gydlpH2BHP00w4ifxPqlYlWrgTwuD6wnkrJDCwBlgy1q31cERjCJRXN1lrE2VmkLvFjv/6g=="], + + "prettier-plugin-astro/@astrojs/compiler-rs/@astrojs/compiler-binding/@astrojs/compiler-binding-win32-x64-msvc": ["@astrojs/compiler-binding-win32-x64-msvc@0.4.0", "", { "os": "win32", "cpu": "x64" }, "sha512-zB0Nrv0dGc0zZWPGDRmmETTPhDRqyZjAjk+gWMlVrJX5U89obpB3VUUE1ZiHxOCN5LQojeLK6O8L/dnoHolvNQ=="], + "pretty-bytes/meow/camelcase-keys/camelcase": ["camelcase@2.1.1", "", {}, "sha512-DLIsRzJVBQu72meAKPkWQOLcujdXT32hwdfnkI1frSiSRMK1MofjKHf+MEx0SB6fjEFXL8fBDv1dKymBlOp4Qw=="], "pretty-bytes/meow/normalize-package-data/hosted-git-info": ["hosted-git-info@2.8.9", "", {}, "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="], @@ -2480,6 +2504,8 @@ "concurrently/yargs/string-width/strip-ansi/ansi-regex": ["ansi-regex@6.1.0", "", {}, "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA=="], + "prettier-plugin-astro/@astrojs/compiler-rs/@astrojs/compiler-binding/@astrojs/compiler-binding-wasm32-wasi/@napi-rs/wasm-runtime": ["@napi-rs/wasm-runtime@1.2.4", "", { "dependencies": { "@tybys/wasm-util": "^0.10.3" }, "peerDependencies": { "@emnapi/core": "^1.7.1 || ^2.0.0-alpha.4", "@emnapi/runtime": "^1.7.1 || ^2.0.0-alpha.4" } }, "sha512-AJxoUD2/15ESHbvpcyjU274nsAPLuOtPHCk0vKJM5pj//Fg/B1FXNWjPnXTT9PymCYYiHo4zPj0ZomXBKhoy7g=="], + "pretty-bytes/meow/read-pkg-up/find-up/path-exists": ["path-exists@2.1.0", "", { "dependencies": { "pinkie-promise": "^2.0.0" } }, "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ=="], "pretty-bytes/meow/read-pkg-up/read-pkg/path-type": ["path-type@1.1.0", "", { "dependencies": { "graceful-fs": "^4.1.2", "pify": "^2.0.0", "pinkie-promise": "^2.0.0" } }, "sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg=="], diff --git a/package.json b/package.json index add75d3c17..94728344e9 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "liquidjs": "^10.27.2", "markdownlint-cli": "^0.33.0", "prettier": "^3.9.5", - "prettier-plugin-astro": "^0.14.1", + "prettier-plugin-astro": "^1.0.0", "semver": "^7.7.2", "stylelint": "^14.9.0", "stylelint-config-standard-scss": "^4.0.0", diff --git a/src/components/chrome/LeftSidebar.astro b/src/components/chrome/LeftSidebar.astro index f900e41f11..78d757fbaf 100644 --- a/src/components/chrome/LeftSidebar.astro +++ b/src/components/chrome/LeftSidebar.astro @@ -11,16 +11,14 @@ const { url: pageUrl, version = "latest" } = Astro.props; ---
- { - getNavForVersion(version).categories.map((category) => ( - <> -
{category.name}
- - - )) - } + {getNavForVersion(version).categories.map((category) => ( + <> +
{category.name}
+ + + ))}
diff --git a/src/components/chrome/NavItem.astro b/src/components/chrome/NavItem.astro index 8236493274..37c27cc31e 100644 --- a/src/components/chrome/NavItem.astro +++ b/src/components/chrome/NavItem.astro @@ -18,22 +18,18 @@ const expanded = containsUrl(node, pageUrl); {node.name} - { - hasChildren && ( -
- -
- ) - } + {hasChildren && ( +
+ +
+ )} - { - hasChildren && ( - - ) - } + {hasChildren && ( + + )} diff --git a/src/layouts/DefaultLayout.astro b/src/layouts/DefaultLayout.astro index 46fe205a75..8fa7958fde 100644 --- a/src/layouts/DefaultLayout.astro +++ b/src/layouts/DefaultLayout.astro @@ -26,32 +26,45 @@ const currentDocsVersion = await lq.render("{{ site.docs_version }}");
- { - page.version && page.version !== currentDocsVersion && ( -
-
- You are viewing the documentation for Metabase {page.version}. The{" "} - - most recent docs version is {currentDocsVersion}. - -
-
- ) - } + {page.version && page.version !== currentDocsVersion && ( +
+
+ You are viewing the documentation for Metabase {page.version}. The{" "} + + most recent docs version is {currentDocsVersion}. + +
+
+ )}
- - - - - diff --git a/src/layouts/DefaultNewLayout.astro b/src/layouts/DefaultNewLayout.astro index d122c27f99..dcf4716c8b 100644 --- a/src/layouts/DefaultNewLayout.astro +++ b/src/layouts/DefaultNewLayout.astro @@ -27,25 +27,34 @@ const lq = getLiquidRenderer({ page, dirname }); - - - - - - { - Astro.url.pathname.includes("/docs/") && - Astro.url.pathname.includes("embedding") && ( - + )} diff --git a/src/layouts/NewDocsLayout.astro b/src/layouts/NewDocsLayout.astro index f4385c99da..4db6cedfb2 100644 --- a/src/layouts/NewDocsLayout.astro +++ b/src/layouts/NewDocsLayout.astro @@ -30,7 +30,10 @@ const unify = UNIFY_ENABLED_PAGES.includes(page.url);
- +
-
- {/* Is populated via js */} -
+
{/* Is populated via js */}
+ src="/docs/js/new-docs-version-selector.js" + > + + src="/docs/js/new-docs-code-snippet-copy.js" + > + src="/docs/js/new-docs-table-overflow.js" + > - - - - + src="/docs/js/position-feedback-widget.js" + > diff --git a/src/layouts/OldDocsLayout.astro b/src/layouts/OldDocsLayout.astro index be7efd3907..e7db0ea7e4 100644 --- a/src/layouts/OldDocsLayout.astro +++ b/src/layouts/OldDocsLayout.astro @@ -41,13 +41,11 @@ const showChrome = page.category !== "ignore"; Metabase Documentation - { - showChrome && ( - - {page.version} {page.version === currentDocsVersion && " (Latest) "} - - ) - } + {showChrome && ( + + {page.version} {page.version === currentDocsVersion && " (Latest) "} + + )}
@@ -56,44 +54,38 @@ const showChrome = page.category !== "ignore";
- { - showChrome && ( - - ) - } + {showChrome && ( + + )} - { - support?.status === "unsupported" && ( -
- Version {page.version} of Metabase is no longer{" "} - supported. Check out the{" "} - - docs for the current stable version, Metabase{" "} - {currentDocsVersion}. - -
- ) - } + {support?.status === "unsupported" && ( +
+ Version {page.version} of Metabase is no longer{" "} + supported. Check out the{" "} + + docs for the current stable version, Metabase{" "} + {currentDocsVersion}. + +
+ )}
- { - showChrome && ( -
-
-
- - See something that needs fixing?{" "} - - Propose a change. - - -
+ {showChrome && ( +
+
+
+ + See something that needs fixing?{" "} + + Propose a change. + +
- ) - } +
+ )}
diff --git a/src/pages/docs/404.astro b/src/pages/docs/404.astro index 7eda7d2a3e..8cce49c632 100644 --- a/src/pages/docs/404.astro +++ b/src/pages/docs/404.astro @@ -78,7 +78,6 @@ const dirname = path.dirname(fileURLToPath(import.meta.url)); } }); - -
Not FoundWe're a little lost...

The page you asked for couldn't be found

- Go to the latest version of the documentation - Go to Metabase homepage + + Go to the latest version of the documentation + + + Go to Metabase homepage +
diff --git a/src/pages/docs/[version]/[...slug].astro b/src/pages/docs/[version]/[...slug].astro index beb8d2a1ca..547eb0b197 100644 --- a/src/pages/docs/[version]/[...slug].astro +++ b/src/pages/docs/[version]/[...slug].astro @@ -92,12 +92,10 @@ if (kind === "html") { const Layout = doc.data.layout === "docs" ? OldDocsLayout : NewDocsLayout; --- -{ - kind === "html" ? ( +{kind === "html" ? ( + +) : ( + - ) : ( - - - - ) -} + +)} diff --git a/src/pages/docs/all.astro b/src/pages/docs/all.astro index c5a2eb3b55..b13590c631 100644 --- a/src/pages/docs/all.astro +++ b/src/pages/docs/all.astro @@ -24,40 +24,39 @@ const dirname = path.dirname(fileURLToPath(import.meta.url));

- For product releases, see the list of Metabase releases. + For product releases, see the list of{" "} + + Metabase releases + + .

- Versions marked unsupported have passed their end-of-life date. See our version support policy for details. + Versions marked{" "} + unsupported have + passed their end-of-life date. See our{" "} + version support policy for details.