From 9cd89f77a0eb6ebabd15303958d6758683c1efaf Mon Sep 17 00:00:00 2001 From: Karl Kemister-Sheppard Date: Tue, 5 Dec 2023 16:55:50 +1000 Subject: [PATCH 1/7] DOC-2228: Updates to bundling with js, to bundling with es6+vite. --- modules/ROOT/pages/vite-es6-npm.adoc | 2 - .../module-loading/bundling-plugin-files.adoc | 4 ++ .../bundling-plugin-language-files.adoc | 45 +++++++++++++++ .../bundling-plugins-that-cant-bundle.adoc | 2 +- .../bundling-vite-es6-npm_editor.adoc | 15 ++--- .../plugin-file-list-a11ychecker.adoc | 57 ++++++------------- .../plugin-file-list-advcode.adoc | 19 ++++++- .../plugin-file-list-advlist.adoc | 6 +- .../plugin-file-list-advtable.adoc | 44 ++------------ .../plugin-files/plugin-file-list-anchor.adoc | 6 +- .../plugin-file-list-autocorrect.adoc | 44 ++------------ .../plugin-file-list-autolink.adoc | 6 +- .../plugin-file-list-autoresize.adoc | 6 +- .../plugin-file-list-autosave.adoc | 6 +- .../plugin-file-list-casechange.adoc | 6 +- .../plugin-file-list-charmap.adoc | 6 +- .../plugin-file-list-checklist.adoc | 6 +- .../plugin-files/plugin-file-list-code.adoc | 6 +- .../plugin-file-list-codesample.adoc | 6 +- .../plugin-file-list-directionality.adoc | 6 +- .../plugin-file-list-editimage.adoc | 44 ++------------ .../plugin-file-list-emoticons.adoc | 8 ++- .../plugin-files/plugin-file-list-export.adoc | 46 ++------------- .../plugin-file-list-footnotes.adoc | 44 ++------------ .../plugin-file-list-formatpainter.adoc | 6 +- .../plugin-file-list-fullscreen.adoc | 6 +- .../plugin-files/plugin-file-list-help.adoc | 6 +- .../plugin-files/plugin-file-list-image.adoc | 6 +- .../plugin-file-list-importcss.adoc | 6 +- .../plugin-file-list-insertdatetime.adoc | 6 +- .../plugin-files/plugin-file-list-link.adoc | 6 +- .../plugin-file-list-linkchecker.adoc | 19 ++++++- .../plugin-files/plugin-file-list-lists.adoc | 6 +- .../plugin-files/plugin-file-list-media.adoc | 6 +- .../plugin-file-list-mediaembed.adoc | 19 ++++++- .../plugin-file-list-mentions.adoc | 19 ++++++- .../plugin-file-list-mergetags.adoc | 44 ++------------ .../plugin-file-list-nonbreaking.adoc | 6 +- .../plugin-file-list-pagebreak.adoc | 6 +- .../plugin-file-list-pageembed.adoc | 19 ++++++- .../plugin-file-list-permanentpen.adoc | 6 +- .../plugin-file-list-powerpaste.adoc | 44 ++------------ .../plugin-file-list-preview.adoc | 6 +- .../plugin-file-list-quickbars.adoc | 6 +- .../plugin-files/plugin-file-list-save.adoc | 6 +- .../plugin-file-list-searchreplace.adoc | 6 +- .../plugin-files/plugin-file-list-table.adoc | 6 +- .../plugin-file-list-tableofcontents.adoc | 44 ++------------ .../plugin-file-list-template.adoc | 6 +- .../plugin-file-list-tinycomments.adoc | 57 ++++++------------- .../plugin-file-list-tinymcespellchecker.adoc | 44 ++------------ .../plugin-file-list-visualblocks.adoc | 6 +- .../plugin-file-list-visualchars.adoc | 6 +- .../plugin-file-list-wordcount.adoc | 6 +- 54 files changed, 338 insertions(+), 537 deletions(-) create mode 100644 modules/ROOT/partials/module-loading/bundling-plugin-language-files.adoc diff --git a/modules/ROOT/pages/vite-es6-npm.adoc b/modules/ROOT/pages/vite-es6-npm.adoc index 0d871c6d52..2d8c93d9e7 100644 --- a/modules/ROOT/pages/vite-es6-npm.adoc +++ b/modules/ROOT/pages/vite-es6-npm.adoc @@ -25,8 +25,6 @@ include::partial$module-loading/webpack-dev-dependencies.adoc[] include::partial$module-loading/bundling-vite-es6-npm_editor.adoc[] -NOTE: If using {productname} premium skins, run **`@tiny-premium/oxide-premium-skins`** to install the dependency's. - include::partial$module-loading/bundling-vite-es6-npm_config.adoc[] . Import the index.js file in the index.html page, such as: diff --git a/modules/ROOT/partials/module-loading/bundling-plugin-files.adoc b/modules/ROOT/partials/module-loading/bundling-plugin-files.adoc index f10d3281f5..68a68c932b 100644 --- a/modules/ROOT/partials/module-loading/bundling-plugin-files.adoc +++ b/modules/ROOT/partials/module-loading/bundling-plugin-files.adoc @@ -326,3 +326,7 @@ include::partial$plugin-files/plugin-file-list-visualchars.adoc[] === Word Count (`+wordcount+`) include::partial$plugin-files/plugin-file-list-wordcount.adoc[] + + +[[bundling-plugin-language-files]] +include::partial$module-loading/bundling-plugin-language-files.adoc[] \ No newline at end of file diff --git a/modules/ROOT/partials/module-loading/bundling-plugin-language-files.adoc b/modules/ROOT/partials/module-loading/bundling-plugin-language-files.adoc new file mode 100644 index 0000000000..c781a07004 --- /dev/null +++ b/modules/ROOT/partials/module-loading/bundling-plugin-language-files.adoc @@ -0,0 +1,45 @@ +== Plugin language files + +IMPORTANT: Replace `` with the specific plugin name when adding the language files to your config. + +[source, js] +---- +./plugins//langs/ar.js +./plugins//langs/bg_BG.js +./plugins//langs/ca.js +./plugins//langs/cs.js +./plugins//langs/da.js +./plugins//langs/de.js +./plugins//langs/el.js +./plugins//langs/es.js +./plugins//langs/eu.js +./plugins//langs/fa.js +./plugins//langs/fi.js +./plugins//langs/fr_FR.js +./plugins//langs/he_IL.js +./plugins//langs/hi.js +./plugins//langs/hr.js +./plugins//langs/hu_HU.js +./plugins//langs/id.js +./plugins//langs/it.js +./plugins//langs/ja.js +./plugins//langs/kk.js +./plugins//langs/ko_KR.js +./plugins//langs/ms.js +./plugins//langs/nb_NO.js +./plugins//langs/nl.js +./plugins//langs/pl.js +./plugins//langs/pt_BR.js +./plugins//langs/pt_PT.js +./plugins//langs/ro.js +./plugins//langs/ru.js +./plugins//langs/sk.js +./plugins//langs/sl_SI.js +./plugins//langs/sv_SE.js +./plugins//langs/th_TH.js +./plugins//langs/tr.js +./plugins//langs/uk.js +./plugins//langs/vi.js +./plugins//langs/zh_CN.js +./plugins//langs/zh_TW.js +---- \ No newline at end of file diff --git a/modules/ROOT/partials/module-loading/bundling-plugins-that-cant-bundle.adoc b/modules/ROOT/partials/module-loading/bundling-plugins-that-cant-bundle.adoc index 32a3e3e152..aab43893c8 100644 --- a/modules/ROOT/partials/module-loading/bundling-plugins-that-cant-bundle.adoc +++ b/modules/ROOT/partials/module-loading/bundling-plugins-that-cant-bundle.adoc @@ -1,6 +1,6 @@ [IMPORTANT] ==== -The following premium plugins *can not* be bundled at this time: +The following premium plugins *can not* be bundled if the {productname} version is earlier than **6.8.0**. However, if the {productname} version is **v6.8.0** or **later**, the following premium plugins can be bundled: * Accessibility Checker (`+a11ychecker+`) * Advanced Code (`+advcode+`) diff --git a/modules/ROOT/partials/module-loading/bundling-vite-es6-npm_editor.adoc b/modules/ROOT/partials/module-loading/bundling-vite-es6-npm_editor.adoc index fe28988c82..176d1caed3 100644 --- a/modules/ROOT/partials/module-loading/bundling-vite-es6-npm_editor.adoc +++ b/modules/ROOT/partials/module-loading/bundling-vite-es6-npm_editor.adoc @@ -1,7 +1,9 @@ . Create a new source file for importing the required components from {productname} and configuring the editor. + include::partial$module-loading/bundling-required-components.adoc[] -+ + +NOTE: This example will only work for {productname} 6.8.0 and later. + Example `+src/editor.js+` + [source,js] @@ -40,19 +42,14 @@ import contentUiSkinCss from 'tinymce/skins/ui/oxide/content.js'; /* The default content CSS can be changed or replaced with appropriate CSS for the editor content. */ import contentCss from 'tinymce/skins/content/default/content.js'; -/* Import Premium Skins can be changes by uncommenting the below example and updating the skin_url and content_css values */ -/* import '@tiny-premium/oxide-premium-skins/build/skins/ui/material-outline/skin.js' */ -/* import '@tiny-premium/oxide-premium-skins/build/skins/ui/material-outline/content.js' */ -/* import '@tiny-premium/oxide-premium-skins/build/skins/content/material-outline/content.js' */ - /* Initialize TinyMCE */ export function render () { tinymce.init({ selector: 'textarea#editor', plugins: 'advlist code emoticons link lists table', toolbar: 'bold italic | bullist numlist | link emoticons', - skin_url: 'default', /* material-outline */ - content_css: 'default', /* material-outline */ + skin_url: 'default', + content_css: 'default', }); }; ----- +---- \ No newline at end of file diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-a11ychecker.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-a11ychecker.adoc index 4d9a4f529f..1c0deb656c 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-a11ychecker.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-a11ychecker.adoc @@ -1,42 +1,17 @@ -.... -./plugins/a11ychecker/css/annotations.css -./plugins/a11ychecker/langs/ar.js -./plugins/a11ychecker/langs/bg_BG.js -./plugins/a11ychecker/langs/ca.js -./plugins/a11ychecker/langs/cs.js -./plugins/a11ychecker/langs/da.js -./plugins/a11ychecker/langs/de.js -./plugins/a11ychecker/langs/el.js -./plugins/a11ychecker/langs/es.js -./plugins/a11ychecker/langs/eu.js -./plugins/a11ychecker/langs/fa.js -./plugins/a11ychecker/langs/fi.js -./plugins/a11ychecker/langs/fr_FR.js -./plugins/a11ychecker/langs/he_IL.js -./plugins/a11ychecker/langs/hi.js -./plugins/a11ychecker/langs/hr.js -./plugins/a11ychecker/langs/hu_HU.js -./plugins/a11ychecker/langs/id.js -./plugins/a11ychecker/langs/it.js -./plugins/a11ychecker/langs/ja.js -./plugins/a11ychecker/langs/kk.js -./plugins/a11ychecker/langs/ko_KR.js -./plugins/a11ychecker/langs/ms.js -./plugins/a11ychecker/langs/nb_NO.js -./plugins/a11ychecker/langs/nl.js -./plugins/a11ychecker/langs/pl.js -./plugins/a11ychecker/langs/pt_BR.js -./plugins/a11ychecker/langs/pt_PT.js -./plugins/a11ychecker/langs/ro.js -./plugins/a11ychecker/langs/ru.js -./plugins/a11ychecker/langs/sk.js -./plugins/a11ychecker/langs/sl_SI.js -./plugins/a11ychecker/langs/sv_SE.js -./plugins/a11ychecker/langs/th_TH.js -./plugins/a11ychecker/langs/tr.js -./plugins/a11ychecker/langs/uk.js -./plugins/a11ychecker/langs/vi.js -./plugins/a11ychecker/langs/zh_CN.js -./plugins/a11ychecker/langs/zh_TW.js +.Base js file. +[source, js] +---- ./plugins/a11ychecker/plugin.js -.... +---- + +.css +[source, js] +---- +./plugins/a11ychecker/css/annotations.css +---- + +.js +[source, js] +---- +./plugins/a11ychecker/css/annotations_css.js // bundling requires v6.8.0 or later. +---- \ No newline at end of file diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-advcode.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-advcode.adoc index d303b23a42..20fc6bbfc5 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-advcode.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-advcode.adoc @@ -1,6 +1,19 @@ -.... +.Base js file +[source, js] +---- +./plugins/advcode/plugin.js +---- + +.css +[source, js] +---- ./plugins/advcode/codemirror.min.css ./plugins/advcode/codemirror.min.js ./plugins/advcode/customeditor.js -./plugins/advcode/plugin.js -.... +---- + +.js +[source, js] +---- +./plugins/advcode/codemirror_css.js // bundling requires v6.8.0 or later. +---- \ No newline at end of file diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-advlist.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-advlist.adoc index 1796a307a3..1b3bb7d9cc 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-advlist.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-advlist.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/advlist/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-advtable.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-advtable.adoc index 9266218b42..318c0748f1 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-advtable.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-advtable.adoc @@ -1,41 +1,5 @@ -.... -./plugins/advtable/langs/ar.js -./plugins/advtable/langs/bg_BG.js -./plugins/advtable/langs/ca.js -./plugins/advtable/langs/cs.js -./plugins/advtable/langs/da.js -./plugins/advtable/langs/de.js -./plugins/advtable/langs/el.js -./plugins/advtable/langs/es.js -./plugins/advtable/langs/eu.js -./plugins/advtable/langs/fa.js -./plugins/advtable/langs/fi.js -./plugins/advtable/langs/fr_FR.js -./plugins/advtable/langs/he_IL.js -./plugins/advtable/langs/hi.js -./plugins/advtable/langs/hr.js -./plugins/advtable/langs/hu_HU.js -./plugins/advtable/langs/id.js -./plugins/advtable/langs/it.js -./plugins/advtable/langs/ja.js -./plugins/advtable/langs/kk.js -./plugins/advtable/langs/ko_KR.js -./plugins/advtable/langs/ms.js -./plugins/advtable/langs/nb_NO.js -./plugins/advtable/langs/nl.js -./plugins/advtable/langs/pl.js -./plugins/advtable/langs/pt_BR.js -./plugins/advtable/langs/pt_PT.js -./plugins/advtable/langs/ro.js -./plugins/advtable/langs/ru.js -./plugins/advtable/langs/sk.js -./plugins/advtable/langs/sl_SI.js -./plugins/advtable/langs/sv_SE.js -./plugins/advtable/langs/th_TH.js -./plugins/advtable/langs/tr.js -./plugins/advtable/langs/uk.js -./plugins/advtable/langs/vi.js -./plugins/advtable/langs/zh_CN.js -./plugins/advtable/langs/zh_TW.js +.Base js file +[source, js] +---- ./plugins/advtable/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-anchor.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-anchor.adoc index f3b5c0db2d..46ead7f860 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-anchor.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-anchor.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/anchor/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-autocorrect.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-autocorrect.adoc index 62c4c5aadf..3761112a86 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-autocorrect.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-autocorrect.adoc @@ -1,41 +1,5 @@ -.... -./plugins/autocorrect/langs/ar.js -./plugins/autocorrect/langs/bg_BG.js -./plugins/autocorrect/langs/ca.js -./plugins/autocorrect/langs/cs.js -./plugins/autocorrect/langs/da.js -./plugins/autocorrect/langs/de.js -./plugins/autocorrect/langs/el.js -./plugins/autocorrect/langs/es.js -./plugins/autocorrect/langs/eu.js -./plugins/autocorrect/langs/fa.js -./plugins/autocorrect/langs/fi.js -./plugins/autocorrect/langs/fr_FR.js -./plugins/autocorrect/langs/he_IL.js -./plugins/autocorrect/langs/hi.js -./plugins/autocorrect/langs/hr.js -./plugins/autocorrect/langs/hu_HU.js -./plugins/autocorrect/langs/id.js -./plugins/autocorrect/langs/it.js -./plugins/autocorrect/langs/ja.js -./plugins/autocorrect/langs/kk.js -./plugins/autocorrect/langs/ko_KR.js -./plugins/autocorrect/langs/ms.js -./plugins/autocorrect/langs/nb_NO.js -./plugins/autocorrect/langs/nl.js -./plugins/autocorrect/langs/pl.js -./plugins/autocorrect/langs/pt_BR.js -./plugins/autocorrect/langs/pt_PT.js -./plugins/autocorrect/langs/ro.js -./plugins/autocorrect/langs/ru.js -./plugins/autocorrect/langs/sk.js -./plugins/autocorrect/langs/sl_SI.js -./plugins/autocorrect/langs/sv_SE.js -./plugins/autocorrect/langs/th_TH.js -./plugins/autocorrect/langs/tr.js -./plugins/autocorrect/langs/uk.js -./plugins/autocorrect/langs/vi.js -./plugins/autocorrect/langs/zh_CN.js -./plugins/autocorrect/langs/zh_TW.js +.Base js file +[source, js] +---- ./plugins/autocorrect/plugin.js -.... +---- \ No newline at end of file diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-autolink.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-autolink.adoc index 18b3329900..5302b7ab94 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-autolink.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-autolink.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/autolink/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-autoresize.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-autoresize.adoc index fc79582e58..a123e339d9 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-autoresize.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-autoresize.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/autoresize/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-autosave.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-autosave.adoc index 89925cd007..f58d66cc5a 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-autosave.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-autosave.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/autosave/plugin.js -.... +---- \ No newline at end of file diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-casechange.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-casechange.adoc index 785bb09564..c37e517350 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-casechange.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-casechange.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/casechange/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-charmap.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-charmap.adoc index 29ae1737ad..0febba14b9 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-charmap.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-charmap.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/charmap/plugin.js -.... +---- \ No newline at end of file diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-checklist.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-checklist.adoc index aa9c7587f4..a1f3cff071 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-checklist.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-checklist.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/checklist/plugin.js -.... +---- \ No newline at end of file diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-code.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-code.adoc index 1b7bc4aad7..7bef9a5371 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-code.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-code.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/code/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-codesample.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-codesample.adoc index 3435cf7b6d..c631f9992c 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-codesample.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-codesample.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/codesample/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-directionality.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-directionality.adoc index e09d97ac85..237cf87c11 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-directionality.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-directionality.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/directionality/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-editimage.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-editimage.adoc index e5614cf64a..cd6f1de99d 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-editimage.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-editimage.adoc @@ -1,41 +1,5 @@ -.... -./plugins/editimage/langs/ar.js -./plugins/editimage/langs/bg_BG.js -./plugins/editimage/langs/ca.js -./plugins/editimage/langs/cs.js -./plugins/editimage/langs/da.js -./plugins/editimage/langs/de.js -./plugins/editimage/langs/el.js -./plugins/editimage/langs/es.js -./plugins/editimage/langs/eu.js -./plugins/editimage/langs/fa.js -./plugins/editimage/langs/fi.js -./plugins/editimage/langs/fr_FR.js -./plugins/editimage/langs/he_IL.js -./plugins/editimage/langs/hi.js -./plugins/editimage/langs/hr.js -./plugins/editimage/langs/hu_HU.js -./plugins/editimage/langs/id.js -./plugins/editimage/langs/it.js -./plugins/editimage/langs/ja.js -./plugins/editimage/langs/kk.js -./plugins/editimage/langs/ko_KR.js -./plugins/editimage/langs/ms.js -./plugins/editimage/langs/nb_NO.js -./plugins/editimage/langs/nl.js -./plugins/editimage/langs/pl.js -./plugins/editimage/langs/pt_BR.js -./plugins/editimage/langs/pt_PT.js -./plugins/editimage/langs/ro.js -./plugins/editimage/langs/ru.js -./plugins/editimage/langs/sk.js -./plugins/editimage/langs/sl_SI.js -./plugins/editimage/langs/sv_SE.js -./plugins/editimage/langs/th_TH.js -./plugins/editimage/langs/tr.js -./plugins/editimage/langs/uk.js -./plugins/editimage/langs/vi.js -./plugins/editimage/langs/zh_CN.js -./plugins/editimage/langs/zh_TW.js +.Base js file +[source, js] +---- ./plugins/editimage/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-emoticons.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-emoticons.adoc index e42a8308f2..71f0922db5 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-emoticons.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-emoticons.adoc @@ -1,5 +1,7 @@ -.... +.Base js file +[source, js] +---- +./plugins/emoticons/plugin.js ./plugins/emoticons/js/emojiimages.js ./plugins/emoticons/js/emojis.js -./plugins/emoticons/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-export.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-export.adoc index c68b28cdd3..b87ece763e 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-export.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-export.adoc @@ -1,42 +1,6 @@ -.... -./plugins/export/exporters/clientpdf.js -./plugins/export/langs/ar.js -./plugins/export/langs/bg_BG.js -./plugins/export/langs/ca.js -./plugins/export/langs/cs.js -./plugins/export/langs/da.js -./plugins/export/langs/de.js -./plugins/export/langs/el.js -./plugins/export/langs/es.js -./plugins/export/langs/eu.js -./plugins/export/langs/fa.js -./plugins/export/langs/fi.js -./plugins/export/langs/fr_FR.js -./plugins/export/langs/he_IL.js -./plugins/export/langs/hi.js -./plugins/export/langs/hr.js -./plugins/export/langs/hu_HU.js -./plugins/export/langs/id.js -./plugins/export/langs/it.js -./plugins/export/langs/ja.js -./plugins/export/langs/kk.js -./plugins/export/langs/ko_KR.js -./plugins/export/langs/ms.js -./plugins/export/langs/nb_NO.js -./plugins/export/langs/nl.js -./plugins/export/langs/pl.js -./plugins/export/langs/pt_BR.js -./plugins/export/langs/pt_PT.js -./plugins/export/langs/ro.js -./plugins/export/langs/ru.js -./plugins/export/langs/sk.js -./plugins/export/langs/sl_SI.js -./plugins/export/langs/sv_SE.js -./plugins/export/langs/th_TH.js -./plugins/export/langs/tr.js -./plugins/export/langs/uk.js -./plugins/export/langs/vi.js -./plugins/export/langs/zh_CN.js -./plugins/export/langs/zh_TW.js +.Base js file +[source, js] +---- ./plugins/export/plugin.js -.... +./plugins/export/exporters/clientpdf.js +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-footnotes.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-footnotes.adoc index 9e46347231..f142867931 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-footnotes.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-footnotes.adoc @@ -1,41 +1,5 @@ -.... -./plugins/footnotes/langs/ar.js -./plugins/footnotes/langs/bg_BG.js -./plugins/footnotes/langs/ca.js -./plugins/footnotes/langs/cs.js -./plugins/footnotes/langs/da.js -./plugins/footnotes/langs/de.js -./plugins/footnotes/langs/el.js -./plugins/footnotes/langs/es.js -./plugins/footnotes/langs/eu.js -./plugins/footnotes/langs/fa.js -./plugins/footnotes/langs/fi.js -./plugins/footnotes/langs/fr_FR.js -./plugins/footnotes/langs/he_IL.js -./plugins/footnotes/langs/hi.js -./plugins/footnotes/langs/hr.js -./plugins/footnotes/langs/hu_HU.js -./plugins/footnotes/langs/id.js -./plugins/footnotes/langs/it.js -./plugins/footnotes/langs/ja.js -./plugins/footnotes/langs/kk.js -./plugins/footnotes/langs/ko_KR.js -./plugins/footnotes/langs/ms.js -./plugins/footnotes/langs/nb_NO.js -./plugins/footnotes/langs/nl.js -./plugins/footnotes/langs/pl.js -./plugins/footnotes/langs/pt_BR.js -./plugins/footnotes/langs/pt_PT.js -./plugins/footnotes/langs/ro.js -./plugins/footnotes/langs/ru.js -./plugins/footnotes/langs/sk.js -./plugins/footnotes/langs/sl_SI.js -./plugins/footnotes/langs/sv_SE.js -./plugins/footnotes/langs/th_TH.js -./plugins/footnotes/langs/tr.js -./plugins/footnotes/langs/uk.js -./plugins/footnotes/langs/vi.js -./plugins/footnotes/langs/zh_CN.js -./plugins/footnotes/langs/zh_TW.js +.Base js file +[source, js] +---- ./plugins/footnotes/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-formatpainter.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-formatpainter.adoc index e20418b5d7..8cd2b84be2 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-formatpainter.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-formatpainter.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/formatpainter/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-fullscreen.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-fullscreen.adoc index a4e9b217a3..8c06cc566b 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-fullscreen.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-fullscreen.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/fullscreen/plugin.js -.... +---- \ No newline at end of file diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-help.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-help.adoc index 4b5980509b..513eee5909 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-help.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-help.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/help/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-image.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-image.adoc index 12a71165d1..a9c2602394 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-image.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-image.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/image/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-importcss.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-importcss.adoc index ef61b06419..ff9ffc5554 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-importcss.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-importcss.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/importcss/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-insertdatetime.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-insertdatetime.adoc index c45c64995e..e3075e73cb 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-insertdatetime.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-insertdatetime.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/insertdatetime/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-link.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-link.adoc index af85538882..14eacc69af 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-link.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-link.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/link/plugin.js -.... +---- \ No newline at end of file diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-linkchecker.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-linkchecker.adoc index 77a994360c..3c2e33f1a3 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-linkchecker.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-linkchecker.adoc @@ -1,4 +1,17 @@ -.... -./plugins/linkchecker/content.min.css +.Base js file +[source, js] +---- ./plugins/linkchecker/plugin.js -.... +---- + +.css +[source, js] +---- +./plugins/linkchecker/content.min.css +---- + +.js +[source, js] +---- +./plugins/linkchecker/content_css.js // bundling requires v6.8.0 or later. +---- \ No newline at end of file diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-lists.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-lists.adoc index 3c10194458..e3cd76456b 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-lists.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-lists.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/lists/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-media.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-media.adoc index 36b6ac2800..aac8d116e5 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-media.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-media.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/media/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-mediaembed.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-mediaembed.adoc index 7fd6bde5cf..e4d8253db4 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-mediaembed.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-mediaembed.adoc @@ -1,4 +1,17 @@ -.... -./plugins/mediaembed/content.min.css +.Base js file +[source, js] +---- ./plugins/mediaembed/plugin.js -.... +---- + +.css +[source, js] +---- +./plugins/mediaembed/content.min.css +---- + +.js +[source, js] +---- +./plugins/mediaembed/content_css.js // bundling requires v6.8.0 or later. +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-mentions.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-mentions.adoc index 5c538da587..cc0a4ad000 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-mentions.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-mentions.adoc @@ -1,4 +1,17 @@ -.... -./plugins/mentions/css/mentions.css +.Base js file +[source, js] +---- ./plugins/mentions/plugin.js -.... +---- + +.css +[source, js] +---- +./plugins/mentions/css/mentions.css +---- + +.js +[source, js] +---- +./plugins/mentions/css/mentions_css.js // bundling requires v6.8.0 or later. +---- \ No newline at end of file diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-mergetags.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-mergetags.adoc index bb8c092a80..85cc860a09 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-mergetags.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-mergetags.adoc @@ -1,41 +1,5 @@ -.... -./plugins/mergetags/langs/ar.js -./plugins/mergetags/langs/bg_BG.js -./plugins/mergetags/langs/ca.js -./plugins/mergetags/langs/cs.js -./plugins/mergetags/langs/da.js -./plugins/mergetags/langs/de.js -./plugins/mergetags/langs/el.js -./plugins/mergetags/langs/es.js -./plugins/mergetags/langs/eu.js -./plugins/mergetags/langs/fa.js -./plugins/mergetags/langs/fi.js -./plugins/mergetags/langs/fr_FR.js -./plugins/mergetags/langs/he_IL.js -./plugins/mergetags/langs/hi.js -./plugins/mergetags/langs/hr.js -./plugins/mergetags/langs/hu_HU.js -./plugins/mergetags/langs/id.js -./plugins/mergetags/langs/it.js -./plugins/mergetags/langs/ja.js -./plugins/mergetags/langs/kk.js -./plugins/mergetags/langs/ko_KR.js -./plugins/mergetags/langs/ms.js -./plugins/mergetags/langs/nb_NO.js -./plugins/mergetags/langs/nl.js -./plugins/mergetags/langs/pl.js -./plugins/mergetags/langs/pt_BR.js -./plugins/mergetags/langs/pt_PT.js -./plugins/mergetags/langs/ro.js -./plugins/mergetags/langs/ru.js -./plugins/mergetags/langs/sk.js -./plugins/mergetags/langs/sl_SI.js -./plugins/mergetags/langs/sv_SE.js -./plugins/mergetags/langs/th_TH.js -./plugins/mergetags/langs/tr.js -./plugins/mergetags/langs/uk.js -./plugins/mergetags/langs/vi.js -./plugins/mergetags/langs/zh_CN.js -./plugins/mergetags/langs/zh_TW.js +.Base js file +[source, js] +---- ./plugins/mergetags/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-nonbreaking.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-nonbreaking.adoc index 202443ac74..bda47311c0 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-nonbreaking.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-nonbreaking.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/nonbreaking/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-pagebreak.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-pagebreak.adoc index c743c79b9f..e796db7f97 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-pagebreak.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-pagebreak.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/pagebreak/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-pageembed.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-pageembed.adoc index 54b7cf98fa..ad796258f7 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-pageembed.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-pageembed.adoc @@ -1,4 +1,17 @@ -.... -./plugins/pageembed/css/empa30.css +.Base js file +[source, js] +---- ./plugins/pageembed/plugin.js -.... +---- + +.css +[source, js] +---- +./plugins/pageembed/css/empa30.css +---- + +.js +[source, js] +---- +./plugins/pageembed/css/empa30_css.js // bundling requires v6.8.0 or later. +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-permanentpen.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-permanentpen.adoc index 2b814594ef..716902cd5c 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-permanentpen.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-permanentpen.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/permanentpen/plugin.js -.... +---- \ No newline at end of file diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-powerpaste.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-powerpaste.adoc index 7be2e78656..c79ba444aa 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-powerpaste.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-powerpaste.adoc @@ -1,42 +1,6 @@ -.... +.Base js file +[source, js] +---- ./plugins/powerpaste/js/wordimport.js -./plugins/powerpaste/langs/ar.js -./plugins/powerpaste/langs/bg_BG.js -./plugins/powerpaste/langs/ca.js -./plugins/powerpaste/langs/cs.js -./plugins/powerpaste/langs/da.js -./plugins/powerpaste/langs/de.js -./plugins/powerpaste/langs/el.js -./plugins/powerpaste/langs/es.js -./plugins/powerpaste/langs/eu.js -./plugins/powerpaste/langs/fa.js -./plugins/powerpaste/langs/fi.js -./plugins/powerpaste/langs/fr_FR.js -./plugins/powerpaste/langs/he_IL.js -./plugins/powerpaste/langs/hi.js -./plugins/powerpaste/langs/hr.js -./plugins/powerpaste/langs/hu_HU.js -./plugins/powerpaste/langs/id.js -./plugins/powerpaste/langs/it.js -./plugins/powerpaste/langs/ja.js -./plugins/powerpaste/langs/kk.js -./plugins/powerpaste/langs/ko_KR.js -./plugins/powerpaste/langs/ms.js -./plugins/powerpaste/langs/nb_NO.js -./plugins/powerpaste/langs/nl.js -./plugins/powerpaste/langs/pl.js -./plugins/powerpaste/langs/pt_BR.js -./plugins/powerpaste/langs/pt_PT.js -./plugins/powerpaste/langs/ro.js -./plugins/powerpaste/langs/ru.js -./plugins/powerpaste/langs/sk.js -./plugins/powerpaste/langs/sl_SI.js -./plugins/powerpaste/langs/sv_SE.js -./plugins/powerpaste/langs/th_TH.js -./plugins/powerpaste/langs/tr.js -./plugins/powerpaste/langs/uk.js -./plugins/powerpaste/langs/vi.js -./plugins/powerpaste/langs/zh_CN.js -./plugins/powerpaste/langs/zh_TW.js ./plugins/powerpaste/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-preview.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-preview.adoc index 1792ceb05a..ca2a54702d 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-preview.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-preview.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/preview/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-quickbars.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-quickbars.adoc index e1fc270cc1..123c58c438 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-quickbars.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-quickbars.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/quickbars/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-save.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-save.adoc index e7f996f898..0623d5b80f 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-save.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-save.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/save/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-searchreplace.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-searchreplace.adoc index 4af830f9a3..6c89e4a13f 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-searchreplace.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-searchreplace.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/searchreplace/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-table.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-table.adoc index b1b63ea357..a2fa6e49d7 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-table.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-table.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/table/plugin.js -.... +---- \ No newline at end of file diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-tableofcontents.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-tableofcontents.adoc index a3185dd843..9599110120 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-tableofcontents.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-tableofcontents.adoc @@ -1,41 +1,5 @@ -.... -./plugins/tableofcontents/langs/ar.js -./plugins/tableofcontents/langs/bg_BG.js -./plugins/tableofcontents/langs/ca.js -./plugins/tableofcontents/langs/cs.js -./plugins/tableofcontents/langs/da.js -./plugins/tableofcontents/langs/de.js -./plugins/tableofcontents/langs/el.js -./plugins/tableofcontents/langs/es.js -./plugins/tableofcontents/langs/eu.js -./plugins/tableofcontents/langs/fa.js -./plugins/tableofcontents/langs/fi.js -./plugins/tableofcontents/langs/fr_FR.js -./plugins/tableofcontents/langs/he_IL.js -./plugins/tableofcontents/langs/hi.js -./plugins/tableofcontents/langs/hr.js -./plugins/tableofcontents/langs/hu_HU.js -./plugins/tableofcontents/langs/id.js -./plugins/tableofcontents/langs/it.js -./plugins/tableofcontents/langs/ja.js -./plugins/tableofcontents/langs/kk.js -./plugins/tableofcontents/langs/ko_KR.js -./plugins/tableofcontents/langs/ms.js -./plugins/tableofcontents/langs/nb_NO.js -./plugins/tableofcontents/langs/nl.js -./plugins/tableofcontents/langs/pl.js -./plugins/tableofcontents/langs/pt_BR.js -./plugins/tableofcontents/langs/pt_PT.js -./plugins/tableofcontents/langs/ro.js -./plugins/tableofcontents/langs/ru.js -./plugins/tableofcontents/langs/sk.js -./plugins/tableofcontents/langs/sl_SI.js -./plugins/tableofcontents/langs/sv_SE.js -./plugins/tableofcontents/langs/th_TH.js -./plugins/tableofcontents/langs/tr.js -./plugins/tableofcontents/langs/uk.js -./plugins/tableofcontents/langs/vi.js -./plugins/tableofcontents/langs/zh_CN.js -./plugins/tableofcontents/langs/zh_TW.js +.Base js file +[source, js] +---- ./plugins/tableofcontents/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-template.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-template.adoc index 43d357c97f..b23bf45f0d 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-template.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-template.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/template/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-tinycomments.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-tinycomments.adoc index b63a89ac6d..44106485c3 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-tinycomments.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-tinycomments.adoc @@ -1,43 +1,18 @@ -.... +.Base js file +[source, js] +---- +./plugins/tinycomments/plugin.js +---- + +.css +[source, js] +---- ./plugins/tinycomments/css/tinycomments.css ./plugins/tinycomments/js/tinycomments-sidebar.js -./plugins/tinycomments/langs/ar.js -./plugins/tinycomments/langs/bg_BG.js -./plugins/tinycomments/langs/ca.js -./plugins/tinycomments/langs/cs.js -./plugins/tinycomments/langs/da.js -./plugins/tinycomments/langs/de.js -./plugins/tinycomments/langs/el.js -./plugins/tinycomments/langs/es.js -./plugins/tinycomments/langs/eu.js -./plugins/tinycomments/langs/fa.js -./plugins/tinycomments/langs/fi.js -./plugins/tinycomments/langs/fr_FR.js -./plugins/tinycomments/langs/he_IL.js -./plugins/tinycomments/langs/hi.js -./plugins/tinycomments/langs/hr.js -./plugins/tinycomments/langs/hu_HU.js -./plugins/tinycomments/langs/id.js -./plugins/tinycomments/langs/it.js -./plugins/tinycomments/langs/ja.js -./plugins/tinycomments/langs/kk.js -./plugins/tinycomments/langs/ko_KR.js -./plugins/tinycomments/langs/ms.js -./plugins/tinycomments/langs/nb_NO.js -./plugins/tinycomments/langs/nl.js -./plugins/tinycomments/langs/pl.js -./plugins/tinycomments/langs/pt_BR.js -./plugins/tinycomments/langs/pt_PT.js -./plugins/tinycomments/langs/ro.js -./plugins/tinycomments/langs/ru.js -./plugins/tinycomments/langs/sk.js -./plugins/tinycomments/langs/sl_SI.js -./plugins/tinycomments/langs/sv_SE.js -./plugins/tinycomments/langs/th_TH.js -./plugins/tinycomments/langs/tr.js -./plugins/tinycomments/langs/uk.js -./plugins/tinycomments/langs/vi.js -./plugins/tinycomments/langs/zh_CN.js -./plugins/tinycomments/langs/zh_TW.js -./plugins/tinycomments/plugin.js -.... +---- + +.js +[source, js] +---- +./plugins/tinycomments/css/tinycomments_css.js // bundling requires v6.8.0 or later. +---- \ No newline at end of file diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-tinymcespellchecker.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-tinymcespellchecker.adoc index 8b2e78ea01..f078bb8250 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-tinymcespellchecker.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-tinymcespellchecker.adoc @@ -1,41 +1,5 @@ -.... -./plugins/tinymcespellchecker/langs/ar.js -./plugins/tinymcespellchecker/langs/bg_BG.js -./plugins/tinymcespellchecker/langs/ca.js -./plugins/tinymcespellchecker/langs/cs.js -./plugins/tinymcespellchecker/langs/da.js -./plugins/tinymcespellchecker/langs/de.js -./plugins/tinymcespellchecker/langs/el.js -./plugins/tinymcespellchecker/langs/es.js -./plugins/tinymcespellchecker/langs/eu.js -./plugins/tinymcespellchecker/langs/fa.js -./plugins/tinymcespellchecker/langs/fi.js -./plugins/tinymcespellchecker/langs/fr_FR.js -./plugins/tinymcespellchecker/langs/he_IL.js -./plugins/tinymcespellchecker/langs/hi.js -./plugins/tinymcespellchecker/langs/hr.js -./plugins/tinymcespellchecker/langs/hu_HU.js -./plugins/tinymcespellchecker/langs/id.js -./plugins/tinymcespellchecker/langs/it.js -./plugins/tinymcespellchecker/langs/ja.js -./plugins/tinymcespellchecker/langs/kk.js -./plugins/tinymcespellchecker/langs/ko_KR.js -./plugins/tinymcespellchecker/langs/ms.js -./plugins/tinymcespellchecker/langs/nb_NO.js -./plugins/tinymcespellchecker/langs/nl.js -./plugins/tinymcespellchecker/langs/pl.js -./plugins/tinymcespellchecker/langs/pt_BR.js -./plugins/tinymcespellchecker/langs/pt_PT.js -./plugins/tinymcespellchecker/langs/ro.js -./plugins/tinymcespellchecker/langs/ru.js -./plugins/tinymcespellchecker/langs/sk.js -./plugins/tinymcespellchecker/langs/sl_SI.js -./plugins/tinymcespellchecker/langs/sv_SE.js -./plugins/tinymcespellchecker/langs/th_TH.js -./plugins/tinymcespellchecker/langs/tr.js -./plugins/tinymcespellchecker/langs/uk.js -./plugins/tinymcespellchecker/langs/vi.js -./plugins/tinymcespellchecker/langs/zh_CN.js -./plugins/tinymcespellchecker/langs/zh_TW.js +.Base js file +[source, js] +---- ./plugins/tinymcespellchecker/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-visualblocks.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-visualblocks.adoc index 46d003c008..c90153f2aa 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-visualblocks.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-visualblocks.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/visualblocks/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-visualchars.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-visualchars.adoc index c88e1652f1..a7fe145542 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-visualchars.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-visualchars.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/visualchars/plugin.js -.... +---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-wordcount.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-wordcount.adoc index 1e80543e64..cc01decc10 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-wordcount.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-wordcount.adoc @@ -1,3 +1,5 @@ -.... +.Base js file +[source, js] +---- ./plugins/wordcount/plugin.js -.... +---- From 5b939c1a1a39508843ff192f6504ef3acd21258f Mon Sep 17 00:00:00 2001 From: Karl Kemister-Sheppard Date: Tue, 5 Dec 2023 17:02:03 +1000 Subject: [PATCH 2/7] DOC-2228: add changelog entry. --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index 17ddb0dfc1..4a749072a5 100644 --- a/changelog.md +++ b/changelog.md @@ -6,6 +6,7 @@ The format is loosely based on [Keep a Changelog](https://keepachangelog.com/en/ ### Unreleased +- DOC-2228: Updates new bundling with `js` feature, `additional` copy edits to bundling with es6 vite documentation. - DOC-2215: add new feature `mce-clipboard` to 6.8.1 release project for AdvTemplate. - DOC-2216: add new single `js` bundling feature example for `Bundling an npm version of TinyMCE with ES6 and Vite`. - DOC-2202: add new `bespoke` button text updates to `events.adoc` file. From 47318e69083a705fc33b8c1aa8828857740f757e Mon Sep 17 00:00:00 2001 From: Karl Kemister-Sheppard Date: Tue, 5 Dec 2023 18:47:29 +1000 Subject: [PATCH 3/7] DOC-2228: update js code blocks for various files. --- .../partials/plugin-files/plugin-file-list-a11ychecker.adoc | 2 +- .../ROOT/partials/plugin-files/plugin-file-list-mentions.adoc | 2 +- .../ROOT/partials/plugin-files/plugin-file-list-pageembed.adoc | 2 +- .../partials/plugin-files/plugin-file-list-tinycomments.adoc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-a11ychecker.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-a11ychecker.adoc index 1c0deb656c..cf8f109859 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-a11ychecker.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-a11ychecker.adoc @@ -13,5 +13,5 @@ .js [source, js] ---- -./plugins/a11ychecker/css/annotations_css.js // bundling requires v6.8.0 or later. +./plugins/a11ychecker/css/annotations.js // bundling requires v6.8.0 or later. ---- \ No newline at end of file diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-mentions.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-mentions.adoc index cc0a4ad000..288003468b 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-mentions.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-mentions.adoc @@ -13,5 +13,5 @@ .js [source, js] ---- -./plugins/mentions/css/mentions_css.js // bundling requires v6.8.0 or later. +./plugins/mentions/css/mentions.js // bundling requires v6.8.0 or later. ---- \ No newline at end of file diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-pageembed.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-pageembed.adoc index ad796258f7..716c0a9e7f 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-pageembed.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-pageembed.adoc @@ -13,5 +13,5 @@ .js [source, js] ---- -./plugins/pageembed/css/empa30_css.js // bundling requires v6.8.0 or later. +./plugins/pageembed/css/empa30.js // bundling requires v6.8.0 or later. ---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-tinycomments.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-tinycomments.adoc index 44106485c3..b6fc6ace88 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-tinycomments.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-tinycomments.adoc @@ -14,5 +14,5 @@ .js [source, js] ---- -./plugins/tinycomments/css/tinycomments_css.js // bundling requires v6.8.0 or later. +./plugins/tinycomments/css/tinycomments.js // bundling requires v6.8.0 or later. ---- \ No newline at end of file From 62509f00dc35d47839703bffbba687f26197b41a Mon Sep 17 00:00:00 2001 From: Karl Kemister-Sheppard Date: Tue, 5 Dec 2023 20:03:00 +1000 Subject: [PATCH 4/7] DOC-2228: add example 2 to bundling-plugins.adoc update bundling-plugins-that-cant-bundle.adoc message. --- modules/ROOT/pages/bundling-plugins.adoc | 68 ++++++++++++++++++- .../bundling-plugins-that-cant-bundle.adoc | 2 +- 2 files changed, 66 insertions(+), 4 deletions(-) diff --git a/modules/ROOT/pages/bundling-plugins.adoc b/modules/ROOT/pages/bundling-plugins.adoc index 1d6b5228de..9c8577b87f 100644 --- a/modules/ROOT/pages/bundling-plugins.adoc +++ b/modules/ROOT/pages/bundling-plugins.adoc @@ -7,16 +7,20 @@ include::partial$module-loading/bundling-ref-example.adoc[] :!editorcomponent: +== Example 1 + The following table shows examples of the syntax used to bundle the following plugin. Required files for an example plugin: -.... +.when using `content.css` +[source, js] +---- ./plugins/example/content.css ./plugins/example/plugin.js -.... +---- -Example syntax for including the example "plugin" in a bundle: +Example syntax for including the example "plugin" in a bundle for styling: [cols='1,1,4'] |=== @@ -59,4 +63,62 @@ require('../tinymce/plugins/example/plugin.js'); IMPORTANT: The handling of content CSS files (such as `+content.css+` or `+content.min.css+`) varies between bundling tools. View the relevant guide for the required syntax at xref:introduction-to-bundling-tinymce.adoc[Bundling {productname} with a module loader]. +== Example 2 + +The following table shows examples of the syntax used to bundle the following plugin. + +Required files for an example plugin: + +.when using `content.js` or `content_css.js` +[source, js] +---- +./plugins/example/content.js // or './plugins/example/content_css.js' +./plugins/example/plugin.js +---- + +Example syntax for including the example 2 "plugin" in a bundle using `content.js` or `content_css.js` files for styling: + +[cols='1,1,4'] +|=== +|Module Syntax |Source |Example + +.2+|ES6+ +|npm +a| +[source, js] +---- +import pluginCss from 'tinymce/plugins/example/content.js'; +//import pluginCss from 'tinymce/plugins/example/content_css.js'; +import 'tinymce/plugins/example'; +---- + +|`.zip` +a| +[source, js] +---- +import pluginCss from '../tinymce/plugins/example/content.js'; +//import pluginCss from '../tinymce/plugins/example/content_css.js'; +import '../tinymce/plugins/example/plugin'; +---- + +.2+|Common JS +|npm +a| +[source, js] +---- +const pluginCss = require('tinymce/plugins/example/content.js'); +//require('tinymce/plugins/example/content_css.js'); +require('tinymce/plugins/example'); +---- + +|`.zip` +a| +[source, js] +---- +const pluginCss = require('../tinymce/plugins/example/content.js'); +//require('../tinymce/plugins/example/content_css.js'); +require('../tinymce/plugins/example/plugin.js'); +---- +|=== + include::partial$module-loading/bundling-plugin-files.adoc[] diff --git a/modules/ROOT/partials/module-loading/bundling-plugins-that-cant-bundle.adoc b/modules/ROOT/partials/module-loading/bundling-plugins-that-cant-bundle.adoc index aab43893c8..3e178c1c85 100644 --- a/modules/ROOT/partials/module-loading/bundling-plugins-that-cant-bundle.adoc +++ b/modules/ROOT/partials/module-loading/bundling-plugins-that-cant-bundle.adoc @@ -1,6 +1,6 @@ [IMPORTANT] ==== -The following premium plugins *can not* be bundled if the {productname} version is earlier than **6.8.0**. However, if the {productname} version is **v6.8.0** or **later**, the following premium plugins can be bundled: +The following premium plugins *can not* be bundled if the {productname} version is earlier than **6.8.0**. However, if the {productname} version is equivalent to **v6.8.0** or **later**, the following premium plugins can be bundled: * Accessibility Checker (`+a11ychecker+`) * Advanced Code (`+advcode+`) From dad81c97ba36af83c2c1fd3a7ae523314b9b23a7 Mon Sep 17 00:00:00 2001 From: Karl Kemister-Sheppard Date: Tue, 5 Dec 2023 21:56:24 +1000 Subject: [PATCH 5/7] DOC-2228: Various updates including.. removal of example 1 from bundling-plugins.adoc condensing of css and js to css or bundled css --- modules/ROOT/pages/bundling-plugins.adoc | 63 +------------------ .../plugin-file-list-a11ychecker.adoc | 9 +-- .../plugin-file-list-advcode.adoc | 12 ++-- .../plugin-files/plugin-file-list-export.adoc | 7 ++- .../plugin-file-list-linkchecker.adoc | 9 +-- .../plugin-file-list-mediaembed.adoc | 9 +-- .../plugin-file-list-mentions.adoc | 9 +-- .../plugin-file-list-pageembed.adoc | 9 +-- .../plugin-file-list-powerpaste.adoc | 7 ++- .../plugin-file-list-tinycomments.adoc | 10 +-- 10 files changed, 35 insertions(+), 109 deletions(-) diff --git a/modules/ROOT/pages/bundling-plugins.adoc b/modules/ROOT/pages/bundling-plugins.adoc index 9c8577b87f..b04942045c 100644 --- a/modules/ROOT/pages/bundling-plugins.adoc +++ b/modules/ROOT/pages/bundling-plugins.adoc @@ -7,76 +7,17 @@ include::partial$module-loading/bundling-ref-example.adoc[] :!editorcomponent: -== Example 1 - -The following table shows examples of the syntax used to bundle the following plugin. - -Required files for an example plugin: - -.when using `content.css` -[source, js] ----- -./plugins/example/content.css -./plugins/example/plugin.js ----- - -Example syntax for including the example "plugin" in a bundle for styling: - -[cols='1,1,4'] -|=== -|Module Syntax |Source |Example - -.2+|ES6+ -|npm -a| -[source, js] ----- -import pluginCss from 'tinymce/plugins/example/content.css'; -import 'tinymce/plugins/example'; ----- - -|`.zip` -a| -[source, js] ----- -import pluginCss from '../tinymce/plugins/example/content.css'; -import '../tinymce/plugins/example/plugin'; ----- - -.2+|Common JS -|npm -a| -[source, js] ----- -const pluginCss = require('tinymce/plugins/example/content.css'); -require('tinymce/plugins/example'); ----- - -|`.zip` -a| -[source, js] ----- -const pluginCss = require('../tinymce/plugins/example/content.css'); -require('../tinymce/plugins/example/plugin.js'); ----- -|=== - -IMPORTANT: The handling of content CSS files (such as `+content.css+` or `+content.min.css+`) varies between bundling tools. View the relevant guide for the required syntax at xref:introduction-to-bundling-tinymce.adoc[Bundling {productname} with a module loader]. - -== Example 2 - The following table shows examples of the syntax used to bundle the following plugin. Required files for an example plugin: -.when using `content.js` or `content_css.js` [source, js] ---- ./plugins/example/content.js // or './plugins/example/content_css.js' ./plugins/example/plugin.js ---- -Example syntax for including the example 2 "plugin" in a bundle using `content.js` or `content_css.js` files for styling: +Example syntax for including the example "plugin" in a bundle using `content.js` or `content_css.js` files for bundling: [cols='1,1,4'] |=== @@ -121,4 +62,4 @@ require('../tinymce/plugins/example/plugin.js'); ---- |=== -include::partial$module-loading/bundling-plugin-files.adoc[] +include::partial$module-loading/bundling-plugin-files.adoc[] \ No newline at end of file diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-a11ychecker.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-a11ychecker.adoc index cf8f109859..96654c8258 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-a11ychecker.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-a11ychecker.adoc @@ -4,14 +4,9 @@ ./plugins/a11ychecker/plugin.js ---- -.css -[source, js] ----- -./plugins/a11ychecker/css/annotations.css ----- - -.js +.css or bundled css [source, js] ---- +./plugins/a11ychecker/css/annotations.css // or ./plugins/a11ychecker/css/annotations.js // bundling requires v6.8.0 or later. ---- \ No newline at end of file diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-advcode.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-advcode.adoc index 20fc6bbfc5..9e7c646d1a 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-advcode.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-advcode.adoc @@ -4,16 +4,16 @@ ./plugins/advcode/plugin.js ---- -.css +.css or bundled css [source, js] ---- -./plugins/advcode/codemirror.min.css -./plugins/advcode/codemirror.min.js -./plugins/advcode/customeditor.js +./plugins/advcode/codemirror.min.css //or +./plugins/advcode/codemirror_css.js // bundling requires v6.8.0 or later. ---- -.js +.other js files [source, js] ---- -./plugins/advcode/codemirror_css.js // bundling requires v6.8.0 or later. +./plugins/advcode/codemirror.min.js +./plugins/advcode/customeditor.js ---- \ No newline at end of file diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-export.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-export.adoc index b87ece763e..5309614ddf 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-export.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-export.adoc @@ -2,5 +2,10 @@ [source, js] ---- ./plugins/export/plugin.js -./plugins/export/exporters/clientpdf.js ---- + +.other js files +[source, js] +---- +./plugins/export/exporters/clientpdf.js +---- \ No newline at end of file diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-linkchecker.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-linkchecker.adoc index 3c2e33f1a3..8dce71103c 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-linkchecker.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-linkchecker.adoc @@ -4,14 +4,9 @@ ./plugins/linkchecker/plugin.js ---- -.css -[source, js] ----- -./plugins/linkchecker/content.min.css ----- - -.js +.css or bundled css [source, js] ---- +./plugins/linkchecker/content.min.css //or ./plugins/linkchecker/content_css.js // bundling requires v6.8.0 or later. ---- \ No newline at end of file diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-mediaembed.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-mediaembed.adoc index e4d8253db4..f1364d71a1 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-mediaembed.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-mediaembed.adoc @@ -4,14 +4,9 @@ ./plugins/mediaembed/plugin.js ---- -.css -[source, js] ----- -./plugins/mediaembed/content.min.css ----- - -.js +.css or bundled css [source, js] ---- +./plugins/mediaembed/content.min.css //or ./plugins/mediaembed/content_css.js // bundling requires v6.8.0 or later. ---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-mentions.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-mentions.adoc index 288003468b..0d76a3595a 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-mentions.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-mentions.adoc @@ -4,14 +4,9 @@ ./plugins/mentions/plugin.js ---- -.css -[source, js] ----- -./plugins/mentions/css/mentions.css ----- - -.js +.css or bundled css [source, js] ---- +./plugins/mentions/css/mentions.css //or ./plugins/mentions/css/mentions.js // bundling requires v6.8.0 or later. ---- \ No newline at end of file diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-pageembed.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-pageembed.adoc index 716c0a9e7f..635a839e6d 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-pageembed.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-pageembed.adoc @@ -4,14 +4,9 @@ ./plugins/pageembed/plugin.js ---- -.css -[source, js] ----- -./plugins/pageembed/css/empa30.css ----- - -.js +.css or bundled css [source, js] ---- +./plugins/pageembed/css/empa30.css //or ./plugins/pageembed/css/empa30.js // bundling requires v6.8.0 or later. ---- diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-powerpaste.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-powerpaste.adoc index c79ba444aa..35ef74418f 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-powerpaste.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-powerpaste.adoc @@ -1,6 +1,11 @@ .Base js file [source, js] ---- -./plugins/powerpaste/js/wordimport.js ./plugins/powerpaste/plugin.js ---- + +.other js files +[source, js] +---- +./plugins/powerpaste/js/wordimport.js +---- \ No newline at end of file diff --git a/modules/ROOT/partials/plugin-files/plugin-file-list-tinycomments.adoc b/modules/ROOT/partials/plugin-files/plugin-file-list-tinycomments.adoc index b6fc6ace88..dcd3744dd9 100644 --- a/modules/ROOT/partials/plugin-files/plugin-file-list-tinycomments.adoc +++ b/modules/ROOT/partials/plugin-files/plugin-file-list-tinycomments.adoc @@ -4,15 +4,15 @@ ./plugins/tinycomments/plugin.js ---- -.css +.css or bundled css [source, js] ---- -./plugins/tinycomments/css/tinycomments.css -./plugins/tinycomments/js/tinycomments-sidebar.js +./plugins/tinycomments/css/tinycomments.css //or +./plugins/tinycomments/css/tinycomments.js // bundling requires v6.8.0 or later. ---- -.js +.other js files [source, js] ---- -./plugins/tinycomments/css/tinycomments.js // bundling requires v6.8.0 or later. +./plugins/tinycomments/js/tinycomments-sidebar.js ---- \ No newline at end of file From 17fa523df8ef859a933e12aa5cfa59f965fc0d38 Mon Sep 17 00:00:00 2001 From: Karl Kemister-Sheppard Date: Wed, 6 Dec 2023 08:04:25 +1000 Subject: [PATCH 6/7] Update bundling-plugins.adoc Co-authored-by: Hamza Benkhaldoun --- modules/ROOT/pages/bundling-plugins.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/ROOT/pages/bundling-plugins.adoc b/modules/ROOT/pages/bundling-plugins.adoc index b04942045c..721a60c14a 100644 --- a/modules/ROOT/pages/bundling-plugins.adoc +++ b/modules/ROOT/pages/bundling-plugins.adoc @@ -37,8 +37,8 @@ import 'tinymce/plugins/example'; a| [source, js] ---- -import pluginCss from '../tinymce/plugins/example/content.js'; -//import pluginCss from '../tinymce/plugins/example/content_css.js'; +import '../tinymce/plugins/example/content.js'; +//import '../tinymce/plugins/example/content_css.js'; import '../tinymce/plugins/example/plugin'; ---- From 77007244c8fe9e49f50adcca00681db3d1d81fe2 Mon Sep 17 00:00:00 2001 From: Karl Kemister-Sheppard Date: Wed, 6 Dec 2023 12:07:06 +1000 Subject: [PATCH 7/7] DOC-2228: update admon-building-plugin-langs.adoc to include links. --- .../partials/module-loading/admon-bundling-plugin-langs.adoc | 2 +- .../ROOT/partials/module-loading/bundling-plugin-files.adoc | 4 +++- .../module-loading/bundling-plugin-language-files.adoc | 4 +--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/ROOT/partials/module-loading/admon-bundling-plugin-langs.adoc b/modules/ROOT/partials/module-loading/admon-bundling-plugin-langs.adoc index 7b4b7b31d4..990c46eb52 100644 --- a/modules/ROOT/partials/module-loading/admon-bundling-plugin-langs.adoc +++ b/modules/ROOT/partials/module-loading/admon-bundling-plugin-langs.adoc @@ -1 +1 @@ -NOTE: The plugin language files (such as `+./plugins/plugin/langs/sv_SE.js+`) are required where the editor user interface is localized using the xref:ui-localization.adoc#language[`+language+` option]. +NOTE: The plugin language files (such as `+./plugins/plugin/langs/sv_SE.js+`) are required where the editor user interface is localized using the xref:ui-localization.adoc#language[language option]. Please prefer to xref:bundling-plugins.adoc#plugin-language-files[plugin-language-files] \ No newline at end of file diff --git a/modules/ROOT/partials/module-loading/bundling-plugin-files.adoc b/modules/ROOT/partials/module-loading/bundling-plugin-files.adoc index 68a68c932b..f2864eb69d 100644 --- a/modules/ROOT/partials/module-loading/bundling-plugin-files.adoc +++ b/modules/ROOT/partials/module-loading/bundling-plugin-files.adoc @@ -328,5 +328,7 @@ include::partial$plugin-files/plugin-file-list-visualchars.adoc[] include::partial$plugin-files/plugin-file-list-wordcount.adoc[] -[[bundling-plugin-language-files]] +[[plugin-language-files]] +== Plugin language files + include::partial$module-loading/bundling-plugin-language-files.adoc[] \ No newline at end of file diff --git a/modules/ROOT/partials/module-loading/bundling-plugin-language-files.adoc b/modules/ROOT/partials/module-loading/bundling-plugin-language-files.adoc index c781a07004..602ebcafe1 100644 --- a/modules/ROOT/partials/module-loading/bundling-plugin-language-files.adoc +++ b/modules/ROOT/partials/module-loading/bundling-plugin-language-files.adoc @@ -1,6 +1,4 @@ -== Plugin language files - -IMPORTANT: Replace `` with the specific plugin name when adding the language files to your config. +IMPORTANT: Replace `` with the specific plugin name when adding the plugin language files to your config. [source, js] ----