From 4ba94b9239dc06eeb2c35384648567879d05f944 Mon Sep 17 00:00:00 2001 From: Deniss Kozickis Date: Fri, 15 Dec 2023 10:34:22 +0200 Subject: [PATCH] chore: Bump editor dependencies --- .changeset/lucky-mirrors-bake.md | 10 ++++++++++ app/components/rdfa-editor-container.hbs | 3 +++ .../zitting-text-document-container.js | 8 ++++++-- app/controllers/agendapoints/edit.js | 4 ++-- app/controllers/regulatory-statements/edit.js | 4 ++-- package-lock.json | 18 +++++++++--------- package.json | 4 ++-- 7 files changed, 34 insertions(+), 17 deletions(-) create mode 100644 .changeset/lucky-mirrors-bake.md diff --git a/.changeset/lucky-mirrors-bake.md b/.changeset/lucky-mirrors-bake.md new file mode 100644 index 000000000..20f52b43a --- /dev/null +++ b/.changeset/lucky-mirrors-bake.md @@ -0,0 +1,10 @@ +--- +"frontend-gelinkt-notuleren": minor +--- + +Bump editor dependencies + +* Bump `@lblod/ember-rdfa-editor` to `^8.0.2` +* Bump `@lblod/ember-rdfa-editor-lblod-plugins` to `^15.2.1` +* Enable `Alignment` plugin +* Enable column sizing for tables diff --git a/app/components/rdfa-editor-container.hbs b/app/components/rdfa-editor-container.hbs index bd4037e58..1d9dbe30c 100644 --- a/app/components/rdfa-editor-container.hbs +++ b/app/components/rdfa-editor-container.hbs @@ -71,6 +71,9 @@ + + + <:side as |Tb|> diff --git a/app/components/zitting-text-document-container.js b/app/components/zitting-text-document-container.js index d75c99cd9..282a0cca6 100644 --- a/app/components/zitting-text-document-container.js +++ b/app/components/zitting-text-document-container.js @@ -25,7 +25,7 @@ import { } from '@lblod/ember-rdfa-editor/nodes'; import { tableNodes, - tablePlugin, + tablePlugins, tableKeymap, } from '@lblod/ember-rdfa-editor/plugins/table'; import { link, linkView } from '@lblod/ember-rdfa-editor/nodes/link'; @@ -159,7 +159,11 @@ export default class ZittingTextDocumentContainerComponent extends Component { } get plugins() { - return [tablePlugin, tableKeymap, linkPasteHandler(this.schema.nodes.link)]; + return [ + ...tablePlugins, + tableKeymap, + linkPasteHandler(this.schema.nodes.link), + ]; } get nodeViews() { diff --git a/app/controllers/agendapoints/edit.js b/app/controllers/agendapoints/edit.js index b84dd4943..dcac1d906 100644 --- a/app/controllers/agendapoints/edit.js +++ b/app/controllers/agendapoints/edit.js @@ -27,7 +27,7 @@ import { import { tableKeymap, tableNodes, - tablePlugin, + tablePlugins, } from '@lblod/ember-rdfa-editor/plugins/table'; import { STRUCTURE_NODES } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/article-structure-plugin/structures'; import { @@ -243,7 +243,7 @@ export default class AgendapointsEditController extends Controller { get plugins() { return [ - tablePlugin, + ...tablePlugins, tableKeymap, this.citationPlugin, this.validationPlugin, diff --git a/app/controllers/regulatory-statements/edit.js b/app/controllers/regulatory-statements/edit.js index 800c34297..ff76e75c0 100644 --- a/app/controllers/regulatory-statements/edit.js +++ b/app/controllers/regulatory-statements/edit.js @@ -27,7 +27,7 @@ import { import { tableKeymap, tableNodes, - tablePlugin, + tablePlugins, } from '@lblod/ember-rdfa-editor/plugins/table'; import { link, @@ -170,7 +170,7 @@ export default class RegulatoryStatementsRoute extends Controller { get plugins() { return [ - tablePlugin, + ...tablePlugins, tableKeymap, this.citationPlugin, createInvisiblesPlugin( diff --git a/package-lock.json b/package-lock.json index d4e4a614d..346540f7f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,8 +28,8 @@ "@lblod/ember-acmidm-login": "^2.0.0-beta.1", "@lblod/ember-environment-banner": "^0.2.0", "@lblod/ember-mock-login": "0.7.0", - "@lblod/ember-rdfa-editor": "^7.0.1", - "@lblod/ember-rdfa-editor-lblod-plugins": "^15.1.0", + "@lblod/ember-rdfa-editor": "^8.0.2", + "@lblod/ember-rdfa-editor-lblod-plugins": "^15.2.1", "@release-it-plugins/lerna-changelog": "^6.0.0", "broccoli-asset-rev": "^3.0.0", "broccoli-plugin": "^4.0.7", @@ -4725,9 +4725,9 @@ } }, "node_modules/@lblod/ember-rdfa-editor": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/@lblod/ember-rdfa-editor/-/ember-rdfa-editor-7.0.1.tgz", - "integrity": "sha512-QNOie9fbKhpoRBSYy6x6dgQ2VNQskd1Hc8w/YXuUu35fBK4Ip6GcaspHJIPrYw1EPUXHCH+M2/zG+PkuzxE4Jg==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@lblod/ember-rdfa-editor/-/ember-rdfa-editor-8.0.2.tgz", + "integrity": "sha512-Ux7tg6HIidpsdgWKdYiTGhv7SLzISm8azlv1cJgE4+HCFGFt8wePKQGdS4WncwWYi0YH503c6m0mX71tlup3EA==", "dev": true, "dependencies": { "@codemirror/lang-html": "^6.1.1", @@ -4793,9 +4793,9 @@ } }, "node_modules/@lblod/ember-rdfa-editor-lblod-plugins": { - "version": "15.1.0", - "resolved": "https://registry.npmjs.org/@lblod/ember-rdfa-editor-lblod-plugins/-/ember-rdfa-editor-lblod-plugins-15.1.0.tgz", - "integrity": "sha512-wf7JCaHefVRe+VO8C2na7dRDruPuDT9svee3AD3uECuEI+rfVJdShr1wYmLzRbOJgCCZwmJyoZGaWocqL3te9Q==", + "version": "15.2.1", + "resolved": "https://registry.npmjs.org/@lblod/ember-rdfa-editor-lblod-plugins/-/ember-rdfa-editor-lblod-plugins-15.2.1.tgz", + "integrity": "sha512-DH41VaPEkZ5jQSqIEE36IAvIfnXB0b2IUKjIVMEuNOBvp6X7tImd8A27hvQIFhL2a86M/dveuDElwJTC1vC+LA==", "dev": true, "dependencies": { "@codemirror/lang-html": "^6.4.3", @@ -4836,7 +4836,7 @@ "@appuniversum/ember-appuniversum": "^2.4.2", "@ember/string": "3.x", "@glint/template": "^1.1.0", - "@lblod/ember-rdfa-editor": "^6.0.0 || ^7.0.1", + "@lblod/ember-rdfa-editor": "^6.0.0 || ^7.0.1 || ^8.0.1", "ember-concurrency": "2.x || ^3.1.0", "ember-modifier": "^3.2.7", "ember-power-select": "6.x || 7.x", diff --git a/package.json b/package.json index 1b3ecc5db..3d67fa5e5 100644 --- a/package.json +++ b/package.json @@ -43,8 +43,8 @@ "@lblod/ember-acmidm-login": "^2.0.0-beta.1", "@lblod/ember-environment-banner": "^0.2.0", "@lblod/ember-mock-login": "0.7.0", - "@lblod/ember-rdfa-editor": "^7.0.1", - "@lblod/ember-rdfa-editor-lblod-plugins": "^15.1.0", + "@lblod/ember-rdfa-editor": "^8.0.2", + "@lblod/ember-rdfa-editor-lblod-plugins": "^15.2.1", "@release-it-plugins/lerna-changelog": "^6.0.0", "broccoli-asset-rev": "^3.0.0", "broccoli-plugin": "^4.0.7",