Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the tinymce from vendor without modification

Browse Source
This commit is contained in:
Calen Pennington
2018-06-19 21:49:46 -04:00
parent 07a15c681f
commit df67288a3b
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
package-lock.json generated
View File

@@ -9997,11 +9997,6 @@
"setimmediate": "1.0.5" "setimmediate": "1.0.5"
} }
}, },
"tinymce": {
"version": "4.7.6",
"resolved": "https://registry.npmjs.org/tinymce/-/tinymce-4.7.6.tgz",
"integrity": "sha512-mdbeMvCOO0ws0HXiZO9L8mDGFA9/VmDHltlt+/9qV0Fl1EWKWoPIRURHFtiFYuLKo9yjYUvYucwiZ1XfCT/91Q=="
},
"tmp": { "tmp": {
"version": "0.0.33", "version": "0.0.33",
"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",

1
package.json
View File

@@ -53,7 +53,6 @@
"string-replace-webpack-plugin": "0.1.3", "string-replace-webpack-plugin": "0.1.3",
"style-loader": "0.18.2", "style-loader": "0.18.2",
"svg-inline-loader": "0.8.0", "svg-inline-loader": "0.8.0",
"tinymce": "4.7.6",
"uglify-js": "2.7.0", "uglify-js": "2.7.0",
"underscore": "1.8.3", "underscore": "1.8.3",
"underscore.string": "3.3.4", "underscore.string": "3.3.4",

5
webpack.common.config.js
View File

@@ -130,7 +130,7 @@ module.exports = Merge.smart({
// https://github.com/webpack/webpack/issues/304#issuecomment-272150177 // https://github.com/webpack/webpack/issues/304#issuecomment-272150177
// (I've tried every other suggestion solution on that page, this // (I've tried every other suggestion solution on that page, this
// was the only one that worked.) // was the only one that worked.)
/\/sinon\.js|codemirror-compressed\.js|hls\.js/ /\/sinon\.js|codemirror-compressed\.js|hls\.js|tinymce\.full\.min\.js/
], ],
rules: [ rules: [
{ {
@@ -312,13 +312,14 @@ module.exports = Merge.smart({
jquery: 'jquery/src/jquery', // Use the non-diqst form of jQuery for better debugging + optimization jquery: 'jquery/src/jquery', // Use the non-diqst form of jQuery for better debugging + optimization
'jquery.flot': 'flot/jquery.flot.min', 'jquery.flot': 'flot/jquery.flot.min',
'jquery.ui': 'jquery-ui.min', 'jquery.ui': 'jquery-ui.min',
'jquery.tinymce': 'tinymce/jquery.tinymce.min', 'jquery.tinymce': 'jquery.tinymce.min',
'jquery.inputnumber': 'html5-input-polyfills/number-polyfill', 'jquery.inputnumber': 'html5-input-polyfills/number-polyfill',
'jquery.qtip': 'jquery.qtip.min', 'jquery.qtip': 'jquery.qtip.min',
'jquery.smoothScroll': 'jquery.smooth-scroll.min', 'jquery.smoothScroll': 'jquery.smooth-scroll.min',
'jquery.timepicker': 'timepicker/jquery.timepicker', 'jquery.timepicker': 'timepicker/jquery.timepicker',
'backbone.associations': 'backbone-associations/backbone-associations-min', 'backbone.associations': 'backbone-associations/backbone-associations-min',
squire: 'Squire', squire: 'Squire',
tinymce: 'tinymce.full.min',
// See sinon/webpack interaction weirdness: // See sinon/webpack interaction weirdness:
// https://github.com/webpack/webpack/issues/304#issuecomment-272150177 // https://github.com/webpack/webpack/issues/304#issuecomment-272150177