Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/8.3' into 8.4
Browse files Browse the repository at this point in the history
  • Loading branch information
markusguenther committed Dec 28, 2023
2 parents 5cb3978 + 56732e2 commit 204e381
Show file tree
Hide file tree
Showing 65 changed files with 66 additions and 131 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"bugs": "https://github.com/neos/neos-ui/issues",
"homepage": "https://github.com/neos/neos-ui/blob/master/README.md",
"license": "GNU GPLv3",
"version": "8.3.4",
"version": "8.3.5",
"private": true,
"resolutions": {
"moment": "^2.20.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/debug-reason-for-rendering/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@neos-project/debug-reason-for-rendering",
"version": "8.3.4",
"version": "8.3.5",
"description": "React Performance Optimization Utility - Why does a component re-render?",
"repository": "neos/neos-ui",
"bugs": "https://github.com/neos/neos-ui/issues",
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-preset-neos-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@neos-project/jest-preset-neos-ui",
"version": "8.3.4",
"version": "8.3.5",
"description": "The jest preset for all packages of the neos-ui mono-repo.",
"main": "jest-preset.json",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion packages/neos-ts-interfaces/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@neos-project/neos-ts-interfaces",
"version": "8.3.4",
"version": "8.3.5",
"description": "Neos domain-related TypeScript interfaces",
"private": true,
"main": "src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/neos-ui-backend-connector/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@neos-project/neos-ui-backend-connector",
"version": "8.3.4",
"version": "8.3.5",
"description": "Endoints and fetch cals to the Neos CMS backend",
"private": true,
"main": "./src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/neos-ui-build/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@neos-project/neos-ui-build",
"version": "8.3.4",
"version": "8.3.5",
"description": "Bob der Baumeister",
"private": true
}
2 changes: 1 addition & 1 deletion packages/neos-ui-ckeditor5-bindings/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@neos-project/neos-ui-ckeditor5-bindings",
"version": "8.3.4",
"version": "8.3.5",
"description": "Prepare CKEditor5 for the Neos CMS UI",
"private": true,
"main": "./src/manifest.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/neos-ui-constants/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@neos-project/neos-ui-constants",
"version": "8.3.4",
"version": "8.3.5",
"description": "Container package to store Neos CMS UI constants",
"private": true,
"main": "./src/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/neos-ui-containers/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@neos-project/neos-ui-containers",
"version": "8.3.4",
"version": "8.3.5",
"description": "Smart components for Neos CMS UI.",
"private": true,
"main": "./src/index.js",
Expand Down
5 changes: 1 addition & 4 deletions packages/neos-ui-containers/src/InsertModeSelector/index.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import React, {PureComponent} from 'react';
import PropTypes from 'prop-types';

import ButtonGroup from '@neos-project/react-ui-components/src/ButtonGroup/';
import Button from '@neos-project/react-ui-components/src/Button/';
import Icon from '@neos-project/react-ui-components/src/Icon/';

import {ButtonGroup, Button, Icon} from '@neos-project/react-ui-components';
import {neos} from '@neos-project/neos-ui-decorators';
import I18n from '@neos-project/neos-ui-i18n';

Expand Down
2 changes: 1 addition & 1 deletion packages/neos-ui-contentrepository/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@neos-project/neos-ui-contentrepository",
"version": "8.3.4",
"version": "8.3.5",
"description": "Bindings for the Neos ContentRepository",
"private": true,
"main": "./src/manifest.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/neos-ui-decorators/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@neos-project/neos-ui-decorators",
"version": "8.3.4",
"version": "8.3.5",
"description": "Decorators for Neos CMS UI.",
"private": true,
"main": "./src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/neos-ui-editors/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@neos-project/neos-ui-editors",
"version": "8.3.4",
"version": "8.3.5",
"description": "Neos CMS UI Editors for use in the inspector.",
"main": "src/manifest.js",
"private": true,
Expand Down
5 changes: 1 addition & 4 deletions packages/neos-ui-editors/src/EditorEnvelope/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,12 @@ import mergeClassNames from 'classnames';
import ReactMarkdown from 'react-markdown';
import omit from 'lodash.omit';

