Skip to content

Commit

Permalink
Merge branch 'master' into release-notes
Browse files Browse the repository at this point in the history
  • Loading branch information
Janpot authored Nov 28, 2022
2 parents b34f5d9 + 06498e7 commit 21554ed
Show file tree
Hide file tree
Showing 70 changed files with 2,819 additions and 2,129 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ jobs:
- install_js
- run:
name: '`yarn prettier` changes committed?'
command: yarn prettier check-changed
command: yarn prettier --check
- run:
name: 'Build packages'
command: yarn release:build
Expand Down Expand Up @@ -187,7 +187,7 @@ jobs:
-w /tests \
-e PLAYWRIGHT_TEST_BASE_URL=http://172.17.0.1:3000/ \
-e HTTPBIN_BASEURL=http://httpbin/ \
mcr.microsoft.com/playwright:v1.27.0-focal \
mcr.microsoft.com/playwright:v1.28.0-focal \
yarn test:integration --forbid-only
docker-compose -f ./docker-compose.test.yml logs toolpad
docker-compose -f ./docker-compose.test.yml down
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@c3b6fce4ee2ca25bc1066aa3bf73962fda0e8898 # v2.1.31
uses: github/codeql-action/init@312e093a1892bd801f026f1090904ee8e460b9b6 # v2.1.34
with:
languages: typescript
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -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@c3b6fce4ee2ca25bc1066aa3bf73962fda0e8898 # v2.1.31
uses: github/codeql-action/analyze@312e093a1892bd801f026f1090904ee8e460b9b6 # v2.1.34
4 changes: 2 additions & 2 deletions .github/workflows/release-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ jobs:
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Publish version tag
uses: akhilerm/tag-push-action@f973043dc002b8e5a772c53e79441e6e1861e874 # v2.0.0
uses: akhilerm/tag-push-action@85bf542f43f5f2060ef76262a67ee3607cb6db37 # v2.1.0
with:
src: docker.io/muicom/toolpad:${{ github.event.inputs.commit }}
dst: docker.io/muicom/toolpad:${{ github.event.inputs.version }}

