Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into feat/accordion
Browse files Browse the repository at this point in the history
  • Loading branch information
mj12albert committed Oct 21, 2024
2 parents 8e0df16 + 342cb97 commit 03e0ec4
Show file tree
Hide file tree
Showing 196 changed files with 709 additions and 1,406 deletions.
2 changes: 1 addition & 1 deletion .codesandbox/ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"publishDirectory": {
"@base_ui/react": "packages/mui-base/build"
},
"sandboxes": ["/examples/base-ui-cra-ts"],
"sandboxes": ["/.codesandbox/template"],
"silent": true
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 0 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
* @atomiks @michaldudak
/docs/data/ @atomiks @colmtuite @michaldudak
/examples/ @atomiks @colmtuite @michaldudak
/packages/mui-base/ @atomiks @colmtuite @michaldudak
/scripts/ @michaldudak
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
/docs/app/playground/*
!/docs/app/playground/\[slug\]
/docs/public/feed/
/examples/**/.cache
/test/bundling/fixtures/*/yarn.lock
/test/bundling/fixtures/*/pnpm-lock.yaml
# created by test/bundling/scripts/createFixture
Expand Down
3 changes: 1 addition & 2 deletions babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ module.exports = function getBabelConfig(api) {

const defaultAlias = {
'@base_ui/react': resolveAliasPath('./packages/mui-base/src'),
docs: resolveAliasPath('./node_modules/@mui/monorepo/docs'),
'docs-base': resolveAliasPath('./docs'),
docs: resolveAliasPath('./docs'),
test: resolveAliasPath('./test'),
'@mui-internal/api-docs-builder': resolveAliasPath(
'./node_modules/@mui/monorepo/packages/api-docs-builder',
Expand Down
19 changes: 0 additions & 19 deletions docs/data/getting-started/support/support.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -36,25 +36,6 @@ You have a few possible options to provide it:

You can browse the documentation, find an example close to your use case, and then open it in a live editor:

<span className="only-light-mode">
<img
src="/static/docs-infra/forking-an-example.png"
alt="Forking an example"
loading="lazy"
width="1628"
style={{ display: 'block', maxWidth: '774px' }}
/>
</span>
<span className="only-dark-mode">
<img
src="/static/docs-infra/forking-an-example-dark.png"
alt="Forking an example"
loading="lazy"
width="1628"
style={{ display: 'block', maxWidth: '774px' }}
/>
</span>

#### Use starter templates

You can use a starter React template to build a reproduction case with [JavaScript](https://stackblitz.com/github/stackblitz/starters/tree/main/react) or [TypeScript](https://stackblitz.com/github/stackblitz/starters/tree/main/react-ts).
Expand Down
8 changes: 0 additions & 8 deletions docs/data/guides/next-js-app-router/next-js-app-router.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@ description: Learn how to use Base UI with the Next.js App Router.

<Description />

## Example

Starting fresh on a new App Router-based project?

Jump right into the code with [this example: Base UI - Next.js App Router with Tailwind CSS in TypeScript](https://github.com/mui/base-ui/tree/master/examples/base-ui-nextjs-tailwind-ts).

## Next.js and React Server Components

The Next.js App Router implements React Server Components, [an upcoming feature for React](https://github.com/reactjs/rfcs/blob/main/text/0227-server-module-conventions.md).
Expand Down Expand Up @@ -52,8 +46,6 @@ module.exports = {
};
```

Refer to this [example repo](https://github.com/mui/base-ui/tree/master/examples/base-ui-nextjs-tailwind-ts) for a full working demo of a Next.js 13 app using Base UI and Tailwind CSS.

### Emotion

If you're using Emotion, or something Emotion-based like MUI System, create a custom `ThemeRegistry` component that combines the Emotion `CacheProvider`, the Material UI `ThemeProvider`, and the `useServerInsertedHTML` hook from `next/navigation` as follows:
Expand Down
3 changes: 1 addition & 2 deletions docs/next.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ const nextConfig = {
...config.resolve,
alias: {
...config.resolve.alias,
'docs-base': path.resolve(workspaceRoot, 'docs'),
docs: path.resolve(workspaceRoot, 'node_modules/@mui/monorepo/docs'),
docs: path.resolve(workspaceRoot, 'docs'),
},
},
module: {
Expand Down
3 changes: 0 additions & 3 deletions docs/public/_headers
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
/_next/*.js
Cache-Control: public, max-age=31536000, immutable

/static/images/*
Cache-Control: public, max-age=86400

/static/favicon.ico
Content-Type: image/x-icon

Expand Down
1 change: 0 additions & 1 deletion docs/public/static/BIMI.svg

This file was deleted.

Binary file removed docs/public/static/ads-in-house/figma.png
Binary file not shown.
Binary file removed docs/public/static/ads-in-house/scaffoldhub.png
Binary file not shown.
Binary file removed docs/public/static/ads-in-house/themes-2.jpg
Binary file not shown.
Binary file removed docs/public/static/ads-in-house/themes.png
Binary file not shown.
Binary file removed docs/public/static/ads-in-house/tidelift.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed docs/public/static/branding/base-ui/avatar.png
Diff not rendered.
1 change: 0 additions & 1 deletion docs/public/static/branding/base-ui/headless-ui-dark.svg
Diff not rendered.
1 change: 0 additions & 1 deletion docs/public/static/branding/base-ui/headless-ui.svg
Diff not rendered.
Loading

0 comments on commit 03e0ec4

Please sign in to comment.