Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Janpot committed Mar 26, 2024
2 parents eaad9f3 + c93afe3 commit d36dad1
Show file tree
Hide file tree
Showing 48 changed files with 635 additions and 150 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ default-job: &default-job
working_directory: /tmp/mui-toolpad
resource_class: medium
docker:
- image: cimg/node:18.17.1
- image: cimg/node:18.19.1
environment:
# Keep in sync with "Save playwright cache"
PLAYWRIGHT_BROWSERS_PATH: /tmp/pw-browsers
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@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@05963f47d870e2cb19a537396c1f668a348c7d8f # v3.24.8
uses: github/codeql-action/init@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
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@05963f47d870e2cb19a537396c1f668a348c7d8f # v3.24.8
uses: github/codeql-action/analyze@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
2 changes: 1 addition & 1 deletion .github/workflows/maintenance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
steps:
- run: echo "${{ github.actor }}"
- name: check if prs are dirty
uses: eps1lon/actions-label-merge-conflict@fd1f295ee7443d13745804bc49fe158e240f6c6e # v2.1.0
uses: eps1lon/actions-label-merge-conflict@e62d7a53ff8be8b97684bffb6cfbbf3fc1115e2e # v3.0.0
with:
dirtyLabel: 'PR: out-of-date'
removeOnDirtyLabel: 'PR: ready to ship'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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@05963f47d870e2cb19a537396c1f668a348c7d8f # v3.24.8
uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
with:
sarif_file: results.sarif
29 changes: 29 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,34 @@
# Changelog

## v0.1.53

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

_Mar 22, 2024_

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

Very early first version of @toolpad/core, fix examples, and documentation fixes and updates.

- &#8203;<!-- 16 -->Remove deprecated dependencies (#3313) @Janpot
- &#8203;<!-- 15 -->Remove lerna isolation (#3312) @Janpot
- &#8203;<!-- 14 -->Toolpad core project setup (#3291) @apedroferreira
- &#8203;<!-- 13 -->isolate lerna in renovatebot @Janpot
- &#8203;<!-- 12 -->Remove renovatebot vitest-fail-on-console exception @Janpot
- &#8203;<!-- 11 -->Fix flaky authentication test: Wait for network idle in tests again (#3290) @apedroferreira
- &#8203;<!-- 10 -->Fix flaky auth test with console error "Failed to fetch" (#3287) @apedroferreira
- &#8203;<!-- 09 -->Update renovate.json @Janpot
- &#8203;<!-- 08 -->[code-infra] Update renove.json (#3288) @Janpot
- &#8203;<!-- 07 -->[core] Lower the frequency of no-response action runs (#3302) @michaldudak
- &#8203;<!-- 06 -->[core] Use Circle CI context @oliviertassinari
- &#8203;<!-- 05 -->[docs] Fix support link (#3306) @oliviertassinari
- &#8203;<!-- 04 -->[docs] Link blog post from examples overview page and some minor edits. (#3299) @prakhargupta1
- &#8203;<!-- 03 -->[docs] Fix Vale error @oliviertassinari
- &#8203;<!-- 02 -->[docs] Fix some Vale errors (#3293) @oliviertassinari
- &#8203;<!-- 01 -->[examples] @toolpad/studio@0.1.51 doesn't exist @oliviertassinari

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

## v0.1.52

