Skip to content

Commit ec48654

Browse files
markusguenthermarkusguenther
authored
Merge pull request #15 from markusguenther/task/update-dependencies
TASK: Update dependencies and make it ready for neos 7
2 parents db7b29d + 1a31f3e commit ec48654

File tree

7 files changed

+83
-37353
lines changed

7 files changed

+83
-37353
lines changed

‎Configuration/Settings.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ Neos:
44
resources:
55
javascript:
66
'Breadlesscode.SimpleEditorExtend:UiPlugin':
7-
resource: resource://Breadlesscode.SimpleEditorExtend/Public/UiPlugin/Plugin.js
7+
resource: resource://Breadlesscode.SimpleEditorExtend/Public/UiPlugin/Plugin.js

‎Resources/Private/UiPlugin/.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.15.3
1+
12

‎Resources/Private/UiPlugin/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
"buildTargetDirectory": "../../Public/UiPlugin"
1313
},
1414
"dependencies": {
15-
"@ckeditor/ckeditor5-basic-styles": "^10.0.0"
15+
"@ckeditor/ckeditor5-basic-styles": "^16.0.0"
1616
}
1717
}

‎Resources/Private/UiPlugin/src/ButtonComponent.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ export default function (commandName) {
1212
static propTypes = {
1313
i18nRegistry: PropTypes.object,
1414
tooltip: PropTypes.string,
15-
isActive: PropTypes.boolean,
1615
};
1716
handleClick = () => {
1817
// this command name must match the identifier of the command from examplePlugin.js, this.editor.commands.add(...)
@@ -21,7 +20,6 @@ export default function (commandName) {
2120
render() {
2221
const props = {
2322
onClick: this.handleClick,
24-
isActive: Boolean(this.props.isActive),
2523
title: this.props.i18nRegistry.translate(this.props.tooltip),
2624
icon: this.props.icon,
2725
};

‎Resources/Private/UiPlugin/yarn.lock

Lines changed: 27 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -118,21 +118,21 @@
118118
lodash "^4.17.13"
119119
to-fast-properties "^2.0.0"
120120

121-
"@ckeditor/ckeditor5-basic-styles@^10.0.0":
122-
version "10.1.0"
123-
resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-basic-styles/-/ckeditor5-basic-styles-10.1.0.tgz#2e504f1f177ab4050f8a2f3fa9ca4cbb74a0e9f3"
124-
integrity sha512-OenBNiowZsW2ZZasrA8FMr508uvWii+B3oF0blzaVIDjb7zDpbAan9Otuisxz/YGMcQpoDnSaVnYtBCTqov1EQ==
121+
"@ckeditor/ckeditor5-basic-styles@^16.0.0":
122+
version "16.0.0"
123+
resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-basic-styles/-/ckeditor5-basic-styles-16.0.0.tgz#4ef4b475a9e559f2247058db27f1fbcbe59049f5"
124+
integrity sha512-SArVUT28+AjS3kHI6473nDd+L28ZMW7kGIYk4uN6dyOiyb5jBw4Bn/U+dEjHYagWHDtXopKtH4l8ljJPyBmluw==
125125
dependencies:
126-
"@ckeditor/ckeditor5-core" "^11.1.0"
127-
"@ckeditor/ckeditor5-ui" "^11.2.0"
126+
"@ckeditor/ckeditor5-core" "^16.0.0"
127+
"@ckeditor/ckeditor5-ui" "^16.0.0"
128128

129-
"@ckeditor/ckeditor5-core@^11.1.0":
130-
version "11.1.0"
131-
resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-core/-/ckeditor5-core-11.1.0.tgz#e2ff1e399a0024a2343c750f2796606196167f1a"
132-
integrity sha512-iwSV1SUBITOxncuIVbGv/xFwkZ1Sd0Po/8CRn+p6r5mq91T73L6nMC+MUfT52W9Z/12DfjAz4hRMsabLqRbkIQ==
129+
"@ckeditor/ckeditor5-core@^16.0.0":
130+
version "16.0.0"
131+
resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-core/-/ckeditor5-core-16.0.0.tgz#c9ff37b883ca293ac5998e04a89e2ac613042e09"
132+
integrity sha512-JKYnoXgfULjfAGRgVmf9/at3gGikfzKwGp4O8RpE3NYGeb/xH6hSgj2mUE9QwqyAY5at1QLnio5ZvU2HiWL4pA==
133133
dependencies:
134-
"@ckeditor/ckeditor5-engine" "^12.0.0"
135-
"@ckeditor/ckeditor5-utils" "^11.1.0"
134+
"@ckeditor/ckeditor5-engine" "^16.0.0"
135+
"@ckeditor/ckeditor5-utils" "^16.0.0"
136136
lodash-es "^4.17.10"
137137

138138
"@ckeditor/ckeditor5-dev-utils@^12.0.1":
@@ -156,37 +156,28 @@
156156
shelljs "^0.8.1"
157157
through2 "^3.0.1"
158158

159-
"@ckeditor/ckeditor5-engine@^12.0.0":
160-
version "12.0.0"
161-
resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-engine/-/ckeditor5-engine-12.0.0.tgz#89f6adeb36ad21841166af542ba2bb940e065307"
162-
integrity sha512-tRgI4kyPq4UaS9eIZoeMhzNwOKqNV/HC6dAD5JZxghnPsuqAwGlOjGygGVCje7j8I3byTFgaxS5xWFwwnn3fqQ==
159+
"@ckeditor/ckeditor5-engine@^16.0.0":
160+
version "16.0.0"
161+
resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-engine/-/ckeditor5-engine-16.0.0.tgz#68d8fabb4fa31541c9870cc94b021c5cb0f72d4f"
162+
integrity sha512-2p0DT/1B+UyVAwNkkaNaG4wGkrR0TNQuPJ1c5TEMWb9NVk3mhIOJ+6lPVl0ApP3tmMALol+pLmXLX5aht6Ewnw==
163163
dependencies:
164-
"@ckeditor/ckeditor5-utils" "^11.1.0"
164+
"@ckeditor/ckeditor5-utils" "^16.0.0"
165165
lodash-es "^4.17.10"
166166

167-
"@ckeditor/ckeditor5-theme-lark@^12.0.0":
168-
version "12.0.0"
169-
resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-theme-lark/-/ckeditor5-theme-lark-12.0.0.tgz#db87a8f0215f374b4e50d07c8b4ad88352ddd4ec"
170-
integrity sha512-+ZemhL8jpvUNgS3JdkP4eLR+au8/GQcjiwExLp350CwSklOaQk5hApYB7F/3z6sLuZbjxg1M6a9/QarwQJpWDg==
171-
dependencies:
172-
"@ckeditor/ckeditor5-ui" "^11.2.0"
173-
174-
"@ckeditor/ckeditor5-ui@^11.2.0":
175-
version "11.2.0"
176-
resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-ui/-/ckeditor5-ui-11.2.0.tgz#c8de7b4b1f1f9b256b3e298f161acdb5ef168b54"
177-
integrity sha512-V8fxKRwfZdXy011IyxuHX+1FawboMEBBKqdoY2zdVv5zdwsMQRq5jvFUEAeowAXdc7mx0b3zKnafVNUV5Imr0g==
167+
"@ckeditor/ckeditor5-ui@^16.0.0":
168+
version "16.0.0"
169+
resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-ui/-/ckeditor5-ui-16.0.0.tgz#b656202e407ec1d6aebbdb96568e73dacc771cef"
170+
integrity sha512-7mwIRajaN9Mf6S5ZkqWAOt/Rqy6GNS3WxhwaayMym7b1XI4oVIrxEKoun3DoKnKp3bTBMcWdQFJfsRvja2X2hA==
178171
dependencies:
179-
"@ckeditor/ckeditor5-core" "^11.1.0"
180-
"@ckeditor/ckeditor5-theme-lark" "^12.0.0"
181-
"@ckeditor/ckeditor5-utils" "^11.1.0"
172+
"@ckeditor/ckeditor5-core" "^16.0.0"
173+
"@ckeditor/ckeditor5-utils" "^16.0.0"
182174
lodash-es "^4.17.10"
183175

184-
"@ckeditor/ckeditor5-utils@^11.1.0":
185-
version "11.1.0"
186-
resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-utils/-/ckeditor5-utils-11.1.0.tgz#53535004ca9e2074fc0776b60a1706aa8af9a180"
187-
integrity sha512-QgjK5BHs2krdqv8OY7qR0SMEKePcLaBo+b26oh3vMuzdC0KckMytbngn+uIGRoGBiKiza5RwI51Wk4Y8zxKMxQ==
176+
"@ckeditor/ckeditor5-utils@^16.0.0":
177+
version "16.0.0"
178+
resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-utils/-/ckeditor5-utils-16.0.0.tgz#9f7851d0271deebe3db3a5f8f1ca1c1ad6cfdcbc"
179+
integrity sha512-EMrKmVmxfyuttGlbZI0eK7stYigbo2kFCasN0m2apg/Pn4Dwil0pennWuJ964zvZ8te1Pyt33cweQZlYzSqvYQ==
188180
dependencies:
189-
ckeditor5 "^11.2.0"
190181
lodash-es "^4.17.10"
191182

192183
"@mrmlnc/readdir-enhanced@^2.2.1":
@@ -1980,11 +1971,6 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
19801971
inherits "^2.0.1"
19811972
safe-buffer "^5.0.1"
19821973

1983-
ckeditor5@^11.2.0:
1984-
version "11.2.0"
1985-
resolved "https://registry.yarnpkg.com/ckeditor5/-/ckeditor5-11.2.0.tgz#480c6d65475b73772681877114da859c1c2b5cba"
1986-
integrity sha512-hP6lxCj0bDGv/yhtdYxuASjZbho0zpVKu5x7rNHSjwcsIKeJleRf3TQCxECcG6Mhmuigf6gV4JZzOp+0zLz2rA==
1987-
19881974
class-utils@^0.3.5:
19891975
version "0.3.6"
19901976
resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"

‎Resources/Public/UiPlugin/Plugin.js

Lines changed: 52 additions & 37306 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313
],
1414
"require": {
15-
"neos/neos-ui-compiled": "^3.0 || ^4.0 || ^5.0"
15+
"neos/neos-ui-compiled": "^4.0 || ^5.0 || ^7.0"
1616
},
1717
"autoload": {
1818
"psr-4": {

0 commit comments

Comments
 (0)