- name: Publish latest tag
uses: akhilerm/tag-push-action@f973043dc002b8e5a772c53e79441e6e1861e874 # v2.0.0
uses: akhilerm/tag-push-action@85bf542f43f5f2060ef76262a67ee3607cb6db37 # v2.1.0
if: ${{ github.event.inputs.latest == 'true' }}
with:
src: docker.io/muicom/toolpad:${{ github.event.inputs.commit }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: Upload to code-scanning
uses: github/codeql-action/upload-sarif@c3b6fce4ee2ca25bc1066aa3bf73962fda0e8898 # v2.1.31
uses: github/codeql-action/upload-sarif@312e093a1892bd801f026f1090904ee8e460b9b6 # v2.1.34
with:
sarif_file: results.sarif
69 changes: 69 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,74 @@
# Changelog

## 0.0.28

<!-- generated comparing v0.0.27..master -->

_Nov 23, 2022_

A big thanks to the 4 contributors who made this release possible. Here are some highlights ✨:

Client-side functions, migration fixes, add sidebar to overview page, support visual captcha as fallback, add "alpha" label to app and landing page, automatic app names in demo.

- &#8203;<!-- 19 -->Fix landing page hydration issue (#1375) @bharatkashyap
- &#8203;<!-- 18 -->Update demo bar copy (#1371) @apedroferreira
- &#8203;<!-- 17 -->Fix overflow for explorer (#1372) @Janpot
- &#8203;<!-- 16 -->Add "alpha" label to app and landing page hero (#1356) @bharatkashyap
- &#8203;<!-- 15 -->Add missing sucrase helper (#1360) @Janpot
- &#8203;<!-- 14 -->Remove demo docker (#1369) @apedroferreira
- &#8203;<!-- 13 -->Remove demo configuration from render.yaml (#1368) @apedroferreira
- &#8203;<!-- 12 -->Move typescript to devDependencies (#1366) @Janpot
- &#8203;<!-- 11 -->Remove sentry debug option (#1361) @Janpot
- &#8203;<!-- 10 -->Fix yarn.lock @Janpot
- &#8203;<!-- 09 -->Upgrade eslint (#1287) @Janpot
- &#8203;<!-- 08 -->Fallback to visible captcha if invisible captcha fails (#1272) @apedroferreira
- &#8203;<!-- 07 -->Refactor overview page (#1357) @Janpot
- &#8203;<!-- 06 -->Fix migration to v3 (#1359) @Janpot
- &#8203;<!-- 05 -->Run functions client side (#1325) @Janpot
- &#8203;<!-- 04 -->Show IP address in log messages (#1350) @apedroferreira
- &#8203;<!-- 03 -->Fix prettier script in CI (#1355) @Janpot
- &#8203;<!-- 02 -->Automatic app names in demo (#1351) @apedroferreira
- &#8203;<!-- 01 -->[core] Group renovate GitHub Action dependency updates (#1341) @oliviertassinari

All contributors of this release in alphabetical order: @apedroferreira, @bharatkashyap, @Janpot, @oliviertassinari

## 0.0.27

<!-- generated comparing v0.0.26..master -->

_Nov 16, 2022_

A big thanks to the 5 contributors who made this release possible. Here are some highlights ✨:

Upgraded to Next.js 13, some fixes on undo/redo and also an improvement to the cloud demo which allows continuing work on the latest-used app.

- &#8203;<!-- 24 -->Allow working on latest used app from demo home page (#1304) @apedroferreira
- &#8203;<!-- 23 -->Make sure to show a 404 for non existing apps in the preview (#1344) @Janpot
- &#8203;<!-- 22 -->Make sure code components can run against React in production mode (#1348) @Janpot
- &#8203;<!-- 21 -->Disable baseUrl when ran in browser (#1346) @Janpot
- &#8203;<!-- 20 -->Upgrade to next 13 (#1294) @Janpot
- &#8203;<!-- 19 -->Show self-host bar in demo (#1309) @apedroferreira
- &#8203;<!-- 18 -->Move component compilation serverside (#1332) @Janpot
- &#8203;<!-- 17 -->Remove externalResolver for Sentry (#1343) @Janpot
- &#8203;<!-- 16 -->Convert scripts to ESM (#1307) @Janpot
- &#8203;<!-- 15 -->Add github repository link from landing page (#1342) @bharatkashyap
- &#8203;<!-- 14 -->Fix windows and AZERTY shortcuts for undo redo (#1274) @bytasv
- &#8203;<!-- 13 -->Simplify menu actions (#1281) @oliviertassinari
- &#8203;<!-- 12 -->Fix undo/redo race condition (#1328) @bytasv
- &#8203;<!-- 11 -->Fix hud overlay index (#1329) @bytasv
- &#8203;<!-- 10 -->Reorganize QueryEditor into its own folder (#1322) @Janpot
- &#8203;<!-- 09 -->Upgrade docs to Next.js 13 (#1297) @Janpot
- &#8203;<!-- 08 -->Remove package.json resolutions field (#1316) @Janpot
- &#8203;<!-- 07 -->Show creation dialog as loading while navigating to newly created app (#1317) @Janpot
- &#8203;<!-- 06 -->Change dots to ellipsis (#1314) @Janpot
- &#8203;<!-- 05 -->[core] Show the whole version to make blame easier @oliviertassinari
- &#8203;<!-- 04 -->[core] Pin GitHub Action versions @oliviertassinari
- &#8203;<!-- 03 -->[core] Feedback on branch protection @oliviertassinari
- &#8203;<!-- 02 -->[core] Remove scorecard default permissions @oliviertassinari
- &#8203;<!-- 01 -->[docs] Fix path typo in Fetch docs (#1331) @bharatkashyap

All contributors of this release in alphabetical order: @apedroferreira, @bharatkashyap, @bytasv, @Janpot, @oliviertassinari

## 0.0.26

<!-- generated comparing v0.0.25..master -->
Expand Down
1 change: 0 additions & 1 deletion docker/images/toolpad-demo/Dockerfile

This file was deleted.

20 changes: 10 additions & 10 deletions docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "docs",
"version": "0.0.26",
"version": "0.0.28",
"private": true,
"author": "MUI Toolpad",
"license": "MIT",
Expand All @@ -26,14 +26,14 @@
"@emotion/react": "^11.10.5",
"@emotion/server": "^11.10.0",
"@emotion/styled": "^11.10.5",
"@mui/icons-material": "^5.10.14",
"@mui/material": "^5.10.14",
"@mui/icons-material": "^5.10.15",
"@mui/material": "^5.10.15",
"@mui/monorepo": "https://github.com/mui/material-ui.git",
"@mui/styles": "^5.10.14",
"@mui/utils": "^5.10.14",
"@mui/styles": "^5.10.15",
"@mui/utils": "^5.10.15",
"@trendmicro/react-interpolate": "^0.5.5",
"@types/lodash": "^4.14.188",
"@types/react-dom": "^18.0.8",
"@types/lodash": "^4.14.189",
"@types/react-dom": "^18.0.9",
"@types/react-router-dom": "^5.3.3",
"accept-language": "^3.0.18",
"address": "^1.2.1",
Expand All @@ -60,7 +60,7 @@
"lz-string": "^1.4.4",
"markdown-to-jsx": "^7.1.7",
"marked": "^4.2.2",
"next": "13.0.2",
"next": "13.0.4",
"next-transpile-modules": "^10.0.0",
"nprogress": "^0.2.0",
"postcss": "^8.4.19",
Expand All @@ -70,7 +70,7 @@
"react": "^18.2.0",
"react-docgen": "^5.4.3",
"react-dom": "^18.2.0",
"react-hook-form": "^7.39.3",
"react-hook-form": "^7.39.4",
"react-is": "^18.2.0",
"react-router": "^6.3.0",
"react-router-dom": "^6.3.0",
Expand All @@ -92,7 +92,7 @@
"cpy-cli": "^4.2.0",
"cross-fetch": "^3.1.5",
"gm": "^1.25.0",
"typescript": "^4.8.4",
"typescript": "^4.9.3",
"typescript-to-proptypes": "^2.2.1"
}
}
4 changes: 3 additions & 1 deletion docs/src/components/landing/Hero.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as React from 'react';
import Box from '@mui/material/Box';
import Chip from '@mui/material/Chip';
import Typography from '@mui/material/Typography';
import IconImage from 'docs/src/components/icon/IconImage';
import GradientText from 'docs/src/components/typography/GradientText';
Expand Down Expand Up @@ -27,9 +28,10 @@ export default function Hero() {
}}
>
<IconImage name="product-toolpad" width="28" height="28" sx={{ mr: 1 }} />
<Box component="span" sx={{ mr: 2 }}>
<Box component="span" sx={{ mr: 1 }}>
MUI Toolpad
</Box>
<Chip label="Alpha" component="span" color="grey" size="small" />
</Typography>
<Typography variant="h1" sx={{ my: 2 }}>
Low-code
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.0.26",
"version": "0.0.28",
"npmClient": "yarn",
"useWorkspaces": true
}
26 changes: 14 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,42 +41,44 @@
},
"devDependencies": {
"@mui/monorepo": "https://github.com/mui/material-ui.git",
"@next/eslint-plugin-next": "13.0.3",
"@playwright/test": "^1.27.1",
"@swc/helpers": "^0.4.12",
"@next/eslint-plugin-next": "13.0.5",
"@playwright/test": "^1.28.1",
"@swc/helpers": "^0.4.14",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0",
"@types/gtag.js": "^0.0.12",
"@types/jest": "^29.2.2",
"@types/jest": "^29.2.3",
"@types/node": "^18.11.9",
"@types/rimraf": "^3.0.2",
"@typescript-eslint/eslint-plugin": "^5.42.1",
"@typescript-eslint/parser": "^5.42.1",
"@typescript-eslint/eslint-plugin": "^5.44.0",
"@typescript-eslint/parser": "^5.44.0",
"babel-plugin-transform-rename-import": "^2.3.0",
"chalk": "^4.1.2",
"eslint": "^8.27.0",
"eslint-config-airbnb-typescript": "12",
"eslint": "^8.28.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-airbnb-typescript": "^17.0.0",
"eslint-config-prettier": "^8.5.0",
"eslint-import-resolver-webpack": "^0.13.2",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jsx-a11y": "^6.6.1",
"eslint-plugin-mocha": "^10.1.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.31.10",
"eslint-plugin-react": "^7.31.11",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-typescript-enum": "^2.1.0",
"execa": "^6.1.0",
"format-util": "^1.0.5",
"globby": "^13.1.2",
"jest": "^29.3.1",
"jest-environment-jsdom": "^29.3.1",
"lerna": "^6.0.3",
"markdownlint-cli2": "^0.5.1",
"prettier": "^2.7.1",
"prettier": "^2.8.0",
"prettier-plugin-prisma": "^4.4.0",
"pretty-quick": "^3.1.3",
"regenerator-runtime": "^0.13.10",
"regenerator-runtime": "^0.13.11",
"rimraf": "^3.0.2",
"typescript": "^4.8.4",
"typescript": "^4.9.3",
"yarn-deduplicate": "^6.0.0"
},
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/eslint-plugin-material-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eslint-plugin-material-ui",
"version": "0.0.26",
"version": "0.0.28",
"private": true,
"description": "Custom eslint rules for MUI.",
"main": "src/index.js",
Expand All @@ -9,7 +9,7 @@
},
"devDependencies": {
"@types/eslint": "^8.4.10",
"@typescript-eslint/parser": "^5.42.1"
"@typescript-eslint/parser": "^5.44.0"
},
"scripts": {},
"repository": {
Expand Down
Loading

0 comments on commit 21554ed

Please sign in to comment.