Merge pull request #354 from easyops-cn/steve/docusaurus-v3

feat: support docusaurus v3
easyops-cn · Nov 9, 2023 · 280a6e4 · 280a6e4
2 parents 0f2fda6 + 18c01c2
commit 280a6e4
Show file tree

Hide file tree

Showing 32 changed files with 11,703 additions and 8,527 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.15.x]
+        node-version: [18.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.15.x]
+        node-version: [18.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:

diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -10,7 +10,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.15.x]
+        node-version: [18.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:

diff --git a/.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs b/.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
diff --git a/.yarn/releases/yarn-3.2.4.cjs b/.yarn/releases/yarn-3.2.4.cjs
diff --git a/.yarn/releases/yarn-4.0.1.cjs b/.yarn/releases/yarn-4.0.1.cjs
diff --git a/.yarn/sdks/eslint/bin/eslint.js b/.yarn/sdks/eslint/bin/eslint.js
@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
 const { existsSync } = require(`fs`);
-const { createRequire, createRequireFromPath } = require(`module`);
+const { createRequire } = require(`module`);
 const { resolve } = require(`path`);
 
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
 
 if (existsSync(absPnpApiPath)) {
   if (!process.versions.pnp) {

diff --git a/.yarn/sdks/eslint/lib/api.js b/.yarn/sdks/eslint/lib/api.js
@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
 const { existsSync } = require(`fs`);
-const { createRequire, createRequireFromPath } = require(`module`);
+const { createRequire } = require(`module`);
 const { resolve } = require(`path`);
 
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
 
 if (existsSync(absPnpApiPath)) {
   if (!process.versions.pnp) {

diff --git a/.yarn/sdks/eslint/lib/unsupported-api.js b/.yarn/sdks/eslint/lib/unsupported-api.js
@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+
+const { existsSync } = require(`fs`);
+const { createRequire } = require(`module`);
+const { resolve } = require(`path`);
+
+const relPnpApiPath = "../../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require eslint/use-at-your-own-risk
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real eslint/use-at-your-own-risk your application uses
+module.exports = absRequire(`eslint/use-at-your-own-risk`);
diff --git a/.yarn/sdks/eslint/package.json b/.yarn/sdks/eslint/package.json
@@ -2,5 +2,13 @@
   "name": "eslint",
   "version": "8.15.0-sdk",
   "main": "./lib/api.js",
-  "type": "commonjs"
+  "type": "commonjs",
+  "bin": {
+    "eslint": "./bin/eslint.js"
+  },
+  "exports": {
+    "./package.json": "./package.json",
+    ".": "./lib/api.js",
+    "./use-at-your-own-risk": "./lib/unsupported-api.js"
+  }
 }
diff --git a/.yarn/sdks/prettier/bin-prettier.js b/.yarn/sdks/prettier/bin-prettier.js
@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+
+const { existsSync } = require(`fs`);
+const { createRequire } = require(`module`);
+const { resolve } = require(`path`);
+
+const relPnpApiPath = "../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require prettier/bin-prettier.js
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real prettier/bin-prettier.js your application uses
+module.exports = absRequire(`prettier/bin-prettier.js`);
diff --git a/.yarn/sdks/prettier/index.js b/.yarn/sdks/prettier/index.js
@@ -1,20 +1,20 @@
 #!/usr/bin/env node
 
 const { existsSync } = require(`fs`);
-const { createRequire, createRequireFromPath } = require(`module`);
+const { createRequire } = require(`module`);
 const { resolve } = require(`path`);
 
 const relPnpApiPath = "../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
 
 if (existsSync(absPnpApiPath)) {
   if (!process.versions.pnp) {
-    // Setup the environment to be able to require prettier/index.js
+    // Setup the environment to be able to require prettier
     require(absPnpApiPath).setup();
   }
 }
 
-// Defer to the real prettier/index.js your application uses
-module.exports = absRequire(`prettier/index.js`);
+// Defer to the real prettier your application uses
+module.exports = absRequire(`prettier`);
diff --git a/.yarn/sdks/prettier/package.json b/.yarn/sdks/prettier/package.json
@@ -2,5 +2,6 @@
   "name": "prettier",
   "version": "2.6.2-sdk",
   "main": "./index.js",
-  "type": "commonjs"
+  "type": "commonjs",
+  "bin": "./bin-prettier.js"
 }
diff --git a/.yarn/sdks/typescript/bin/tsc b/.yarn/sdks/typescript/bin/tsc
@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
 const {existsSync} = require(`fs`);
-const {createRequire, createRequireFromPath} = require(`module`);
+const {createRequire} = require(`module`);
 const {resolve} = require(`path`);
 
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
 
 if (existsSync(absPnpApiPath)) {
   if (!process.versions.pnp) {

diff --git a/.yarn/sdks/typescript/bin/tsserver b/.yarn/sdks/typescript/bin/tsserver
@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
 const {existsSync} = require(`fs`);
-const {createRequire, createRequireFromPath} = require(`module`);
+const {createRequire} = require(`module`);
 const {resolve} = require(`path`);
 
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
 
 if (existsSync(absPnpApiPath)) {
   if (!process.versions.pnp) {

diff --git a/.yarn/sdks/typescript/lib/tsc.js b/.yarn/sdks/typescript/lib/tsc.js
@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
 const { existsSync } = require(`fs`);
-const { createRequire, createRequireFromPath } = require(`module`);
+const { createRequire } = require(`module`);
 const { resolve } = require(`path`);
 
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
 
 if (existsSync(absPnpApiPath)) {
   if (!process.versions.pnp) {

diff --git a/.yarn/sdks/typescript/lib/tsserver.js b/.yarn/sdks/typescript/lib/tsserver.js
@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
 const { existsSync } = require(`fs`);
-const { createRequire, createRequireFromPath } = require(`module`);
+const { createRequire } = require(`module`);
 const { resolve } = require(`path`);
 
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
 
 const moduleWrapper = (tsserver) => {
   if (!process.versions.pnp) {
@@ -133,6 +133,8 @@ const moduleWrapper = (tsserver) => {
             }
             break;
         }
+      } else {
+        str = str.replace(/^\/?/, process.platform === `win32` ? `` : `/`);
       }
     }
 

diff --git a/.yarn/sdks/typescript/lib/tsserverlibrary.js b/.yarn/sdks/typescript/lib/tsserverlibrary.js
@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
 const { existsSync } = require(`fs`);
-const { createRequire, createRequireFromPath } = require(`module`);
+const { createRequire } = require(`module`);
 const { resolve } = require(`path`);
 
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
 
 const moduleWrapper = (tsserver) => {
   if (!process.versions.pnp) {
@@ -133,6 +133,8 @@ const moduleWrapper = (tsserver) => {
             }
             break;
         }
+      } else {
+        str = str.replace(/^\/?/, process.platform === `win32` ? `` : `/`);
       }
     }
 

diff --git a/.yarn/sdks/typescript/lib/typescript.js b/.yarn/sdks/typescript/lib/typescript.js
@@ -1,20 +1,20 @@
 #!/usr/bin/env node
 
 const { existsSync } = require(`fs`);
-const { createRequire, createRequireFromPath } = require(`module`);
+const { createRequire } = require(`module`);
 const { resolve } = require(`path`);
 
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
 
 if (existsSync(absPnpApiPath)) {
   if (!process.versions.pnp) {
-    // Setup the environment to be able to require typescript/lib/typescript.js
+    // Setup the environment to be able to require typescript
     require(absPnpApiPath).setup();
   }
 }
 
-// Defer to the real typescript/lib/typescript.js your application uses
-module.exports = absRequire(`typescript/lib/typescript.js`);
+// Defer to the real typescript your application uses
+module.exports = absRequire(`typescript`);
diff --git a/.yarn/sdks/typescript/package.json b/.yarn/sdks/typescript/package.json
@@ -1,6 +1,10 @@
 {
   "name": "typescript",
-  "version": "4.7.4-sdk",
+  "version": "5.2.2-sdk",
   "main": "./lib/typescript.js",
-  "type": "commonjs"
+  "type": "commonjs",
+  "bin": {
+    "tsc": "./bin/tsc",
+    "tsserver": "./bin/tsserver"
+  }
 }
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -1,7 +1,7 @@
-plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
-    spec: "@yarnpkg/plugin-workspace-tools"
+compressionLevel: mixed
 
-yarnPath: .yarn/releases/yarn-3.2.4.cjs
+enableGlobalCache: false
 
 npmPublishAccess: public
+
+yarnPath: .yarn/releases/yarn-4.0.1.cjs
diff --git a/docusaurus-search-local/package.json b/docusaurus-search-local/package.json
@@ -26,11 +26,11 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/plugin-content-docs": "^2.0.0-rc.1",
-    "@docusaurus/theme-translations": "^2.0.0-rc.1",
-    "@docusaurus/utils": "^2.0.0-rc.1",
-    "@docusaurus/utils-common": "^2.0.0-rc.1",
-    "@docusaurus/utils-validation": "^2.0.0-rc.1",
+    "@docusaurus/plugin-content-docs": "^3.0.0",
+    "@docusaurus/theme-translations": "^3.0.0",
+    "@docusaurus/utils": "^3.0.0",
+    "@docusaurus/utils-common": "^3.0.0",
+    "@docusaurus/utils-validation": "^3.0.0",
     "@easyops-cn/autocomplete.js": "^0.38.1",
     "@node-rs/jieba": "^1.6.0",
     "cheerio": "^1.0.0-rc.3",
@@ -44,28 +44,28 @@
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "^2.0.0-rc.1",
-    "@docusaurus/theme-common": "^2.0.0-rc.1",
-    "@docusaurus/types": "^2.0.0-rc.1",
-    "@tsconfig/docusaurus": "^1.0.2",
+    "@docusaurus/module-type-aliases": "^3.0.0",
+    "@docusaurus/theme-common": "^3.0.0",
+    "@docusaurus/tsconfig": "3.0.0",
+    "@docusaurus/types": "^3.0.0",
     "@types/cheerio": "^0.22.31",
     "@types/debug": "^4.1.5",
     "@types/fs-extra": "^9.0.2",
     "@types/jest": "^28.0.0",
     "@types/klaw-sync": "^6.0.0",
     "@types/lunr": "^2.3.3",
     "@types/node": "^18.0.0",
-    "@types/react": "^18.0.0",
+    "@types/react": "^18.2.37",
     "@types/react-helmet": "^6.1.0",
     "@types/react-router-dom": "^5.1.6",
     "concurrently": "^7.0.0",
     "copyfiles": "^2.4.0",
     "rimraf": "^3.0.2",
-    "typescript": "^4.7.4"
+    "typescript": "~5.2.2"
   },
   "peerDependencies": {
-    "@docusaurus/theme-common": "^2.0.0-rc.1",
-    "react": "^16.14.0 || ^17.0.0 || ^18.0.0",
-    "react-dom": "^16.14.0 || ^17.0.0 || ^18.0.0"
+    "@docusaurus/theme-common": "^3.0.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   }
 }
diff --git a/docusaurus-search-local/tsconfig.client.json b/docusaurus-search-local/tsconfig.client.json
@@ -1,7 +1,6 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "module": "ESNext",
     "target": "ESNext",
     "outDir": "dist/client"
   },

diff --git a/docusaurus-search-local/tsconfig.json b/docusaurus-search-local/tsconfig.json
@@ -7,8 +7,8 @@
     "jsx": "preserve",
     // moduleResolution and module are required because Docusaurus uses 'exports' in its package.json
     // See here for more information: https://github.com/microsoft/TypeScript/issues/33079#issuecomment-1169377037
-    "moduleResolution": "Node16",
-    "module": "Node16",
+    "moduleResolution": "bundler",
+    "module": "ESNext",
     "outDir": "dist",
     "resolveJsonModule": true,
     "skipLibCheck": true,

diff --git a/docusaurus-search-local/tsconfig.server.json b/docusaurus-search-local/tsconfig.server.json
@@ -1,8 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "module": "CommonJS",
-    "target": "ES6",
+    "target": "ESNext",
     "outDir": "dist/server",
     "types": ["cheerio"]
   },