Merge remote-tracking branch 'upstream/master' into resizing-fixes

mui · Nov 1, 2023 · 1a40eaa · 1a40eaa
2 parents 6f0aaec + 3ad2d30
commit 1a40eaa
Show file tree

Hide file tree

Showing 47 changed files with 2,006 additions and 1,884 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -16,10 +16,10 @@ jobs:
       security-events: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # v2.22.3
+        uses: github/codeql-action/init@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
         with:
           languages: typescript
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -29,4 +29,4 @@ jobs:
           # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
           # queries: security-extended,security-and-quality
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # v2.22.3
+        uses: github/codeql-action/analyze@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -23,12 +23,12 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           persist-credentials: false
 
       - name: Run analysis
-        uses: ossf/scorecard-action@483ef80eb98fb506c348f7d62e28055e49fe2398 # v2.3.0
+        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
         with:
           results_file: results.sarif
           results_format: sarif
@@ -44,6 +44,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: Upload to code-scanning
-        uses: github/codeql-action/upload-sarif@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # v2.22.3
+        uses: github/codeql-action/upload-sarif@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/update-monorepo.yml b/.github/workflows/update-monorepo.yml
@@ -12,14 +12,14 @@ jobs:
       issues: write
     steps:
       - name: Set up Node.js ⚙️
-        uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3
+        uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4
         with:
           node-version: '18.x'
 
       - name: Setup yarn
         run: npm install -g yarn
 
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
       - name: Get latest monorepo commit
         run: echo "MONOREPO_LATEST_COMMIT=$(git ls-remote https://github.com/mui/material-ui master | awk '{print $1}')" >> $GITHUB_ENV
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+## 0.1.34
+
+<!-- generated comparing v0.1.33..master -->
+
+_Oct 25, 2023_
+
+A big thanks to the 2 contributors who made this release possible. Here are some highlights ✨:
+
+Improvements to the Support page, some fixes to the tests.
+
+- &#8203;<!-- 4 -->Update Support URL in Help menu (#2832) @bharatkashyap
+- &#8203;<!-- 3 -->Fix flaky tests (#2812) @apedroferreira
+- &#8203;<!-- 2 -->[core] Monorepo upgrade (#2825) @bharatkashyap
+- &#8203;<!-- 1 -->[docs] A few Support page improvements (#2824) @bharatkashyap
+
+All contributors of this release in alphabetical order: @apedroferreira, @bharatkashyap
+
 ## 0.1.33
 
 <!-- generated comparing v0.1.32..master -->

diff --git a/docs/data/pages.ts b/docs/data/pages.ts
@@ -21,7 +21,7 @@ const pages: MuiPage[] = [
       },
       { pathname: '/toolpad/getting-started/roadmap' },
       {
-        pathname: '/toolpad/support/support',
+        pathname: '/toolpad/getting-started/support',
         title: 'Support',
       },
     ],

diff --git a/docs/data/toolpad/concepts/data-providers.md b/docs/data/toolpad/concepts/data-providers.md
@@ -1,4 +1,4 @@
-# Data Providers
+# Data providers
 
 <p class="description">Bring tabular data to the frontend with server-side pagination and filtering.</p>
 

diff --git a/docs/data/toolpad/getting-started/support.md b/docs/data/toolpad/getting-started/support.md
@@ -40,11 +40,11 @@ Stack Overflow contains a wealth of information about MUI products. Toolpad is a
 
 ### Social media
 
