Reduced plugin and theme configs to the minimal set and extended the …

…base tsconfig. Removed help demo that was necessitating plugins be on the compile path for the theme. Removed codeview demo that doesn't exist.
smfukaya · Feb 19, 2019 · 45642ac · 45642ac
1 parent 05d7d88
commit 45642ac
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 186 deletions.
diff --git a/src/themes/silver/demo/html/components/CodeView.html b/src/themes/silver/demo/html/components/CodeView.html
diff --git a/src/themes/silver/demo/html/demo/HelpDialog.html b/src/themes/silver/demo/html/demo/HelpDialog.html
diff --git a/src/themes/silver/demo/ts/demo/Demos.ts b/src/themes/silver/demo/ts/demo/Demos.ts
@@ -2,7 +2,6 @@ import PlayDemo from './PlayDemo';
 import MenuItemDemo from './MenuItemDemo';
 import ToolbarButtonDemo from './ToolbarButtonDemo';
 import FormatSelectDemo from './FormatSelectDemo';
-import HelpDialogDemo from './Help';
 import ToolbarComponentsDemo from './ToolbarComponentsDemo';
 import SidebarDemo from './SidebarDemo';
 // import InsertAnchorDemo from './InsertAnchorDemo';
@@ -14,7 +13,6 @@ window.demos = {
   MenuItemDemo,
   ToolbarButtonDemo,
   FormatSelectDemo,
-  HelpDialogDemo,
   ToolbarComponentsDemo,
   SidebarDemo
   // InsertAnchorDemo

diff --git a/src/themes/silver/demo/ts/demo/Help.ts b/src/themes/silver/demo/ts/demo/Help.ts
diff --git a/tsconfig.plugin.json b/tsconfig.plugin.json
@@ -1,23 +1,11 @@
 {
+  "extends": "./tsconfig.json",
   "compilerOptions": {
-    "moduleResolution": "node",
-    "target": "es5",
-    "module": "es2015",
-    "importHelpers": true,
-    "lib": ["es2015"],
-    "declaration": true,
-    "declarationMap": true,
-    "sourceMap": true,
     "outDir": "lib",
     "baseUrl": ".",
     "paths": {
       "tinymce": ["src/core/dist/tinymce"],
       "tinymce/core/*": ["lib/globals/tinymce/core/*"],
-      "tinymce/ui/*": ["src/ui/main/ts/*"],
-      "tinymce/themes/mobile/*": ["src/themes/mobile/main/ts/*"],
-      "tinymce/themes/modern/*": ["src/themes/modern/main/ts/*"],
-      "tinymce/themes/quickbars/*": ["src/themes/quickbars/main/ts/*"],
-      "tinymce/themes/silver/*": ["src/themes/silver/main/ts/*"],
       "tinymce/plugins/advlist/*": ["src/plugins/advlist/main/ts/*"],
       "tinymce/plugins/anchor/*": ["src/plugins/anchor/main/ts/*"],
       "tinymce/plugins/autolink/*": ["src/plugins/autolink/main/ts/*"],
@@ -49,6 +37,7 @@
       "tinymce/plugins/paste/*": ["src/plugins/paste/main/ts/*"],
       "tinymce/plugins/preview/*": ["src/plugins/preview/main/ts/*"],
       "tinymce/plugins/print/*": ["src/plugins/print/main/ts/*"],
+      "tinymce/plugins/quickbars/*": ["src/plugins/quickbars/main/ts/*"],
       "tinymce/plugins/save/*": ["src/plugins/save/main/ts/*"],
       "tinymce/plugins/searchreplace/*": ["src/plugins/searchreplace/main/ts/*"],
       "tinymce/plugins/spellchecker/*": ["src/plugins/spellchecker/main/ts/*"],
@@ -64,15 +53,9 @@
     }
   },
   "include": [
-    "src/ui/main/ts",
-    "src/ui/src/demo/ts",
-    "src/ui/src/test/ts",
     "src/plugins/*/main/ts",
     "src/plugins/*/src/demo/ts",
     "src/plugins/*/src/test/ts",
-    "src/themes/*/main/ts",
-    "src/themes/*/src/demo/ts",
-    "src/themes/*/src/test/ts",
     "src/core/dist/globals/tinymce/core/",
     "src/core/dist/globals/**/*.ts",
   ]

diff --git a/tsconfig.theme.json b/tsconfig.theme.json
@@ -1,75 +1,16 @@
 {
+  "extends": "./tsconfig.json",
   "compilerOptions": {
-    "moduleResolution": "node",
-    "target": "es5",
-    "module": "es2015",
-    "importHelpers": true,
-    "lib": ["es2015"],
-    "declaration": true,
-    "declarationMap": true,
-    "sourceMap": true,
     "outDir": "lib",
     "baseUrl": ".",
     "paths": {
       "tinymce": ["src/core/dist/tinymce"],
       "tinymce/core/*": ["lib/globals/tinymce/core/*"],
-      "tinymce/ui/*": ["src/ui/main/ts/*"],
       "tinymce/themes/mobile/*": ["src/themes/mobile/main/ts/*"],
-      "tinymce/themes/modern/*": ["src/themes/modern/main/ts/*"],
-      "tinymce/themes/quickbars/*": ["src/themes/quickbars/main/ts/*"],
-      "tinymce/themes/silver/*": ["src/themes/silver/main/ts/*"],
-      "tinymce/plugins/advlist/*": ["src/plugins/advlist/main/ts/*"],
-      "tinymce/plugins/anchor/*": ["src/plugins/anchor/main/ts/*"],
-      "tinymce/plugins/autolink/*": ["src/plugins/autolink/main/ts/*"],
-      "tinymce/plugins/autoresize/*": ["src/plugins/autoresize/main/ts/*"],
-      "tinymce/plugins/autosave/*": ["src/plugins/autosave/main/ts/*"],
-      "tinymce/plugins/bbcode/*": ["src/plugins/bbcode/main/ts/*"],
-      "tinymce/plugins/charmap/*": ["src/plugins/charmap/main/ts/*"],
-      "tinymce/plugins/code/*": ["src/plugins/code/main/ts/*"],
-      "tinymce/plugins/codesample/*": ["src/plugins/codesample/main/ts/*"],
-      "tinymce/plugins/colorpicker/*": ["src/plugins/colorpicker/main/ts/*"],
-      "tinymce/plugins/contextmenu/*": ["src/plugins/contextmenu/main/ts/*"],
-      "tinymce/plugins/directionality/*": ["src/plugins/directionality/main/ts/*"],
-      "tinymce/plugins/emoticons/*": ["src/plugins/emoticons/main/ts/*"],
-      "tinymce/plugins/fullpage/*": ["src/plugins/fullpage/main/ts/*"],
-      "tinymce/plugins/fullscreen/*": ["src/plugins/fullscreen/main/ts/*"],
-      "tinymce/plugins/help/*": ["src/plugins/help/main/ts/*"],
-      "tinymce/plugins/hr/*": ["src/plugins/hr/main/ts/*"],
-      "tinymce/plugins/image/*": ["src/plugins/image/main/ts/*"],
-      "tinymce/plugins/imagetools/*": ["src/plugins/imagetools/main/ts/*"],
-      "tinymce/plugins/importcss/*": ["src/plugins/importcss/main/ts/*"],
-      "tinymce/plugins/insertdatetime/*": ["src/plugins/insertdatetime/main/ts/*"],
-      "tinymce/plugins/legacyoutput/*": ["src/plugins/legacyoutput/main/ts/*"],
-      "tinymce/plugins/link/*": ["src/plugins/link/main/ts/*"],
-      "tinymce/plugins/lists/*": ["src/plugins/lists/main/ts/*"],
-      "tinymce/plugins/media/*": ["src/plugins/media/main/ts/*"],
-      "tinymce/plugins/nonbreaking/*": ["src/plugins/nonbreaking/main/ts/*"],
-      "tinymce/plugins/noneditable/*": ["src/plugins/noneditable/main/ts/*"],
-      "tinymce/plugins/pagebreak/*": ["src/plugins/pagebreak/main/ts/*"],
-      "tinymce/plugins/paste/*": ["src/plugins/paste/main/ts/*"],
-      "tinymce/plugins/preview/*": ["src/plugins/preview/main/ts/*"],
-      "tinymce/plugins/print/*": ["src/plugins/print/main/ts/*"],
-      "tinymce/plugins/save/*": ["src/plugins/save/main/ts/*"],
-      "tinymce/plugins/searchreplace/*": ["src/plugins/searchreplace/main/ts/*"],
-      "tinymce/plugins/spellchecker/*": ["src/plugins/spellchecker/main/ts/*"],
-      "tinymce/plugins/tabfocus/*": ["src/plugins/tabfocus/main/ts/*"],
-      "tinymce/plugins/table/*": ["src/plugins/table/main/ts/*"],
-      "tinymce/plugins/template/*": ["src/plugins/template/main/ts/*"],
-      "tinymce/plugins/textcolor/*": ["src/plugins/textcolor/main/ts/*"],
-      "tinymce/plugins/textpattern/*": ["src/plugins/textpattern/main/ts/*"],
-      "tinymce/plugins/toc/*": ["src/plugins/toc/main/ts/*"],
-      "tinymce/plugins/visualblocks/*": ["src/plugins/visualblocks/main/ts/*"],
-      "tinymce/plugins/visualchars/*": ["src/plugins/visualchars/main/ts/*"],
-      "tinymce/plugins/wordcount/*": ["src/plugins/wordcount/main/ts/*"]
+      "tinymce/themes/silver/*": ["src/themes/silver/main/ts/*"]
     }
   },
   "include": [
-    "src/ui/main/ts",
-    "src/ui/src/demo/ts",
-    "src/ui/src/test/ts",
-    "src/plugins/*/main/ts",
-    "src/plugins/*/src/demo/ts",
-    "src/plugins/*/src/test/ts",
     "src/themes/*/main/ts",
     "src/themes/*/src/demo/ts",
     "src/themes/*/src/test/ts",