Skip to content

Commit e0f5186

Browse files
authored
Merge pull request #2188 from opensource-workshop/dev/tinymce
[JSライブラリ][WYSIWYG] TinyMCEを5→6へアップデート OW-2523
2 parents 33e7eb6 + 8470d0c commit e0f5186

File tree

19 files changed

+1041
-1722
lines changed

19 files changed

+1041
-1722
lines changed

package-lock.json

Lines changed: 5 additions & 5 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.10.9",
33+
"tinymce": "^6.8.5",
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: 0 additions & 7 deletions
This file was deleted.

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

Lines changed: 0 additions & 7 deletions
This file was deleted.

public/mix-manifest.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
{
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"
2+
"/js/app.js": "/js/app.js?id=4b33b4976170adce391d1d910fc9d34f",
3+
"/css/app.css": "/css/app.css?id=94110667e125790f9646ca8f0c9d2382"
64
}

resources/js/bootstrap.js

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -92,24 +92,24 @@ dayjs.extend(utc);
9292
dayjs.extend(timezone);
9393
window.dayjs = dayjs;
9494

95-
// --- TinyMCE 5
96-
// 「Example src/editor.js」よりコピー: https://www.tiny.cloud/docs/tinymce/5/webpack-cjs-npm/#_procedure
95+
// --- TinyMCE
96+
// 「Example src/editor.js」よりコピーして編集: https://www.tiny.cloud/docs/tinymce/6/vite-es6-npm/#procedures
9797
/* Import TinyMCE */
9898
import tinymce from 'tinymce';
9999
window.tinymce = tinymce;
100100

101-
/* Default icons are required for TinyMCE 5.3 or above */
101+
/* Default icons are required. After that, import custom icons if applicable */
102102
import 'tinymce/icons/default';
103103

104-
/* A theme is also required */
104+
/* Required TinyMCE components */
105105
import 'tinymce/themes/silver';
106+
import 'tinymce/models/dom';
106107

107-
/* Import the skin */
108-
// delete: webpack.mix.js でコピーする
109-
// ここでCSSをimportすると、resources/views/layouts/app.blade.php の mix('/js/app.js') 配下に<style>でべた書きされ、デザインに影響する
110-
// import 'tinymce/skins/ui/oxide/skin.css';
108+
/* Import a skin (can be a custom skin instead of the default) */
109+
import 'tinymce/skins/ui/oxide/skin.js';
111110

112111
/* Import plugins */
112+
// delete: imagetools はTinyMCE 6.0のオープンソース版で削除されました
113113
import 'tinymce/plugins/advlist';
114114
import 'tinymce/plugins/code';
115115
import 'tinymce/plugins/link';
@@ -119,13 +119,11 @@ import 'tinymce/plugins/media';
119119
import 'tinymce/plugins/autolink';
120120
import 'tinymce/plugins/preview';
121121
import 'tinymce/plugins/template';
122-
import 'tinymce/plugins/hr';
123122

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';
123+
/* Import plugins(Connect-CMS Custom)
124+
コピー元Path: node_modules/tinymce/plugins/image/plugin.js */
125+
// import 'tinymce/plugins/image';
126+
import './tinymce/plugins/image/plugin.js';
129127

130128
/* Import plugins(Connect-CMS Only)
131129
Path: resources/js/tinymce/plugins/... */
@@ -134,22 +132,14 @@ import './tinymce/plugins/translate/plugin.js';
134132
import './tinymce/plugins/pdf/plugin.js';
135133
import './tinymce/plugins/face/plugin.js';
136134

137-
/* Import plugins(Connect-CMS Custom)
138-
コピー元import: import 'tinymce/plugins/image';
139-
コピー元Path: node_modules/tinymce/plugins/image/plugin.js */
140-
import './tinymce/plugins/image/plugin.js';
141-
142-
/* Import content css */
143-
// delete: webpack.mix.js でコピーする
144-
// ここでCSSをimportすると、resources/views/layouts/app.blade.php の mix('/js/app.js') 配下に<style>でべた書きされ、デザインに影響する
145-
// import contentUiCss from 'tinymce/skins/ui/oxide/content.css';
146-
// window.contentUiCss = contentUiCss;
135+
/* content UI CSS is required */
136+
import 'tinymce/skins/ui/oxide/content.js';
147137

138+
/* The default content CSS can be changed or replaced with appropriate CSS for the editor content. */
148139
// delete: contentCssは使用しない
149-
// 参考Path: node_modules/tinymce/skins/content/default/content.css
150-
// import contentCss from 'tinymce/skins/content/default/content.css';
151-
// window.contentCss = contentCss;
140+
// 参考Path: node_modules/tinymce/skins/content/default/content.js
141+
// import 'tinymce/skins/content/default/content.js';
152142

153-
/* ダウンロードした日本語+Connect-CMSで追記
143+
/* ダウンロードした日本語 https://www.tiny.cloud/get-tiny/language-packages/
154144
Path: resources/js/tinymce/langs/ja.js */
155145
import './tinymce/langs/ja.js';
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
This is where language files should be placed.
2-
3-
Please DO NOT translate these directly use this service: https://www.transifex.com/projects/p/tinymce/
1+
Download the TinyMCE language packs (.zip)
2+
https://www.tiny.cloud/get-tiny/language-packages/

0 commit comments

Comments
 (0)