-Toolpad has growing presence on [Twitter](https://twitter.com/MUI_Toolpad).
+Toolpad has a growing presence on [Twitter](https://twitter.com/MUI_Toolpad).
 You can use it to share what you're working on and connect with other developers.
 
 Please keep in mind that we don't actively monitor direct messages on the company's social media accounts, so this is _not_ a good way to get in touch with us directly.
 
 ### Direct email
 
-If email is your thing, the team can be directly reached out at _toolpad@mui.com_.
+If email is your thing, the team can be directly reached out at toolpad@mui.com.
diff --git a/docs/package.json b/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "docs",
-  "version": "0.1.33",
+  "version": "0.1.34",
   "private": true,
   "author": "MUI Toolpad",
   "license": "MIT",
@@ -26,15 +26,15 @@
     "@emotion/react": "11.11.1",
     "@emotion/server": "11.11.0",
     "@emotion/styled": "11.11.0",
-    "@mui/icons-material": "5.14.14",
-    "@mui/material": "5.14.14",
+    "@mui/icons-material": "5.14.16",
+    "@mui/material": "5.14.16",
     "@mui/monorepo": "https://github.com/mui/material-ui.git",
-    "@mui/styles": "5.14.14",
-    "@mui/toolpad": "0.1.33",
-    "@mui/utils": "5.14.14",
+    "@mui/styles": "5.14.16",
+    "@mui/toolpad": "0.1.34",
+    "@mui/utils": "5.14.16",
     "@trendmicro/react-interpolate": "0.5.5",
-    "@types/lodash": "4.14.199",
-    "@types/react-dom": "18.2.13",
+    "@types/lodash": "4.14.200",
+    "@types/react-dom": "18.2.14",
     "@types/react-router-dom": "5.3.3",
     "accept-language": "3.0.18",
     "ast-types": "0.14.2",
@@ -52,7 +52,7 @@
     "cross-env": "7.0.3",
     "date-fns-jalali": "2.29.3-0",
     "doctrine": "3.0.0",
-    "exceljs": "4.3.0",
+    "exceljs": "4.4.0",
     "express": "4.18.2",
     "fg-loadcss": "3.1.0",
     "fs-extra": "11.1.1",
@@ -61,20 +61,20 @@
     "lodash": "4.17.21",
     "lz-string": "1.5.0",
     "markdown-to-jsx": "7.3.2",
-    "marked": "9.1.2",
+    "marked": "9.1.3",
     "next": "13.4.19",
     "nprogress": "0.2.0",
     "postcss": "8.4.31",
     "prismjs": "1.29.0",
     "prop-types": "15.8.1",
     "raw-loader": "4.0.2",
     "react": "18.2.0",
-    "react-docgen": "6.0.4",
+    "react-docgen": "7.0.0",
     "react-dom": "18.2.0",
     "react-hook-form": "7.47.0",
     "react-is": "18.2.0",
-    "react-router": "6.16.0",
-    "react-router-dom": "6.16.0",
+    "react-router": "6.17.0",
+    "react-router-dom": "6.17.0",
     "react-runner": "1.0.3",
     "react-simple-code-editor": "0.13.1",
     "react-transition-group": "4.4.5",
@@ -89,9 +89,9 @@
   "devDependencies": {
     "@babel/plugin-transform-react-constant-elements": "7.22.5",
     "@babel/preset-typescript": "7.23.2",
-    "@types/doctrine": "0.0.7",
-    "@types/json-schema": "7.0.13",
-    "@types/react-is": "18.2.2",
+    "@types/doctrine": "0.0.8",
+    "@types/json-schema": "7.0.14",
+    "@types/react-is": "18.2.3",
     "cpy-cli": "5.0.0",
     "cross-fetch": "4.0.0",
     "gm": "1.25.0",

diff --git a/docs/pages/toolpad/support/support.js → .../pages/toolpad/getting-started/support.js b/docs/pages/toolpad/support/support.js → .../pages/toolpad/getting-started/support.js
diff --git a/docs/public/_redirects b/docs/public/_redirects
@@ -34,6 +34,7 @@
 /toolpad/tutorials/render-deploy/ /toolpad/how-to-guides/render-deploy/ 301
 /toolpad/examples/overview/ /toolpad/examples/ 301
 /toolpad/how-to-guides/number-display/ /toolpad/how-to-guides/map-display/ 301
+/toolpad/support/support/ /toolpad/getting-started/support/ 301
 
 # Create separate namespace on https://mui.com
 

diff --git a/examples/basic-crud-app/package.json b/examples/basic-crud-app/package.json
@@ -8,6 +8,6 @@
     "start": "toolpad start"
   },
   "dependencies": {
-    "@mui/toolpad": "0.1.33"
+    "@mui/toolpad": "0.1.34"
   }
 }
diff --git a/examples/custom-datagrid-column/package.json b/examples/custom-datagrid-column/package.json
@@ -8,6 +8,6 @@
     "start": "toolpad start"
   },
   "dependencies": {
-    "@mui/toolpad": "0.1.33"
+    "@mui/toolpad": "0.1.34"
   }
 }
