From d173ee154df6167b62d70b86f3fe500183f0244e Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Tue, 22 Oct 2019 17:07:50 -0400 Subject: [PATCH] Switch back to 'codemirror' --- .gitignore | 2 +- package.json | 2 +- rollup.config.js | 43 ++++++++++---------- src/demo/app/app.component.ts | 8 ++-- src/demo/styles.css | 8 ++-- src/demo/systemjs.config.js | 3 +- src/lib/code-editor/code-editor.component.ts | 38 ++++++++--------- src/lib/dsl-editor/dsl-editor.component.ts | 12 +++--- src/lib/styles.scss | 8 ++-- 9 files changed, 61 insertions(+), 63 deletions(-) diff --git a/.gitignore b/.gitignore index 86be9b3..a37c858 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,4 @@ e2e/**/*.js.map **/.DS_Store *.iml .idea/ -!/src/lib/@types/codemirror-minified/index.d.ts +#!/src/lib/@types/codemirror-minified/index.d.ts diff --git a/package.json b/package.json index f981f88..67e3672 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "prepare": "npm run build" }, "dependencies": { - "codemirror-minified": "5.44.0", + "codemirror": "5.49.2", "jointjs": "3.1.0", "ts-disposables": "2.2.3" }, diff --git a/rollup.config.js b/rollup.config.js index f6dbcf6..601eba1 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -41,38 +41,37 @@ const globals = { 'rxjs/operators': 'rxjs.operators', 'lodash': 'lodash', 'ts-disposables': 'ts-disposables', - 'codemirror-minified': 'codemirror-minified', - 'codemirror': 'codemirror-minified', + 'codemirror': 'codemirror', 'jointjs': 'jointjs', 'jquery': 'jquery', // CodeMirror extensions - 'codemirror-minified/mode/meta': 'codemirror-minified/mode/meta', - 'codemirror-minified/addon/lint/lint': 'codemirror-minified/addon/lint/lint', - 'codemirror-minified/addon/hint/show-hint': 'codemirror-minified/addon/hint/show-hint', - 'codemirror-minified/addon/mode/loadmode': 'codemirror-minified/addon/mode/loadmode', - 'codemirror-minified/addon/edit/matchbrackets': 'codemirror-minified/addon/edit/matchbrackets', - 'codemirror-minified/addon/edit/closebrackets': 'codemirror-minified/addon/edit/closebrackets', - 'codemirror-minified/addon/display/placeholder': 'codemirror-minified/addon/edit/closebrackets', - 'codemirror-minified/addon/scroll/annotatescrollbar': 'codemirror-minified/addon/scroll/annotatescrollbar', - 'codemirror-minified/addon/scroll/simplescrollbars': 'codemirror-minified/addon/scroll/simplescrollbars', + 'codemirror/mode/meta': 'codemirror/mode/meta', + 'codemirror/addon/lint/lint': 'codemirror/addon/lint/lint', + 'codemirror/addon/hint/show-hint': 'codemirror/addon/hint/show-hint', + 'codemirror/addon/mode/loadmode': 'codemirror/addon/mode/loadmode', + 'codemirror/addon/edit/matchbrackets': 'codemirror/addon/edit/matchbrackets', + 'codemirror/addon/edit/closebrackets': 'codemirror/addon/edit/closebrackets', + 'codemirror/addon/display/placeholder': 'codemirror/addon/edit/closebrackets', + 'codemirror/addon/scroll/annotatescrollbar': 'codemirror/addon/scroll/annotatescrollbar', + 'codemirror/addon/scroll/simplescrollbars': 'codemirror/addon/scroll/simplescrollbars', // Lint support // Unclear how to import this dynamically... - 'codemirror-minified/addon/lint/javascript-lint': 'codemirror-minified/addon/lint/javascript-lint', - 'codemirror-minified/addon/lint/coffeescript-lint': 'codemirror-minified/addon/lint/coffeescript-lint', - 'codemirror-minified/addon/lint/json-lint': 'codemirror-minified/addon/lint/json-lint', - 'codemirror-minified/addon/lint/yaml-lint': 'codemirror-minified/addon/lint/yaml-lint', + 'codemirror/addon/lint/javascript-lint': 'codemirror/addon/lint/javascript-lint', + 'codemirror/addon/lint/coffeescript-lint': 'codemirror/addon/lint/coffeescript-lint', + 'codemirror/addon/lint/json-lint': 'codemirror/addon/lint/json-lint', + 'codemirror/addon/lint/yaml-lint': 'codemirror/addon/lint/yaml-lint', // TODO: use dynamic import with JS7 in the future. CM autoLoad cannot load it properly - thinks its AMD // Supported languages until dynamic loading - 'codemirror-minified/mode/groovy/groovy': 'codemirror-minified/mode/groovy/groovy', - 'codemirror-minified/mode/javascript/javascript': 'codemirror-minified/mode/javascript/javascript', - 'codemirror-minified/mode/python/python': 'codemirror-minified/mode/python/python', - 'codemirror-minified/mode/ruby/ruby': 'codemirror-minified/mode/ruby/ruby', - 'codemirror-minified/mode/clike/clike': 'codemirror-minified/mode/clike/clike', - 'codemirror-minified/mode/yaml/yaml': 'codemirror-minified/mode/yaml/yaml', - 'codemirror-minified/mode/coffeescript/coffeescript': 'codemirror-minified/mode/coffeescript/coffeescript' + 'codemirror/mode/groovy/groovy': 'codemirror/mode/groovy/groovy', + 'codemirror/mode/javascript/javascript': 'codemirror/mode/javascript/javascript', + 'codemirror/mode/python/python': 'codemirror/mode/python/python', + 'codemirror/mode/ruby/ruby': 'codemirror/mode/ruby/ruby', + 'codemirror/mode/clike/clike': 'codemirror/mode/clike/clike', + 'codemirror/mode/yaml/yaml': 'codemirror/mode/yaml/yaml', + 'codemirror/mode/coffeescript/coffeescript': 'codemirror/mode/coffeescript/coffeescript' }; diff --git a/src/demo/app/app.component.ts b/src/demo/app/app.component.ts index dcbfb3b..61f8069 100644 --- a/src/demo/app/app.component.ts +++ b/src/demo/app/app.component.ts @@ -7,10 +7,10 @@ const { Renderer } = require('./renderer'); const { Editor } = require('./editor'); // Code editor used from Flo requires the follwoing CM extensions -import 'codemirror-minified/mode/javascript/javascript'; -import 'codemirror-minified/mode/ruby/ruby'; -import 'codemirror-minified/mode/clike/clike'; -import 'codemirror-minified/addon/lint/javascript-lint'; +import 'codemirror/mode/javascript/javascript'; +import 'codemirror/mode/ruby/ruby'; +import 'codemirror/mode/clike/clike'; +import 'codemirror/addon/lint/javascript-lint'; @Component({ selector: 'demo-app', diff --git a/src/demo/styles.css b/src/demo/styles.css index a75c1b3..6569e4c 100644 --- a/src/demo/styles.css +++ b/src/demo/styles.css @@ -1,8 +1,8 @@ @import "./../../node_modules/jointjs/dist/joint.core.css"; -@import "./../../node_modules/codemirror-minified/lib/codemirror.css"; -@import "./../../node_modules/codemirror-minified/addon/hint/show-hint.css"; -@import "./../../node_modules/codemirror-minified/addon/lint/lint.css"; -@import "./../../node_modules/codemirror-minified/addon/scroll/simplescrollbars.css"; +@import "./../../node_modules/codemirror/lib/codemirror.css"; +@import "./../../node_modules/codemirror/addon/hint/show-hint.css"; +@import "./../../node_modules/codemirror/addon/lint/lint.css"; +@import "./../../node_modules/codemirror/addon/scroll/simplescrollbars.css"; h1 { color: #369; diff --git a/src/demo/systemjs.config.js b/src/demo/systemjs.config.js index aaaec7d..0a4fb39 100644 --- a/src/demo/systemjs.config.js +++ b/src/demo/systemjs.config.js @@ -59,8 +59,7 @@ 'lodash': 'npm:lodash', 'underscore': 'npm:lodash', 'dagre': 'npm:dagre', - 'codemirror': 'npm:codemirror-minified', - 'codemirror-minified': 'npm:codemirror-minified', + 'codemirror': 'npm:codemirror', 'moment': 'npm:moment/moment.js', 'ts-disposables': 'npm:ts-disposables', 'jshint': 'npm:jshint/dist/jshint.js' diff --git a/src/lib/code-editor/code-editor.component.ts b/src/lib/code-editor/code-editor.component.ts index 5df0477..b52d8d9 100644 --- a/src/lib/code-editor/code-editor.component.ts +++ b/src/lib/code-editor/code-editor.component.ts @@ -1,35 +1,35 @@ import { Component, Input, Output, ElementRef, EventEmitter, OnInit, OnDestroy, ViewEncapsulation, forwardRef } from '@angular/core'; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; -import * as CodeMirror from 'codemirror-minified'; +import * as CodeMirror from 'codemirror'; import * as _$ from 'jquery'; const $: any = _$; // CodeMirror extensions -import 'codemirror-minified/mode/meta'; -import 'codemirror-minified/addon/lint/lint'; -import 'codemirror-minified/addon/hint/show-hint'; -// import 'codemirror-minified/addon/mode/loadmode'; -import 'codemirror-minified/addon/edit/matchbrackets'; -import 'codemirror-minified/addon/edit/closebrackets'; -import 'codemirror-minified/addon/display/placeholder'; -import 'codemirror-minified/addon/scroll/annotatescrollbar'; -import 'codemirror-minified/addon/scroll/simplescrollbars'; +import 'codemirror/mode/meta'; +import 'codemirror/addon/lint/lint'; +import 'codemirror/addon/hint/show-hint'; +// import 'codemirror/addon/mode/loadmode'; +import 'codemirror/addon/edit/matchbrackets'; +import 'codemirror/addon/edit/closebrackets'; +import 'codemirror/addon/display/placeholder'; +import 'codemirror/addon/scroll/annotatescrollbar'; +import 'codemirror/addon/scroll/simplescrollbars'; // Lint support // Unclear how to import this dynamically... -// import 'codemirror-minified/addon/lint/javascript-lint'; -// import 'codemirror-minified/addon/lint/json-lint'; -// import 'codemirror-minified/addon/lint/yaml-lint'; +// import 'codemirror/addon/lint/javascript-lint'; +// import 'codemirror/addon/lint/json-lint'; +// import 'codemirror/addon/lint/yaml-lint'; // TODO: use dynamic import with JS7 in the future. CM autoLoad cannot load it properly - thinks its AMD // Supported languages until dynamic loading -// import 'codemirror-minified/mode/groovy/groovy'; -// import 'codemirror-minified/mode/javascript/javascript'; -// import 'codemirror-minified/mode/python/python'; -// import 'codemirror-minified/mode/ruby/ruby'; -// import 'codemirror-minified/mode/clike/clike'; -// import 'codemirror-minified/mode/yaml/yaml'; +// import 'codemirror/mode/groovy/groovy'; +// import 'codemirror/mode/javascript/javascript'; +// import 'codemirror/mode/python/python'; +// import 'codemirror/mode/ruby/ruby'; +// import 'codemirror/mode/clike/clike'; +// import 'codemirror/mode/yaml/yaml'; @Component({ selector: 'code-editor', diff --git a/src/lib/dsl-editor/dsl-editor.component.ts b/src/lib/dsl-editor/dsl-editor.component.ts index 21c66eb..60a9c6d 100644 --- a/src/lib/dsl-editor/dsl-editor.component.ts +++ b/src/lib/dsl-editor/dsl-editor.component.ts @@ -1,14 +1,14 @@ import { Component, Input, Output, ElementRef, EventEmitter, OnInit, OnDestroy, ViewEncapsulation } from '@angular/core'; import * as _ from 'lodash'; -import * as CodeMirror from 'codemirror-minified'; +import * as CodeMirror from 'codemirror'; import * as _$ from 'jquery'; const $: any = _$; -import 'codemirror-minified/addon/lint/lint'; -import 'codemirror-minified/addon/hint/show-hint'; -import 'codemirror-minified/addon/display/placeholder'; -import 'codemirror-minified/addon/scroll/annotatescrollbar'; -import 'codemirror-minified/addon/scroll/simplescrollbars'; +import 'codemirror/addon/lint/lint'; +import 'codemirror/addon/hint/show-hint'; +import 'codemirror/addon/display/placeholder'; +import 'codemirror/addon/scroll/annotatescrollbar'; +import 'codemirror/addon/scroll/simplescrollbars'; @Component({ selector: 'dsl-editor', diff --git a/src/lib/styles.scss b/src/lib/styles.scss index 0636111..94e0d6b 100644 --- a/src/lib/styles.scss +++ b/src/lib/styles.scss @@ -1,5 +1,5 @@ @import "./../../node_modules/jointjs/dist/joint.core.css"; -@import "./../../node_modules/codemirror-minified/lib/codemirror.css"; -@import "./../../node_modules/codemirror-minified/addon/hint/show-hint.css"; -@import "./../../node_modules/codemirror-minified/addon/lint/lint.css"; -@import "./../../node_modules/codemirror-minified/addon/scroll/simplescrollbars.css"; +@import "./../../node_modules/codemirror/lib/codemirror.css"; +@import "./../../node_modules/codemirror/addon/hint/show-hint.css"; +@import "./../../node_modules/codemirror/addon/lint/lint.css"; +@import "./../../node_modules/codemirror/addon/scroll/simplescrollbars.css";