Skip to content

Commit

Permalink
Merge branch 'master' into registryinownpackage
Browse files Browse the repository at this point in the history
* master: (31 commits)
  Refactor Content Rename Model (#4971)
  Refactor Content Tags Modal  (#4970)
  Refactor Content workflow Modal  (#4969)
  Refactor Content Property Model  (#4968)
  Refactor Sidebar (#4965)
  Refactor PersonalTool component (#4954)
  Fix standalone navigation action call if expander is set (#5197)
  Fix api convenience buildout build
  Fix instruction to fetch add-on from repo (#5196)
  Remove JSON files from being linted by ESlint, since it's not its pur… (#5194)
  Release generate-volto 7.0.0-alpha.8
  Add missing empty lock to acceptance generator addon folder (#5193)
  Release generate-volto 7.0.0-alpha.7
  Release 17.0.0-alpha.27
  TypeScript support in core (#4662)
  Update delete content modal for link integrity (#4786)
  Add external className to slate Link view. (#5188)
  Release generate-volto 7.0.0-alpha.6
  Fix addon i18n local command when executed outside the scope of a Volto project. (#5181)
  Release 17.0.0-alpha.26
  ...
  • Loading branch information
sneridagh committed Sep 19, 2023
2 parents 41ef155 + e3be234 commit 71a487f
Show file tree
Hide file tree
Showing 180 changed files with 7,090 additions and 2,424 deletions.
7 changes: 5 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,11 @@
"overrides": [
{
"files": ["**/*.ts", "**/*.tsx"],
"extends": ["plugin:@typescript-eslint/recommended", "react-app", "prettier", "plugin:jsx-a11y/recommended"],
"plugins": ["@typescript-eslint", "prettier", "react-hooks", "jsx-a11y"],
// "react-app" already loads plugin:@typescript-eslint/eslint-plugin
// and it complains on having two different versions around.
// Re-add it if at some point, we stop relying on it
"extends": ["react-app", "prettier", "plugin:jsx-a11y/recommended"],
"plugins": ["prettier", "react-hooks", "jsx-a11y"],
"parser": "@typescript-eslint/parser"
},
{
Expand Down
70 changes: 15 additions & 55 deletions .github/workflows/acceptance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [16.x, 18.x]
node-version: [18.x, 20.x]
steps:
- uses: actions/checkout@v3

Expand All @@ -24,20 +24,16 @@ jobs:
- run: yarn --immutable

- name: Cypress acceptance tests
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
env:
BABEL_ENV: production
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
CYPRESS_RETRIES: 2
# Recommended: pass the GitHub token lets this action correctly
# determine the unique run id necessary to re-run the checks
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
install: false
record: true
parallel: false # Since they run on different node versions, we can't parallel
browser: chrome
group: Core ${{ matrix.node-version }}
spec: cypress/tests/core/basic/**/*.js
start: |
make start-test-acceptance-server
Expand Down Expand Up @@ -65,7 +61,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [16.x, 18.x]
node-version: [18.x, 20.x]
steps:
- uses: actions/checkout@v3

Expand All @@ -80,20 +76,16 @@ jobs:
- run: yarn --immutable

- name: Cypress acceptance tests
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
env:
BABEL_ENV: production
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
CYPRESS_RETRIES: 2
# Recommended: pass the GitHub token lets this action correctly
# determine the unique run id necessary to re-run the checks
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
install: false
record: true
parallel: false # Since they run on different node versions, we can't parallel
browser: chrome
group: Core Blocks ${{ matrix.node-version }}
spec: cypress/tests/core/blocks/**/*.js
start: |
make start-test-acceptance-server
Expand Down Expand Up @@ -121,7 +113,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [16.x, 18.x]
node-version: [18.x, 20.x]
steps:
- uses: actions/checkout@v3

Expand All @@ -136,20 +128,16 @@ jobs:
- run: yarn --immutable

- name: Cypress acceptance tests
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
env:
BABEL_ENV: production
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
CYPRESS_RETRIES: 2
# Recommended: pass the GitHub token lets this action correctly
# determine the unique run id necessary to re-run the checks
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
install: false
record: true
parallel: false # Since they run on different node versions, we can't parallel
browser: chrome
group: Core Volto Slate ${{ matrix.node-version }}
spec: cypress/tests/core/volto-slate/**/*.js
start: |
make start-test-acceptance-server
Expand Down Expand Up @@ -191,20 +179,16 @@ jobs:
- run: yarn --immutable

- name: Cypress acceptance tests
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
env:
BABEL_ENV: production
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
CYPRESS_RETRIES: 2
# Recommended: pass the GitHub token lets this action correctly
# determine the unique run id necessary to re-run the checks
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
install: false
record: true
parallel: false # Since they run on different node versions, we can't parallel
browser: chrome
group: Core Basic - Plone 5
spec: cypress/tests/core/basic/**/*.js
start: |
make start-test-acceptance-server-5
Expand Down Expand Up @@ -246,20 +230,16 @@ jobs:
- run: yarn --immutable

- name: Cypress Coresandbox Acceptance tests
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
env:
BABEL_ENV: production
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
CYPRESS_RETRIES: 2
# Recommended: pass the GitHub token lets this action correctly
# determine the unique run id necessary to re-run the checks
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
install: false
record: true
parallel: true
browser: chrome
group: Coresandbox
spec: cypress/tests/coresandbox/**/*.js
start: |
make start-test-acceptance-server-coresandbox
Expand Down Expand Up @@ -302,21 +282,17 @@ jobs:
- run: yarn --immutable

- name: Cypress acceptance tests
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
env:
BABEL_ENV: production
CYPRESS_API: guillotina
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
CYPRESS_RETRIES: 2
# Recommended: pass the GitHub token lets this action correctly
# determine the unique run id necessary to re-run the checks
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
install: false
record: true
parallel: true
browser: chrome
group: Guillotina
spec: cypress/tests/guillotina/**/*.js
start: |
make start-test-acceptance-server-guillotina
Expand Down Expand Up @@ -359,20 +335,16 @@ jobs:
- run: yarn --immutable

- name: Cypress acceptance tests
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
env:
BABEL_ENV: production
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
CYPRESS_RETRIES: 2
# Recommended: pass the GitHub token lets this action correctly
# determine the unique run id necessary to re-run the checks
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
install: false
record: true
parallel: true
browser: chrome
group: Multilingual
spec: cypress/tests/multilingual/**/*.js
start: |
make start-test-acceptance-server-multilingual
Expand Down Expand Up @@ -440,20 +412,16 @@ jobs:
# CI: true

- name: Cypress acceptance tests
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
env:
BABEL_ENV: production
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
CYPRESS_RETRIES: 2
# Recommended: pass the GitHub token lets this action correctly
# determine the unique run id necessary to re-run the checks
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
install: false
record: true
parallel: true
browser: chrome
group: Working Copy
spec: cypress/tests/workingCopy/**/*.js
start: |
make start-test-acceptance-server-workingcopy
Expand All @@ -468,7 +436,7 @@ jobs:
path: cypress/screenshots
# Upload Cypress videos
- uses: actions/upload-artifact@v1
if: always()
if: failure()
with:
name: cypress-videos
path: cypress/videos
Expand All @@ -481,7 +449,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [18.x]
node-version: [18.x, 20.x]
env:
generator-directory: ./packages/generator-volto
project-directory: ./my-volto-app
Expand Down Expand Up @@ -531,20 +499,16 @@ jobs:
working-directory: ${{env.project-directory}}

- name: Cypress acceptance tests
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
env:
BABEL_ENV: production
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
CYPRESS_RETRIES: 2
# Recommended: pass the GitHub token lets this action correctly
# determine the unique run id necessary to re-run the checks
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
install: false
record: true
parallel: true
browser: chrome
group: Project Generator
spec: cypress/tests/minimal/**/*.js
start: |
make start-test-acceptance-server
Expand Down Expand Up @@ -593,20 +557,16 @@ jobs:
- run: yarn --immutable

- name: Cypress acceptance tests
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
env:
BABEL_ENV: production
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
CYPRESS_RETRIES: 2
# Recommended: pass the GitHub token lets this action correctly
# determine the unique run id necessary to re-run the checks
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
install: false
record: true
parallel: true
browser: chrome
group: Seamless
spec: cypress/tests/core/basic/**/*.js
config: baseUrl=http://localhost
start: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/towncrier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- master

env:
node-version: 16.x
node-version: 18.x

jobs:
towncrier:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [16.x, 18.x]
node-version: [18.x, 20.x]
steps:
- uses: actions/checkout@v3

# node setup
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
# remove workaround for 18.x once https://github.com/nodejs/node/issues/47563 is fixed
# remove workaround for 18.x once https://github.com/nodejs/node/issues/47563 is fixed
node-version: ${{ matrix.node-version == '18.x' && '18.15.0' || matrix.node-version }}
cache: yarn

Expand Down
65 changes: 62 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,65 @@

<!-- towncrier release notes start -->

## 17.0.0-alpha.27 (2023-09-18)

### Feature

- TypeScript support in core @sneridagh @ninanoleto [#4662](https://github.com/plone/volto/issues/4662)
- Add external className to slate Link view. @iFlameing [#5109](https://github.com/plone/volto/issues/5109)

### Bugfix

- Update delete-content modal to simplify text and improve UX @danlavrz [#4786](https://github.com/plone/volto/issues/4786)


## 17.0.0-alpha.26 (2023-09-14)

### Breaking

- Upgrade to Cypress 13 @sneridagh [#5163](https://github.com/plone/volto/issues/5163)
- Removed support for Node.js 16. It is no longer supported by the Node.js community. @davisagli [#5166](https://github.com/plone/volto/issues/5166)

### Feature

- Use the `@navroot` endpoint to build the `title` tag. @erral

Use the `@site` endpoint to render the logo. @erral

Register a widget to set the logo in the site control panel. @erral [#3537](https://github.com/plone/volto/issues/3537)
- Refactor Navigation -@Tishasoumya-02 [#4076](https://github.com/plone/volto/issues/4076)
- Added loading spinner and disable search button while data is fetching. @tedw87 [#4551](https://github.com/plone/volto/issues/4551)
- User Control panel improvements. See #4551 @erral [#4572](https://github.com/plone/volto/issues/4572)
- Messages Component Refactor - @Tishasoumya-02 [#4926](https://github.com/plone/volto/issues/4926)
- Refactor Login -@Tishasoumya-02 [#4933](https://github.com/plone/volto/issues/4933)
- Add external className to UniversalLink for external link. @iFlameing [#5109](https://github.com/plone/volto/issues/5109)
- Updated Spanish translation @macagua [#5120](https://github.com/plone/volto/issues/5120)
- (feat): Update toc block entries @dobri1408 [#5146](https://github.com/plone/volto/issues/5146)
- Views cypress test -@Tishasoumya [#5149](https://github.com/plone/volto/issues/5149)
- Added support for Node.js 20. @davisagli [#5166](https://github.com/plone/volto/issues/5166)
- Cypress test to test if 'Search results: number' text is present @ionlizarazu [#5171](https://github.com/plone/volto/issues/5171)

### Bugfix

- Fix for responsive error in the login page when the width of the screen decreases. @suman9893 [#3250](https://github.com/plone/volto/issues/3250)
- Fix back button in the search block to execute the search by adding two useEffects that update the facets and search data based on the current URL. @MihaelaCretu11 [#4402](https://github.com/plone/volto/issues/4402)
- fix : RecursiveWidget is incorrectly translated. @suman9893 [#4503](https://github.com/plone/volto/issues/4503)
- Fix use of CSS modules in webpack 5. @wesleybl [#5019](https://github.com/plone/volto/issues/5019)
- Fix toc accessibility issue @dobri1408 [#5058](https://github.com/plone/volto/issues/5058)
- Fix storybook config for project generator. Add support for SCSS, upgrade to webpack 5 in there as well. @sneridagh [#5132](https://github.com/plone/volto/issues/5132)
- Don't show ``No value`` option in SelectWidget and ArrayWidget if default value is 0. @wesleybl [#5151](https://github.com/plone/volto/issues/5151)
- Fix SelectWidget throwing error when editing a recently created content. @iFlameing [#5154](https://github.com/plone/volto/issues/5154)
- Fix editing layout for blocks using schema enhancers. @iFlameing, @davisagli [#5158](https://github.com/plone/volto/issues/5158)
- Fix ContentRules add and edit forms for languages other than English. @ericof [#5161](https://github.com/plone/volto/issues/5161)
- Fix search block search results number @ionlizarazu [#5171](https://github.com/plone/volto/issues/5171)
- fix flaky cypress in blocks-listing.js @nileshgulia1 [#5173](https://github.com/plone/volto/issues/5173)
- Fix regression in forms input in toolbar height related to (#5115) @sneridagh [#5176](https://github.com/plone/volto/issues/5176)

### Documentation

- Fix linkcheckbroken 301 redirect to https://www.dlr.de/de @stevepiercy [#5131](https://github.com/plone/volto/issues/5131)


## 17.0.0-alpha.25 (2023-08-25)

### Breaking
Expand Down Expand Up @@ -510,7 +569,7 @@

### Breaking

- Volto 17 drops support for NodeJS 14, and adds support for NodeJS 18.
- Volto 17 drops support for NodeJS 14, and adds support for Node.js 18.
Please see the [upgrade guide](https://6.docs.plone.org/volto/upgrade-guide/index.html)
for more information.

Expand Down Expand Up @@ -1410,7 +1469,7 @@ See https://6.docs.plone.org/volto/upgrade-guide/index.html for more information
- Update README with latest versions, point to Plone 6 as recommended default @sneridagh
- Trigger a new deploy core Plone documentation when Volto documentation is updated @esteele
- Update supported Python versions. @stevepiercy
- Add NodeJS 18 (LTS) usage notice @sneridagh
- Add Node.js 18 (LTS) usage notice @sneridagh
- Fix Netlify build @sneridagh
- Fix grammar in Theming Strategy. Fixes #954. @stevepiercy
- Fix wording in About Semantic UI. Fixes #953. @stevepiercy
Expand Down Expand Up @@ -1623,7 +1682,7 @@ See https://6.docs.plone.org/volto/upgrade-guide/index.html for more information

### Documentation

- Add NodeJS 18 (LTS) usage notice @sneridagh
- Add Node.js 18 (LTS) usage notice @sneridagh
- Fix Netlify build @sneridagh

## 16.0.0-alpha.45 (2022-10-24)
Expand Down
Loading

0 comments on commit 71a487f

Please sign in to comment.