Merge pull request #760 from WordPress/remove/tinymce-global

Reference TinyMCE as external module, not assumed global
WordPress · May 11, 2017 · ca6bd50 · ca6bd50
2 parents b8bf441 + 7541390
commit ca6bd50
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -18,8 +18,7 @@
 		}
 	},
 	"globals": {
-		"wp": true,
-		"tinymce": true
+		"wp": true
 	},
 	"plugins": [
 		"react",

diff --git a/blocks/api/parser.js b/blocks/api/parser.js
@@ -1,6 +1,7 @@
 /**
  * External dependencies
  */
+import tinymce from 'tinymce';
 import { parse as hpqParse } from 'hpq';
 import { escape, unescape, pickBy } from 'lodash';
 

diff --git a/blocks/editable/tinymce.js b/blocks/editable/tinymce.js
@@ -1,3 +1,8 @@
+/**
+ * External dependencies
+ */
+import tinymce from 'tinymce';
+
 export default class TinyMCE extends wp.element.Component {
 	componentDidMount() {
 		this.initialize();

diff --git a/webpack.config.js b/webpack.config.js
@@ -22,7 +22,8 @@ const config = {
 	externals: {
 		react: 'React',
 		'react-dom': 'ReactDOM',
-		'react-dom/server': 'ReactDOMServer'
+		'react-dom/server': 'ReactDOMServer',
+		tinymce: 'tinymce'
 	},
 	resolve: {
 		modules: [