From 056af03b7cd832265d68b6a7c95a1d277caaf612 Mon Sep 17 00:00:00 2001 From: David Mehren Date: Wed, 11 Nov 2020 20:16:47 +0100 Subject: Revert "Adjust webpack config to new code mirror version" It turned out that we can't directly use the codemirror source files and actually need to run their build script manually. This reverts commit 0ec180de Signed-off-by: David Mehren --- package.json | 2 +- webpack.common.js | 233 +----------------------------------------------------- 2 files changed, 4 insertions(+), 231 deletions(-) diff --git a/package.json b/package.json index 1f0f2ce3..fc1716b7 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "bootstrap-validator": "^0.11.8", "chance": "^1.0.4", "cheerio": "^0.22.0", - "codemirror": "git+https://github.com/codimd/CodeMirror.git", + "codemirror": "git+https://github.com/hackmdio/CodeMirror.git", "compression": "^1.6.2", "connect-flash": "^0.1.1", "connect-session-sequelize": "^6.0.0", diff --git a/webpack.common.js b/webpack.common.js index 1f522178..9d1a9005 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -212,83 +212,7 @@ module.exports = { 'script-loader!jquery-ui-resizable', 'script-loader!Idle.Js', 'expose-loader?LZString!lz-string', - - 'script-loader!codemirror-lib-codemirror', - 'script-loader!codemirror-addon-mode-overlay', - 'script-loader!codemirror-addon-mode-simple', - 'script-loader!codemirror-addon-mode-multiplex', - 'script-loader!codemirror-addon-selection-active-line', - 'script-loader!codemirror-addon-search-searchcursor', - 'script-loader!codemirror-addon-search-search', - 'script-loader!codemirror-addon-search-jump-to-line', - 'script-loader!codemirror-addon-search-matchesonscrollbar', - 'script-loader!codemirror-addon-search-match-highlighter', - 'script-loader!codemirror-addon-scroll-simplescrollbars', - 'script-loader!codemirror-addon-scroll-annotatescrollbar', - 'script-loader!codemirror-addon-display-panel', - 'script-loader!codemirror-addon-display-placeholder', - 'script-loader!codemirror-addon-display-fullscreen', - 'script-loader!codemirror-addon-display-autorefresh', - 'script-loader!codemirror-addon-dialog-dialog', - 'script-loader!codemirror-addon-edit-matchbrackets', - 'script-loader!codemirror-addon-edit-closebrackets', - 'script-loader!codemirror-addon-edit-matchtags', - 'script-loader!codemirror-addon-edit-closetag', - 'script-loader!codemirror-addon-edit-continuelist', - 'script-loader!codemirror-addon-comment-comment', - 'script-loader!codemirror-addon-comment-continuecomment', - 'script-loader!codemirror-addon-wrap-hardwrap', - 'script-loader!codemirror-addon-fold-foldcode', - 'script-loader!codemirror-addon-fold-brace-fold', - 'script-loader!codemirror-addon-fold-foldgutter', - 'script-loader!codemirror-addon-fold-markdown-fold', - 'script-loader!codemirror-addon-fold-xml-fold', - 'script-loader!codemirror-addon-merge-merge', - 'script-loader!codemirror-mode-xml-xml', - 'script-loader!codemirror-mode-markdown-markdown_math', - 'script-loader!codemirror-mode-gfm-gfm', - 'script-loader!codemirror-mode-javascript-javascript', - 'script-loader!codemirror-mode-typescript-typescript', - 'script-loader!codemirror-mode-jsx-jsx', - 'script-loader!codemirror-mode-css-css', - 'script-loader!codemirror-mode-htmlmixed-htmlmixed', - 'script-loader!codemirror-mode-htmlembedded-htmlembedded', - 'script-loader!codemirror-mode-clike-clike', - 'script-loader!codemirror-mode-clojure-clojure', - 'script-loader!codemirror-mode-diff-diff', - 'script-loader!codemirror-mode-ruby-ruby', - 'script-loader!codemirror-mode-rust-rust', - 'script-loader!codemirror-mode-python-python', - 'script-loader!codemirror-mode-plantuml-plantuml', - 'script-loader!codemirror-mode-csv-csv', - 'script-loader!codemirror-mode-shell-shell', - 'script-loader!codemirror-mode-php-php', - 'script-loader!codemirror-mode-sas-sas', - 'script-loader!codemirror-mode-stex-stex', - 'script-loader!codemirror-mode-sql-sql', - 'script-loader!codemirror-mode-haskell-haskell', - 'script-loader!codemirror-mode-coffeescript-coffeescript', - 'script-loader!codemirror-mode-yaml-yaml', - 'script-loader!codemirror-mode-yaml-frontmatter-yaml-frontmatter', - 'script-loader!codemirror-mode-pug-pug', - 'script-loader!codemirror-mode-lua-lua', - 'script-loader!codemirror-mode-cmake-cmake', - 'script-loader!codemirror-mode-nginx-nginx', - 'script-loader!codemirror-mode-perl-perl', - 'script-loader!codemirror-mode-sass-sass', - 'script-loader!codemirror-mode-r-r', - 'script-loader!codemirror-mode-dockerfile-dockerfile', - 'script-loader!codemirror-mode-tiddlywiki-tiddlywiki', - 'script-loader!codemirror-mode-mediawiki-mediawiki', - 'script-loader!codemirror-mode-go-go', - 'script-loader!codemirror-mode-graphviz-graphviz', - 'script-loader!codemirror-mode-groovy-groovy', - 'script-loader!codemirror-mode-gherkin-gherkin', - 'script-loader!codemirror-mode-mllike-mllike', - 'script-loader!codemirror-keymap-emacs', - 'script-loader!codemirror-keymap-sublime', - 'script-loader!codemirror-keymap-vim', - + 'script-loader!codemirror', 'script-loader!inlineAttachment', 'script-loader!jqueryTextcomplete', 'script-loader!codemirrorSpellChecker', @@ -338,83 +262,7 @@ module.exports = { 'script-loader!Idle.Js', 'script-loader!gist-embed', 'expose-loader?LZString!lz-string', - - 'script-loader!codemirror-lib-codemirror', - 'script-loader!codemirror-addon-mode-overlay', - 'script-loader!codemirror-addon-mode-simple', - 'script-loader!codemirror-addon-mode-multiplex', - 'script-loader!codemirror-addon-selection-active-line', - 'script-loader!codemirror-addon-search-searchcursor', - 'script-loader!codemirror-addon-search-search', - 'script-loader!codemirror-addon-search-jump-to-line', - 'script-loader!codemirror-addon-search-matchesonscrollbar', - 'script-loader!codemirror-addon-search-match-highlighter', - 'script-loader!codemirror-addon-scroll-simplescrollbars', - 'script-loader!codemirror-addon-scroll-annotatescrollbar', - 'script-loader!codemirror-addon-display-panel', - 'script-loader!codemirror-addon-display-placeholder', - 'script-loader!codemirror-addon-display-fullscreen', - 'script-loader!codemirror-addon-display-autorefresh', - 'script-loader!codemirror-addon-dialog-dialog', - 'script-loader!codemirror-addon-edit-matchbrackets', - 'script-loader!codemirror-addon-edit-closebrackets', - 'script-loader!codemirror-addon-edit-matchtags', - 'script-loader!codemirror-addon-edit-closetag', - 'script-loader!codemirror-addon-edit-continuelist', - 'script-loader!codemirror-addon-comment-comment', - 'script-loader!codemirror-addon-comment-continuecomment', - 'script-loader!codemirror-addon-wrap-hardwrap', - 'script-loader!codemirror-addon-fold-foldcode', - 'script-loader!codemirror-addon-fold-brace-fold', - 'script-loader!codemirror-addon-fold-foldgutter', - 'script-loader!codemirror-addon-fold-markdown-fold', - 'script-loader!codemirror-addon-fold-xml-fold', - 'script-loader!codemirror-addon-merge-merge', - 'script-loader!codemirror-mode-xml-xml', - 'script-loader!codemirror-mode-markdown-markdown_math', - 'script-loader!codemirror-mode-gfm-gfm', - 'script-loader!codemirror-mode-javascript-javascript', - 'script-loader!codemirror-mode-typescript-typescript', - 'script-loader!codemirror-mode-jsx-jsx', - 'script-loader!codemirror-mode-css-css', - 'script-loader!codemirror-mode-htmlmixed-htmlmixed', - 'script-loader!codemirror-mode-htmlembedded-htmlembedded', - 'script-loader!codemirror-mode-clike-clike', - 'script-loader!codemirror-mode-clojure-clojure', - 'script-loader!codemirror-mode-diff-diff', - 'script-loader!codemirror-mode-ruby-ruby', - 'script-loader!codemirror-mode-rust-rust', - 'script-loader!codemirror-mode-python-python', - 'script-loader!codemirror-mode-plantuml-plantuml', - 'script-loader!codemirror-mode-csv-csv', - 'script-loader!codemirror-mode-shell-shell', - 'script-loader!codemirror-mode-php-php', - 'script-loader!codemirror-mode-sas-sas', - 'script-loader!codemirror-mode-stex-stex', - 'script-loader!codemirror-mode-sql-sql', - 'script-loader!codemirror-mode-haskell-haskell', - 'script-loader!codemirror-mode-coffeescript-coffeescript', - 'script-loader!codemirror-mode-yaml-yaml', - 'script-loader!codemirror-mode-yaml-frontmatter-yaml-frontmatter', - 'script-loader!codemirror-mode-pug-pug', - 'script-loader!codemirror-mode-lua-lua', - 'script-loader!codemirror-mode-cmake-cmake', - 'script-loader!codemirror-mode-nginx-nginx', - 'script-loader!codemirror-mode-perl-perl', - 'script-loader!codemirror-mode-sass-sass', - 'script-loader!codemirror-mode-r-r', - 'script-loader!codemirror-mode-dockerfile-dockerfile', - 'script-loader!codemirror-mode-tiddlywiki-tiddlywiki', - 'script-loader!codemirror-mode-mediawiki-mediawiki', - 'script-loader!codemirror-mode-go-go', - 'script-loader!codemirror-mode-graphviz-graphviz', - 'script-loader!codemirror-mode-groovy-groovy', - 'script-loader!codemirror-mode-gherkin-gherkin', - 'script-loader!codemirror-mode-mllike-mllike', - 'script-loader!codemirror-keymap-emacs', - 'script-loader!codemirror-keymap-sublime', - 'script-loader!codemirror-keymap-vim', - + 'script-loader!codemirror', 'script-loader!inlineAttachment', 'script-loader!jqueryTextcomplete', 'script-loader!codemirrorSpellChecker', @@ -513,82 +361,7 @@ module.exports = { modules: ['node_modules'], extensions: ['.js'], alias: { - 'codemirror-lib-codemirror': path.join(__dirname, 'node_modules/codemirror/src/codemirror.js'), - 'codemirror-addon-mode-overlay': path.join(__dirname, 'node_modules/codemirror/addon/mode/overlay.js'), - 'codemirror-addon-mode-simple': path.join(__dirname, 'node_modules/codemirror/addon/mode/simple.js'), - 'codemirror-addon-mode-multiplex': path.join(__dirname, 'node_modules/codemirror/addon/mode/multiplex.js'), - 'codemirror-addon-selection-active-line': path.join(__dirname, 'node_modules/codemirror/addon/selection/active-line.js'), - 'codemirror-addon-search-searchcursor': path.join(__dirname, 'node_modules/codemirror/addon/search/searchcursor.js'), - 'codemirror-addon-search-search': path.join(__dirname, 'node_modules/codemirror/addon/search/search.js'), - 'codemirror-addon-search-jump-to-line': path.join(__dirname, 'node_modules/codemirror/addon/search/jump-to-line.js'), - 'codemirror-addon-search-matchesonscrollbar': path.join(__dirname, 'node_modules/codemirror/addon/search/matchesonscrollbar.js'), - 'codemirror-addon-search-match-highlighter': path.join(__dirname, 'node_modules/codemirror/addon/search/match-highlighter.js'), - 'codemirror-addon-scroll-simplescrollbars': path.join(__dirname, 'node_modules/codemirror/addon/scroll/simplescrollbars.js'), - 'codemirror-addon-scroll-annotatescrollbar': path.join(__dirname, 'node_modules/codemirror/addon/scroll/annotatescrollbar.js'), - 'codemirror-addon-display-panel': path.join(__dirname, 'node_modules/codemirror/addon/display/panel.js'), - 'codemirror-addon-display-placeholder': path.join(__dirname, 'node_modules/codemirror/addon/display/placeholder.js'), - 'codemirror-addon-display-fullscreen': path.join(__dirname, 'node_modules/codemirror/addon/display/fullscreen.js'), - 'codemirror-addon-display-autorefresh': path.join(__dirname, 'node_modules/codemirror/addon/display/autorefresh.js'), - 'codemirror-addon-dialog-dialog': path.join(__dirname, 'node_modules/codemirror/addon/dialog/dialog.js'), - 'codemirror-addon-edit-matchbrackets': path.join(__dirname, 'node_modules/codemirror/addon/edit/matchbrackets.js'), - 'codemirror-addon-edit-closebrackets': path.join(__dirname, 'node_modules/codemirror/addon/edit/closebrackets.js'), - 'codemirror-addon-edit-matchtags': path.join(__dirname, 'node_modules/codemirror/addon/edit/matchtags.js'), - 'codemirror-addon-edit-closetag': path.join(__dirname, 'node_modules/codemirror/addon/edit/closetag.js'), - 'codemirror-addon-edit-continuelist': path.join(__dirname, 'node_modules/codemirror/addon/edit/continuelist.js'), - 'codemirror-addon-comment-comment': path.join(__dirname, 'node_modules/codemirror/addon/comment/comment.js'), - 'codemirror-addon-comment-continuecomment': path.join(__dirname, 'node_modules/codemirror/addon/comment/continuecomment.js'), - 'codemirror-addon-wrap-hardwrap': path.join(__dirname, 'node_modules/codemirror/addon/wrap/hardwrap.js'), - 'codemirror-addon-fold-foldcode': path.join(__dirname, 'node_modules/codemirror/addon/fold/foldcode.js'), - 'codemirror-addon-fold-brace-fold': path.join(__dirname, 'node_modules/codemirror/addon/fold/brace-fold.js'), - 'codemirror-addon-fold-foldgutter': path.join(__dirname, 'node_modules/codemirror/addon/fold/foldgutter.js'), - 'codemirror-addon-fold-markdown-fold': path.join(__dirname, 'node_modules/codemirror/addon/fold/markdown-fold.js'), - 'codemirror-addon-fold-xml-fold': path.join(__dirname, 'node_modules/codemirror/addon/fold/xml-fold.js'), - 'codemirror-addon-merge-merge': path.join(__dirname, 'node_modules/codemirror/addon/merge/merge.js'), - 'codemirror-mode-xml-xml': path.join(__dirname, 'node_modules/codemirror/mode/xml/xml.js'), - 'codemirror-mode-markdown-markdown_math': path.join(__dirname, 'node_modules/codemirror/mode/markdown/markdown_math.js'), - 'codemirror-mode-gfm-gfm': path.join(__dirname, 'node_modules/codemirror/mode/gfm/gfm.js'), - 'codemirror-mode-javascript-javascript': path.join(__dirname, 'node_modules/codemirror/mode/javascript/javascript.js'), - 'codemirror-mode-typescript-typescript': path.join(__dirname, 'node_modules/codemirror/mode/typescript/typescript.js'), - 'codemirror-mode-jsx-jsx': path.join(__dirname, 'node_modules/codemirror/mode/jsx/jsx.js'), - 'codemirror-mode-css-css': path.join(__dirname, 'node_modules/codemirror/mode/css/css.js'), - 'codemirror-mode-htmlmixed-htmlmixed': path.join(__dirname, 'node_modules/codemirror/mode/htmlmixed/htmlmixed.js'), - 'codemirror-mode-htmlembedded-htmlembedded': path.join(__dirname, 'node_modules/codemirror/mode/htmlembedded/htmlembedded.js'), - 'codemirror-mode-clike-clike': path.join(__dirname, 'node_modules/codemirror/mode/clike/clike.js'), - 'codemirror-mode-clojure-clojure': path.join(__dirname, 'node_modules/codemirror/mode/clojure/clojure.js'), - 'codemirror-mode-diff-diff': path.join(__dirname, 'node_modules/codemirror/mode/diff/diff.js'), - 'codemirror-mode-ruby-ruby': path.join(__dirname, 'node_modules/codemirror/mode/ruby/ruby.js'), - 'codemirror-mode-rust-rust': path.join(__dirname, 'node_modules/codemirror/mode/rust/rust.js'), - 'codemirror-mode-python-python': path.join(__dirname, 'node_modules/codemirror/mode/python/python.js'), - 'codemirror-mode-plantuml-plantuml': path.join(__dirname, 'node_modules/codemirror/mode/plantuml/plantuml.js'), - 'codemirror-mode-csv-csv': path.join(__dirname, 'node_modules/codemirror/mode/csv/csv.js'), - 'codemirror-mode-shell-shell': path.join(__dirname, 'node_modules/codemirror/mode/shell/shell.js'), - 'codemirror-mode-php-php': path.join(__dirname, 'node_modules/codemirror/mode/php/php.js'), - 'codemirror-mode-sas-sas': path.join(__dirname, 'node_modules/codemirror/mode/sas/sas.js'), - 'codemirror-mode-stex-stex': path.join(__dirname, 'node_modules/codemirror/mode/stex/stex.js'), - 'codemirror-mode-sql-sql': path.join(__dirname, 'node_modules/codemirror/mode/sql/sql.js'), - 'codemirror-mode-haskell-haskell': path.join(__dirname, 'node_modules/codemirror/mode/haskell/haskell.js'), - 'codemirror-mode-coffeescript-coffeescript': path.join(__dirname, 'node_modules/codemirror/mode/coffeescript/coffeescript.js'), - 'codemirror-mode-yaml-yaml': path.join(__dirname, 'node_modules/codemirror/mode/yaml/yaml.js'), - 'codemirror-mode-yaml-frontmatter-yaml-frontmatter': path.join(__dirname, 'node_modules/codemirror/mode/yaml-frontmatter/yaml-frontmatter.js'), - 'codemirror-mode-pug-pug': path.join(__dirname, 'node_modules/codemirror/mode/pug/pug.js'), - 'codemirror-mode-lua-lua': path.join(__dirname, 'node_modules/codemirror/mode/lua/lua.js'), - 'codemirror-mode-cmake-cmake': path.join(__dirname, 'node_modules/codemirror/mode/cmake/cmake.js'), - 'codemirror-mode-nginx-nginx': path.join(__dirname, 'node_modules/codemirror/mode/nginx/nginx.js'), - 'codemirror-mode-perl-perl': path.join(__dirname, 'node_modules/codemirror/mode/perl/perl.js'), - 'codemirror-mode-sass-sass': path.join(__dirname, 'node_modules/codemirror/mode/sass/sass.js'), - 'codemirror-mode-r-r': path.join(__dirname, 'node_modules/codemirror/mode/r/r.js'), - 'codemirror-mode-dockerfile-dockerfile': path.join(__dirname, 'node_modules/codemirror/mode/dockerfile/dockerfile.js'), - 'codemirror-mode-tiddlywiki-tiddlywiki': path.join(__dirname, 'node_modules/codemirror/mode/tiddlywiki/tiddlywiki.js'), - 'codemirror-mode-mediawiki-mediawiki': path.join(__dirname, 'node_modules/codemirror/mode/mediawiki/mediawiki.js'), - 'codemirror-mode-go-go': path.join(__dirname, 'node_modules/codemirror/mode/go/go.js'), - 'codemirror-mode-graphviz-graphviz': path.join(__dirname, 'node_modules/codemirror/mode/graphviz/graphviz.js'), - 'codemirror-mode-groovy-groovy': path.join(__dirname, 'node_modules/codemirror/mode/groovy/groovy.js'), - 'codemirror-mode-gherkin-gherkin': path.join(__dirname, 'node_modules/codemirror/mode/gherkin/gherkin.js'), - 'codemirror-mode-mllike-mllike': path.join(__dirname, 'node_modules/codemirror/mode/mllike/mllike.js'), - 'codemirror-keymap-emacs': path.join(__dirname, 'node_modules/codemirror/keymap/emacs.js'), - 'codemirror-keymap-sublime': path.join(__dirname, 'node_modules/codemirror/keymap/sublime.js'), - 'codemirror-keymap-vim': path.join(__dirname, 'node_modules/codemirror/keymap/vim.js'), - + codemirror: path.join(__dirname, 'node_modules/codemirror/codemirror.min.js'), inlineAttachment: path.join(__dirname, 'public/vendor/inlineAttachment/inline-attachment.js'), jqueryTextcomplete: path.join(__dirname, 'public/vendor/jquery-textcomplete/jquery.textcomplete.js'), codemirrorSpellChecker: path.join(__dirname, 'public/vendor/codemirror-spell-checker/spell-checker.min.js'), -- cgit v1.2.3 From 5bd8d9f03e796a0897220b2ea19eb7e29e9c2681 Mon Sep 17 00:00:00 2001 From: David Mehren Date: Wed, 11 Nov 2020 20:20:24 +0100 Subject: Use our fork of CodeMirror Signed-off-by: David Mehren --- package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index fc1716b7..1f0f2ce3 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "bootstrap-validator": "^0.11.8", "chance": "^1.0.4", "cheerio": "^0.22.0", - "codemirror": "git+https://github.com/hackmdio/CodeMirror.git", + "codemirror": "git+https://github.com/codimd/CodeMirror.git", "compression": "^1.6.2", "connect-flash": "^0.1.1", "connect-session-sequelize": "^6.0.0", diff --git a/yarn.lock b/yarn.lock index 2c591002..05b4c7f2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2363,7 +2363,7 @@ code-point-at@^1.0.0: "codemirror@git+https://github.com/codimd/CodeMirror.git": version "5.58.2" - resolved "git+https://github.com/codimd/CodeMirror.git#14d7274d417005fbce00f94c8e56a9568c7fb012" + resolved "git+https://github.com/codimd/CodeMirror.git#f780b569b3717cdff4c8507538cc63101bfa02e1" collapse-white-space@^1.0.2: version "1.0.6" -- cgit v1.2.3