From 060baf2f68dd22e74d8f5e819cdd4904e01a7698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20M=C3=BCller?= Date: Thu, 16 Jul 2015 21:10:59 +0200 Subject: [PATCH 1/3] Correctly wire up tinymce plugin dependencies --- .../github/tinymce/tinymce-dist@4.1.7.json | 252 +++++++++++++++++- 1 file changed, 249 insertions(+), 3 deletions(-) diff --git a/package-overrides/github/tinymce/tinymce-dist@4.1.7.json b/package-overrides/github/tinymce/tinymce-dist@4.1.7.json index 75f0dd4..ec13e66 100644 --- a/package-overrides/github/tinymce/tinymce-dist@4.1.7.json +++ b/package-overrides/github/tinymce/tinymce-dist@4.1.7.json @@ -1,12 +1,258 @@ { "format": "global", - "main": "tinymce.min", + "main": "tinymce", "shim": { "tinymce.min": { - "exports": "tinyMCE" + "exports": "tinymce" }, "tinymce": { - "exports": "tinyMCE" + "exports": "tinymce" + }, + "plugins/advlist/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/anchor/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/autolink/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/autoresize/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/autosave/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/bbcode/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/charmap/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/code/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/colorpicker/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/contextmenu/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/directionality/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/emoticons/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/fullpage/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/fullscreen/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/hr/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/image/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/importcss/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/insertdatetime/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/layer/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/legacyoutput/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/link/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/lists/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/media/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/nonbreaking/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/noneditable/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/pagebreak/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/paste/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/preview/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/print/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/save/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/searchreplace/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/spellchecker/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/tabfocus/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/table/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/template/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/textcolor/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/textpattern/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/visualblocks/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/visualchars/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "plugins/wordcount/plugin": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] + }, + "themes/modern/theme": { + "imports": "tinymce", + "deps": [ + "tinymce" + ] } } } From fda32ad1d738dd92aab48d8d1020d841e6c5f6ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20M=C3=BCller?= Date: Thu, 16 Jul 2015 21:12:32 +0200 Subject: [PATCH 2/3] Widen tinymce package override to all versions released under github:tinymce/tinymce-dist --- .../tinymce/{tinymce-dist@4.1.7.json => tinymce-dist@4.0.0.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename package-overrides/github/tinymce/{tinymce-dist@4.1.7.json => tinymce-dist@4.0.0.json} (100%) diff --git a/package-overrides/github/tinymce/tinymce-dist@4.1.7.json b/package-overrides/github/tinymce/tinymce-dist@4.0.0.json similarity index 100% rename from package-overrides/github/tinymce/tinymce-dist@4.1.7.json rename to package-overrides/github/tinymce/tinymce-dist@4.0.0.json From beb06188c69098f621ed315b6ae219969810ae83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20M=C3=BCller?= Date: Thu, 16 Jul 2015 21:26:33 +0200 Subject: [PATCH 3/3] Remove 'imports' properties in tinymce plugins overrides --- .../github/tinymce/tinymce-dist@4.0.0.json | 41 ------------------- 1 file changed, 41 deletions(-) diff --git a/package-overrides/github/tinymce/tinymce-dist@4.0.0.json b/package-overrides/github/tinymce/tinymce-dist@4.0.0.json index ec13e66..126a335 100644 --- a/package-overrides/github/tinymce/tinymce-dist@4.0.0.json +++ b/package-overrides/github/tinymce/tinymce-dist@4.0.0.json @@ -9,247 +9,206 @@ "exports": "tinymce" }, "plugins/advlist/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/anchor/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/autolink/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/autoresize/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/autosave/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/bbcode/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/charmap/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/code/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/colorpicker/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/contextmenu/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/directionality/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/emoticons/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/fullpage/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/fullscreen/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/hr/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/image/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/importcss/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/insertdatetime/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/layer/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/legacyoutput/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/link/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/lists/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/media/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/nonbreaking/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/noneditable/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/pagebreak/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/paste/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/preview/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/print/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/save/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/searchreplace/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/spellchecker/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/tabfocus/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/table/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/template/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/textcolor/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/textpattern/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/visualblocks/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/visualchars/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "plugins/wordcount/plugin": { - "imports": "tinymce", "deps": [ "tinymce" ] }, "themes/modern/theme": { - "imports": "tinymce", "deps": [ "tinymce" ]