import Label from '@neos-project/react-ui-components/src/Label/';
import {Tooltip} from '@neos-project/react-ui-components';
import {Tooltip, Label, Icon} from '@neos-project/react-ui-components';
import I18n from '@neos-project/neos-ui-i18n';
import {neos} from '@neos-project/neos-ui-decorators';

import style from './style.module.css';

import {Icon} from '@neos-project/react-ui-components';

@neos(globalRegistry => ({
editorRegistry: globalRegistry.get('inspector').get('editors'),
i18nRegistry: globalRegistry.get('i18n')
Expand Down
3 changes: 1 addition & 2 deletions packages/neos-ui-editors/src/Editors/AssetEditor/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React, {PureComponent} from 'react';
import PropTypes from 'prop-types';
import MultiSelectBox from '@neos-project/react-ui-components/src/MultiSelectBox/';
import SelectBox from '@neos-project/react-ui-components/src/SelectBox/';
import {MultiSelectBox, SelectBox} from '@neos-project/react-ui-components';
import {dndTypes} from '@neos-project/neos-ui-constants';
import {neos} from '@neos-project/neos-ui-decorators';
import {$get} from 'plow-js';
Expand Down
3 changes: 1 addition & 2 deletions packages/neos-ui-editors/src/Editors/Boolean/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import mergeClassNames from 'classnames';

import CheckBox from '@neos-project/react-ui-components/src/CheckBox/';
import Label from '@neos-project/react-ui-components/src/Label/';
import {CheckBox, Label} from '@neos-project/react-ui-components';
import I18n from '@neos-project/neos-ui-i18n';

import style from './style.module.css';
Expand Down
4 changes: 1 addition & 3 deletions packages/neos-ui-editors/src/Editors/CKEditor/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ import React, {PureComponent} from 'react';
import PropTypes from 'prop-types';
import {$get} from 'plow-js';

import Button from '@neos-project/react-ui-components/src/Button/';
import Icon from '@neos-project/react-ui-components/src/Icon/';
import Label from '@neos-project/react-ui-components/src/Label/';
import {Button, Icon, Label} from '@neos-project/react-ui-components';
import I18n from '@neos-project/neos-ui-i18n';
import {neos} from '@neos-project/neos-ui-decorators';

Expand Down
4 changes: 1 addition & 3 deletions packages/neos-ui-editors/src/Editors/CodeMirror/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ import React, {PureComponent} from 'react';
import PropTypes from 'prop-types';
import {$get} from 'plow-js';

import Button from '@neos-project/react-ui-components/src/Button/';
import Icon from '@neos-project/react-ui-components/src/Icon/';
import Label from '@neos-project/react-ui-components/src/Label/';
import {Button, Icon, Label} from '@neos-project/react-ui-components';
import I18n from '@neos-project/neos-ui-i18n';
import {neos} from '@neos-project/neos-ui-decorators';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import {$get} from 'plow-js';

import TextInput from '@neos-project/react-ui-components/src/TextInput/';
import CheckBox from '@neos-project/react-ui-components/src/CheckBox/';
import {TextInput, CheckBox} from '@neos-project/react-ui-components';
import I18n from '@neos-project/neos-ui-i18n';

import style from './style.module.css';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ import React, {PureComponent} from 'react';
import PropTypes from 'prop-types';
import {$transform} from 'plow-js';
import {connect} from 'react-redux';
import SelectBox from '@neos-project/react-ui-components/src/SelectBox/';
import MultiSelectBox from '@neos-project/react-ui-components/src/MultiSelectBox/';
import {SelectBox, MultiSelectBox} from '@neos-project/react-ui-components';
import {selectors} from '@neos-project/neos-ui-redux-store';
import {neos} from '@neos-project/neos-ui-decorators';
import {shouldDisplaySearchBox, searchOptions, processSelectBoxOptions} from './SelectBoxHelpers';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React, {PureComponent} from 'react';
import PropTypes from 'prop-types';
import SelectBox from '@neos-project/react-ui-components/src/SelectBox/';
import MultiSelectBox from '@neos-project/react-ui-components/src/MultiSelectBox/';
import {SelectBox, MultiSelectBox} from '@neos-project/react-ui-components';
import {neos} from '@neos-project/neos-ui-decorators';
import {shouldDisplaySearchBox, searchOptions, processSelectBoxOptions} from './SelectBoxHelpers';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import React, {PureComponent} from 'react';
import PropTypes from 'prop-types';
import mergeClassNames from 'classnames';
import IconButton from '@neos-project/react-ui-components/src/IconButton/';
import DropDown from '@neos-project/react-ui-components/src/DropDown/';
import {DropDown, IconButton} from '@neos-project/react-ui-components';

import {AspectRatioOption, NullAspectRatioStrategy} from '../model';
import style from './style.module.css';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ import React, {PureComponent} from 'react';
import PropTypes from 'prop-types';
import ReactCrop from 'react-image-crop';

import Icon from '@neos-project/react-ui-components/src/Icon/';
import IconButton from '@neos-project/react-ui-components/src/IconButton/';
import TextInput from '@neos-project/react-ui-components/src/TextInput/';
import {Icon, IconButton, TextInput} from '@neos-project/react-ui-components';
import {neos} from '@neos-project/neos-ui-decorators';
import {$get} from 'plow-js';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@neos-project/neos-ui-extensibility-webpack-adapter",
"version": "8.3.4",
"version": "8.3.5",
"description": "Minimal configuration, highly opinionated Webpack 4 + Babel plugin build stack for the Neos CMS UI",
"repository": "neos/neos-ui",
"bugs": "https://github.com/neos/neos-ui/issues",
Expand Down
2 changes: 1 addition & 1 deletion packages/neos-ui-extensibility/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@neos-project/neos-ui-extensibility",
"version": "8.3.4",
"version": "8.3.5",
"description": "Core of the extensibility mechanisms for the Neos UI",
"repository": "neos/neos-ui",
"bugs": "https://github.com/neos/neos-ui/issues",
Expand Down
2 changes: 1 addition & 1 deletion packages/neos-ui-guest-frame/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@neos-project/neos-ui-guest-frame",
"version": "8.3.4",
"version": "8.3.5",
"description": "Guest frame initialization bindings",
"private": true,
"main": "./src/manifest.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/neos-ui-i18n/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@neos-project/neos-ui-i18n",
"version": "8.3.4",
"version": "8.3.5",
"description": "I18n utilities and components for Neos CMS UI.",
"private": true,
"main": "./src/index.tsx",
Expand Down
2 changes: 1 addition & 1 deletion packages/neos-ui-inspector/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@neos-project/neos-ui-inspector",
"version": "8.3.4",
"version": "8.3.5",
"description": "Components for integrating views and editors into the Neos CMS UI inspector.",
"private": true,
"main": "./src/index.js",
Expand Down
3 changes: 1 addition & 2 deletions packages/neos-ui-inspector/src/SecondaryInspector/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ import {$get} from 'plow-js';

import {selectors} from '@neos-project/neos-ui-redux-store';

import Icon from '@neos-project/react-ui-components/src/Icon/';
import Button from '@neos-project/react-ui-components/src/Button/';
import {Icon, Button} from '@neos-project/react-ui-components';

import style from './style.module.css';

Expand Down
2 changes: 1 addition & 1 deletion packages/neos-ui-redux-store/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@neos-project/neos-ui-redux-store",
"version": "8.3.4",
"version": "8.3.5",
"description": "Redux store implementation for the Neos CMS UI",
"private": true,
"main": "./src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/neos-ui-sagas/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@neos-project/neos-ui-sagas",
"version": "8.3.4",
"version": "8.3.5",
"description": "Redux Sagas implementation for the Neos CMS UI",
"private": true,
"main": "src/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/neos-ui-validators/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@neos-project/neos-ui-validators",
"version": "8.3.4",
"version": "8.3.5",
"description": "Validators for Neos CMS UI.",
"private": true,
"main": "./src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/neos-ui-views/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@neos-project/neos-ui-views",
"version": "8.3.4",
"version": "8.3.5",
"description": "Neos CMS UI Views for use in the inspector.",
"main": "./src/index.js",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion packages/neos-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@neos-project/neos-ui",
"version": "8.3.4",
"version": "8.3.5",
"description": "Neos CMS UI written in ReactJS and a ton of other fun technology.",
"private": true,
"devDependencies": {
Expand Down
3 changes: 1 addition & 2 deletions packages/neos-ui/src/Containers/Drawer/MenuItem/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import React, {PureComponent} from 'react';
import PropTypes from 'prop-types';

import Icon from '@neos-project/react-ui-components/src/Icon/';
import Button from '@neos-project/react-ui-components/src/Button/';
import {Icon, Button} from '@neos-project/react-ui-components';

import I18n from '@neos-project/neos-ui-i18n';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import React, {PureComponent} from 'react';
import PropTypes from 'prop-types';

import Icon from '@neos-project/react-ui-components/src/Icon/';
import ToggablePanel from '@neos-project/react-ui-components/src/ToggablePanel/';
import Button from '@neos-project/react-ui-components/src/Button/';
import {Icon, ToggablePanel, Button} from '@neos-project/react-ui-components';

import I18n from '@neos-project/neos-ui-i18n';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import React, {PureComponent} from 'react';
import PropTypes from 'prop-types';
import mergeClassNames from 'classnames';
import IconButton from '@neos-project/react-ui-components/src/IconButton/';
import Icon from '@neos-project/react-ui-components/src/Icon/';
import {IconButton, Icon} from '@neos-project/react-ui-components';

import style from './style.module.css';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import {$transform, $get} from 'plow-js';
import {connect} from 'react-redux';

import flowright from 'lodash.flowright';
import Tree from '@neos-project/react-ui-components/src/Tree/';
import Icon from '@neos-project/react-ui-components/src/Icon/';
import {Tree, Icon} from '@neos-project/react-ui-components';
import {stripTags, decodeHtml} from '@neos-project/utils-helpers';

import {actions, selectors} from '@neos-project/neos-ui-redux-store';
Expand Down
4 changes: 1 addition & 3 deletions packages/neos-ui/src/Containers/LeftSideBar/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ import {$transform, $get} from 'plow-js';

import {actions, selectors} from '@neos-project/neos-ui-redux-store';

import IconButton from '@neos-project/react-ui-components/src/IconButton/';

import SideBar from '@neos-project/react-ui-components/src/SideBar/';
import {IconButton, SideBar} from '@neos-project/react-ui-components';
import {neos} from '@neos-project/neos-ui-decorators';

import style from './style.module.css';
Expand Down
4 changes: 1 addition & 3 deletions packages/neos-ui/src/Containers/Modals/DeleteNode/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ import PropTypes from 'prop-types';
import {connect} from 'react-redux';
import {$get, $transform} from 'plow-js';

import Button from '@neos-project/react-ui-components/src/Button/';
import Dialog from '@neos-project/react-ui-components/src/Dialog/';
import Icon from '@neos-project/react-ui-components/src/Icon/';
import {Button, Dialog, Icon} from '@neos-project/react-ui-components';

import {selectors, actions} from '@neos-project/neos-ui-redux-store';
import {neos} from '@neos-project/neos-ui-decorators';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ import PropTypes from 'prop-types';
import {connect} from 'react-redux';
import {$get, $transform} from 'plow-js';

import Button from '@neos-project/react-ui-components/src/Button/';
import Dialog from '@neos-project/react-ui-components/src/Dialog/';
import Icon from '@neos-project/react-ui-components/src/Icon/';
import {Button, Dialog, Icon} from '@neos-project/react-ui-components';
import I18n from '@neos-project/neos-ui-i18n';

import {actions} from '@neos-project/neos-ui-redux-store';
Expand Down
4 changes: 1 addition & 3 deletions packages/neos-ui/src/Containers/Modals/InsertMode/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ import {$transform, $get} from 'plow-js';

import {neos} from '@neos-project/neos-ui-decorators';

import Button from '@neos-project/react-ui-components/src/Button/';
import Dialog from '@neos-project/react-ui-components/src/Dialog/';
import Icon from '@neos-project/react-ui-components/src/Icon/';
import {Button, Dialog, Icon} from '@neos-project/react-ui-components';
import I18n from '@neos-project/neos-ui-i18n';

import {InsertModeSelector} from '@neos-project/neos-ui-containers';
Expand Down
Loading

0 comments on commit 204e381

Please sign in to comment.