Skip to content

Commit

Permalink
Merge branch 'main' into robots-txt-setting
Browse files Browse the repository at this point in the history
* main: (741 commits)
  Improve the usability of the ObjectBrowser when inputting a manual value, checking it on blur, and adding a local validator (#6576)
  fixing Markdown heading (#6588)
  fix site logo issue (#6591)
  Route registry (#6600)
  Release @plone/client 1.0.0-alpha.21
  Export the getContent bare fetcher (#6594)
  fix: incorrect copied state useClipboard (#6585)
  [RR7] Update to latest RR7 and conventions, fix index page (#6589)
  Release 18.6.0
  Release @plone/slate 18.1.0
  Revert "added swedish translation" (#6578)
  Slate Italian translations (#6563)
  Release 18.5.0
  Fix robots.txt in devmode (#6571)
  added swedish translation (#6557)
  Depth search issue (#6558)
  Block examples documentation (#6560)
  Fixed folder contents issues with persistent selection (#6554)
  Fix redirects to MDN responsive images (#6552)
  Bugfix remove query string inclusion in body class generation logic (#6547)
  ...
  • Loading branch information
sneridagh committed Jan 21, 2025
2 parents 442520b + 5c88b0b commit ad3d9e1
Show file tree
Hide file tree
Showing 2,417 changed files with 119,766 additions and 82,383 deletions.
4 changes: 4 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,7 @@ build
packages/volto
packages/volto-guillotina
!.*
dist
packages/registry/lib
packages/registry/docs
apps/rr7/.react-router
8 changes: 6 additions & 2 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,19 @@ const config = {
files: ['**/*.ts', '**/*.tsx'],
plugins: ['@typescript-eslint', 'import'],
extends: [
'plugin:react/recommended',
// 'plugin:@typescript-eslint/eslint-recommended',
// 'plugin:@typescript-eslint/recommended',
'plugin:react/recommended',
// 'plugin:import/recommended',
'plugin:import/typescript',
'plugin:prettier/recommended',
'plugin:react/jsx-runtime',
// 'plugin:react/jsx-runtime', // We only want this for non-library code (eg. volto add-ons)
// 'plugin:storybook/recommended',
],
rules: {
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/ban-ts-comment': 0,
},
},
{
files: ['**/*.js', '**/*.jsx'],
Expand Down
5 changes: 3 additions & 2 deletions .github/ISSUE_TEMPLATE/PLIP.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@
name: "\U0001F680 PLIP"
about: Plone Improvement Proposal
title: ''
labels: ''
labels: '03 type: feature (plip)'
assignees: ''
projects: 'plone/47'

---

## PLIP (Plone Improvement Proposal)

<!--
Read http://5.docs.plone.org/develop/coredev/docs/plips.html first!
Read https://6.docs.plone.org/contributing/core/plips.html first!
Set "03 type: feature: plip" as label.
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: Bug report
about: Create a report to help us improve Volto
title: ''
labels: '01 type: bug'
labels: ['01 type: bug', 'needs: triage']
assignees: ''
---

Expand Down
15 changes: 15 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
- [ ] I signed and returned the [Plone Contributor Agreement](https://plone.org/foundation/contributors-agreement), and received and accepted an invitation to join a team in the Plone GitHub organization.
- [ ] I verified there aren't other open [pull requests](https://github.com/plone/volto/pulls) for the same change.
- [ ] I followed the guidelines in [Contributing to Volto](https://6.docs.plone.org/volto/contributing/index.html).
- [ ] I succesfully ran [code linting checks](https://6.docs.plone.org/volto/contributing/linting.html) on my changes locally.
- [ ] I succesfully ran [unit tests](https://6.docs.plone.org/volto/contributing/testing.html) on my changes locally.
- [ ] I succesfully ran [acceptance tests](https://6.docs.plone.org/volto/contributing/acceptance-tests.html) on my changes locally.
- [ ] If needed, I added new tests for my changes.
- [ ] If needed, I added [documentation](https://6.docs.plone.org/volto/contributing/documentation.html#narrative-documentation) for my changes, either in the Storybook or narrative documentation.
- [ ] I included a [change log entry](https://6.docs.plone.org/contributing/index.html#contributing-change-log-label) in my commits.

-----

If your pull request closes an open issue, include the exact text below, immediately followed by the issue number. When your pull request gets merged, then that issue will close automatically.

Closes #
50 changes: 50 additions & 0 deletions .github/actions/node_env_setup/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Set up Node.js environment

runs:
using: "composite"
steps:
- uses: actions/checkout@v4

- name: Use Node.js ${{ inputs.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ inputs.node-version }}

- name: Enable corepack
shell: bash
run: corepack enable

- name: Get pnpm store directory
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- uses: actions/cache@v4
name: Setup pnpm cache
with:
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
- name: Cache Cypress Binary
id: cache-cypress-binary
uses: actions/cache@v4
with:
path: ~/.cache/Cypress
key: binary-${{ inputs.node-version }}-${{ hashFiles('pnpm-lock.yaml') }}

- name: Install Volto dependencies
shell: bash
run: make install

- name: Install Cypress if not in cache
if: steps.cache-cypress-binary.outputs.cache-hit != 'true'
shell: bash
working-directory: packages/volto
run: make cypress-install

inputs:
node-version:
description: 'Node.js version'
required: true
Loading

0 comments on commit ad3d9e1

Please sign in to comment.