From b0169d58ae0dcaf151cf73b2f8b3a74c71275675 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 4 May 2025 18:53:18 +0300 Subject: [PATCH] chore(ckeditor5-admonition): integrate code structure --- .../ckeditor5-admonition/CHANGELOG.md | 4 -- .../ckeditor5-admonition/CONTRIBUTING.md | 4 -- .../packages/ckeditor5-admonition/LICENSE.md | 17 ----- .../packages/ckeditor5-admonition/README.md | 26 -------- .../ckeditor5-metadata.json | 23 ------- .../ckeditor5-admonition/lang/contexts.json | 3 - .../ckeditor5-admonition/package.json | 62 ------------------- .../ckeditor5-admonition/src/admonition.ts | 40 ------------ .../ckeditor5-admonition/src/augmentation.ts | 23 ------- .../ckeditor5-admonition/src/index.ts | 16 ----- .../ckeditor5-admonition/tsconfig.dist.json | 12 ---- .../ckeditor5-admonition/tsconfig.json | 10 --- .../ckeditor5-admonition/webpack.config.cjs | 19 ------ .../ckeditor5-metadata.json | 9 ++- .../ckeditor5-admonition/lang/contexts.json | 2 +- .../ckeditor5-admonition/lang}/en.po | 0 packages/ckeditor5-admonition/package.json | 7 ++- .../ckeditor5-admonition/src/admonition.ts | 12 +++- .../src/admonitionautoformat.ts | 7 +-- .../src/admonitioncommand.ts | 5 +- .../src/admonitionediting.ts | 10 +-- .../ckeditor5-admonition/src/admonitionui.ts | 16 ++--- .../ckeditor5-admonition/src/augmentation.ts | 10 +++ packages/ckeditor5-admonition/src/index.ts | 5 ++ .../ckeditor5-admonition/theme/blockquote.css | 0 .../theme/icons/admonition.svg | 0 .../theme/icons/ckeditor.svg | 1 - 27 files changed, 56 insertions(+), 287 deletions(-) delete mode 100644 _regroup/ckeditor5-admonition/packages/ckeditor5-admonition/CHANGELOG.md delete mode 100644 _regroup/ckeditor5-admonition/packages/ckeditor5-admonition/CONTRIBUTING.md delete mode 100644 _regroup/ckeditor5-admonition/packages/ckeditor5-admonition/LICENSE.md delete mode 100644 _regroup/ckeditor5-admonition/packages/ckeditor5-admonition/README.md delete mode 100644 _regroup/ckeditor5-admonition/packages/ckeditor5-admonition/ckeditor5-metadata.json delete mode 100644 _regroup/ckeditor5-admonition/packages/ckeditor5-admonition/lang/contexts.json delete mode 100644 _regroup/ckeditor5-admonition/packages/ckeditor5-admonition/package.json delete mode 100644 _regroup/ckeditor5-admonition/packages/ckeditor5-admonition/src/admonition.ts delete mode 100644 _regroup/ckeditor5-admonition/packages/ckeditor5-admonition/src/augmentation.ts delete mode 100644 _regroup/ckeditor5-admonition/packages/ckeditor5-admonition/src/index.ts delete mode 100644 _regroup/ckeditor5-admonition/packages/ckeditor5-admonition/tsconfig.dist.json delete mode 100644 _regroup/ckeditor5-admonition/packages/ckeditor5-admonition/tsconfig.json delete mode 100644 _regroup/ckeditor5-admonition/packages/ckeditor5-admonition/webpack.config.cjs rename {_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/lang/translations => packages/ckeditor5-admonition/lang}/en.po (100%) rename {_regroup/ckeditor5-admonition/packages => packages}/ckeditor5-admonition/src/admonitionautoformat.ts (81%) rename {_regroup/ckeditor5-admonition/packages => packages}/ckeditor5-admonition/src/admonitioncommand.ts (98%) rename {_regroup/ckeditor5-admonition/packages => packages}/ckeditor5-admonition/src/admonitionediting.ts (94%) rename {_regroup/ckeditor5-admonition/packages => packages}/ckeditor5-admonition/src/admonitionui.ts (83%) rename {_regroup/ckeditor5-admonition/packages => packages}/ckeditor5-admonition/theme/blockquote.css (100%) rename {_regroup/ckeditor5-admonition/packages => packages}/ckeditor5-admonition/theme/icons/admonition.svg (100%) delete mode 100644 packages/ckeditor5-admonition/theme/icons/ckeditor.svg diff --git a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/CHANGELOG.md b/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/CHANGELOG.md deleted file mode 100644 index 01711a3f7..000000000 --- a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/CHANGELOG.md +++ /dev/null @@ -1,4 +0,0 @@ -Changelog -========= - -All changes in the package are documented in https://github.com/ckeditor/ckeditor5/blob/master/CHANGELOG.md. diff --git a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/CONTRIBUTING.md b/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/CONTRIBUTING.md deleted file mode 100644 index ae3ecb8ff..000000000 --- a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/CONTRIBUTING.md +++ /dev/null @@ -1,4 +0,0 @@ -Contributing -======================================== - -See the [official contributors' guide to CKEditor 5](https://ckeditor.com/docs/ckeditor5/latest/framework/contributing/contributing.html) to learn more. diff --git a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/LICENSE.md b/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/LICENSE.md deleted file mode 100644 index 106d679d4..000000000 --- a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/LICENSE.md +++ /dev/null @@ -1,17 +0,0 @@ -Software License Agreement -========================== - -**CKEditor 5 block quote feature** – https://github.com/ckeditor/ckeditor5-block-quote
-Copyright (c) 2003–2024, [CKSource Holding sp. z o.o.](https://cksource.com) All rights reserved. - -Licensed under the terms of [GNU General Public License Version 2 or later](http://www.gnu.org/licenses/gpl.html). - -Sources of Intellectual Property Included in CKEditor ------------------------------------------------------ - -Where not otherwise indicated, all CKEditor content is authored by CKSource engineers and consists of CKSource-owned intellectual property. In some specific instances, CKEditor will incorporate work done by developers outside of CKSource with their express permission. - -Trademarks ----------- - -**CKEditor** is a trademark of [CKSource Holding sp. z o.o.](https://cksource.com) All other brand and product names are trademarks, registered trademarks, or service marks of their respective holders. diff --git a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/README.md b/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/README.md deleted file mode 100644 index 71656077a..000000000 --- a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/README.md +++ /dev/null @@ -1,26 +0,0 @@ -CKEditor 5 block quote feature -======================================== - -[![npm version](https://badge.fury.io/js/%40ckeditor%2Fckeditor5-block-quote.svg)](https://www.npmjs.com/package/@ckeditor/ckeditor5-block-quote) -[![Coverage Status](https://coveralls.io/repos/github/ckeditor/ckeditor5/badge.svg?branch=master)](https://coveralls.io/github/ckeditor/ckeditor5?branch=master) -[![Build Status](https://travis-ci.com/ckeditor/ckeditor5.svg?branch=master)](https://app.travis-ci.com/github/ckeditor/ckeditor5) - -This package implements block quote support for CKEditor 5. - -## Demo - -Check out the [demo in the block quote feature guide](https://ckeditor.com/docs/ckeditor5/latest/features/block-quote.html#demo). - -## Documentation - -See the [`@ckeditor/ckeditor5-block-quote` package](https://ckeditor.com/docs/ckeditor5/latest/api/block-quote.html) page in [CKEditor 5 documentation](https://ckeditor.com/docs/ckeditor5/latest/). - -## Installation - -```bash -npm install ckeditor5 -``` - -## License - -Licensed under the terms of [GNU General Public License Version 2 or later](http://www.gnu.org/licenses/gpl.html). For full details about the license, please check the `LICENSE.md` file or [https://ckeditor.com/legal/ckeditor-oss-license](https://ckeditor.com/legal/ckeditor-oss-license). diff --git a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/ckeditor5-metadata.json b/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/ckeditor5-metadata.json deleted file mode 100644 index 3218dff50..000000000 --- a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/ckeditor5-metadata.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "plugins": [ - { - "name": "Admonitions", - "className": "Admonition", - "description": "Implements admonitions (warning, info boxes) in a similar fashion to blockquotes", - "docs": "features/block-quote.html", - "path": "src/admonition.js", - "uiComponents": [ - { - "type": "Button", - "name": "admonition", - "iconPath": "theme/icons/admonition.svg" - } - ], - "htmlOutput": [ - { - "elements": "aside" - } - ] - } - ] -} diff --git a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/lang/contexts.json b/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/lang/contexts.json deleted file mode 100644 index 421249ff6..000000000 --- a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/lang/contexts.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "Admonition": "Toolbar button tooltip for the Admonition feature." -} diff --git a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/package.json b/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/package.json deleted file mode 100644 index e93c8fdfc..000000000 --- a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/package.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "name": "@ckeditor/ckeditor5-admonition", - "version": "43.2.0", - "description": "Admonition (info box, warning box) feature for CKEditor 5.", - "keywords": [ - "ckeditor", - "ckeditor5", - "ckeditor 5", - "ckeditor5-feature", - "ckeditor5-plugin", - "ckeditor5-dll" - ], - "type": "module", - "main": "src/index.ts", - "dependencies": { - "@ckeditor/ckeditor5-core": "43.2.0", - "@ckeditor/ckeditor5-enter": "43.2.0", - "@ckeditor/ckeditor5-typing": "43.2.0", - "@ckeditor/ckeditor5-ui": "43.2.0", - "@ckeditor/ckeditor5-utils": "43.2.0", - "ckeditor5": "43.2.0" - }, - "devDependencies": { - "@ckeditor/ckeditor5-basic-styles": "43.2.0", - "@ckeditor/ckeditor5-dev-utils": "^43.0.0", - "@ckeditor/ckeditor5-editor-classic": "43.2.0", - "@ckeditor/ckeditor5-engine": "43.2.0", - "@ckeditor/ckeditor5-heading": "43.2.0", - "@ckeditor/ckeditor5-image": "43.2.0", - "@ckeditor/ckeditor5-list": "43.2.0", - "@ckeditor/ckeditor5-paragraph": "43.2.0", - "@ckeditor/ckeditor5-table": "43.2.0", - "@ckeditor/ckeditor5-theme-lark": "43.2.0", - "typescript": "5.0.4", - "webpack": "^5.94.0", - "webpack-cli": "^5.1.4" - }, - "author": "CKSource (http://cksource.com/)", - "license": "GPL-2.0-or-later", - "homepage": "https://ckeditor.com/ckeditor-5", - "bugs": "https://github.com/ckeditor/ckeditor5/issues", - "repository": { - "type": "git", - "url": "https://github.com/ckeditor/ckeditor5.git", - "directory": "packages/ckeditor5-admonition" - }, - "files": [ - "dist", - "lang", - "src/**/*.js", - "src/**/*.d.ts", - "theme", - "build", - "ckeditor5-metadata.json", - "CHANGELOG.md" - ], - "scripts": { - "dll:build": "webpack", - "build": "tsc -p ./tsconfig.json", - "build:dist": "node ../../scripts/build-package.mjs" - } -} diff --git a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/src/admonition.ts b/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/src/admonition.ts deleted file mode 100644 index b09dfb78d..000000000 --- a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/src/admonition.ts +++ /dev/null @@ -1,40 +0,0 @@ -/** - * @license Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved. - * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license - */ - -/** - * @module admonition/admonition - */ - -import { Plugin } from 'ckeditor5/src/core.js'; - -import AdmonitionEditing from './admonitionediting.js'; -import AdmonitionUI from './admonitionui.js'; -import AdmonitionAutoformat from './admonitionautoformat.js'; - -/** - * The block quote plugin. - * - * For more information about this feature check the {@glink api/block-quote package page}. - * - * This is a "glue" plugin which loads the {@link module:block-quote/blockquoteediting~BlockQuoteEditing block quote editing feature} - * and {@link module:block-quote/blockquoteui~BlockQuoteUI block quote UI feature}. - * - * @extends module:core/plugin~Plugin - */ -export default class Admonition extends Plugin { - /** - * @inheritDoc - */ - public static get requires() { - return [ AdmonitionEditing, AdmonitionUI, AdmonitionAutoformat ] as const; - } - - /** - * @inheritDoc - */ - public static get pluginName() { - return 'Admonition' as const; - } -} diff --git a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/src/augmentation.ts b/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/src/augmentation.ts deleted file mode 100644 index 5bf87e70e..000000000 --- a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/src/augmentation.ts +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @license Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved. - * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license - */ - -import type { - Admonition, - AdmonitionCommand, - AdmonitionEditing, - AdmonitionUI -} from './index.js'; - -declare module '@ckeditor/ckeditor5-core' { - interface PluginsMap { - [ Admonition.pluginName ]: Admonition; - [ AdmonitionEditing.pluginName ]: AdmonitionEditing; - [ AdmonitionUI.pluginName ]: AdmonitionUI; - } - - interface CommandsMap { - admonition: AdmonitionCommand; - } -} diff --git a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/src/index.ts b/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/src/index.ts deleted file mode 100644 index 073365f5d..000000000 --- a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/src/index.ts +++ /dev/null @@ -1,16 +0,0 @@ -/** - * @license Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved. - * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license - */ - -/** - * @module admonition - */ - -export { default as Admonition } from './admonition.js'; -export { default as AdmonitionEditing } from './admonitionediting.js'; -export { default as AdmonitionUI } from './admonitionui.js'; -export { default as AdmonitionAutoformat } from './admonitionautoformat.js'; -export type { default as AdmonitionCommand } from './admonitioncommand.js'; - -import './augmentation.js'; diff --git a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/tsconfig.dist.json b/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/tsconfig.dist.json deleted file mode 100644 index d8e5823ec..000000000 --- a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/tsconfig.dist.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "extends": "../../tsconfig.dist.json", - "compilerOptions": { - "rootDir": "src", - "types": [ - "../../typings/types" - ] - }, - "include": [ - "src" - ] -} diff --git a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/tsconfig.json b/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/tsconfig.json deleted file mode 100644 index 06d45c898..000000000 --- a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig.release.json", - "include": [ - "src", - "../../typings" - ], - "exclude": [ - "tests" - ] -} diff --git a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/webpack.config.cjs b/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/webpack.config.cjs deleted file mode 100644 index 04e3af7a4..000000000 --- a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/webpack.config.cjs +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @license Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved. - * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license - */ - -'use strict'; - -/* eslint-env node */ - -const { builds } = require( '@ckeditor/ckeditor5-dev-utils' ); -const webpack = require( 'webpack' ); - -module.exports = builds.getDllPluginWebpackConfig( webpack, { - themePath: require.resolve( '@ckeditor/ckeditor5-theme-lark' ), - packagePath: __dirname, - manifestPath: require.resolve( 'ckeditor5/build/ckeditor5-dll.manifest.json' ), - isDevelopmentMode: process.argv.includes( '--mode=development' ), - tsconfigPath: require.resolve( 'ckeditor5/tsconfig.dll.json' ) -} ); diff --git a/packages/ckeditor5-admonition/ckeditor5-metadata.json b/packages/ckeditor5-admonition/ckeditor5-metadata.json index 9306df40a..a0fb3a623 100644 --- a/packages/ckeditor5-admonition/ckeditor5-metadata.json +++ b/packages/ckeditor5-admonition/ckeditor5-metadata.json @@ -3,7 +3,7 @@ { "name": "Admonition", "className": "Admonition", - "description": "Adds text to the editor.", + "description": "Implements admonitions (warning, info boxes) in a similar fashion to blockquotes", "path": "src/admonition.ts", "uiComponents": [ { @@ -11,7 +11,12 @@ "type": "Button", "iconPath": "theme/icons/ckeditor.svg" } - ] + ], + "htmlOutput": [ + { + "elements": "aside" + } + ] } ] } diff --git a/packages/ckeditor5-admonition/lang/contexts.json b/packages/ckeditor5-admonition/lang/contexts.json index 92bc704a4..421249ff6 100644 --- a/packages/ckeditor5-admonition/lang/contexts.json +++ b/packages/ckeditor5-admonition/lang/contexts.json @@ -1,3 +1,3 @@ { - "Admonition": "Content for a tooltip is displayed when a user hovers the CKEditor 5 icon." + "Admonition": "Toolbar button tooltip for the Admonition feature." } diff --git a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/lang/translations/en.po b/packages/ckeditor5-admonition/lang/en.po similarity index 100% rename from _regroup/ckeditor5-admonition/packages/ckeditor5-admonition/lang/translations/en.po rename to packages/ckeditor5-admonition/lang/en.po diff --git a/packages/ckeditor5-admonition/package.json b/packages/ckeditor5-admonition/package.json index 61c713548..c306a50c9 100644 --- a/packages/ckeditor5-admonition/package.json +++ b/packages/ckeditor5-admonition/package.json @@ -1,7 +1,7 @@ { "name": "@triliumnext/ckeditor5-admonition", - "version": "0.0.1", - "description": "A plugin for CKEditor 5.", + "version": "1.0.0", + "description": "Admonition (info box, warning box) feature for CKEditor 5.", "keywords": [ "ckeditor", "ckeditor5", @@ -23,7 +23,6 @@ "./browser/*": null, "./package.json": "./package.json" }, - "license": "MIT", "engines": { "node": ">=18.0.0", "npm": ">=5.7.1" @@ -59,6 +58,8 @@ "peerDependencies": { "ckeditor5": "43.2.0" }, + "author": "Elian Doran ", + "license": "GPL-2.0-or-later", "scripts": { "build:dist": "node ./scripts/build-dist.mjs", "ts:build": "tsc -p ./tsconfig.release.json", diff --git a/packages/ckeditor5-admonition/src/admonition.ts b/packages/ckeditor5-admonition/src/admonition.ts index 336f106d2..edc31357d 100644 --- a/packages/ckeditor5-admonition/src/admonition.ts +++ b/packages/ckeditor5-admonition/src/admonition.ts @@ -1,8 +1,16 @@ import { Plugin, ButtonView } from 'ckeditor5'; -import ckeditor5Icon from '../theme/icons/ckeditor.svg'; +import admonitionIcon from '../theme/icons/admonition.svg'; +import AdmonitionEditing from './admonitionediting.js'; +import AdmonitionUI from './admonitionui.js'; +import AdmonitionAutoformat from './admonitionautoformat.js'; export default class Admonition extends Plugin { + + public static get requires() { + return [ AdmonitionEditing, AdmonitionUI, AdmonitionAutoformat ] as const; + } + public static get pluginName() { return 'Admonition' as const; } @@ -18,7 +26,7 @@ export default class Admonition extends Plugin { view.set( { label: t( 'Admonition' ), - icon: ckeditor5Icon, + icon: admonitionIcon, tooltip: true } ); diff --git a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/src/admonitionautoformat.ts b/packages/ckeditor5-admonition/src/admonitionautoformat.ts similarity index 81% rename from _regroup/ckeditor5-admonition/packages/ckeditor5-admonition/src/admonitionautoformat.ts rename to packages/ckeditor5-admonition/src/admonitionautoformat.ts index ac104a845..9179aabaa 100644 --- a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/src/admonitionautoformat.ts +++ b/packages/ckeditor5-admonition/src/admonitionautoformat.ts @@ -1,7 +1,5 @@ -import Plugin from "@ckeditor/ckeditor5-core/src/plugin"; -import Autoformat from "@ckeditor/ckeditor5-autoformat/src/autoformat"; -import blockAutoformatEditing from "@ckeditor/ckeditor5-autoformat/src/blockautoformatediting"; -import { AdmonitionType, ADMONITION_TYPES } from "./admonitioncommand"; +import { Autoformat, blockAutoformatEditing, Plugin } from "ckeditor5"; +import { AdmonitionType, ADMONITION_TYPES } from "./admonitioncommand.js"; function tryParseAdmonitionType(match: RegExpMatchArray) { if (match.length !== 2) { @@ -14,6 +12,7 @@ function tryParseAdmonitionType(match: RegExpMatchArray) { } export default class AdmonitionAutoformat extends Plugin { + static get requires() { return [ Autoformat ]; } diff --git a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/src/admonitioncommand.ts b/packages/ckeditor5-admonition/src/admonitioncommand.ts similarity index 98% rename from _regroup/ckeditor5-admonition/packages/ckeditor5-admonition/src/admonitioncommand.ts rename to packages/ckeditor5-admonition/src/admonitioncommand.ts index c9a6cae49..27381cd52 100644 --- a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/src/admonitioncommand.ts +++ b/packages/ckeditor5-admonition/src/admonitioncommand.ts @@ -7,9 +7,8 @@ * @module admonition/admonitioncommand */ -import { Command } from 'ckeditor5/src/core.js'; -import { first } from 'ckeditor5/src/utils.js'; -import type { DocumentFragment, Element, Position, Range, Schema, Writer } from 'ckeditor5/src/engine.js'; +import { Command, first } from 'ckeditor5'; +import type { DocumentFragment, Element, Position, Range, Schema, Writer } from 'ckeditor5'; /** * The block quote command plugin. diff --git a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/src/admonitionediting.ts b/packages/ckeditor5-admonition/src/admonitionediting.ts similarity index 94% rename from _regroup/ckeditor5-admonition/packages/ckeditor5-admonition/src/admonitionediting.ts rename to packages/ckeditor5-admonition/src/admonitionediting.ts index 6af25b965..30fa26029 100644 --- a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/src/admonitionediting.ts +++ b/packages/ckeditor5-admonition/src/admonitionediting.ts @@ -7,10 +7,7 @@ * @module admonition/admonitionediting */ -import { Plugin } from 'ckeditor5/src/core.js'; -import { Enter, type ViewDocumentEnterEvent } from 'ckeditor5/src/enter.js'; -import { Delete, type ViewDocumentDeleteEvent } from 'ckeditor5/src/typing.js'; - +import { Delete, Enter, Plugin, ViewDocumentDeleteEvent, ViewDocumentEnterEvent } from 'ckeditor5'; import AdmonitionCommand, { AdmonitionType, ADMONITION_TYPES, DEFAULT_ADMONITION_TYPE, ADMONITION_TYPE_ATTRIBUTE } from './admonitioncommand.js'; /** @@ -136,7 +133,10 @@ export default class AdmonitionEditing extends Plugin { const viewDocument = this.editor.editing.view.document; const selection = editor.model.document.selection; - const admonitionCommand: AdmonitionCommand = editor.commands.get( 'admonition' )!; + const admonitionCommand = editor.commands.get( 'admonition' ); + if (!admonitionCommand) { + return; + } // Overwrite default Enter key behavior. // If Enter key is pressed with selection collapsed in empty block inside a quote, break the quote. diff --git a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/src/admonitionui.ts b/packages/ckeditor5-admonition/src/admonitionui.ts similarity index 83% rename from _regroup/ckeditor5-admonition/packages/ckeditor5-admonition/src/admonitionui.ts rename to packages/ckeditor5-admonition/src/admonitionui.ts index 6e5b779fe..c02cd595e 100644 --- a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/src/admonitionui.ts +++ b/packages/ckeditor5-admonition/src/admonitionui.ts @@ -7,13 +7,12 @@ * @module admonition/admonitionui */ -import { Plugin, } from 'ckeditor5/src/core.js'; -import { addListToDropdown, createDropdown, ListDropdownButtonDefinition, SplitButtonView, ViewModel } from 'ckeditor5/src/ui.js'; +import { Plugin, addListToDropdown, createDropdown, ListDropdownItemDefinition, SplitButtonView, ViewModel } from 'ckeditor5'; import '../theme/blockquote.css'; import admonitionIcon from '../theme/icons/admonition.svg'; -import { Collection } from '@ckeditor/ckeditor5-utils'; -import AdmonitionCommand, { AdmonitionType } from './admonitioncommand'; +import { AdmonitionType } from './admonitioncommand.js'; +import { Collection } from 'ckeditor5'; interface AdmonitionDefinition { title: string; @@ -102,11 +101,14 @@ export default class AdmonitionUI extends Plugin { } private _getDropdownItems() { - const itemDefinitions = new Collection(); - const command = this.editor.commands.get("admonition") as AdmonitionCommand + const itemDefinitions = new Collection(); + const command = this.editor.commands.get("admonition"); + if (!command) { + return itemDefinitions; + } for (const [ type, admonition ] of Object.entries(ADMONITION_TYPES)) { - const definition: ListDropdownButtonDefinition = { + const definition: ListDropdownItemDefinition = { type: "button", model: new ViewModel({ commandParam: type, diff --git a/packages/ckeditor5-admonition/src/augmentation.ts b/packages/ckeditor5-admonition/src/augmentation.ts index aa634b7b2..200ee650b 100644 --- a/packages/ckeditor5-admonition/src/augmentation.ts +++ b/packages/ckeditor5-admonition/src/augmentation.ts @@ -1,7 +1,17 @@ +import AdmonitionCommand from './admonitioncommand.js'; +import AdmonitionEditing from './admonitionediting.js'; +import AdmonitionUI from './admonitionui.js'; import type { Admonition } from './index.js'; declare module 'ckeditor5' { interface PluginsMap { [ Admonition.pluginName ]: Admonition; + [ AdmonitionEditing.pluginName ]: AdmonitionEditing; + [ AdmonitionUI.pluginName ]: AdmonitionUI; } + + interface CommandsMap { + admonition: AdmonitionCommand; + } + } diff --git a/packages/ckeditor5-admonition/src/index.ts b/packages/ckeditor5-admonition/src/index.ts index 939fa8314..0242a34fa 100644 --- a/packages/ckeditor5-admonition/src/index.ts +++ b/packages/ckeditor5-admonition/src/index.ts @@ -1,7 +1,12 @@ import ckeditor from './../theme/icons/ckeditor.svg'; import './augmentation.js'; +import "../theme/blockquote.css"; export { default as Admonition } from './admonition.js'; +export { default as AdmonitionEditing } from './admonitionediting.js'; +export { default as AdmonitionUI } from './admonitionui.js'; +export { default as AdmonitionAutoformat } from './admonitionautoformat.js'; +export type { default as AdmonitionCommand } from './admonitioncommand.js'; export const icons = { ckeditor diff --git a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/theme/blockquote.css b/packages/ckeditor5-admonition/theme/blockquote.css similarity index 100% rename from _regroup/ckeditor5-admonition/packages/ckeditor5-admonition/theme/blockquote.css rename to packages/ckeditor5-admonition/theme/blockquote.css diff --git a/_regroup/ckeditor5-admonition/packages/ckeditor5-admonition/theme/icons/admonition.svg b/packages/ckeditor5-admonition/theme/icons/admonition.svg similarity index 100% rename from _regroup/ckeditor5-admonition/packages/ckeditor5-admonition/theme/icons/admonition.svg rename to packages/ckeditor5-admonition/theme/icons/admonition.svg diff --git a/packages/ckeditor5-admonition/theme/icons/ckeditor.svg b/packages/ckeditor5-admonition/theme/icons/ckeditor.svg deleted file mode 100644 index 25436f4b8..000000000 --- a/packages/ckeditor5-admonition/theme/icons/ckeditor.svg +++ /dev/null @@ -1 +0,0 @@ -