Skip to content

Commit

Permalink
Merge branch 'master' into properprettierstylelint
Browse files Browse the repository at this point in the history
* master:
  Back to development
  Release 4.0.0-alpha.13
  Upgrade react and react-dom to 16.12.0 (#1008)
  • Loading branch information
sneridagh committed Nov 24, 2019
2 parents b07fbf8 + bc5e919 commit 0327712
Show file tree
Hide file tree
Showing 74 changed files with 320 additions and 154 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@

### Changes

## 4.0.0-alpha.13 (2019-11-23)

### Internal

- Upgrade autoprefixer, remove deprecated `browsers` option, move to `browserlist` in `package.json` @sneridagh
- Upgrade react and react-dom to 16.12.0 @pnicolli

## 4.0.0-alpha.12 (2019-11-13)

Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
}
],
"license": "MIT",
"version": "4.0.0-alpha.12",
"version": "4.0.0-alpha.13",
"repository": {
"type": "git",
"url": "[email protected]:plone/volto.git"
Expand Down Expand Up @@ -269,12 +269,12 @@
"raven-js": "3.27.0",
"razzle": "3.0.0",
"razzle-plugin-bundle-analyzer": "1.0.2",
"react": "16.8.6",
"react": "16.12.0",
"react-animate-height": "2.0.15",
"react-cookie": "1.0.5",
"react-dnd": "5.0.0",
"react-dnd-html5-backend": "5.0.1",
"react-dom": "16.8.6",
"react-dom": "16.12.0",
"react-dropzone": "5.1.0",
"react-helmet": "5.2.0",
"react-intl": "3.3.2",
Expand All @@ -287,20 +287,20 @@
"react-select": "2.4.2",
"react-select-async-paginate": "0.2.9",
"react-share": "2.3.1",
"react-side-effect": "1.1.5",
"react-side-effect": "2.1.0",
"react-simple-code-editor": "0.7.1",
"react-test-renderer": "16.8.6",
"react-toastify": "5.1.1",
"redraft": "0.10.1",
"redux": "4.0.1",
"redux-actions": "2.6.5",
"redux-connect": "9.0.0",
"redux-connect": "10.0.0",
"redux-devtools-extension": "2.13.8",
"redux-mock-store": "1.5.3",
"redux-thunk": "2.3.0",
"release-it": "12.4.0",
"semantic-ui-less": "2.4.1",
"semantic-ui-react": "0.84.0",
"semantic-ui-react": "0.88.1",
"semver": "5.6.0",
"serialize-javascript": "1.5.0",
"start-server-and-test": "1.7.13",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ exports[`Actions renders an actions component 1`] = `
<i
aria-hidden="true"
className="lightning big icon"
onClick={[Function]}
/>
Actions
Expand All @@ -37,6 +38,7 @@ exports[`Actions renders an actions component 1`] = `
<i
aria-hidden="true"
className="cut icon"
onClick={[Function]}
/>
<span
className="text"
Expand All @@ -52,6 +54,7 @@ exports[`Actions renders an actions component 1`] = `
<i
aria-hidden="true"
className="copy icon"
onClick={[Function]}
/>
<span
className="text"
Expand All @@ -67,6 +70,7 @@ exports[`Actions renders an actions component 1`] = `
<i
aria-hidden="true"
className="trash icon"
onClick={[Function]}
/>
Delete
</a>
Expand All @@ -78,6 +82,7 @@ exports[`Actions renders an actions component 1`] = `
<i
aria-hidden="true"
className="text cursor icon"
onClick={[Function]}
/>
<span
className="text"
Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/Add/Add.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ class Add extends Component {
* @param {Object} nextProps Next properties
* @returns {undefined}
*/
componentWillReceiveProps(nextProps) {
UNSAFE_componentWillReceiveProps(nextProps) {
if (
this.props.createRequest.loading &&
nextProps.createRequest.loaded &&
Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/Blocks/Block/Edit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ class Edit extends Component {
}
}

componentWillReceiveProps(nextProps) {
UNSAFE_componentWillReceiveProps(nextProps) {
const { selected, type } = this.props;
const blockHasOwnFocusManagement =
blocks.blocksConfig?.[type]?.['blockHasOwnFocusManagement'] || null;
Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/Blocks/Description/Edit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class Edit extends Component {
* @param {Object} nextProps Next properties
* @returns {undefined}
*/
componentWillReceiveProps(nextProps) {
UNSAFE_componentWillReceiveProps(nextProps) {
if (
nextProps.properties.description &&
this.props.properties.description !== nextProps.properties.description &&
Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/Blocks/HTML/Edit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class Edit extends Component {
* @param {Object} nextProps Next properties
* @returns {undefined}
*/
componentWillReceiveProps(nextProps) {
UNSAFE_componentWillReceiveProps(nextProps) {
if (nextProps.selected) {
this.codeEditor._input.focus();
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/Blocks/HeroImageLeft/Edit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ class Edit extends Component {
* @param {Object} nextProps Next properties
* @returns {undefined}
*/
componentWillReceiveProps(nextProps) {
UNSAFE_componentWillReceiveProps(nextProps) {
if (
this.props.request.loading &&
nextProps.request.loaded &&
Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/Blocks/Image/Edit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class Edit extends Component {
* @param {Object} nextProps Next properties
* @returns {undefined}
*/
componentWillReceiveProps(nextProps) {
UNSAFE_componentWillReceiveProps(nextProps) {
if (
this.props.request.loading &&
nextProps.request.loaded &&
Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/Blocks/Table/Cell.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class Cell extends Component {
* @param {Object} nextProps Next properties
* @returns {undefined}
*/
componentWillReceiveProps(nextProps) {
UNSAFE_componentWillReceiveProps(nextProps) {
if (
nextProps.isTableBlockSelected !== this.props.isTableBlockSelected &&
this.props.cell === 0 &&
Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/Blocks/Table/Edit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ class Edit extends Component {
* @param {Object} nextProps Next properties
* @returns {undefined}
*/
componentWillReceiveProps(nextProps) {
UNSAFE_componentWillReceiveProps(nextProps) {
if (!nextProps.data.table) {
this.props.onChangeBlock(nextProps.block, {
...nextProps.data,
Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/Blocks/Text/Edit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class Edit extends Component {
* @param {Object} nextProps Next properties
* @returns {undefined}
*/
componentWillReceiveProps(nextProps) {
UNSAFE_componentWillReceiveProps(nextProps) {
if (!this.props.selected && nextProps.selected) {
this.node.focus();
this.setState({
Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/Blocks/Title/Edit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class Edit extends Component {
* @param {Object} nextProps Next properties
* @returns {undefined}
*/
componentWillReceiveProps(nextProps) {
UNSAFE_componentWillReceiveProps(nextProps) {
if (
nextProps.properties.title &&
this.props.properties.title !== nextProps.properties.title &&
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ exports[`renders an edit image block component 1`] = `
<i
aria-hidden="true"
className="arrow right icon"
onClick={[Function]}
/>
<div
className="embed"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ exports[`renders a view video component 1`] = `
<i
aria-hidden="true"
className="arrow right icon"
onClick={[Function]}
/>
<div
className="embed"
Expand Down
4 changes: 2 additions & 2 deletions src/components/manage/Contents/Contents.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ class Contents extends Component {
* @method componentWillMount
* @returns {undefined}
*/
componentWillMount() {
UNSAFE_componentWillMount() {
this.fetchContents();
}

Expand All @@ -308,7 +308,7 @@ class Contents extends Component {
* @param {Object} nextProps Next properties
* @returns {undefined}
*/
componentWillReceiveProps(nextProps) {
UNSAFE_componentWillReceiveProps(nextProps) {
if (
(this.props.clipboardRequest.loading &&
nextProps.clipboardRequest.loaded) ||
Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/Contents/ContentsPropertiesModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ class ContentsPropertiesModal extends Component {
* @param {Object} nextProps Next properties
* @returns {undefined}
*/
componentWillReceiveProps(nextProps) {
UNSAFE_componentWillReceiveProps(nextProps) {
if (this.props.request.loading && nextProps.request.loaded) {
this.props.onOk();
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/Contents/ContentsRenameModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class ContentsRenameModal extends Component {
* @param {Object} nextProps Next properties
* @returns {undefined}
*/
componentWillReceiveProps(nextProps) {
UNSAFE_componentWillReceiveProps(nextProps) {
if (this.props.request.loading && nextProps.request.loaded) {
this.props.onOk();
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/Contents/ContentsTagsModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class ContentsTagsModal extends Component {
* @param {Object} nextProps Next properties
* @returns {undefined}
*/
componentWillReceiveProps(nextProps) {
UNSAFE_componentWillReceiveProps(nextProps) {
if (this.props.request.loading && nextProps.request.loaded) {
this.props.onOk();
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/Contents/ContentsUploadModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class ContentsUploadModal extends Component {
* @param {Object} nextProps Next properties
* @returns {undefined}
*/
componentWillReceiveProps(nextProps) {
UNSAFE_componentWillReceiveProps(nextProps) {
if (this.props.request.loading && nextProps.request.loaded) {
this.props.onOk();
this.setState({
Expand Down
4 changes: 2 additions & 2 deletions src/components/manage/Contents/ContentsWorkflowModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class ContentsWorkflowModal extends Component {
* @method componentWillMount
* @returns {undefined}
*/
componentWillMount() {
UNSAFE_componentWillMount() {
this.props.getWorkflow(this.props.items);
}

Expand All @@ -87,7 +87,7 @@ class ContentsWorkflowModal extends Component {
* @param {Object} nextProps Next properties
* @returns {undefined}
*/
componentWillReceiveProps(nextProps) {
UNSAFE_componentWillReceiveProps(nextProps) {
if (this.props.request.loading && nextProps.request.loaded) {
this.props.onOk();
}
Expand Down
Loading

0 comments on commit 0327712

Please sign in to comment.