Skip to content

Commit

Permalink
Update GrapesJs dependency versions #18
Browse files Browse the repository at this point in the history
  • Loading branch information
@glebfox
glebfox committed Mar 14, 2024
1 parent 89ed59b commit 62ee5fe
Show file tree
Hide file tree
Showing 5,613 changed files with 343,795 additions and 6,020 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ build/*
deploy/*
modules/*/build/*
out
test-run
test-run
.idea
3 changes: 2 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,9 @@ The add-on corresponding to the used platform version will be installed.

where `<add-on version>` is compatible with the used version of the CUBA platform.

| Platform Version | Add-on Version |
| Platform Version | Add-on Version |
|------------------|----------------|
| 7.2.x | 0.6.0 |
| 7.2.x | 0.5.3 |
| 7.1.x | 0.4.0 |
| 7.0.x | 0.2.0 |
Expand Down
44 changes: 15 additions & 29 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ apply(plugin: 'addon-gradle-plugin')
cuba {
artifact {
group = 'com.haulmont.addon.grapesjs'
version = '0.5'
version = '0.6'
isSnapshot = true
}
ide {
Expand Down Expand Up @@ -187,34 +187,20 @@ configure(webModule) {
dependencies {
compileOnly(servletApi)
compile(globalModule)
// Webjars
compile('org.webjars.npm:grapesjs:0.16.2') {
exclude group: 'org.webjars.npm', module: 'keymaster'
exclude group: 'org.webjars.npm', module: 'cash-dom'
exclude group: 'org.webjars.npm', module: 'babel__runtime'
}
compile('org.webjars.bower:keymaster:1.6.3')
compile('org.webjars.npm:babel__runtime:7.9.2')
compile 'org.webjars.npm:github-com-kenwheeler-cash:2.3.9'
compile('org.webjars.npm:grapesjs-plugin-ckeditor:0.0.9')
compile('org.webjars.npm:grapesjs-custom-code:0.1.1')
compile('org.webjars.npm:grapesjs-tabs:0.1.2')
compile('org.webjars.npm:grapesjs-touch:0.1.1')
compile('org.webjars.npm:grapesjs-parser-postcss:0.1.1')
compile('org.webjars.npm:grapesjs-preset-webpage:0.1.10')
compile('org.webjars.npm:github-com-artf-grapesjs-preset-newsletter:0.2.20'){
exclude group: 'org.webjars.npm', module: 'slick'
}
compile('org.webjars.npm:grapesjs-blocks-basic:0.1.8')
compile('org.webjars.npm:grapesjs-blocks-flexbox:0.1.1')
compile('org.webjars.npm:grapesjs-tui-image-editor:0.1.2')
compile('org.webjars.npm:grapesjs-plugin-forms:1.0.5')
compile('org.webjars.npm:grapesjs-style-filter:0.1.1')
compile('org.webjars.npm:grapesjs-tooltip:0.1.5')

compile ('org.webjars.bowergithub.mootools:slick:1.1.7')
compile('org.webjars:ckeditor:4.14.0')

// Webjars
compile('org.webjars.npm:grapesjs:0.21.8')
compile('org.webjars.npm:grapesjs-plugin-ckeditor:1.0.1')
compile('org.webjars.npm:grapesjs-custom-code:1.0.2')
compile('org.webjars.npm:grapesjs-tabs:1.0.6')
compile('org.webjars.npm:grapesjs-parser-postcss:1.0.3')
compile('org.webjars.npm:grapesjs-preset-webpage:1.0.3')
compile('org.webjars.npm:grapesjs-preset-newsletter:1.0.2')
compile('org.webjars.npm:grapesjs-blocks-basic:1.0.2')
compile('org.webjars.npm:grapesjs-blocks-flexbox:1.0.1')
compile('org.webjars.npm:grapesjs-tui-image-editor:1.0.2')
compile('org.webjars.npm:grapesjs-plugin-forms:2.0.6')
compile('org.webjars.npm:grapesjs-style-filter:1.0.2')
compile('org.webjars.npm:grapesjs-tooltip:0.1.8')
}

task webArchive(type: Zip) {
Expand Down
1 change: 0 additions & 1 deletion modules/web/src/com/haulmont/addon/grapesjs/web/gui/components/GjsPluginsRepositoryImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ protected void registerDefaultPlugins() {
registeredPlugins.put("newsletter", new NewsletterGjsPlugin());
registeredPlugins.put("postcss", new PostCssGjsPlugin());
registeredPlugins.put("tabs", new TabsGjsPlugin());
registeredPlugins.put("touch", new TouchGjsPlugin());
registeredPlugins.put("webpage", new WebpageGjsPlugin());
registeredPlugins.put("basicBlocks", new BasicBlocksGjsPlugin());
registeredPlugins.put("flexBlocks", new FlexBlocksGjsPlugin());
Expand Down
2 changes: 1 addition & 1 deletion modules/web/src/com/haulmont/addon/grapesjs/web/gui/plugins/BasicBlocksGjsPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
public class BasicBlocksGjsPlugin extends GjsPlugin {

public BasicBlocksGjsPlugin() {
super("grapesjs-blocks-basic", null);
super("gjs-blocks-basic", null);
}
}
2 changes: 1 addition & 1 deletion modules/web/src/com/haulmont/addon/grapesjs/web/gui/plugins/CKEditorGjsPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
public class CKEditorGjsPlugin extends GjsPlugin {

public CKEditorGjsPlugin() {
super("gjs-plugin-ckeditor", AppBeans.get(Resources.class).getResourceAsString(
super("grapesjs-plugin-ckeditor", AppBeans.get(Resources.class).getResourceAsString(
"/com/haulmont/addon/grapesjs/web/gui/plugins/gjs-plugin-ckeditor.js"));
}
}
2 changes: 1 addition & 1 deletion modules/web/src/com/haulmont/addon/grapesjs/web/gui/plugins/NewsletterGjsPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
public class NewsletterGjsPlugin extends GjsPlugin {

public NewsletterGjsPlugin() {
super("gjs-preset-newsletter", AppBeans.get(Resources.class).getResourceAsString(
super("grapesjs-preset-newsletter", AppBeans.get(Resources.class).getResourceAsString(
"/com/haulmont/addon/grapesjs/web/gui/plugins/gjs-preset-newsletter.js"));
}
}
26 changes: 0 additions & 26 deletions modules/web/src/com/haulmont/addon/grapesjs/web/gui/plugins/TouchGjsPlugin.java
View file

This file was deleted.

2 changes: 1 addition & 1 deletion modules/web/src/com/haulmont/addon/grapesjs/web/gui/plugins/WebpageGjsPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
public class WebpageGjsPlugin extends GjsPlugin {

public WebpageGjsPlugin() {
super("gjs-preset-webpage", AppBeans.get(Resources.class).getResourceAsString(
super("grapesjs-preset-webpage", AppBeans.get(Resources.class).getResourceAsString(
"/com/haulmont/addon/grapesjs/web/gui/plugins/gjs-preset-webpage.js"));
}
}
2 changes: 1 addition & 1 deletion modules/web/src/com/haulmont/addon/grapesjs/web/gui/plugins/gjs-plugin-ckeditor.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
startupFocus: true,
extraAllowedContent: '*(*);*{*}',
allowedContent: true,
enterMode: CKEDITOR.ENTER_BR,
enterMode: 2, // CKEDITOR.ENTER_BR
extraPlugins: 'sharedspace,justify,colorbutton,panelbutton,font',
toolbar: [{
name: 'styles',
Expand Down
25 changes: 11 additions & 14 deletions ...ddon/grapesjs/web/toolkit/ui/grapesjshtmleditorcomponent/GrapesJsHtmlEditorComponent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,18 @@
"jquery:jquery.min.js",
"grapesjs:dist/grapes.min.js",
"grapesjs:dist/css/grapes.min.css",
"grapesjs-plugin-ckeditor:dist/grapesjs-plugin-ckeditor.min.js",
"grapesjs-custom-code:dist/grapesjs-custom-code.min.js",
"grapesjs-plugin-ckeditor:dist/index.js",
"grapesjs-custom-code:dist/index.js",
"grapesjs-tabs:dist/grapesjs-tabs.min.js",
"grapesjs-touch:dist/grapesjs-touch.min.js",
"grapesjs-blocks-basic:dist/grapesjs-blocks-basic.min.js",
"grapesjs-blocks-flexbox:dist/grapesjs-blocks-flexbox.min.js",
"grapesjs-tui-image-editor:dist/grapesjs-tui-image-editor.min.js",
"grapesjs-plugin-forms:dist/grapesjs-plugin-forms.min.js",
"grapesjs-style-filter:dist/grapesjs-style-filter.min.js",
"grapesjs-tooltip:dist/grapesjs-tooltip.min.js",
"grapesjs-parser-postcss:dist/grapesjs-parser-postcss.min.js",
"grapesjs-preset-webpage:dist/grapesjs-preset-webpage.min.js",
"grapesjs-preset-webpage:dist/grapesjs-preset-webpage.min.css",
"github-com-artf-grapesjs-preset-newsletter:grapesjs-preset-newsletter.min.js",
"github-com-artf-grapesjs-preset-newsletter:grapesjs-preset-newsletter.css"
"grapesjs-blocks-basic:dist/index.js",
"grapesjs-blocks-flexbox:dist/index.js",
"grapesjs-tui-image-editor:dist/index.js",
"grapesjs-plugin-forms:dist/index.js",
"grapesjs-style-filter:dist/index.js",
"grapesjs-tooltip:dist/index.js",
"grapesjs-parser-postcss:dist/index.js",
"grapesjs-preset-webpage:dist/index.js",
"grapesjs-preset-newsletter:dist/index.js",
})
@JavaScript({"vaadin://ckeditor/ckeditor.js",
"grapesjshtmleditorcomponent-connector.js"})
Expand Down
Loading

0 comments on commit 62ee5fe

Please sign in to comment.