Skip to content

Commit c264e3a

Browse files
authored
Merge pull request #2187 from opensource-workshop/dev/tinymce5-npm
[JSライブラリ][WYSIWYG] TinyMCEを5の最新版へアップデート OW-2523
2 parents 2a25502 + a54c72d commit c264e3a

File tree

10 files changed

+595
-591
lines changed

10 files changed

+595
-591
lines changed

package-lock.json

Lines changed: 485 additions & 506 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"sass": "^1.62.1",
3131
"sass-loader": "^12.6.0",
3232
"sortablejs": "^1.15.2",
33-
"tinymce": "^5.8.0",
33+
"tinymce": "^5.10.9",
3434
"vue": "^3.5.13",
3535
"vue-loader": "^17.3.0"
3636
}

public/js/app.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/js/skins/ui/oxide/content.min.css

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/js/skins/ui/oxide/skin.min.css

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/mix-manifest.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"/js/app.js": "/js/app.js?id=8bbf9b5085bf03f4554289bd5b4eeb54",
3-
"/js/skins/ui/oxide/content.min.css": "/js/skins/ui/oxide/content.min.css?id=7c636f1aff57f75cdb0f1c4c0ba0704f",
4-
"/js/skins/ui/oxide/skin.min.css": "/js/skins/ui/oxide/skin.min.css?id=a8f2a825adcfa42962fd3ef179ba5ece",
5-
"/css/app.css": "/css/app.css?id=94110667e125790f9646ca8f0c9d2382"
2+
"/js/app.js": "/js/app.js?id=19d578ab8d9d2749c607d3f6e9fcdad5",
3+
"/css/app.css": "/css/app.css?id=94110667e125790f9646ca8f0c9d2382",
4+
"/js/skins/ui/oxide/skin.min.css": "/js/skins/ui/oxide/skin.min.css?id=40292756e45aaf491b954f5c323c4587",
5+
"/js/skins/ui/oxide/content.min.css": "/js/skins/ui/oxide/content.min.css?id=6de47628a73ed8bc258f96e9edfa29d7"
66
}

resources/js/bootstrap.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,18 @@ import 'tinymce/plugins/code';
115115
import 'tinymce/plugins/link';
116116
import 'tinymce/plugins/lists';
117117
import 'tinymce/plugins/table';
118-
import 'tinymce/plugins/imagetools';
119118
import 'tinymce/plugins/media';
120119
import 'tinymce/plugins/autolink';
121120
import 'tinymce/plugins/preview';
122121
import 'tinymce/plugins/template';
123122
import 'tinymce/plugins/hr';
124123

124+
// [非推奨] imagetoolsはTinyMCE 6.0のオープンソース版から削除される予定
125+
// The following deprecated features are currently enabled, these will be removed in TinyMCE 6.0. See https://www.tiny.cloud/docs/release-notes/6.0-upcoming-changes/ for more information.
126+
// Plugins:
127+
// - imagetools (moving to premium)
128+
import 'tinymce/plugins/imagetools';
129+
125130
/* Import plugins(Connect-CMS Only)
126131
Path: resources/js/tinymce/plugins/... */
127132
import './tinymce/plugins/file/plugin.js';

0 commit comments

Comments
 (0)