Merge branch 'release/5.0.3'

getgrav · Jan 15, 2021 · 49bfdbf · 49bfdbf
2 parents d936458 + 03850cb
commit 49bfdbf
Show file tree

Hide file tree

Showing 8 changed files with 590 additions and 425 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+/.idea
+/vendor/.DS_Store
+.DS_Store
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v5.0.3
+## 01/15/2021
+
+1. [](#improved)
+   * NextGen Editor: Update to support latest version
+
 # v5.0.2
 ## 12/18/2020
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,7 +1,7 @@
 name: Shortcode Core
 slug: shortcode-core
 type: plugin
-version: 5.0.2
+version: 5.0.3
 description: "This plugin provides the core functionality for shortcode plugins"
 icon: code
 author:

diff --git a/nextgen-editor/dist/js/app.js b/nextgen-editor/dist/js/app.js
diff --git a/nextgen-editor/dist/js/app.js.map b/nextgen-editor/dist/js/app.js.map
diff --git a/nextgen-editor/package.json b/nextgen-editor/package.json
@@ -9,16 +9,16 @@
     "lint": "vue-cli-service lint"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.2.0",
-    "@vue/cli-plugin-eslint": "~4.2.0",
-    "@vue/cli-service": "~4.2.0",
-    "@vue/eslint-config-airbnb": "^5.0.2",
-    "babel-eslint": "^10.0.3",
+    "@vue/cli-plugin-babel": "~4.5.10",
+    "@vue/cli-plugin-eslint": "~4.5.10",
+    "@vue/cli-service": "~4.5.10",
+    "@vue/eslint-config-airbnb": "^5.3.0",
+    "babel-eslint": "^10.1.0",
     "directory-named-webpack-plugin": "^4.0.1",
-    "eslint": "^6.7.2",
-    "eslint-plugin-import": "^2.20.1",
-    "eslint-plugin-vue": "^6.1.2",
-    "node-sass": "^4.12.0",
-    "sass-loader": "^8.0.2"
+    "eslint": "^7.17.0",
+    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-vue": "^7.4.1",
+    "node-sass": "^5.0.0",
+    "sass-loader": "^10.1.0"
   }
 }
diff --git a/nextgen-editor/src/converters.js b/nextgen-editor/src/converters.js
@@ -18,23 +18,23 @@ window.nextgenEditor.addPlugin('GravShortcodeCoreConvertersBlock', {
 
     this.editor.conversion.for('upcast').elementToElement({
       view: 'shortcode-block',
-      model(viewElement, modelWriter) {
-        return modelWriter.createElement('shortcode-block', viewElement.getAttributes());
+      model(viewElement, { writer }) {
+        return writer.createElement('shortcode-block', viewElement.getAttributes());
       },
     });
 
     this.editor.conversion.for('dataDowncast').elementToElement({
       model: 'shortcode-block',
-      view(modelElement, viewWriter) {
-        return viewWriter.createContainerElement('shortcode-block', modelElement.getAttributes());
+      view(modelElement, { writer }) {
+        return writer.createContainerElement('shortcode-block', modelElement.getAttributes());
       },
     });
 
     this.editor.conversion.for('editingDowncast').elementToElement({
       model: 'shortcode-block',
-      view(modelElement, viewWriter) {
-        const container = viewWriter.createContainerElement('shortcode-block', modelElement.getAttributes());
-        return toWidget(container, viewWriter);
+      view(modelElement, { writer }) {
+        const container = writer.createContainerElement('shortcode-block', modelElement.getAttributes());
+        return toWidget(container, writer);
       },
     });
 
@@ -56,9 +56,9 @@ window.nextgenEditor.addPlugin('GravShortcodeCoreConvertersBlock', {
 
     this.editor.conversion.for('editingDowncast').elementToElement({
       model: 'shortcode-block-editable',
-      view(modelElement, viewWriter) {
-        const container = viewWriter.createEditableElement('shortcode-block-editable', modelElement.getAttributes());
-        return toWidgetEditable(container, viewWriter);
+      view(modelElement, { writer }) {
+        const container = writer.createEditableElement('shortcode-block-editable', modelElement.getAttributes());
+        return toWidgetEditable(container, writer);
       },
     });
 
@@ -92,23 +92,23 @@ window.nextgenEditor.addPlugin('GravShortcodeCoreConvertersInline', {
 
     this.editor.conversion.for('upcast').elementToElement({
       view: 'shortcode-inline',
-      model(viewElement, modelWriter) {
-        return modelWriter.createElement('shortcode-inline', viewElement.getAttributes());
+      model(viewElement, { writer }) {
+        return writer.createElement('shortcode-inline', viewElement.getAttributes());
       },
     });
 
     this.editor.conversion.for('dataDowncast').elementToElement({
       model: 'shortcode-inline',
-      view(modelElement, viewWriter) {
-        return viewWriter.createContainerElement('shortcode-inline', modelElement.getAttributes());
+      view(modelElement, { writer }) {
+        return writer.createContainerElement('shortcode-inline', modelElement.getAttributes());
       },
     });
 
     this.editor.conversion.for('editingDowncast').elementToElement({
       model: 'shortcode-inline',
-      view(modelElement, viewWriter) {
-        const container = viewWriter.createContainerElement('shortcode-inline', modelElement.getAttributes());
-        return toWidget(container, viewWriter);
+      view(modelElement, { writer }) {
+        const container = writer.createContainerElement('shortcode-inline', modelElement.getAttributes());
+        return toWidget(container, writer);
       },
     });
 
@@ -130,9 +130,9 @@ window.nextgenEditor.addPlugin('GravShortcodeCoreConvertersInline', {
 
     this.editor.conversion.for('editingDowncast').elementToElement({
       model: 'shortcode-inline-editable',
-      view(modelElement, viewWriter) {
-        const container = viewWriter.createEditableElement('shortcode-inline-editable', modelElement.getAttributes());
-        return toWidgetEditable(container, viewWriter);
+      view(modelElement, { writer }) {
+        const container = writer.createEditableElement('shortcode-inline-editable', modelElement.getAttributes());
+        return toWidgetEditable(container, writer);
       },
     });