Skip to content

[JSライブラリ][WYSIWYG] TinyMCEを5→6へアップデート OW-2523 #2188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
May 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"sass": "^1.62.1",
"sass-loader": "^12.6.0",
"sortablejs": "^1.15.2",
"tinymce": "^5.10.9",
"tinymce": "^6.8.5",
"vue": "^3.5.13",
"vue-loader": "^17.3.0"
}
Expand Down
2 changes: 1 addition & 1 deletion public/js/app.js

Large diffs are not rendered by default.

7 changes: 0 additions & 7 deletions public/js/skins/ui/oxide/content.min.css

This file was deleted.

7 changes: 0 additions & 7 deletions public/js/skins/ui/oxide/skin.min.css

This file was deleted.

6 changes: 2 additions & 4 deletions public/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{
"/js/app.js": "/js/app.js?id=19d578ab8d9d2749c607d3f6e9fcdad5",
"/css/app.css": "/css/app.css?id=94110667e125790f9646ca8f0c9d2382",
"/js/skins/ui/oxide/skin.min.css": "/js/skins/ui/oxide/skin.min.css?id=40292756e45aaf491b954f5c323c4587",
"/js/skins/ui/oxide/content.min.css": "/js/skins/ui/oxide/content.min.css?id=6de47628a73ed8bc258f96e9edfa29d7"
"/js/app.js": "/js/app.js?id=4b33b4976170adce391d1d910fc9d34f",
"/css/app.css": "/css/app.css?id=94110667e125790f9646ca8f0c9d2382"
}
46 changes: 18 additions & 28 deletions resources/js/bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,24 +92,24 @@ dayjs.extend(utc);
dayjs.extend(timezone);
window.dayjs = dayjs;

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

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

/* A theme is also required */
/* Required TinyMCE components */
import 'tinymce/themes/silver';
import 'tinymce/models/dom';

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

/* Import plugins */
// delete: imagetools はTinyMCE 6.0のオープンソース版で削除されました
import 'tinymce/plugins/advlist';
import 'tinymce/plugins/code';
import 'tinymce/plugins/link';
Expand All @@ -119,13 +119,11 @@ import 'tinymce/plugins/media';
import 'tinymce/plugins/autolink';
import 'tinymce/plugins/preview';
import 'tinymce/plugins/template';
import 'tinymce/plugins/hr';

// [非推奨] imagetoolsはTinyMCE 6.0のオープンソース版から削除される予定
// 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.
// Plugins:
// - imagetools (moving to premium)
import 'tinymce/plugins/imagetools';
/* Import plugins(Connect-CMS Custom)
コピー元Path: node_modules/tinymce/plugins/image/plugin.js */
// import 'tinymce/plugins/image';
import './tinymce/plugins/image/plugin.js';

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

/* Import plugins(Connect-CMS Custom)
コピー元import: import 'tinymce/plugins/image';
コピー元Path: node_modules/tinymce/plugins/image/plugin.js */
import './tinymce/plugins/image/plugin.js';

/* Import content css */
// delete: webpack.mix.js でコピーする
// ここでCSSをimportすると、resources/views/layouts/app.blade.php の mix('/js/app.js') 配下に<style>でべた書きされ、デザインに影響する
// import contentUiCss from 'tinymce/skins/ui/oxide/content.css';
// window.contentUiCss = contentUiCss;
/* content UI CSS is required */
import 'tinymce/skins/ui/oxide/content.js';

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

/* ダウンロードした日本語+Connect-CMSで追記
/* ダウンロードした日本語 https://www.tiny.cloud/get-tiny/language-packages/
Path: resources/js/tinymce/langs/ja.js */
import './tinymce/langs/ja.js';
5 changes: 2 additions & 3 deletions resources/js/tinymce/langs/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
This is where language files should be placed.

Please DO NOT translate these directly use this service: https://www.transifex.com/projects/p/tinymce/
Download the TinyMCE language packs (.zip)
https://www.tiny.cloud/get-tiny/language-packages/
Loading