diff --git a/sci-types-project/package-lock.json b/sci-types-project/package-lock.json index 3425c31..ceef2bc 100644 --- a/sci-types-project/package-lock.json +++ b/sci-types-project/package-lock.json @@ -8,9 +8,6 @@ "name": "sci-types-project", "version": "7.0.0", "license": "LGPL-3.0-or-later", - "dependencies": { - "@librecms/ccm-cms-editor": "^7.0.0-SNAPSHOT" - }, "devDependencies": { "@types/jquery": "^3.5.6", "@types/sortablejs": "^1.10.7", @@ -30,368 +27,6 @@ "node": ">=10.0.0" } }, - "node_modules/@librecms/ccm-cms-editor": { - "version": "7.0.0-SNAPSHOT.2022-04-27T190905", - "resolved": "http://packages.libreccm.org/repository/libreccm-npm/@librecms/ccm-cms-editor/-/ccm-cms-editor-7.0.0-SNAPSHOT.2022-04-27T190905.tgz", - "integrity": "sha512-agPjqd90+FJGBVEC7aCaov5/odC9ke9JZEskMHU7CYcBGnW224y94ayIRMm8lvpMEca98UU45gQX97rBiGEH5Q==", - "license": "LGPL-3.0-or-later", - "dependencies": { - "@tiptap/core": "^2.0.0-beta.127", - "@tiptap/extension-subscript": "^2.0.0-beta.4", - "@tiptap/extension-superscript": "^2.0.0-beta.4", - "@tiptap/extension-table": "^2.0.0-beta.35", - "@tiptap/extension-table-cell": "^2.0.0-beta.15", - "@tiptap/extension-table-header": "^2.0.0-beta.17", - "@tiptap/extension-table-row": "^2.0.0-beta.14", - "@tiptap/starter-kit": "^2.0.0-beta.129", - "acorn": "^8.5.0", - "bootstrap": "^4.6.0", - "bootstrap-icons": "^1.5.0", - "jquery": "^3.6.0", - "popper.js": "^1.16.1", - "remixicon": "^2.5.0", - "sortablejs": "^1.14.0" - } - }, - "node_modules/@tiptap/core": { - "version": "2.0.0-beta.174", - "license": "MIT", - "dependencies": { - "@types/prosemirror-commands": "^1.0.4", - "@types/prosemirror-keymap": "^1.0.4", - "@types/prosemirror-model": "^1.16.0", - "@types/prosemirror-schema-list": "^1.0.3", - "@types/prosemirror-state": "^1.2.8", - "@types/prosemirror-transform": "^1.1.5", - "@types/prosemirror-view": "^1.23.1", - "prosemirror-commands": "^1.2.1", - "prosemirror-keymap": "^1.1.5", - "prosemirror-model": "^1.16.1", - "prosemirror-schema-list": "^1.1.6", - "prosemirror-state": "^1.3.4", - "prosemirror-transform": "^1.3.3", - "prosemirror-view": "^1.23.6" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - } - }, - "node_modules/@tiptap/extension-blockquote": { - "version": "2.0.0-beta.26", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "^2.0.0-beta.1" - } - }, - "node_modules/@tiptap/extension-bold": { - "version": "2.0.0-beta.26", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "^2.0.0-beta.1" - } - }, - "node_modules/@tiptap/extension-bullet-list": { - "version": "2.0.0-beta.26", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "^2.0.0-beta.1" - } - }, - "node_modules/@tiptap/extension-code": { - "version": "2.0.0-beta.26", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "^2.0.0-beta.1" - } - }, - "node_modules/@tiptap/extension-code-block": { - "version": "2.0.0-beta.37", - "license": "MIT", - "dependencies": { - "prosemirror-state": "^1.3.4" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "^2.0.0-beta.1" - } - }, - "node_modules/@tiptap/extension-document": { - "version": "2.0.0-beta.15", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "^2.0.0-beta.1" - } - }, - "node_modules/@tiptap/extension-dropcursor": { - "version": "2.0.0-beta.25", - "license": "MIT", - "dependencies": { - "@types/prosemirror-dropcursor": "^1.0.3", - "prosemirror-dropcursor": "^1.4.0" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "^2.0.0-beta.1" - } - }, - "node_modules/@tiptap/extension-gapcursor": { - "version": "2.0.0-beta.34", - "license": "MIT", - "dependencies": { - "@types/prosemirror-gapcursor": "^1.0.4", - "prosemirror-gapcursor": "^1.2.1" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "^2.0.0-beta.1" - } - }, - "node_modules/@tiptap/extension-hard-break": { - "version": "2.0.0-beta.30", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "^2.0.0-beta.1" - } - }, - "node_modules/@tiptap/extension-heading": { - "version": "2.0.0-beta.26", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "^2.0.0-beta.1" - } - }, - "node_modules/@tiptap/extension-history": { - "version": "2.0.0-beta.21", - "license": "MIT", - "dependencies": { - "@types/prosemirror-history": "^1.0.3", - "prosemirror-history": "^1.2.0" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "^2.0.0-beta.1" - } - }, - "node_modules/@tiptap/extension-horizontal-rule": { - "version": "2.0.0-beta.31", - "license": "MIT", - "dependencies": { - "prosemirror-state": "^1.3.4" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "^2.0.0-beta.1" - } - }, - "node_modules/@tiptap/extension-italic": { - "version": "2.0.0-beta.26", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "^2.0.0-beta.1" - } - }, - "node_modules/@tiptap/extension-list-item": { - "version": "2.0.0-beta.20", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "^2.0.0-beta.1" - } - }, - "node_modules/@tiptap/extension-ordered-list": { - "version": "2.0.0-beta.27", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "^2.0.0-beta.1" - } - }, - "node_modules/@tiptap/extension-paragraph": { - "version": "2.0.0-beta.23", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "^2.0.0-beta.1" - } - }, - "node_modules/@tiptap/extension-strike": { - "version": "2.0.0-beta.27", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "^2.0.0-beta.1" - } - }, - "node_modules/@tiptap/extension-subscript": { - "version": "2.0.0-beta.10", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "^2.0.0-beta.1" - } - }, - "node_modules/@tiptap/extension-superscript": { - "version": "2.0.0-beta.10", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "^2.0.0-beta.1" - } - }, - "node_modules/@tiptap/extension-table": { - "version": "2.0.0-beta.48", - "license": "MIT", - "dependencies": { - "prosemirror-tables": "^1.1.1", - "prosemirror-view": "^1.23.6" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "^2.0.0-beta.1" - } - }, - "node_modules/@tiptap/extension-table-cell": { - "version": "2.0.0-beta.20", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "^2.0.0-beta.1" - } - }, - "node_modules/@tiptap/extension-table-header": { - "version": "2.0.0-beta.22", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "^2.0.0-beta.1" - } - }, - "node_modules/@tiptap/extension-table-row": { - "version": "2.0.0-beta.19", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "^2.0.0-beta.1" - } - }, - "node_modules/@tiptap/extension-text": { - "version": "2.0.0-beta.15", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "^2.0.0-beta.1" - } - }, - "node_modules/@tiptap/starter-kit": { - "version": "2.0.0-beta.183", - "license": "MIT", - "dependencies": { - "@tiptap/core": "^2.0.0-beta.174", - "@tiptap/extension-blockquote": "^2.0.0-beta.26", - "@tiptap/extension-bold": "^2.0.0-beta.26", - "@tiptap/extension-bullet-list": "^2.0.0-beta.26", - "@tiptap/extension-code": "^2.0.0-beta.26", - "@tiptap/extension-code-block": "^2.0.0-beta.37", - "@tiptap/extension-document": "^2.0.0-beta.15", - "@tiptap/extension-dropcursor": "^2.0.0-beta.25", - "@tiptap/extension-gapcursor": "^2.0.0-beta.34", - "@tiptap/extension-hard-break": "^2.0.0-beta.30", - "@tiptap/extension-heading": "^2.0.0-beta.26", - "@tiptap/extension-history": "^2.0.0-beta.21", - "@tiptap/extension-horizontal-rule": "^2.0.0-beta.31", - "@tiptap/extension-italic": "^2.0.0-beta.26", - "@tiptap/extension-list-item": "^2.0.0-beta.20", - "@tiptap/extension-ordered-list": "^2.0.0-beta.27", - "@tiptap/extension-paragraph": "^2.0.0-beta.23", - "@tiptap/extension-strike": "^2.0.0-beta.27", - "@tiptap/extension-text": "^2.0.0-beta.15" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - } - }, "node_modules/@types/eslint": { "version": "8.4.1", "dev": true, @@ -433,93 +68,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@types/orderedmap": { - "version": "1.0.0", - "license": "MIT" - }, - "node_modules/@types/prosemirror-commands": { - "version": "1.0.4", - "license": "MIT", - "dependencies": { - "@types/prosemirror-model": "*", - "@types/prosemirror-state": "*", - "@types/prosemirror-view": "*" - } - }, - "node_modules/@types/prosemirror-dropcursor": { - "version": "1.0.3", - "license": "MIT", - "dependencies": { - "@types/prosemirror-state": "*" - } - }, - "node_modules/@types/prosemirror-gapcursor": { - "version": "1.0.4", - "license": "MIT", - "dependencies": { - "@types/prosemirror-model": "*", - "@types/prosemirror-state": "*" - } - }, - "node_modules/@types/prosemirror-history": { - "version": "1.0.3", - "license": "MIT", - "dependencies": { - "@types/prosemirror-model": "*", - "@types/prosemirror-state": "*" - } - }, - "node_modules/@types/prosemirror-keymap": { - "version": "1.0.4", - "license": "MIT", - "dependencies": { - "@types/prosemirror-commands": "*", - "@types/prosemirror-model": "*", - "@types/prosemirror-state": "*", - "@types/prosemirror-view": "*" - } - }, - "node_modules/@types/prosemirror-model": { - "version": "1.16.1", - "license": "MIT", - "dependencies": { - "@types/orderedmap": "*" - } - }, - "node_modules/@types/prosemirror-schema-list": { - "version": "1.0.3", - "license": "MIT", - "dependencies": { - "@types/orderedmap": "*", - "@types/prosemirror-model": "*", - "@types/prosemirror-state": "*" - } - }, - "node_modules/@types/prosemirror-state": { - "version": "1.2.8", - "license": "MIT", - "dependencies": { - "@types/prosemirror-model": "*", - "@types/prosemirror-transform": "*", - "@types/prosemirror-view": "*" - } - }, - "node_modules/@types/prosemirror-transform": { - "version": "1.1.6", - "license": "MIT", - "dependencies": { - "@types/prosemirror-model": "*" - } - }, - "node_modules/@types/prosemirror-view": { - "version": "1.23.1", - "license": "MIT", - "dependencies": { - "@types/prosemirror-model": "*", - "@types/prosemirror-state": "*", - "@types/prosemirror-transform": "*" - } - }, "node_modules/@types/sizzle": { "version": "2.3.3", "dev": true, @@ -706,6 +254,7 @@ }, "node_modules/acorn": { "version": "8.7.1", + "dev": true, "license": "MIT", "bin": { "acorn": "bin/acorn" @@ -781,25 +330,6 @@ "node": ">=8" } }, - "node_modules/bootstrap": { - "version": "4.6.1", - "license": "MIT", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/bootstrap" - }, - "peerDependencies": { - "jquery": "1.9.1 - 3", - "popper.js": "^1.16.1" - } - }, - "node_modules/bootstrap-icons": { - "version": "1.8.1", - "license": "MIT", - "engines": { - "node": ">=10" - } - }, "node_modules/brace-expansion": { "version": "1.1.11", "dev": true, @@ -1715,10 +1245,6 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, - "node_modules/jquery": { - "version": "3.6.0", - "license": "MIT" - }, "node_modules/json-parse-better-errors": { "version": "1.0.2", "dev": true, @@ -1972,10 +1498,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/orderedmap": { - "version": "1.1.5", - "license": "MIT" - }, "node_modules/p-limit": { "version": "2.3.0", "dev": true, @@ -2099,109 +1621,6 @@ "node": ">=8" } }, - "node_modules/popper.js": { - "version": "1.16.1", - "license": "MIT", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/popperjs" - } - }, - "node_modules/prosemirror-commands": { - "version": "1.2.2", - "license": "MIT", - "dependencies": { - "prosemirror-model": "^1.0.0", - "prosemirror-state": "^1.0.0", - "prosemirror-transform": "^1.0.0" - } - }, - "node_modules/prosemirror-dropcursor": { - "version": "1.4.0", - "license": "MIT", - "dependencies": { - "prosemirror-state": "^1.0.0", - "prosemirror-transform": "^1.1.0", - "prosemirror-view": "^1.1.0" - } - }, - "node_modules/prosemirror-gapcursor": { - "version": "1.2.2", - "license": "MIT", - "dependencies": { - "prosemirror-keymap": "^1.0.0", - "prosemirror-model": "^1.0.0", - "prosemirror-state": "^1.0.0", - "prosemirror-view": "^1.0.0" - } - }, - "node_modules/prosemirror-history": { - "version": "1.2.0", - "license": "MIT", - "dependencies": { - "prosemirror-state": "^1.2.2", - "prosemirror-transform": "^1.0.0", - "rope-sequence": "^1.3.0" - } - }, - "node_modules/prosemirror-keymap": { - "version": "1.1.5", - "license": "MIT", - "dependencies": { - "prosemirror-state": "^1.0.0", - "w3c-keyname": "^2.2.0" - } - }, - "node_modules/prosemirror-model": { - "version": "1.16.1", - "license": "MIT", - "dependencies": { - "orderedmap": "^1.1.0" - } - }, - "node_modules/prosemirror-schema-list": { - "version": "1.1.6", - "license": "MIT", - "dependencies": { - "prosemirror-model": "^1.0.0", - "prosemirror-transform": "^1.0.0" - } - }, - "node_modules/prosemirror-state": { - "version": "1.3.4", - "license": "MIT", - "dependencies": { - "prosemirror-model": "^1.0.0", - "prosemirror-transform": "^1.0.0" - } - }, - "node_modules/prosemirror-tables": { - "version": "1.1.1", - "license": "MIT", - "dependencies": { - "prosemirror-keymap": "^1.1.2", - "prosemirror-model": "^1.8.1", - "prosemirror-state": "^1.3.1", - "prosemirror-transform": "^1.2.1", - "prosemirror-view": "^1.13.3" - } - }, - "node_modules/prosemirror-transform": { - "version": "1.4.2", - "license": "MIT", - "dependencies": { - "prosemirror-model": "^1.0.0" - } - }, - "node_modules/prosemirror-view": { - "version": "1.23.13", - "license": "MIT", - "dependencies": { - "prosemirror-model": "^1.16.0", - "prosemirror-state": "^1.0.0", - "prosemirror-transform": "^1.1.0" - } - }, "node_modules/punycode": { "version": "2.1.1", "dev": true, @@ -2253,10 +1672,6 @@ "node": ">= 0.10" } }, - "node_modules/remixicon": { - "version": "2.5.0", - "license": "Apache 2.0" - }, "node_modules/resolve": { "version": "1.22.0", "dev": true, @@ -2292,10 +1707,6 @@ "node": ">=8" } }, - "node_modules/rope-sequence": { - "version": "1.3.2", - "license": "MIT" - }, "node_modules/safe-buffer": { "version": "5.2.1", "dev": true, @@ -2417,10 +1828,6 @@ "dev": true, "license": "ISC" }, - "node_modules/sortablejs": { - "version": "1.15.0", - "license": "MIT" - }, "node_modules/source-map": { "version": "0.6.1", "dev": true, @@ -2779,10 +2186,6 @@ "spdx-expression-parse": "^3.0.0" } }, - "node_modules/w3c-keyname": { - "version": "2.2.4", - "license": "MIT" - }, "node_modules/watchpack": { "version": "2.3.1", "dev": true, @@ -2968,183 +2371,6 @@ "version": "0.5.7", "dev": true }, - "@librecms/ccm-cms-editor": { - "version": "7.0.0-SNAPSHOT.2022-04-27T190905", - "resolved": "http://packages.libreccm.org/repository/libreccm-npm/@librecms/ccm-cms-editor/-/ccm-cms-editor-7.0.0-SNAPSHOT.2022-04-27T190905.tgz", - "integrity": "sha512-agPjqd90+FJGBVEC7aCaov5/odC9ke9JZEskMHU7CYcBGnW224y94ayIRMm8lvpMEca98UU45gQX97rBiGEH5Q==", - "requires": { - "@tiptap/core": "^2.0.0-beta.127", - "@tiptap/extension-subscript": "^2.0.0-beta.4", - "@tiptap/extension-superscript": "^2.0.0-beta.4", - "@tiptap/extension-table": "^2.0.0-beta.35", - "@tiptap/extension-table-cell": "^2.0.0-beta.15", - "@tiptap/extension-table-header": "^2.0.0-beta.17", - "@tiptap/extension-table-row": "^2.0.0-beta.14", - "@tiptap/starter-kit": "^2.0.0-beta.129", - "acorn": "^8.5.0", - "bootstrap": "^4.6.0", - "bootstrap-icons": "^1.5.0", - "jquery": "^3.6.0", - "popper.js": "^1.16.1", - "remixicon": "^2.5.0", - "sortablejs": "^1.14.0" - } - }, - "@tiptap/core": { - "version": "2.0.0-beta.174", - "requires": { - "@types/prosemirror-commands": "^1.0.4", - "@types/prosemirror-keymap": "^1.0.4", - "@types/prosemirror-model": "^1.16.0", - "@types/prosemirror-schema-list": "^1.0.3", - "@types/prosemirror-state": "^1.2.8", - "@types/prosemirror-transform": "^1.1.5", - "@types/prosemirror-view": "^1.23.1", - "prosemirror-commands": "^1.2.1", - "prosemirror-keymap": "^1.1.5", - "prosemirror-model": "^1.16.1", - "prosemirror-schema-list": "^1.1.6", - "prosemirror-state": "^1.3.4", - "prosemirror-transform": "^1.3.3", - "prosemirror-view": "^1.23.6" - } - }, - "@tiptap/extension-blockquote": { - "version": "2.0.0-beta.26", - "requires": {} - }, - "@tiptap/extension-bold": { - "version": "2.0.0-beta.26", - "requires": {} - }, - "@tiptap/extension-bullet-list": { - "version": "2.0.0-beta.26", - "requires": {} - }, - "@tiptap/extension-code": { - "version": "2.0.0-beta.26", - "requires": {} - }, - "@tiptap/extension-code-block": { - "version": "2.0.0-beta.37", - "requires": { - "prosemirror-state": "^1.3.4" - } - }, - "@tiptap/extension-document": { - "version": "2.0.0-beta.15", - "requires": {} - }, - "@tiptap/extension-dropcursor": { - "version": "2.0.0-beta.25", - "requires": { - "@types/prosemirror-dropcursor": "^1.0.3", - "prosemirror-dropcursor": "^1.4.0" - } - }, - "@tiptap/extension-gapcursor": { - "version": "2.0.0-beta.34", - "requires": { - "@types/prosemirror-gapcursor": "^1.0.4", - "prosemirror-gapcursor": "^1.2.1" - } - }, - "@tiptap/extension-hard-break": { - "version": "2.0.0-beta.30", - "requires": {} - }, - "@tiptap/extension-heading": { - "version": "2.0.0-beta.26", - "requires": {} - }, - "@tiptap/extension-history": { - "version": "2.0.0-beta.21", - "requires": { - "@types/prosemirror-history": "^1.0.3", - "prosemirror-history": "^1.2.0" - } - }, - "@tiptap/extension-horizontal-rule": { - "version": "2.0.0-beta.31", - "requires": { - "prosemirror-state": "^1.3.4" - } - }, - "@tiptap/extension-italic": { - "version": "2.0.0-beta.26", - "requires": {} - }, - "@tiptap/extension-list-item": { - "version": "2.0.0-beta.20", - "requires": {} - }, - "@tiptap/extension-ordered-list": { - "version": "2.0.0-beta.27", - "requires": {} - }, - "@tiptap/extension-paragraph": { - "version": "2.0.0-beta.23", - "requires": {} - }, - "@tiptap/extension-strike": { - "version": "2.0.0-beta.27", - "requires": {} - }, - "@tiptap/extension-subscript": { - "version": "2.0.0-beta.10", - "requires": {} - }, - "@tiptap/extension-superscript": { - "version": "2.0.0-beta.10", - "requires": {} - }, - "@tiptap/extension-table": { - "version": "2.0.0-beta.48", - "requires": { - "prosemirror-tables": "^1.1.1", - "prosemirror-view": "^1.23.6" - } - }, - "@tiptap/extension-table-cell": { - "version": "2.0.0-beta.20", - "requires": {} - }, - "@tiptap/extension-table-header": { - "version": "2.0.0-beta.22", - "requires": {} - }, - "@tiptap/extension-table-row": { - "version": "2.0.0-beta.19", - "requires": {} - }, - "@tiptap/extension-text": { - "version": "2.0.0-beta.15", - "requires": {} - }, - "@tiptap/starter-kit": { - "version": "2.0.0-beta.183", - "requires": { - "@tiptap/core": "^2.0.0-beta.174", - "@tiptap/extension-blockquote": "^2.0.0-beta.26", - "@tiptap/extension-bold": "^2.0.0-beta.26", - "@tiptap/extension-bullet-list": "^2.0.0-beta.26", - "@tiptap/extension-code": "^2.0.0-beta.26", - "@tiptap/extension-code-block": "^2.0.0-beta.37", - "@tiptap/extension-document": "^2.0.0-beta.15", - "@tiptap/extension-dropcursor": "^2.0.0-beta.25", - "@tiptap/extension-gapcursor": "^2.0.0-beta.34", - "@tiptap/extension-hard-break": "^2.0.0-beta.30", - "@tiptap/extension-heading": "^2.0.0-beta.26", - "@tiptap/extension-history": "^2.0.0-beta.21", - "@tiptap/extension-horizontal-rule": "^2.0.0-beta.31", - "@tiptap/extension-italic": "^2.0.0-beta.26", - "@tiptap/extension-list-item": "^2.0.0-beta.20", - "@tiptap/extension-ordered-list": "^2.0.0-beta.27", - "@tiptap/extension-paragraph": "^2.0.0-beta.23", - "@tiptap/extension-strike": "^2.0.0-beta.27", - "@tiptap/extension-text": "^2.0.0-beta.15" - } - }, "@types/eslint": { "version": "8.4.1", "dev": true, @@ -3180,82 +2406,6 @@ "version": "17.0.27", "dev": true }, - "@types/orderedmap": { - "version": "1.0.0" - }, - "@types/prosemirror-commands": { - "version": "1.0.4", - "requires": { - "@types/prosemirror-model": "*", - "@types/prosemirror-state": "*", - "@types/prosemirror-view": "*" - } - }, - "@types/prosemirror-dropcursor": { - "version": "1.0.3", - "requires": { - "@types/prosemirror-state": "*" - } - }, - "@types/prosemirror-gapcursor": { - "version": "1.0.4", - "requires": { - "@types/prosemirror-model": "*", - "@types/prosemirror-state": "*" - } - }, - "@types/prosemirror-history": { - "version": "1.0.3", - "requires": { - "@types/prosemirror-model": "*", - "@types/prosemirror-state": "*" - } - }, - "@types/prosemirror-keymap": { - "version": "1.0.4", - "requires": { - "@types/prosemirror-commands": "*", - "@types/prosemirror-model": "*", - "@types/prosemirror-state": "*", - "@types/prosemirror-view": "*" - } - }, - "@types/prosemirror-model": { - "version": "1.16.1", - "requires": { - "@types/orderedmap": "*" - } - }, - "@types/prosemirror-schema-list": { - "version": "1.0.3", - "requires": { - "@types/orderedmap": "*", - "@types/prosemirror-model": "*", - "@types/prosemirror-state": "*" - } - }, - "@types/prosemirror-state": { - "version": "1.2.8", - "requires": { - "@types/prosemirror-model": "*", - "@types/prosemirror-transform": "*", - "@types/prosemirror-view": "*" - } - }, - "@types/prosemirror-transform": { - "version": "1.1.6", - "requires": { - "@types/prosemirror-model": "*" - } - }, - "@types/prosemirror-view": { - "version": "1.23.1", - "requires": { - "@types/prosemirror-model": "*", - "@types/prosemirror-state": "*", - "@types/prosemirror-transform": "*" - } - }, "@types/sizzle": { "version": "2.3.3", "dev": true @@ -3406,7 +2556,8 @@ "dev": true }, "acorn": { - "version": "8.7.1" + "version": "8.7.1", + "dev": true }, "acorn-import-assertions": { "version": "1.8.0", @@ -3451,13 +2602,6 @@ "version": "2.2.0", "dev": true }, - "bootstrap": { - "version": "4.6.1", - "requires": {} - }, - "bootstrap-icons": { - "version": "1.8.1" - }, "brace-expansion": { "version": "1.1.11", "dev": true, @@ -4005,9 +3149,6 @@ } } }, - "jquery": { - "version": "3.6.0" - }, "json-parse-better-errors": { "version": "1.0.2", "dev": true @@ -4169,9 +3310,6 @@ "mimic-fn": "^2.1.0" } }, - "orderedmap": { - "version": "1.1.5" - }, "p-limit": { "version": "2.3.0", "dev": true, @@ -4240,93 +3378,6 @@ "find-up": "^4.0.0" } }, - "popper.js": { - "version": "1.16.1" - }, - "prosemirror-commands": { - "version": "1.2.2", - "requires": { - "prosemirror-model": "^1.0.0", - "prosemirror-state": "^1.0.0", - "prosemirror-transform": "^1.0.0" - } - }, - "prosemirror-dropcursor": { - "version": "1.4.0", - "requires": { - "prosemirror-state": "^1.0.0", - "prosemirror-transform": "^1.1.0", - "prosemirror-view": "^1.1.0" - } - }, - "prosemirror-gapcursor": { - "version": "1.2.2", - "requires": { - "prosemirror-keymap": "^1.0.0", - "prosemirror-model": "^1.0.0", - "prosemirror-state": "^1.0.0", - "prosemirror-view": "^1.0.0" - } - }, - "prosemirror-history": { - "version": "1.2.0", - "requires": { - "prosemirror-state": "^1.2.2", - "prosemirror-transform": "^1.0.0", - "rope-sequence": "^1.3.0" - } - }, - "prosemirror-keymap": { - "version": "1.1.5", - "requires": { - "prosemirror-state": "^1.0.0", - "w3c-keyname": "^2.2.0" - } - }, - "prosemirror-model": { - "version": "1.16.1", - "requires": { - "orderedmap": "^1.1.0" - } - }, - "prosemirror-schema-list": { - "version": "1.1.6", - "requires": { - "prosemirror-model": "^1.0.0", - "prosemirror-transform": "^1.0.0" - } - }, - "prosemirror-state": { - "version": "1.3.4", - "requires": { - "prosemirror-model": "^1.0.0", - "prosemirror-transform": "^1.0.0" - } - }, - "prosemirror-tables": { - "version": "1.1.1", - "requires": { - "prosemirror-keymap": "^1.1.2", - "prosemirror-model": "^1.8.1", - "prosemirror-state": "^1.3.1", - "prosemirror-transform": "^1.2.1", - "prosemirror-view": "^1.13.3" - } - }, - "prosemirror-transform": { - "version": "1.4.2", - "requires": { - "prosemirror-model": "^1.0.0" - } - }, - "prosemirror-view": { - "version": "1.23.13", - "requires": { - "prosemirror-model": "^1.16.0", - "prosemirror-state": "^1.0.0", - "prosemirror-transform": "^1.1.0" - } - }, "punycode": { "version": "2.1.1", "dev": true @@ -4361,9 +3412,6 @@ "resolve": "^1.9.0" } }, - "remixicon": { - "version": "2.5.0" - }, "resolve": { "version": "1.22.0", "dev": true, @@ -4384,9 +3432,6 @@ "version": "5.0.0", "dev": true }, - "rope-sequence": { - "version": "1.3.2" - }, "safe-buffer": { "version": "5.2.1", "dev": true @@ -4455,9 +3500,6 @@ "version": "3.0.7", "dev": true }, - "sortablejs": { - "version": "1.15.0" - }, "source-map": { "version": "0.6.1", "dev": true @@ -4675,9 +3717,6 @@ "spdx-expression-parse": "^3.0.0" } }, - "w3c-keyname": { - "version": "2.2.4" - }, "watchpack": { "version": "2.3.1", "dev": true, diff --git a/sci-types-project/package.json b/sci-types-project/package.json index 0afd1d9..f37e2fe 100644 --- a/sci-types-project/package.json +++ b/sci-types-project/package.json @@ -20,7 +20,7 @@ "webpack-cli": "^4.8.0" }, "dependencies": { - "@librecms/ccm-cms-editor": "^7.0.0-SNAPSHOT" + }, "targets": { "main": false diff --git a/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ui/SciProjectAuthoringSteps.java b/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ui/SciProjectAuthoringSteps.java index 5ce0ac4..0cf6382 100644 --- a/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ui/SciProjectAuthoringSteps.java +++ b/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ui/SciProjectAuthoringSteps.java @@ -25,7 +25,9 @@ public class SciProjectAuthoringSteps implements MvcAuthoringSteps { @Override public Set> getResourceClasses() { return Set.of( + SciProjectDescriptionStepResources.class, SciProjectDescriptionStepService.class, + SciProjectFundingStepResources.class, SciProjectFundingStepService.class ); } diff --git a/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ui/SciProjectFundingStep.java b/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ui/SciProjectFundingStep.java index b96e601..4fc7d82 100644 --- a/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ui/SciProjectFundingStep.java +++ b/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ui/SciProjectFundingStep.java @@ -153,7 +153,7 @@ public class SciProjectFundingStep extends AbstractMvcAuthoringStep { new Locale(localeParam).toString() ); - return "org/scientificcms/contenttypes/sciproject/ui/sciproject-fundingtext/view.xhtml"; + return "org/scientificcms/contenttypes/sciproject/ui/funding/view.xhtml"; } else { return documentUi.showAccessDenied( getContentSection(), @@ -206,7 +206,7 @@ public class SciProjectFundingStep extends AbstractMvcAuthoringStep { } @GET - @Path("/funding-text/edit") + @Path("/funding-text/edit/{locale}") @Transactional(Transactional.TxType.REQUIRED) @AuthorizationRequired public String editFundingTextValue( @@ -229,7 +229,7 @@ public class SciProjectFundingStep extends AbstractMvcAuthoringStep { new Locale(localeParam).toString() ); - return "org/scientificcms/contenttypes/sciproject/ui/sciproject-fundingtext/edit.xhtml"; + return "org/scientificcms/contenttypes/sciproject/ui/fundingtext/edit.xhtml"; } else { return documentUi.showAccessDenied( getContentSection(), @@ -332,7 +332,7 @@ public class SciProjectFundingStep extends AbstractMvcAuthoringStep { new Locale(localeParam).toString() ); - return "org/scientificcms/contenttypes/sciproject/ui/sciproject-fundingvolume/view.xhtml"; + return "org/scientificcms/contenttypes/sciproject/ui/fundingvolume/view.xhtml"; } else { return documentUi.showAccessDenied( getContentSection(), @@ -385,7 +385,7 @@ public class SciProjectFundingStep extends AbstractMvcAuthoringStep { } @GET - @Path("/funding-volume/edit") + @Path("/funding-volume/edit/{locale}") @Transactional(Transactional.TxType.REQUIRED) @AuthorizationRequired public String editFundingVolumeValue( @@ -408,7 +408,7 @@ public class SciProjectFundingStep extends AbstractMvcAuthoringStep { new Locale(localeParam).toString() ); - return "org/scientificcms/contenttypes/sciproject/ui/sciproject-fundingtext/edit.xhtml"; + return "org/scientificcms/contenttypes/sciproject/ui/fundingvolume/edit.xhtml"; } else { return documentUi.showAccessDenied( getContentSection(), @@ -695,7 +695,7 @@ public class SciProjectFundingStep extends AbstractMvcAuthoringStep { .collect(Collectors.toList()) ); final Set fundingVolumeLocales = getProject() - .getProjectDescription() + .getFundingVolume() .getAvailableLocales(); fundingVolumeModel.setUnusedLocales( globalizationHelper diff --git a/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ui/SciProjectFundingStepResources.java b/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ui/SciProjectFundingStepResources.java index 7e3f157..7163779 100644 --- a/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ui/SciProjectFundingStepResources.java +++ b/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ui/SciProjectFundingStepResources.java @@ -80,7 +80,7 @@ public class SciProjectFundingStepResources { } @GET - @Path("/project-funding/{locale}") + @Path("/funding/{locale}") @Produces(MediaType.TEXT_HTML) @Transactional(Transactional.TxType.REQUIRED) public String viewFundingValue( @@ -117,7 +117,7 @@ public class SciProjectFundingStepResources { } @GET - @Path("/project-fundingvolume/wordcount/{locale}") + @Path("/fundingvolume/wordcount/{locale}") @Produces(MediaType.TEXT_HTML) @Transactional(Transactional.TxType.REQUIRED) public String getFundingVolumeWordCount( @@ -154,7 +154,7 @@ public class SciProjectFundingStepResources { } @GET - @Path("/project-fundingvolume/{locale}") + @Path("/fundingvolume/{locale}") @Produces(MediaType.TEXT_HTML) @Transactional(Transactional.TxType.REQUIRED) public String viewFundingVolumeValue( diff --git a/sci-types-project/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/sciproject/ui/description/edit.xhtml b/sci-types-project/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/sciproject/ui/description/edit.xhtml index 368da4c..b890815 100644 --- a/sci-types-project/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/sciproject/ui/description/edit.xhtml +++ b/sci-types-project/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/sciproject/ui/description/edit.xhtml @@ -29,14 +29,14 @@ objectIdentifier="#{CmsSelectedDocumentModel.itemPath}" selectedLocale="#{SciProjectDescriptionModel.selectedLocale}" title="#{SciProjectMessageBundle['description.editor.header']}" - variantUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@sciproject-description/description/variants" + variantUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@sciproject-description-resources/project-description" /> - + diff --git a/sci-types-project/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/sciproject/ui/fundingtext/edit.xhtml b/sci-types-project/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/sciproject/ui/fundingtext/edit.xhtml index 420157e..facf28d 100644 --- a/sci-types-project/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/sciproject/ui/fundingtext/edit.xhtml +++ b/sci-types-project/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/sciproject/ui/fundingtext/edit.xhtml @@ -29,14 +29,14 @@ objectIdentifier="#{CmsSelectedDocumentModel.itemPath}" selectedLocale="#{SciProjectFundingText.selectedLocale}" title="#{SciProjectMessageBundle['fundingtext.editor.header']}" - variantUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@sciproject-funding/funding-text/variants" + variantUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@sciproject-funding-resources/funding" /> - + diff --git a/sci-types-project/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/sciproject/ui/fundingvolume/edit.xhtml b/sci-types-project/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/sciproject/ui/fundingvolume/edit.xhtml index 2267b1e..e42da89 100644 --- a/sci-types-project/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/sciproject/ui/fundingvolume/edit.xhtml +++ b/sci-types-project/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/sciproject/ui/fundingvolume/edit.xhtml @@ -27,16 +27,16 @@ editMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@sciproject-funding/funding-volume/edit" editorId="sciproject-funding-volume-editor" objectIdentifier="#{CmsSelectedDocumentModel.itemPath}" - selectedLocale="#{SciProjectFundingText.selectedLocale}" + selectedLocale="#{SciProjectFundingVolume.selectedLocale}" title="#{SciProjectMessageBundle['fundingvolume.editor.header']}" - variantUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@sciproject-funding/funding-volume/variants" + variantUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@sciproject-funding-resources/fundingvolume" /> - + diff --git a/sci-types-project/tsconfig.json b/sci-types-project/tsconfig.json index 257cb29..8ac2cc8 100644 --- a/sci-types-project/tsconfig.json +++ b/sci-types-project/tsconfig.json @@ -11,7 +11,7 @@ "outDir": "target/generated-resources/assets/@content-sections", "sourceMap": true, "strict": true, - "target": "ES5" + "target": "ES6" }, "include": [ "src/main/typescript/**/*" diff --git a/sci-types-project/webpack.config.js b/sci-types-project/webpack.config.js index 2ed41de..bc9886c 100644 --- a/sci-types-project/webpack.config.js +++ b/sci-types-project/webpack.config.js @@ -5,10 +5,10 @@ module.exports = { chunkIds: false }, entry: { - "sciproject-description": "./src/main/typescript/sciproject-description.ts", + // "sciproject-description": "./src/main/typescript/sciproject-description.ts", //"sciproject-contacts": "./src/main/typescript/sciproject-contacts.ts", - "sciproject-fundingtext": "./src/main/typescript/sciproject-fundingtext.ts", - "sciproject-fundingvolume": "./src/main/typescript/sciproject-fundingvolume.ts", + // "sciproject-fundingtext": "./src/main/typescript/sciproject-fundingtext.ts", + // "sciproject-fundingvolume": "./src/main/typescript/sciproject-fundingvolume.ts", //"sciproject-sponsoring": "./src/main/typescript/sciproject-sponsoring.ts" }, output: {