Skip to content

Commit

Permalink
Merge branch 'main' into components-header
Browse files Browse the repository at this point in the history 
* main:
  Add new types generator, don't know why they don't get included when releasing
  Release 18.0.0-alpha.22
  Release @plone/registry 1.5.3
  Cross-package manager Volto path resolver in webpack-relative-resolver (#5893)
  New `volto-update-deps` documentation (#5892)
  Release generate-volto 9.0.0-alpha.13
  Release @plone/scripts 3.6.1
  Improve and fix volto-update-deps (#5889)
  Sort facet values if they are numbers (#5865)
  Release generate-volto 9.0.0-alpha.12
  Bump @plone/scripts and @plone/types to latests (#5888)
  Release 18.0.0-alpha.21
  Release @plone/scripts 3.6.0
  Release @plone/types 1.0.0-alpha.7
  Notify in documentation useLinkedHeadings setting change after changes from #5225 (#5885)
  Add dependencies syncronizer utility (#5879)
  Update volto-slate configuration to indicate it is now part of the core. (#5886)
  Bump all the versions in GitHub workflows (#5873)
  Added download link to filename in file widget (#5880)
  Improve `@plone/types` - Block*Props - Widgets (#5876)
  • Loading branch information
@sneridagh
sneridagh committed Mar 19, 2024
2 parents be6c095 + edf2af3 commit 817cf4a
Show file tree
Hide file tree
Showing 40 changed files with 2,851 additions and 3,460 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.10']
python-version: ['3.12']
steps:
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
cache: 'pip'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/readme-link-check.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Ruby 3.2
uses: ruby/setup-ruby@v1
with:
Expand Down
117 changes: 92 additions & 25 deletions apps/plone/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,33 +141,44 @@
"@loadable/component": "5.14.1",
"@loadable/server": "5.14.0",
"@plone/registry": "workspace:*",
"@plone/scripts": "workspace:*",
"@plone/volto": "workspace:*",
"@plone/volto-slate": "workspace:*",
"@redux-devtools/extension": "^3.3.0",
"classnames": "2.2.6",
"connected-react-router": "6.8.0",
"debug": "4.3.2",
"decorate-component-with-props": "1.2.1",
"dependency-graph": "0.10.0",
"detect-browser": "5.1.0",
"diff": "3.5.0",
"express": "4.17.3",
"filesize": "6",
"github-slugger": "1.4.0",
"history": "4.10.1",
"hoist-non-react-statics": "3.3.2",
"http-proxy-middleware": "2.0.1",
"image-extensions": "1.1.0",
"immutable": "3",
"is-hotkey": "0.2.0",
"is-url": "1.2.4",
"jotai": "2.0.3",
"jwt-decode": "2.2.0",
"linkify-it": "3.0.2",
"locale": "0.1.0",
"lodash": "4.17.21",
"lodash-move": "1.1.1",
"moment": "2.29.4",
"object-assign": "4.1.1",
"prepend-http": "2",
"pretty-bytes": "5.3.0",
"prismjs": "1.27.0",
"process": "^0.11.10",
"promise-file-reader": "1.0.2",
"prop-types": "15.7.2",
"query-string": "7.1.0",
"rc-time-picker": "3.7.3",
"react": "17.0.2",
"react": "18.2.0",
"react-anchor-link-smooth-scroll": "1.0.12",
"react-animate-height": "2.0.17",
"react-beautiful-dnd": "13.0.0",
Expand All @@ -176,40 +187,39 @@
"react-detect-click-outside": "1.1.1",
"react-dnd": "5.0.0",
"react-dnd-html5-backend": "5.0.1",
"react-dom": "17.0.2",
"react-dom": "18.2.0",
"react-dropzone": "11.1.0",
"react-fast-compare": "2.0.4",
"react-image-gallery": "1.2.7",
"react-intersection-observer": "9.1.0",
"react-intl": "3.8.0",
"react-intl-redux": "2.2.0",
"react-intl-redux": "2.3.0",
"react-medium-image-zoom": "3.0.15",
"react-portal": "4.2.1",
"react-redux": "7.2.4",
"react-popper": "^2.3.0",
"react-redux": "8.1.2",
"react-router": "5.2.0",
"react-router-config": "5.1.1",
"react-router-dom": "5.2.0",
"react-router-hash-link": "2.4.3",
"react-select": "4.3.1",
"react-select-async-paginate": "0.5.3",
"react-share": "2.3.1",
"react-side-effect": "2.1.0",
"react-side-effect": "2.1.2",
"react-simple-code-editor": "0.7.1",
"react-sortable-hoc": "2.0.0",
"react-test-renderer": "17.0.2",
"react-toastify": "5.4.1",
"react-test-renderer": "18.2.0",
"react-toastify": "5.5.0",
"react-transition-group": "4.4.5",
"react-virtualized": "9.22.3",
"redux": "4.1.0",
"redux-actions": "2.6.5",
"redux": "4.2.1",
"redux-actions": "3.0.0",
"redux-connect": "10.0.0",
"@redux-devtools/extension": "^3.3.0",
"redux-localstorage-simple": "2.3.1",
"redux-localstorage-simple": "2.5.1",
"redux-mock-store": "1.5.4",
"redux-thunk": "2.3.0",
"redux-thunk": "2.4.2",
"rrule": "2.7.1",
"semantic-ui-less": "2.4.1",
"semantic-ui-react": "2.0.3",
"semantic-ui-react": "2.1.5",
"serialize-javascript": "3.1.0",
"slate": "0.100.0",
"slate-hyperscript": "0.100.0",
Expand All @@ -219,36 +229,66 @@
"undoo": "0.5.0",
"universal-cookie": "4.0.4",
"universal-cookie-express": "4.0.3",
"url": "^0.11.3",
"use-deep-compare-effect": "1.8.1",
"uuid": "^8.3.2",
"volto-volto-project": "workspace:*"
},
"devDependencies": {
"@babel/core": "^7.0.0",
"@babel/eslint-parser": "7.22.15",
"@babel/plugin-proposal-export-default-from": "7.18.10",
"@babel/plugin-proposal-export-namespace-from": "7.18.9",
"@babel/plugin-proposal-json-strings": "7.18.6",
"@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6",
"@babel/plugin-proposal-throw-expressions": "7.18.6",
"@babel/plugin-syntax-export-namespace-from": "7.8.3",
"@babel/runtime": "7.20.6",
"@babel/types": "7.20.5",
"@jest/globals": "^29.7.0",
"@loadable/babel-plugin": "5.13.2",
"@loadable/webpack-plugin": "5.15.2",
"@plone/scripts": "workspace:*",
"@storybook/addon-actions": "^6.3.0",
"@storybook/addon-controls": "6.3.0",
"@storybook/addon-essentials": "^6.3.0",
"@storybook/addon-links": "^6.3.0",
"@plone/types": "workspace:*",
"@plone/volto-coresandbox": "workspace:*",
"@sinonjs/fake-timers": "^6.0.1",
"@storybook/addon-actions": "^6.5.15",
"@storybook/addon-controls": "6.5.15",
"@storybook/addon-docs": "^6.5.15",
"@storybook/addon-essentials": "^6.5.15",
"@storybook/addon-links": "^6.5.15",
"@storybook/builder-webpack5": "^6.5.15",
"@storybook/manager-webpack5": "^6.5.15",
"@storybook/react": "^6.3.0",
"@typescript-eslint/eslint-plugin": "6.7.0",
"@typescript-eslint/parser": "6.7.0",
"@storybook/react": "^6.5.15",
"@testing-library/cypress": "10.0.1",
"@testing-library/jest-dom": "6.4.2",
"@testing-library/react": "14.2.0",
"@testing-library/react-hooks": "8.0.1",
"@types/jest": "^29.5.8",
"@types/lodash": "^4.14.201",
"@types/react": "^18",
"@types/react-dom": "^18",
"@types/react-router-dom": "^5.3.3",
"@types/react-test-renderer": "18.0.7",
"@types/uuid": "^9.0.2",
"@typescript-eslint/eslint-plugin": "7.1.1",
"@typescript-eslint/parser": "7.1.1",
"autoprefixer": "10.4.8",
"axe-core": "4.4.2",
"babel-loader": "9.1.0",
"babel-plugin-add-module-exports": "0.2.1",
"babel-plugin-lodash": "3.3.4",
"babel-plugin-react-intl": "5.1.17",
"babel-plugin-root-import": "6.1.0",
"babel-preset-razzle": "4.2.18",
"bundlewatch": "0.3.3",
"circular-dependency-plugin": "5.2.2",
"css-loader": "5.2.7",
"eslint": "^8.57.0",
"cypress": "13.6.6",
"cypress-axe": "1.5.0",
"cypress-file-upload": "5.0.8",
"deep-freeze": "0.0.1",
"eslint": "8.49.0",
"eslint-config-prettier": "9.1.0",
"eslint-config-react-app": "7.0.1",
"eslint-import-resolver-alias": "1.1.2",
Expand All @@ -258,10 +298,21 @@
"eslint-plugin-prettier": "5.1.3",
"eslint-plugin-react": "7.33.2",
"eslint-plugin-react-hooks": "4.6.0",
"full-icu": "1.4.0",
"glob": "7.1.6",
"html-webpack-plugin": "5.5.0",
"identity-obj-proxy": "3.0.0",
"jest": "26.6.3",
"jest-environment-jsdom": "^26",
"jest-file": "1.0.0",
"jest-junit": "8.0.0",
"jsdom": "^16.7.0",
"jsonwebtoken": "9.0.0",
"less": "3.11.1",
"less-loader": "11.1.0",
"lodash-webpack-plugin": "0.11.6",
"mini-css-extract-plugin": "2.7.2",
"moment-locales-webpack-plugin": "1.2.0",
"mrs-developer": "^2.1.1",
"postcss": "8.4.31",
"postcss-flexbugs-fixes": "5.0.2",
Expand All @@ -272,17 +323,33 @@
"postcss-scss": "4.0.6",
"prettier": "3.2.5",
"razzle": "4.2.18",
"razzle-dev-utils": "4.2.18",
"razzle-plugin-scss": "4.2.18",
"react-docgen-typescript-plugin": "^1.0.5",
"react-error-overlay": "6.0.9",
"react-is": "^18.2.0",
"release-it": "^17.1.1",
"semver": "^7.5.4",
"start-server-and-test": "1.14.0",
"style-loader": "3.3.1",
"stylelint": "^16.2.1",
"stylelint": "16.2.1",
"stylelint-config-idiomatic-order": "10.0.0",
"stylelint-prettier": "5.0.0",
"svg-loader": "0.0.2",
"svgo-loader": "3.0.3",
"terser-webpack-plugin": "5.3.6",
"tmp": "0.2.1",
"ts-jest": "^26.4.2",
"ts-loader": "9.4.4",
"tsconfig": "*",
"typescript": "5.2.2"
"typescript": "5.2.2",
"use-trace-update": "1.3.2",
"wait-on": "6.0.0",
"webpack": "5.76.1",
"webpack-bundle-analyzer": "4.10.1",
"webpack-dev-server": "4.11.1",
"webpack-node-externals": "3.0.0",
"why": "0.6.2"
},
"theme": "volto-volto-project"
}
}
4 changes: 4 additions & 0 deletions docs/source/configuration/volto-slate/configuration-settings.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,10 @@ You can opt out of this feature by setting its value to `false`.
slate.useLinkedHeadings = false
```

```{versionchanged} Volto 17.0.0-alpha.28
This feature is still enabled by default, but has a condition to show only for authenticated users.
```

(editor-configuration-blocks-initialBlocksFocus-label)=

## `blocks.initialBlocksFocus`
Expand Down
18 changes: 14 additions & 4 deletions docs/source/configuration/volto-slate/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ myst:

# `volto-slate`

`volto-slate` is an interactive default text editor for Volto, developed on top of {term}`Slate`.
`volto-slate` is an interactive default text editor for Volto, developed on top of {term}`Slate` and integrated into the core system.
It offers enhanced WYSIWYG functionality and behavior.
See a [brief elevator pitch for `volto-slate`](https://www.youtube.com/watch?v=SOz-rk5e4_w).

Expand All @@ -23,8 +23,18 @@ Some examples of the kind of strong integration we have in mind:
- The text block accepts drag-and-drop images, and it will upload them as Volto image blocks.
- `volto-slate` has a {guilabel}`Table` button with the familiar {guilabel}`size` input, but it creates a table block.

Although this add-on is in an early alpha stage, we have solved most of the big issues.
The API has stabilized, and we have already started several add-ons based on it, including [`volto-slate-metadata-mentions`](https://github.com/eea/volto-slate-metadata-mentions/) and [`volto-slate-zotero`](https://github.com/eea/volto-slate-zotero).
The `volto-slate` API has stabilized, and we have already started several add-ons based on it, including [`volto-slate-metadata-mentions`](https://github.com/eea/volto-slate-metadata-mentions/) and [`volto-slate-zotero`](https://github.com/eea/volto-slate-zotero).

```{versionadded} 16.0.0-alpha.15
`volto-slate` added to Volto core as the default text block.
```

```{deprecated} 16.0.0-alpha.15
`text` text block based on `draftJS` is now deprecated and will be removed from core in Volto 18.
```

To migrate existing projects to `volto-slate`, check the [Upgrade Guide](https://6.docs.plone.org/volto/upgrade-guide/index.html#volto-slate-is-now-in-core) documentation.



(volto-slate-why-another-wysiywg-editor-label)=
Expand Down Expand Up @@ -53,4 +63,4 @@ Some of the main reasons that drove us to create `volto-slate`, instead of enhan
api
configuration-settings
writing-plugins
```
```
31 changes: 31 additions & 0 deletions docs/source/release-notes/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,37 @@ myst:

<!-- towncrier release notes start -->

## 18.0.0-alpha.22 (2024-03-19)

### Bugfix

- Correctly sort facet values if they are numbers @erral [#5864](https://github.com/plone/volto/issues/5864)
- Cross-package manager Volto path resolver in `webpack-relative-resolver` @sneridagh [#5893](https://github.com/plone/volto/issues/5893)

### Documentation

- `Volto 18.0.0-alpha.21` and `volto-update-deps` documentation @sneridagh [#5892](https://github.com/plone/volto/issues/5892)

## 18.0.0-alpha.21 (2024-03-18)

### Breaking

- Moved `devDependencies` and `dependencies` to where they belong. @sneridagh [#5879](https://github.com/plone/volto/issues/5879)

### Feature

- Match props passed to the BlockView if reused from the BlockEdit @sneridagh [#5876](https://github.com/plone/volto/issues/5876)
- Added download link to filename in file widget @sabrina-bongiovanni [#5880](https://github.com/plone/volto/issues/5880)

### Internal

- Bump all the versions in GitHub workflows. @stevepiercy [#5873](https://github.com/plone/volto/issues/5873)

### Documentation

- Update `volto-slate` configuration documentation to indicate it is now part of Volto core. @MostafaMagdyy [#5342](https://github.com/plone/volto/issues/5342)
- Modified `slate.useLinkedHeadings` documentation to mention feature is disabled for authenticated users after #5225 changes. @ichim-david [#5885](https://github.com/plone/volto/issues/5885)

## 18.0.0-alpha.20 (2024-03-14)

### Bugfix
Expand Down
Loading

0 comments on commit 817cf4a

Please sign in to comment.