add replaceCustomContentStream

.github/workflows/update.yml

@@ -52,17 +52,23 @@ jobs:
           then
           yarn download ${{ inputs.repo }} en --ref ${{ inputs.branch }}
           yarn download ${{ inputs.repo }} zh --ref ${{ inputs.branch }}
-          else
-          yarn download ${{ inputs.repo }} --ref ${{ inputs.branch }}
-          fi
-
-          # handle tidb-cloud doc based on specified en/ja doc branch
-          if [ ${{ inputs.repo }} = "pingcap/docs" ] && [ ${{ inputs.branch }} = "release-6.5" ]
+          # Update en TiDB Cloud doc based on specified doc branch
+          elif [ ${{ inputs.repo }} = "pingcap/docs" ] && [ ${{ inputs.branch }} = "release-6.5" ]
           then
+          # Remove TiDB Cloud CustomContent from TiDB doc
+          # yarn download ${{ inputs.repo }} --ref ${{ inputs.branch }} --rm-custom-content tidb
           yarn download:tidb-cloud:en --ref ${{ inputs.branch }}
+          # Re-download TiDB doc and remove TiDB Cloud CustomContent
+          yarn download ${{ inputs.repo }} --ref ${{ inputs.branch }} --rm-custom-content tidb-cloud
+          # Update ja TiDB Cloud doc based on specified doc branch
           elif [ ${{ inputs.repo }} = "pingcap/docs" ] && [ ${{ inputs.branch }} = "i18n-ja-release-6.5" ]
           then
+          # yarn download ${{ inputs.repo }} --ref ${{ inputs.branch }} --rm-custom-content tidb
           yarn download:tidb-cloud:ja --ref ${{ inputs.branch }}
+          # Re-download TiDB doc and remove TiDB Cloud CustomContent
+          yarn download ${{ inputs.repo }} --ref ${{ inputs.branch }} --rm-custom-content tidb-cloud
+          else
+          yarn download ${{ inputs.repo }} --ref ${{ inputs.branch }} --rm-custom-content tidb-cloud
           fi
 
       - name: Update all folder

packages/content/index.js

@@ -1,9 +1,13 @@
-const replaceStream = require('replacestream')
+const replaceStream = require("replacestream");
 
-const frontMatter = /^---(.|\n)*---\n/
-const media = /\(\/?media\//g
-const copyable = /{{< copyable\s+(.+)\s+>}}\r?\n/g
-const tabsPanel = /{{< tabs-panel\s+(.+)\s+>}}\n/g
+const frontMatter = /^---(.|\n)*---\n/;
+const media = /\(\/?media\//g;
+const copyable = /{{< copyable\s+(.+)\s+>}}\r?\n/g;
+const tabsPanel = /{{< tabs-panel\s+(.+)\s+>}}\n/g;
+const customContentTidb =
+  /<CustomContent +platform=["']tidb["'] *>(.|\n)*?<\/CustomContent>\n/g;
+const customContentTidbCloud =
+  /<CustomContent +platform=["']tidb-cloud["'] *>(.|\n)*?<\/CustomContent>\n/g;
 
 /**
  * Replace front matter.
@@ -13,27 +17,38 @@ const tabsPanel = /{{< tabs-panel\s+(.+)\s+>}}\n/g
  * @return {string}
  */
 function replaceFrontMatter(str, replaced) {
-  return str.replace(frontMatter, replaced)
+  return str.replace(frontMatter, replaced);
 }
 
 function replaceImagePath(str, replaced) {
-  return str.replace(media, `(${replaced}/`)
+  return str.replace(media, `(${replaced}/`);
 }
 
 function replaceCopyable(str, replaced) {
-  return str.replace(copyable, replaced)
+  return str.replace(copyable, replaced);
 }
 
 function replaceImagePathStream(replaced) {
-  return replaceStream(media, `(${replaced}/`)
+  return replaceStream(media, `(${replaced}/`);
 }
 
 function replaceCopyableStream() {
   return replaceStream(copyable, function (_, p1) {
     // return `<WithCopy tag=${p1} />\n`
     // ! WithCopy is deprecated!
-    return ``
-  })
+    return ``;
+  });
+}
+
+function replaceCustomContentStream(type) {
+  if (type === "tidb-cloud") {
+    return replaceStream(customContentTidbCloud, function (_, p1) {
+      return ``;
+    });
+  }
+  return replaceStream(customContentTidb, function (_, p1) {
+    return ``;
+  });
 }
 
 module.exports = {
@@ -43,4 +58,5 @@ module.exports = {
   replaceStream,
   replaceImagePathStream,
   replaceCopyableStream,
-}
+  replaceCustomContentStream,
+};

packages/download/index.js

@@ -10,6 +10,7 @@ import {
 import {
   replaceCopyableStream,
   replaceImagePathStream,
+  replaceCustomContentStream,
 } from "@pingcap/docs-content";
 
 import { execSync } from "child_process";
@@ -53,7 +54,8 @@ function renameDoc(repo) {
 }
 
 export function download(argv) {
-  const { repo, path, ref, destination, config, dryRun } = argv;
+  const { repo, path, ref, destination, config, dryRun, rmCustomContent } =
+    argv;
   const dest = nPath.resolve(destination);
   const options = genOptions(repo, config, dryRun);
 
@@ -76,6 +78,11 @@ export function download(argv) {
       );
       break;
     case "pingcap/docs":
+      if (rmCustomContent) {
+        options.pipelines.push(() =>
+          replaceCustomContentStream(rmCustomContent)
+        );
+      }
       if (ref.startsWith("i18n-")) {
         const refDataList = ref.split("-");
         refDataList.shift();
@@ -223,6 +230,7 @@ export function sync(argv) {
     case "pingcap/docs-dm":
     case "pingcap/docs-tidb-operator":
       const name = renameDoc(repo);
+      options.pipelines.push(() => replaceCustomContentStream("tidb-cloud"));
 
       handleSync(
         {
@@ -287,6 +295,7 @@ export function filterCloud(argv) {
     nPath.resolve(dest, `${lang}/tidbcloud/master`)
   );
   rimraf.sync(docsDestPath);
+  options.pipelines.push(() => replaceCustomContentStream("tidb"));
   retrieveCloudMDsFromZip(
     {
       repo,