Merge branch 'production' into marcio/pcx17803-mconn-kvm

Author: marciocloudflare

.github/workflows/comment-changed-filenames.yml renamed to .github/workflows/potential-redirects-or-partials.yml

@@ -1,4 +1,4 @@
-name: Flag changed filenames
+name: Potential redirects or partials
 
 # **What it does**: Adds or removes a comment if a PR renames or removes a file.
 # **Why we have it**: Highlights when we need redirects covering certain file paths.
@@ -22,7 +22,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
-      - name: Get Renamed or Removed Files from Pull Request
+      - name: Potential redirects
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
@@ -37,17 +37,32 @@ jobs:
           echo "${files}" >> "$GITHUB_ENV"
           echo "${delimiter}" >> "$GITHUB_ENV"
 
+      - name: Updated partial files
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          files=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" \
+            -H "Accept: application/vnd.github.v3+json" \
+            "https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/files" | \
+            jq -r '.[] | select(.status=="modified") | select (.filename | startswith("src/content/partials")) | select(.filename | endswith(".mdx")) | .filename' | \
+            sed -e 's|^src/content/partials||' -e 's|\.mdx$|/|')
+          # Use random delimiter for security reasons
+          delimiter="$(openssl rand -hex 8)"
+          echo "PARTIAL_FILES<<${delimiter}" >> "$GITHUB_ENV"
+          echo "${files}" >> "$GITHUB_ENV"
+          echo "${delimiter}" >> "$GITHUB_ENV"
+
       - name: Comment or Update Comment on PR based on changed files
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           # If there are no changed files
-          if [ -z "$CHANGED_FILES" ]; then
+          if [ -z "$CHANGED_FILES" ] && [ -z "$PARTIAL_FILES" ]; then
             # Fetch the ID of the existing comment, if it exists
             existing_comment_id=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" \
               -H "Accept: application/vnd.github.v3+json" \
               "https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/comments" | \
-              jq '.[] | select(.user.id == 41898282) | select(.body | contains("This PR changes current filenames or deletes current files")) | .id')
+              jq '.[] | select(.user.id == 41898282) | select(.body | contains("This PR requires additional review attention because it affects the following areas")) | .id')
 
             # If the comment exists, delete it
             if [ ! -z "$existing_comment_id" ]; then
@@ -58,18 +73,39 @@ jobs:
             fi
           else
             # Construct the comment body for changed files
-            comment_body="This PR changes current filenames or deletes current files. Make sure you have [redirects](https://developers.cloudflare.com/pages/configuration/redirects/) set up to cover the following paths:"
-            for path in $CHANGED_FILES; do
-              clean_path=$(echo $path | sed 's/"//g')  # Remove quotation marks
+            comment_body="This PR requires additional review attention because it affects the following areas:"
+
+            # Add CHANGED_FILES logic
+            if [ -n "$CHANGED_FILES" ]; then
               comment_body="$comment_body
+
+            ### Redirects
+            This PR changes current filenames or deletes current files. Make sure you have [redirects](https://developers.cloudflare.com/pages/configuration/redirects/) set up to cover the following paths:"
+              for path in $CHANGED_FILES; do
+                clean_path=$(echo "$path" | sed 's/"//g') # Remove quotation marks
+                comment_body="$comment_body
             - [ ] \`$clean_path\`"
-            done
+              done
+            fi
+
+            # Conditional bit for PARTIAL_FILES
+            if [ -n "$PARTIAL_FILES" ]; then
+              comment_body="$comment_body
+
+            ### Partials
+            This PR updates partial files, which are pieces of content used across multiple files in our [Render component](https://developers.cloudflare.com/style-guide/components/render/)."
+              for path in $PARTIAL_FILES; do
+                updated_path=$(echo "$path" | sed -e 's/"//g' -e 's/^\///' -e 's/\/$//')
+                comment_body="$comment_body
+            - [ ] \`$updated_path\` - [view affected files](https://developers.cloudflare.com/style-guide/components/render/?partial=$updated_path)"
+              done
+            fi
 
             # Check if a comment already exists
             existing_comment_id=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" \
               -H "Accept: application/vnd.github.v3+json" \
               "https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/comments" | \
-              jq '.[] | select(.user.id == 41898282) | select(.body | contains("This PR changes current filenames or deletes current files")) | .id')
+              jq '.[] | select(.user.id == 41898282) | select(.body | contains("This PR requires additional review attention because it affects the following areas")) | .id')
 
             comment_payload=$(echo '{}' | jq --arg body "$comment_body" '.body = $body')
 

.github/workflows/publish-production.yml

@@ -40,6 +40,19 @@ jobs:
           npx tsx bin/generate-index-md.ts
           cd distmd && zip -r markdown.zip .
           npx wrangler r2 object put vendored-markdown/markdown.zip --file=markdown.zip --remote
+          rm markdown.zip
+      - name: Upload vendored Markdown files to ZT DevDocs bucket
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.ZT_DEVDOCS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.ZT_DEVDOCS_SECRET_ACCESS_KEY }}
+        run: |
+          sudo -v ; curl https://rclone.org/install.sh | sudo bash
+          rclone sync \
+            --s3-env-auth \
+            --s3-provider="Cloudflare" \
+            --s3-endpoint="https://e76c849bd111ee7d3006b6625713991e.r2.cloudflarestorage.com" \
+            distmd \
+            :s3:/zt-dashboard-dev-docs
       - uses: actions/cache/save@v4
         if: always()
         with:

astro.config.ts

@@ -161,14 +161,21 @@ export default defineConfig({
 				headingLinks: false,
 			},
 			routeMiddleware: "./src/plugins/starlight/route-data.ts",
+			disable404Route: true,
 		}),
 		liveCode({}),
 		icon(),
 		sitemap({
 			filter(page) {
-				return !page.startsWith(
-					"https://developers.cloudflare.com/style-guide/",
-				);
+				if (page.includes("/style-guide/")) {
+					return false;
+				}
+
+				if (page.endsWith("/404/")) {
+					return false;
+				}
+
+				return true;
 			},
 			serialize(item) {
 				item.lastmod = new Date().toISOString();

ec.config.mjs

@@ -10,6 +10,7 @@ import pluginDefaultTitles from "./src/plugins/expressive-code/default-titles.js
 import pluginGraphqlApiExplorer from "./src/plugins/expressive-code/graphql-api-explorer.js";
 
 import { pluginCollapsibleSections } from "@expressive-code/plugin-collapsible-sections";
+import { pluginLineNumbers } from "@expressive-code/plugin-line-numbers";
 
 export default defineEcConfig({
 	plugins: [
@@ -18,7 +19,11 @@ export default defineEcConfig({
 		pluginDefaultTitles(),
 		pluginCollapsibleSections(),
 		pluginGraphqlApiExplorer(),
+		pluginLineNumbers(),
 	],
+	defaultProps: {
+		showLineNumbers: false,
+	},
 	themes: [darkTheme, lightTheme],
 	styleOverrides: {
 		borderWidth: "1px",