Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
bharatkashyap authored Feb 11, 2025
2 parents 2628997 + 3967dce commit 9d0d2e3
Show file tree
Hide file tree
Showing 27 changed files with 437 additions and 451 deletions.
4 changes: 4 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ commands:
default: false
description: 'Set to true if you intend to use any browser (for example with playwright).'
steps:
- run:
name: Set npm registry public signing keys
command: |
echo "export COREPACK_INTEGRITY_KEYS='$(curl https://registry.npmjs.org/-/npm/v1/keys | jq -c '{npm: .keys}')'" >> $BASH_ENV
- when:
condition: << parameters.browsers >>
steps:
Expand Down
2 changes: 1 addition & 1 deletion docs/data/toolpad/core/integrations/react-router.md
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ import DashboardIcon from '@mui/icons-material/Dashboard';
import ShoppingCartIcon from '@mui/icons-material/ShoppingCart';
import { ReactRouterAppProvider } from '@toolpad/core/react-router';
import { Outlet, useNavigate } from 'react-router';
import type { Navigation, Session } from '@toolpad/core';
import type { Navigation } from '@toolpad/core';
import {
firebaseSignOut,
signInWithGoogle,
Expand Down
20 changes: 0 additions & 20 deletions docs/data/toolpad/core/pages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,6 @@ const pages: MuiPage[] = [
pathname: '/toolpad/core/react-page-container',
title: 'Page Container',
},
{
pathname: '/toolpad/core/react-notification-center',
title: 'Notification Center',
planned: true,
},
],
},
{
Expand All @@ -103,16 +98,6 @@ const pages: MuiPage[] = [
pathname: '/toolpad/core/react-account',
title: 'Account',
},
{
pathname: '/toolpad/core/react-sign-up-page',
title: 'Sign-up Page',
planned: true,
},
{
pathname: '/toolpad/core/react-rbac',
title: 'RBAC',
planned: true,
},
],
},
{
Expand All @@ -124,11 +109,6 @@ const pages: MuiPage[] = [
title: 'CRUD',
planned: true,
},
{
pathname: '/toolpad/core/react-stat-card',
title: 'Stats Card',
planned: true,
},
],
},
{
Expand Down
2 changes: 1 addition & 1 deletion docs/data/toolpad/studio/concepts/custom-server.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ app.use('/my-app', handler);
app.listen(3001);
```

To run the custom server you'll have to update the scripts in your your package.json
To run the custom server you'll have to update the scripts in your package.json

```json
{
Expand Down
2 changes: 1 addition & 1 deletion docs/data/toolpad/studio/concepts/deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

## Install step

Install required depdencies via:
Install required dependencies via:

<codeblock storageKey="package-manager">

Expand Down
4 changes: 2 additions & 2 deletions docs/data/toolpad/studio/concepts/page-properties.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

### Options

The possible options for the the display mode are:
The possible options for the display mode are:

- **App shell**: Pages with their display mode set to this value will render within the navigation sidebar on the left, allowing for easy navigation between all pages.

Expand Down Expand Up @@ -52,7 +52,7 @@ Page parameters allow you to pass external data into the Toolpad Studio page sta

### Setting parameters

You can set page parameters from the Page tab in the **Inspector panel** on right. You can add multiple parameters along with a default value for each.
You can set page parameters from the Page tab in the **Inspector panel** on the right. You can add multiple parameters along with a default value for each.

### Using parameters

Expand Down
4 changes: 2 additions & 2 deletions docs/data/toolpad/studio/concepts/queries.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Queries allow you to bring backend data to your Toolpad Studio page. They are ca

You can use this option to enable or disable the query from running

Queries may be programatically re-fetched via the `refetch` function available on these query objects. For example, for a query named `getOrders`, you can add
Queries may be programmatically re-fetched via the `refetch` function available on these query objects. For example, for a query named `getOrders`, you can add

```js
getOrders.refetch();
Expand All @@ -34,7 +34,7 @@ in the `onClick` binding of a Button component.

## Actions

Actions allow performing updates to remote data sources (edit, update, delete) on a user interaction. Actions are not automatically called, they must be programtically called a JavaScript expression in a binding. For example, for a query named `createCustomer`, we can add
Actions allow performing updates to remote data sources (edit, update, delete) on a user interaction. Actions are not automatically called, they must be programmatically called a JavaScript expression in a binding. For example, for a query named `createCustomer`, we can add

```js
createCustomer.call();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<p class="description">Toolpad Studio allows you to connect to any database, fast.</p>

You can write a custom function to connect to any database that you need to.
You can focus on writing database queries, while the data fetching and displaying is handled by Toolpad Studio.
You can focus on writing database queries, while the data fetching and displaying are handled by Toolpad Studio.

## Connecting to MySQL

Expand Down
10 changes: 5 additions & 5 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
"@mui/styles": "6.3.1",
"@mui/system": "6.3.1",
"@mui/utils": "6.3.1",
"@mui/x-date-pickers": "7.24.1",
"@mui/x-date-pickers-pro": "7.24.1",
"@mui/x-license": "7.24.1",
"@mui/x-date-pickers": "7.25.0",
"@mui/x-date-pickers-pro": "7.25.0",
"@mui/x-license": "7.25.0",
"@toolpad/core": "workspace:*",
"@toolpad/studio": "workspace:*",
"@trendmicro/react-interpolate": "0.5.5",
Expand Down Expand Up @@ -84,7 +84,7 @@
"recast": "0.23.9",
"rimraf": "6.0.1",
"styled-components": "6.1.14",
"stylis": "4.3.4",
"stylis": "4.3.5",
"stylis-plugin-rtl": "npm:stylis-plugin-rtl@^2.1.1",
"stylis-plugin-rtl-sc": "npm:stylis-plugin-rtl@^2.1.1",
"webpack-bundle-analyzer": "4.10.2",
Expand All @@ -97,7 +97,7 @@
"@types/babel__core": "^7.20.5",
"@types/doctrine": "0.0.9",
"@types/json-schema": "7.0.15",
"@types/react": "^19.0.0",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
"@types/react-is": "^19.0.0",
"@types/react-swipeable-views": "^0.13.6",
Expand Down
2 changes: 1 addition & 1 deletion examples/core/auth-nextjs-email/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ docker run --name postgres -e POSTGRES_PASSWORD=postgres -p 5432:5432 -d postgre
npx prisma migrate dev --schema=./src/prisma/schema.prisma
```

5. You also need to supply the following enviroment variables for the email server to work:
5. You also need to supply the following environment variables for the email server to work:

```bash
EMAIL_SERVER_HOST=
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"@mui/internal-markdown": "1.0.24",
"@mui/internal-scripts": "1.0.32",
"@mui/monorepo": "github:mui/material-ui#dd69cf07e7aace1efad91e5b8e733c7efcf6c02c",
"@mui/x-charts": "7.24.1",
"@mui/x-charts": "7.25.0",
"@next/eslint-plugin-next": "14.2.23",
"@playwright/test": "1.47.2",
"@testing-library/jest-dom": "^6.6.3",
Expand Down Expand Up @@ -115,7 +115,7 @@
},
"dependencies": {
"@types/lodash": "4.17.15",
"@vitest/browser": "2.1.8",
"@vitest/browser": "2.1.9",
"archiver": "7.0.1",
"cross-env": "7.0.3",
"dotenv-cli": "7.4.4",
Expand All @@ -126,7 +126,7 @@
"semver": "7.6.3",
"tsup": "8.3.6",
"tsx": "4.19.2",
"vitest": "2.1.8",
"vitest": "2.1.9",
"yargs": "17.7.2",
"zod": "3.23.8",
"zod-to-json-schema": "3.23.5"
Expand Down
6 changes: 3 additions & 3 deletions packages/toolpad-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,16 @@
"@mui/material": "6.3.1",
"@types/invariant": "2.2.37",
"@types/prop-types": "15.7.14",
"@types/react": "^19.0.0",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
"@types/sinon": "^17.0.3",
"@vitest/browser": "2.1.8",
"@vitest/browser": "2.1.9",
"next": "^15.1.6",
"next-router-mock": "^0.9.13",
"playwright": "^1.47.2",
"react-router": "7.1.5",
"sinon": "^19.0.2",
"vitest": "2.1.8"
"vitest": "2.1.9"
},
"peerDependencies": {
"@mui/icons-material": "5 - 6",
Expand Down
1 change: 1 addition & 0 deletions packages/toolpad-core/src/DashboardLayout/AppTitle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export function AppTitle(props: AppTitleProps) {
fontWeight: '700',
ml: 1,
whiteSpace: 'nowrap',
lineHeight: 1,
}}
>
{title}
Expand Down
1 change: 1 addition & 0 deletions packages/toolpad-core/src/SignInPage/SignInPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ function SignInPage(props: SignInPageProps) {
) : (
<Typography
variant="h5"
component="h1"
color="textPrimary"
sx={{
my: theme.spacing(1),
Expand Down
6 changes: 3 additions & 3 deletions packages/toolpad-core/src/nextjs/NextAppProviderPages.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import type { AppProviderProps, Navigate, Router } from '../AppProvider';
* @ignore - internal component.
*/
export function NextAppProviderPages(props: AppProviderProps) {
const { push, replace, asPath, query } = useRouter();
const { push, replace, pathname, query } = useRouter();

const search = React.useMemo(() => {
const params = new URLSearchParams();
Expand Down Expand Up @@ -38,11 +38,11 @@ export function NextAppProviderPages(props: AppProviderProps) {

const routerImpl = React.useMemo<Router>(
() => ({
pathname: asPath,
pathname,
searchParams,
navigate,
}),
[asPath, navigate, searchParams],
[navigate, pathname, searchParams],
);

return <AppProvider router={routerImpl} {...props} />;
Expand Down
10 changes: 5 additions & 5 deletions packages/toolpad-studio-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
"@mui/icons-material": "6.3.1",
"@mui/lab": "6.0.0-beta.22",
"@mui/material": "6.3.1",
"@mui/x-charts": "7.24.1",
"@mui/x-data-grid-premium": "7.24.1",
"@mui/x-date-pickers": "7.24.1",
"@mui/x-license": "7.24.1",
"@mui/x-charts": "7.25.0",
"@mui/x-data-grid-premium": "7.25.0",
"@mui/x-date-pickers": "7.25.0",
"@mui/x-license": "7.25.0",
"@tanstack/react-query": "5.61.3",
"@toolpad/studio-runtime": "workspace:*",
"@toolpad/utils": "workspace:*",
Expand All @@ -59,7 +59,7 @@
},
"devDependencies": {
"@types/invariant": "2.2.37",
"@types/react": "^19.0.0",
"@types/react": "^19.0.8",
"react": "^19.0.0"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/toolpad-studio-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"@types/cookie": "0.6.0",
"@types/express": "5.0.0",
"@types/invariant": "2.2.37",
"@types/react": "^19.0.0",
"@types/react": "^19.0.8",
"@types/react-is": "^19.0.0"
},
"peerDependencies": {
Expand Down
16 changes: 8 additions & 8 deletions packages/toolpad-studio/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@
"@mui/system": "6.3.1",
"@mui/types": "7.2.21",
"@mui/utils": "6.3.1",
"@mui/x-charts": "7.24.1",
"@mui/x-data-grid": "7.24.1",
"@mui/x-data-grid-premium": "7.24.1",
"@mui/x-date-pickers": "7.24.1",
"@mui/x-date-pickers-pro": "7.24.1",
"@mui/x-license": "7.24.1",
"@mui/x-tree-view": "7.24.1",
"@mui/x-charts": "7.25.0",
"@mui/x-data-grid": "7.25.0",
"@mui/x-data-grid-premium": "7.25.0",
"@mui/x-date-pickers": "7.25.0",
"@mui/x-date-pickers-pro": "7.25.0",
"@mui/x-license": "7.25.0",
"@mui/x-tree-view": "7.25.0",
"@tanstack/react-query": "5.61.3",
"@tanstack/react-query-devtools": "5.61.3",
"@toolpad/core": "workspace:*",
Expand Down Expand Up @@ -162,7 +162,7 @@
"@types/lodash-es": "4.17.12",
"@types/node-fetch": "2.6.12",
"@types/pg": "8.11.11",
"@types/react": "^19.0.0",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
"@types/react-is": "^19.0.0",
"@types/semver": "7.5.8",
Expand Down
4 changes: 2 additions & 2 deletions packages/toolpad-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@
"devDependencies": {
"@types/express": "5.0.0",
"@types/invariant": "2.2.37",
"@types/react": "^19.0.0",
"@types/react": "^19.0.8",
"@types/react-is": "^19.0.0",
"@types/title": "3.4.3",
"vitest": "2.1.8"
"vitest": "2.1.9"
}
}
2 changes: 1 addition & 1 deletion playground/nextjs-pages/next-env.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
/// <reference types="next/navigation-types/compat/navigation" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
2 changes: 1 addition & 1 deletion playground/nextjs-pages/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@mui/material": "6.3.1",
"@mui/material-nextjs": "6.3.1",
"@toolpad/core": "workspace:*",
"@types/react": "^19.0.0",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
"eslint-config-next": "15.1.6",
"next": "^15.1.6",
Expand Down
2 changes: 1 addition & 1 deletion playground/nextjs/next-env.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
2 changes: 1 addition & 1 deletion playground/nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@mui/material-nextjs": "6.3.1",
"@toolpad/core": "workspace:*",
"@types/node": "^20.17.16",
"@types/react": "^19.0.0",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
"eslint-config-next": "15.1.6",
"next": "^15.1.6",
Expand Down
2 changes: 1 addition & 1 deletion playground/vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@mui/icons-material": "6.3.1",
"@mui/material": "6.3.1",
"@toolpad/core": "workspace:*",
"@types/react": "^19.0.0",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
"@vitejs/plugin-react": "4.3.4",
"react": "^19.0.0",
Expand Down
Loading

0 comments on commit 9d0d2e3

Please sign in to comment.