github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-05-29 03:22:00 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Standardised module loading system & fixed build system

Browse Source 
Fixed broken build system in broken webpack version.
Also updates module system to standardise on ES6 import/exports,
Especially since babel has changed it's 'default' logic for the old
module system.
This commit is contained in:
Dan Brown
2018-11-09 21:17:35 +00:00
parent 5b36ddb12f
commit e3230f8f21
37 changed files with 384 additions and 3372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
resources/assets/js/services/code.js
View File

@ -1,27 +1,27 @@
const CodeMirror = require('codemirror');
const Clipboard = require("clipboard");
import CodeMirror from "codemirror";
import Clipboard from "clipboard";
// Modes
require('codemirror/mode/css/css');
require('codemirror/mode/clike/clike');
require('codemirror/mode/diff/diff');
require('codemirror/mode/go/go');
require('codemirror/mode/htmlmixed/htmlmixed');
require('codemirror/mode/javascript/javascript');
require('codemirror/mode/markdown/markdown');
require('codemirror/mode/nginx/nginx');
require('codemirror/mode/php/php');
require('codemirror/mode/powershell/powershell');
require('codemirror/mode/python/python');
require('codemirror/mode/ruby/ruby');
require('codemirror/mode/shell/shell');
require('codemirror/mode/sql/sql');
require('codemirror/mode/toml/toml');
require('codemirror/mode/xml/xml');
require('codemirror/mode/yaml/yaml');
import 'codemirror/mode/css/css';
import 'codemirror/mode/clike/clike';
import 'codemirror/mode/diff/diff';
import 'codemirror/mode/go/go';
import 'codemirror/mode/htmlmixed/htmlmixed';
import 'codemirror/mode/javascript/javascript';
import 'codemirror/mode/markdown/markdown';
import 'codemirror/mode/nginx/nginx';
import 'codemirror/mode/php/php';
import 'codemirror/mode/powershell/powershell';
import 'codemirror/mode/python/python';
import 'codemirror/mode/ruby/ruby';
import 'codemirror/mode/shell/shell';
import 'codemirror/mode/sql/sql';
import 'codemirror/mode/toml/toml';
import 'codemirror/mode/xml/xml';
import 'codemirror/mode/yaml/yaml';
// Addons
require('codemirror/addon/scroll/scrollpastend');
import 'codemirror/addon/scroll/scrollpastend';
const modeMap = {
css: 'css',
@ -255,7 +255,7 @@ function getMetaKey() {
return mac ? "Cmd" : "Ctrl";
}
module.exports = {
export default {
highlight: highlight,
wysiwygView: wysiwygView,
popupEditor: popupEditor,