diff --git a/examples/custom-server/package.json b/examples/custom-server/package.json
@@ -8,7 +8,7 @@
     "start": "node index.mjs"
   },
   "dependencies": {
-    "@mui/toolpad": "0.1.33",
+    "@mui/toolpad": "0.1.34",
     "express": "4.18.2"
   },
   "devDependencies": {}

diff --git a/examples/datagrid-columns/package.json b/examples/datagrid-columns/package.json
@@ -8,6 +8,6 @@
     "start": "toolpad start"
   },
   "dependencies": {
-    "@mui/toolpad": "0.1.33"
+    "@mui/toolpad": "0.1.34"
   }
 }
diff --git a/examples/dog-app/package.json b/examples/dog-app/package.json
@@ -8,6 +8,6 @@
     "start": "toolpad start"
   },
   "dependencies": {
-    "@mui/toolpad": "0.1.33"
+    "@mui/toolpad": "0.1.34"
   }
 }
diff --git a/examples/google-sheet/package.json b/examples/google-sheet/package.json
@@ -8,7 +8,7 @@
     "start": "toolpad start"
   },
   "dependencies": {
-    "@mui/toolpad": "0.1.33",
-    "googleapis": "127.0.0"
+    "@mui/toolpad": "0.1.34",
+    "googleapis": "128.0.0"
   }
 }
diff --git a/examples/graphql/package.json b/examples/graphql/package.json
@@ -8,7 +8,7 @@
     "start": "toolpad start"
   },
   "dependencies": {
-    "@mui/toolpad": "0.1.33",
+    "@mui/toolpad": "0.1.34",
     "graphql": "16.8.1",
     "graphql-request": "6.1.0",
     "graphql-tag": "2.12.6"

diff --git a/examples/npm-stats/package.json b/examples/npm-stats/package.json
@@ -8,7 +8,7 @@
     "start": "NODE_OPTIONS='--max-old-space-size=396' toolpad start"
   },
   "dependencies": {
-    "@mui/toolpad": "0.1.33",
-    "recharts": "2.9.0"
+    "@mui/toolpad": "0.1.34",
+    "recharts": "2.9.1"
   }
 }
diff --git a/examples/qr-generator/package.json b/examples/qr-generator/package.json
@@ -8,10 +8,10 @@
     "start": "toolpad start"
   },
   "dependencies": {
-    "@mui/toolpad": "0.1.33",
+    "@mui/toolpad": "0.1.34",
     "qrcode": "^1.5.3"
   },
   "devDependencies": {
-    "@types/qrcode": "^1.5.2"
+    "@types/qrcode": "^1.5.4"
   }
 }
diff --git a/examples/stripe-script/package.json b/examples/stripe-script/package.json
@@ -8,11 +8,7 @@
     "start": "toolpad start"
   },
   "dependencies": {
-    "@mui/toolpad": "^0.1.33",
-    "child_process": "^1.0.2",
-    "fs": "^0.0.1-security",
-    "path": "^0.12.7",
-    "stripe": "^13.10.0",
-    "url": "^0.11.3"
+    "@mui/toolpad": "^0.1.34",
+    "stripe": "^14.1.0"
   }
 }