From 2515ad962b7eb2f395a004bb6c9948e5f2d55c4d Mon Sep 17 00:00:00 2001 From: David Mehren Date: Fri, 4 Jun 2021 22:02:47 +0200 Subject: [PATCH] Load inline-attachment without script-loader Signed-off-by: David Mehren --- public/js/lib/editor/index.js | 3 +++ webpack.common.js | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/public/js/lib/editor/index.js b/public/js/lib/editor/index.js index adf3b293a..45ae8d9f7 100644 --- a/public/js/lib/editor/index.js +++ b/public/js/lib/editor/index.js @@ -34,6 +34,9 @@ import 'codemirror/addon/fold/xml-fold.js' import 'codemirror/addon/merge/merge.js' import '../../../vendor/codemirror-spell-checker/spell-checker.min.js' +import '../../../vendor/inlineAttachment/inline-attachment' +import '../../../vendor/inlineAttachment/codemirror.inline-attachment' + import * as utils from './utils' import config from './config' import statusBarTemplate from './statusbar.html' diff --git a/webpack.common.js b/webpack.common.js index 67b0271fd..2a7decbee 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -214,9 +214,7 @@ module.exports = { index: [ 'babel-polyfill', 'expose-loader?exposes=LZString!lz-string', - 'script-loader!inlineAttachment', 'script-loader!jqueryTextcomplete', - 'script-loader!codemirrorInlineAttachment', 'script-loader!ot', 'flowchart.js', 'js-sequence-diagrams', @@ -259,9 +257,7 @@ module.exports = { 'expose-loader?exposes=emojify!emojify.js', 'script-loader!gist-embed', 'expose-loader?exposes=LZString!lz-string', - 'script-loader!inlineAttachment', 'script-loader!jqueryTextcomplete', - 'script-loader!codemirrorInlineAttachment', 'script-loader!ot', 'flowchart.js', 'js-sequence-diagrams', @@ -356,9 +352,7 @@ module.exports = { modules: ['node_modules'], extensions: ['.js'], alias: { - inlineAttachment: path.join(__dirname, 'public/vendor/inlineAttachment/inline-attachment.js'), jqueryTextcomplete: path.join(__dirname, 'public/vendor/jquery-textcomplete/jquery.textcomplete.js'), - codemirrorInlineAttachment: path.join(__dirname, 'public/vendor/inlineAttachment/codemirror.inline-attachment.js'), ot: path.join(__dirname, 'public/vendor/ot/ot.min.js'), mermaid: path.join(__dirname, 'node_modules/mermaid/dist/mermaid.min.js'), handlebars: path.join(__dirname, 'node_modules/handlebars/dist/handlebars.min.js'),