<!-- generated comparing v0.1.51..master -->
Expand Down
3 changes: 1 addition & 2 deletions docs/data/toolpad/studio/concepts/custom-components.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,14 @@ Toolpad Studio exposes a [`createComponent`](https://mui.com/toolpad/studio/refe

```jsx
import * as React from 'react';
import { Typography } from '@mui/material';
import { createComponent } from '@toolpad/studio/browser';

export interface HelloWorldProps {
msg: string;
}

function HelloWorld({ msg }: HelloWorldProps) {
return <Typography>{msg}</Typography>;
return <div>{msg}</div>;
}

export default createComponent(HelloWorld, {
Expand Down
2 changes: 1 addition & 1 deletion docs/data/toolpad/studio/getting-started/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Start by installing the required dependencies:
<codeblock storageKey="package-manager">

```bash npm
pnpm install -S @toolpad/studio
npm install -S @toolpad/studio
```

```bash yarn
Expand Down
4 changes: 2 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "docs",
"version": "0.1.52",
"version": "0.1.53",
"private": true,
"author": "MUI Toolpad",
"license": "MIT",
Expand Down Expand Up @@ -31,7 +31,7 @@
"@mui/lab": "5.0.0-alpha.169",
"@mui/material": "5.15.14",
"@mui/material-nextjs": "^5.15.11",
"@mui/monorepo": "github:mui/material-ui#b57951355a60566aeafc88c9aa49c7f198968b3c",
"@mui/monorepo": "github:mui/material-ui#0102a9579628d48d784511a562b7b72f0f51847e",
"@mui/styles": "5.15.14",
"@mui/utils": "5.15.14",
"@mui/x-data-grid-pro": "6.19.8",
Expand Down
2 changes: 1 addition & 1 deletion examples/auth-github/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"start": "toolpad-studio start"
},
"dependencies": {
"@toolpad/studio": "0.1.52"
"@toolpad/studio": "0.1.53"
}
}
2 changes: 1 addition & 1 deletion examples/auth-google/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"start": "toolpad-studio start"
},
"dependencies": {
"@toolpad/studio": "0.1.52"
"@toolpad/studio": "0.1.53"
}
}
2 changes: 1 addition & 1 deletion examples/basic-crud-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"start": "toolpad-studio start"
},
"dependencies": {
"@toolpad/studio": "0.1.52"
"@toolpad/studio": "0.1.53"
}
}
2 changes: 1 addition & 1 deletion examples/charts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"start": "toolpad-studio start"
},
"dependencies": {
"@toolpad/studio": "0.1.52"
"@toolpad/studio": "0.1.53"
}
}
2 changes: 1 addition & 1 deletion examples/custom-datagrid-column/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"start": "toolpad-studio start"
},
"dependencies": {
"@toolpad/studio": "0.1.52"
"@toolpad/studio": "0.1.53"
}
}
4 changes: 2 additions & 2 deletions examples/custom-server-nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"edit": "toolpad-studio editor http://localhost:3001/my-toolpad-studio-app"
},
"dependencies": {
"@toolpad/studio": "0.1.52",
"@toolpad/studio": "0.1.53",
"express": "4.18.2",
"next": "14.1.3",
"next": "14.1.4",
"react": "18.2.0",
"react-dom": "18.2.0"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"edit": "toolpad-studio editor http://localhost:3001/my-app"
},
"dependencies": {
"@toolpad/studio": "0.1.52",
"@toolpad/studio": "0.1.53",
"express": "4.18.2"
},
"devDependencies": {}
Expand Down
2 changes: 1 addition & 1 deletion examples/datagrid-columns/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"start": "toolpad-studio start"
},
"dependencies": {
"@toolpad/studio": "0.1.52"
"@toolpad/studio": "0.1.53"
}
}
2 changes: 1 addition & 1 deletion examples/dog-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"start": "toolpad-studio start"
},
"dependencies": {
"@toolpad/studio": "0.1.52"
"@toolpad/studio": "0.1.53"
}
}
2 changes: 1 addition & 1 deletion examples/google-sheet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"start": "toolpad-studio start"
},
"dependencies": {
"@toolpad/studio": "0.1.52",
"@toolpad/studio": "0.1.53",
"googleapis": "134.0.0"
}
}
2 changes: 1 addition & 1 deletion examples/graphql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"start": "toolpad-studio start"
},
"dependencies": {
"@toolpad/studio": "0.1.52",
"@toolpad/studio": "0.1.53",
"graphql": "16.8.1",
"graphql-request": "6.1.0",
"graphql-tag": "2.12.6"
Expand Down
2 changes: 1 addition & 1 deletion examples/hacker-news-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"start": "toolpad-studio start"
},
"dependencies": {
"@toolpad/studio": "^0.1.52",
"@toolpad/studio": "^0.1.53",
"axios": "^1.4.0"
}
}
2 changes: 1 addition & 1 deletion examples/npm-stats/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"start": "NODE_OPTIONS='--max-old-space-size=396' toolpad-studio start"
},
"dependencies": {
"@toolpad/studio": "0.1.52"
"@toolpad/studio": "0.1.53"
}
}
2 changes: 1 addition & 1 deletion examples/qr-generator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"start": "toolpad-studio start"
},
"dependencies": {
"@toolpad/studio": "0.1.52",
"@toolpad/studio": "0.1.53",
"qrcode": "^1.5.3"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/react-pages/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"dependencies": {
"@mui/material": "5.15.14",
"@toolpad/studio": "0.1.52",
"@toolpad/studio": "0.1.53",
"@mui/x-data-grid": "6.19.8",
"@tanstack/react-query": "5.18.1"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/stripe-script/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"start": "toolpad-studio start"
},
"dependencies": {
"@toolpad/studio": "0.1.52",
"@toolpad/studio": "0.1.53",
"archiver": "7.0.1",
"stripe": "^14.14.0"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/supabase/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"start": "toolpad-studio start"
},
"dependencies": {
"@toolpad/studio": "0.1.52",
"@toolpad/studio": "0.1.53",
"@supabase/supabase-js": "2.39.3"
}
}
2 changes: 1 addition & 1 deletion examples/with-prisma-data-provider/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"prisma": "prisma"
},
"dependencies": {
"@toolpad/studio": "0.1.52",
"@toolpad/studio": "0.1.53",
"@prisma/client": "5.9.1",
"qrcode": "^1.5.3"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/with-prisma/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"prisma": "prisma"
},
"dependencies": {
"@toolpad/studio": "0.1.52",
"@toolpad/studio": "0.1.53",
"@prisma/client": "5.9.1",
"qrcode": "^1.5.3"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/with-wasm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"start": "toolpad-studio start"
},
"dependencies": {
"@toolpad/studio": "0.1.52"
"@toolpad/studio": "0.1.53"
},
"devDependencies": {
"assemblyscript": "0.27.25"
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
"version": "0.1.52",
"version": "0.1.53",
"npmClient": "pnpm"
}
13 changes: 5 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"markdownlint": "markdownlint-cli2 \"**/*.md\"",
"prettier": "pretty-quick --ignore-path .eslintignore",
"prettier:all": "prettier --write . --ignore-path .eslintignore",
"deduplicate": "node scripts/deduplicate.mjs",
"dev": "dotenv cross-env FORCE_COLOR=1 lerna -- run dev --stream --parallel --ignore docs",
"docs:dev": "pnpm --filter docs dev",
"docs:build": "pnpm --filter docs build",
Expand All @@ -40,15 +39,14 @@
},
"devDependencies": {
"@argos-ci/core": "1.5.5",
"@mui/monorepo": "github:mui/material-ui#b57951355a60566aeafc88c9aa49c7f198968b3c",
"@mui/monorepo": "github:mui/material-ui#0102a9579628d48d784511a562b7b72f0f51847e",
"@mui/x-charts": "6.19.8",
"@next/eslint-plugin-next": "14.1.3",
"@next/eslint-plugin-next": "14.1.4",
"@playwright/test": "1.42.1",
"@testing-library/react": "14.2.1",
"@types/archiver": "6.0.2",
"@types/gtag.js": "0.0.19",
"@types/node": "20.11.28",
"@types/rimraf": "3.0.2",
"@typescript-eslint/eslint-plugin": "7.2.0",
"@typescript-eslint/parser": "7.2.0",
"chalk": "5.3.0",
Expand Down Expand Up @@ -79,8 +77,7 @@
"rimraf": "5.0.5",
"typescript": "5.4.2",
"vitest-dom": "0.1.1",
"vitest-fail-on-console": "0.5.1",
"yarn-deduplicate": "6.0.2"
"vitest-fail-on-console": "0.5.1"
},
"dependencies": {
"archiver": "7.0.0",
Expand All @@ -100,10 +97,10 @@
"engines": {
"npm": "please-use-pnpm",
"node": ">=18",
"pnpm": "8.15.4"
"pnpm": "8.15.5"
},
"resolutions": {
"google-auth-library": "*"
},
"packageManager": "[email protected].4"
"packageManager": "[email protected].5"
}
2 changes: 1 addition & 1 deletion packages/create-toolpad-app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "create-toolpad-app",
"version": "0.1.52",
"version": "0.1.53",
"keywords": [
"react",
"toolpad",
Expand Down
Loading

0 comments on commit d36dad1

Please sign in to comment.