From 01535b1f4cce0122d8bf5839d0a0a7f5f06f33a1 Mon Sep 17 00:00:00 2001 From: Elena Poelman Date: Tue, 13 Jun 2023 17:21:38 +0200 Subject: [PATCH 1/2] bump editor to 3.8.1 --- package-lock.json | 78 ++++++++++++----------------------------------- package.json | 2 +- 2 files changed, 21 insertions(+), 59 deletions(-) diff --git a/package-lock.json b/package-lock.json index 52f6c20b1..8ad68c563 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,7 +24,7 @@ "@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": "^3.7.2", + "@lblod/ember-rdfa-editor": "^3.8.1", "@lblod/ember-rdfa-editor-lblod-plugins": "^7.1.0", "@release-it-plugins/lerna-changelog": "^5.0.0", "broccoli-asset-rev": "^3.0.0", @@ -3909,9 +3909,9 @@ } }, "node_modules/@lblod/ember-rdfa-editor": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/@lblod/ember-rdfa-editor/-/ember-rdfa-editor-3.8.0.tgz", - "integrity": "sha512-QFVr21zgimyGJ5E1s74iJFVCWKwJKgTr3bu5dibKcJG+LQY0rzsywL/zzj8NMovmR8W5ieMd+lvileLfpBQeNg==", + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/@lblod/ember-rdfa-editor/-/ember-rdfa-editor-3.8.1.tgz", + "integrity": "sha512-eJ5/YYvLZsU4ZQxetgKtTkFotyZci2/0FA20BdZPfuxMTwXRqIMpmMLScw2uXH+zprSBA2X6m0WP+DEoQ27naA==", "dev": true, "dependencies": { "@codemirror/lang-html": "^6.1.1", @@ -3946,7 +3946,7 @@ "ember-intl": "^5.7.2", "ember-truth-helpers": "^3.0.0", "ember-unique-id-helper-polyfill": "^1.2.2", - "ember-velcro": "^1.1.0", + "ember-velcro": "^2.1.0", "handlebars": "^4.7.7", "handlebars-loader": "^1.7.2", "iter-tools": "^7.4.0", @@ -4269,40 +4269,6 @@ "node": "8.* || >= 10.*" } }, - "node_modules/@lblod/ember-rdfa-editor/node_modules/@glint/environment-ember-loose": { - "version": "0.9.7", - "resolved": "https://registry.npmjs.org/@glint/environment-ember-loose/-/environment-ember-loose-0.9.7.tgz", - "integrity": "sha512-MlCGZtB1Clp4vQWIm2APSnCm7nL8wVhFMOhVy2qzpV0nfLyg3pcN9CQHNpfdJvCydBB72cA4/ahPj7VEFL6xsg==", - "dev": true, - "peer": true, - "dependencies": { - "@glint/config": "^0.9.7", - "@glint/template": "^0.9.7" - }, - "peerDependencies": { - "@glimmer/component": "^1.1.2", - "ember-cli-htmlbars": "^6.0.1", - "ember-modifier": "^3.2.7" - }, - "peerDependenciesMeta": { - "ember-cli-htmlbars": { - "optional": true - }, - "ember-modifier": { - "optional": true - } - } - }, - "node_modules/@lblod/ember-rdfa-editor/node_modules/@glint/template": { - "version": "0.9.7", - "resolved": "https://registry.npmjs.org/@glint/template/-/template-0.9.7.tgz", - "integrity": "sha512-MCp8GxQDIbH8ZzfNxHhVqCSKlydBgQfBEwJLDpN81lgFRCldSDPueIbk8sz3EhpGiZJVdNQbpGeYIDsUXe1ocg==", - "dev": true, - "peer": true, - "peerDependencies": { - "@glimmer/component": "^1.1.2" - } - }, "node_modules/@lblod/ember-rdfa-editor/node_modules/ember-cli-typescript": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/ember-cli-typescript/-/ember-cli-typescript-5.2.1.tgz", @@ -4324,25 +4290,6 @@ "node": ">= 12.*" } }, - "node_modules/@lblod/ember-rdfa-editor/node_modules/ember-velcro": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ember-velcro/-/ember-velcro-1.1.0.tgz", - "integrity": "sha512-oZxcQvd39o0Miv4C4a44BMkzSuS5X684eVLX2Ct4qh7ofAvqSWpEGF9dUDwzCOq5hk4WS8DMsXa0azonv6tP7Q==", - "dev": true, - "dependencies": { - "@embroider/addon-shim": "^1.0.0", - "@floating-ui/dom": "^1.0.1", - "ember-functions-as-helper-polyfill": "^2.1.1", - "ember-modifier": "^3.2.7" - }, - "engines": { - "node": "14.* || >= 16" - }, - "peerDependencies": { - "@glint/environment-ember-loose": "^0.9.4", - "@glint/template": "^0.9.5" - } - }, "node_modules/@lblod/ember-rdfa-editor/node_modules/execa": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz", @@ -22841,6 +22788,21 @@ "node": "12.* || 14.* || >= 16" } }, + "node_modules/ember-velcro": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ember-velcro/-/ember-velcro-2.1.0.tgz", + "integrity": "sha512-5m1JDAGmTT9J8SrVL1NrBj6qe1L0dgb3T1muWL2b36HO4sCHn8/njT/GMHXorcbYz7C/PawYuxKpbILNaGa50A==", + "dev": true, + "dependencies": { + "@embroider/addon-shim": "^1.0.0", + "@floating-ui/dom": "^1.0.1", + "ember-functions-as-helper-polyfill": "^2.1.1", + "ember-modifier": "^3.2.7" + }, + "engines": { + "node": "14.* || >= 16" + } + }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", diff --git a/package.json b/package.json index 75bceb04c..61cfb3346 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@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": "^3.7.2", + "@lblod/ember-rdfa-editor": "^3.8.1", "@lblod/ember-rdfa-editor-lblod-plugins": "^7.1.0", "@release-it-plugins/lerna-changelog": "^5.0.0", "broccoli-asset-rev": "^3.0.0", From ab64a5c1686c1ffcd54137f3ab833aa866390eb4 Mon Sep 17 00:00:00 2001 From: Elena Poelman Date: Tue, 13 Jun 2023 17:37:36 +0200 Subject: [PATCH 2/2] bump editor plugins to 7.2 --- app/components/zitting-text-document-container.js | 6 +++++- app/controllers/agendapoints/edit.js | 6 +++++- app/controllers/regulatory-statements/edit.js | 6 +++++- package-lock.json | 15 ++++++++++----- package.json | 2 +- 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/app/components/zitting-text-document-container.js b/app/components/zitting-text-document-container.js index b9d71afd5..96065f126 100644 --- a/app/components/zitting-text-document-container.js +++ b/app/components/zitting-text-document-container.js @@ -40,7 +40,10 @@ import { blockquote } from '@lblod/ember-rdfa-editor/plugins/blockquote'; import { code_block } from '@lblod/ember-rdfa-editor/plugins/code'; import { image } from '@lblod/ember-rdfa-editor/plugins/image'; import { inline_rdfa } from '@lblod/ember-rdfa-editor/marks'; -import date from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/rdfa-date-plugin/nodes/date'; +import { + date, + dateView, +} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/rdfa-date-plugin/nodes/date'; import { service } from '@ember/service'; import { linkPasteHandler } from '@lblod/ember-rdfa-editor/plugins/link'; @@ -163,6 +166,7 @@ export default class ZittingTextDocumentContainerComponent extends Component { return (controller) => { return { link: linkView(this.config.link)(controller), + date: dateView(this.config.date)(controller), }; }; } diff --git a/app/controllers/agendapoints/edit.js b/app/controllers/agendapoints/edit.js index 8e4211c4e..b4c4ee999 100644 --- a/app/controllers/agendapoints/edit.js +++ b/app/controllers/agendapoints/edit.js @@ -45,7 +45,10 @@ import { blockquote } from '@lblod/ember-rdfa-editor/plugins/blockquote'; import { code_block } from '@lblod/ember-rdfa-editor/plugins/code'; import { image, imageView } from '@lblod/ember-rdfa-editor/plugins/image'; import { inline_rdfa } from '@lblod/ember-rdfa-editor/marks'; -import date from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/rdfa-date-plugin/nodes/date'; +import { + date, + dateView, +} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/rdfa-date-plugin/nodes/date'; import { createInvisiblesPlugin, @@ -191,6 +194,7 @@ export default class AgendapointsEditController extends Controller { regulatoryStatementNode: regulatoryStatementNodeView(controller), link: linkView(this.config.link)(controller), image: imageView(controller), + date: dateView(this.config.date)(controller), }; }; } diff --git a/app/controllers/regulatory-statements/edit.js b/app/controllers/regulatory-statements/edit.js index 439f7320a..e5cef06d5 100644 --- a/app/controllers/regulatory-statements/edit.js +++ b/app/controllers/regulatory-statements/edit.js @@ -52,7 +52,10 @@ import { blockquote } from '@lblod/ember-rdfa-editor/plugins/blockquote'; import { code_block } from '@lblod/ember-rdfa-editor/plugins/code'; import { image, imageView } from '@lblod/ember-rdfa-editor/plugins/image'; import { inline_rdfa } from '@lblod/ember-rdfa-editor/marks'; -import date from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/rdfa-date-plugin/nodes/date'; +import { + date, + dateView, +} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/rdfa-date-plugin/nodes/date'; import { Schema } from '@lblod/ember-rdfa-editor'; @@ -133,6 +136,7 @@ export default class RegulatoryStatementsRoute extends Controller { ), link: linkView(this.config.link)(controller), image: imageView(controller), + date: dateView(this.config.date)(controller), }; }; } diff --git a/package-lock.json b/package-lock.json index 8ad68c563..212f3ac05 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,7 @@ "@lblod/ember-environment-banner": "^0.2.0", "@lblod/ember-mock-login": "0.7.0", "@lblod/ember-rdfa-editor": "^3.8.1", - "@lblod/ember-rdfa-editor-lblod-plugins": "^7.1.0", + "@lblod/ember-rdfa-editor-lblod-plugins": "^7.2.0", "@release-it-plugins/lerna-changelog": "^5.0.0", "broccoli-asset-rev": "^3.0.0", "broccoli-plugin": "^4.0.7", @@ -3981,11 +3981,14 @@ } }, "node_modules/@lblod/ember-rdfa-editor-lblod-plugins": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@lblod/ember-rdfa-editor-lblod-plugins/-/ember-rdfa-editor-lblod-plugins-7.1.0.tgz", - "integrity": "sha512-30aTim3LjCY092sv2fAtsZG1ugL6yfhgpuOIIxzHvlL4XkYjxENcv/kMQjGHKagRREmNN5ZhPWEV95AI0hKt9w==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@lblod/ember-rdfa-editor-lblod-plugins/-/ember-rdfa-editor-lblod-plugins-7.2.0.tgz", + "integrity": "sha512-oWQntjQCDcwYXt7/+8qj5uDpmaiPNYm34+qFonohPFfJyetTXn4vSwLZucDcT+1HVapphGFiwthG00Vyw1cqsg==", "dev": true, "dependencies": { + "@codemirror/lang-html": "^6.4.3", + "@codemirror/state": "^6.2.1", + "@codemirror/view": "^6.12.0", "@curvenote/prosemirror-utils": "^1.0.5", "@lblod/marawa": "^0.8.0-beta.2", "@rdfjs/data-model": "^2.0.1", @@ -3994,6 +3997,7 @@ "@types/rdf-validate-shacl": "^0.4.0", "@types/rdfjs__parser-n3": "^1.1.5", "buffer": "^6.0.3", + "codemirror": "^6.0.1", "date-fns": "^2.29.3", "ember-auto-import": "^2.4.3", "ember-cli-babel": "^7.26.11", @@ -4010,6 +4014,7 @@ "rdf-validate-shacl": "^0.4.5", "stream-browserify": "^3.0.0", "tracked-built-ins": "^3.1.0", + "tracked-toolbox": "^1.2.3", "uuid": "^9.0.0" }, "engines": { @@ -4017,7 +4022,7 @@ }, "peerDependencies": { "@appuniversum/ember-appuniversum": "^2.4.2", - "@lblod/ember-rdfa-editor": "^3.7.0", + "@lblod/ember-rdfa-editor": "^3.8.0", "ember-concurrency": "^2.3.7" } }, diff --git a/package.json b/package.json index 61cfb3346..ef78182ff 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "@lblod/ember-environment-banner": "^0.2.0", "@lblod/ember-mock-login": "0.7.0", "@lblod/ember-rdfa-editor": "^3.8.1", - "@lblod/ember-rdfa-editor-lblod-plugins": "^7.1.0", + "@lblod/ember-rdfa-editor-lblod-plugins": "^7.2.0", "@release-it-plugins/lerna-changelog": "^5.0.0", "broccoli-asset-rev": "^3.0.0", "broccoli-plugin": "^4.0.7",