Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into refactor-nav-sele…
Browse files Browse the repository at this point in the history
…cted-item
  • Loading branch information
apedroferreira committed Jan 16, 2025
2 parents 8d6a960 + 44ce709 commit ee59d32
Show file tree
Hide file tree
Showing 703 changed files with 33,495 additions and 11,613 deletions.
21 changes: 15 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ commands:
type: boolean
default: false
description: 'Set to true if you intend to use any browser (for example with playwright).'

steps:
- when:
condition: << parameters.browsers >>
Expand All @@ -46,7 +45,6 @@ commands:
name: Install pnpm package manager
# See https://stackoverflow.com/a/73411601
command: corepack enable --install-directory ~/bin

- run:
name: View install environment
command: |
Expand Down Expand Up @@ -133,7 +131,6 @@ jobs:
test_unit:
<<: *default-job

steps:
- checkout
- install_js:
Expand All @@ -151,10 +148,9 @@ jobs:
test_unit_browser:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.47.2-focal
- image: mcr.microsoft.com/playwright:v1.48.2-focal
environment:
NODE_ENV: test

steps:
- checkout
- install_js:
Expand All @@ -177,7 +173,6 @@ jobs:
environment:
NODE_ENV: test
TOOLPAD_TEST_RETRIES: 1

steps:
- checkout
- install_js:
Expand All @@ -199,6 +194,16 @@ jobs:
path: test/test-results
destination: playwright-test-results

test_bundle_size_monitor:
<<: *default-job
steps:
- checkout
- install_js
- run:
name: Run danger on PRs
command: pnpm danger ci --fail-on-errors
# TODO test bundle size, similar to https://github.com/mui/base-ui/issues/201

workflows:
pipeline:
jobs:
Expand Down Expand Up @@ -228,3 +233,7 @@ workflows:
<<: *default-context
requires:
- checkout
- test_bundle_size_monitor:
<<: *default-context
requires:
- checkout
6 changes: 2 additions & 4 deletions .github/ISSUE_TEMPLATE/1.bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,10 @@ body:
description: |
**⚠️ Issues that we can't reproduce can't be fixed.**
Provide a link to a live example and an unambiguous set of steps to reproduce this bug. Include code to reproduce, if relevant.
Please provide a link to a live example and an unambiguous set of steps to reproduce this bug.
value: |
Link to live example: (required)
Steps:
1.
1. Open this link to live example: (required)
2.
3.
- type: textarea
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
contact_links:
- name: Support ❔
url: https://mui.com/toolpad/studio/getting-started/support/
url: https://mui.com/toolpad/core/introduction/support/
about: I need support with Toolpad.
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
security-events: write
steps:
- name: Checkout repository
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
uses: github/codeql-action/init@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
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@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
uses: github/codeql-action/analyze@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
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@1b1b1fcde06a9b3d089f3464c96417961dde1168 # v3.0.2
uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3
with:
dirtyLabel: 'PR: out-of-date'
removeOnDirtyLabel: 'PR: ready to ship'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
persist-credentials: false

Expand All @@ -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@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
uses: github/codeql-action/upload-sarif@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
with:
sarif_file: results.sarif
4 changes: 2 additions & 2 deletions .github/workflows/vale-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:
contents: read
pull-requests: write
steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- uses: errata-ai/vale-action@38bf078c328061f59879b347ca344a718a736018 # v2.1.0
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: errata-ai/vale-action@d89dee975228ae261d22c15adcd03578634d429c # v2.1.1
continue-on-error: true # GitHub Action flag needed until https://github.com/errata-ai/vale-action/issues/89 is fixed
with:
# Errors should be more visible
Expand Down
22 changes: 15 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,31 +40,39 @@ yarn-error.log*
.sentryclirc

# docs

/docs/export

# lerna

lerna-debug.log

# env

.env

# build output

dist/
build/

# studio
packages/toolpad-studio/public/web_modules
packages/toolpad-studio/public/runtime
packages/toolpad-studio/public/typings.json
examples/*/yarn.lock

test-results
.toolpad-generated

.yarn-playwright-cache
# examples
examples/*/*/yarn.lock


# tests

test-results
.yarn-playwright-cache
/test/regressions/screenshots/**
.coverage

# vale downloaded config
.github/styles/Google
.github/styles/MUI
.github/styles/.vale-config

.coverage
Loading

0 comments on commit ee59d32

Please sign in to comment.