Merge pull request neo4j#794 from pe4cey/bump-editor-version

Fix editor to handle string literals that contain new lines
myzero1 · Jul 9, 2018 · 4b833ed · 4b833ed
2 parents b1dc40c + 8d2133e
commit 4b833ed
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -131,7 +131,7 @@
     "ascii-data-table": "^2.1.1",
     "classnames": "^2.2.5",
     "codemirror": "^5.29.0",
-    "cypher-codemirror": "1.1.2",
+    "cypher-codemirror": "1.1.3",
     "dnd-core": "^2.5.1",
     "file-saver": "^1.3.8",
     "firebase": "^4.3.0",

diff --git a/src/browser/modules/Stream/CypherScriptFrame/Summary.jsx b/src/browser/modules/Stream/CypherScriptFrame/Summary.jsx
@@ -54,8 +54,8 @@ const GenericSummary = ({ status }) => {
         <PaddedStatsBar>
           <StyledCypherInfoMessage>INFO</StyledCypherInfoMessage>
           <MessageArea>
-            This query is waiting for it's turn. The excution is serial and will
-            break on first error.
+            This query is waiting for it's turn. The execution is serial and
+            will break on first error.
           </MessageArea>
         </PaddedStatsBar>
       )

diff --git a/yarn.lock b/yarn.lock
@@ -2528,15 +2528,15 @@ cyclist@~0.2.2:
   version "0.2.2"
   resolved "https://neo.jfrog.io/neo/api/npm/npm/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
 
-cypher-codemirror@1.1.2:
-  version "1.1.2"
-  resolved "https://neo.jfrog.io/neo/api/npm/npm/cypher-codemirror/-/cypher-codemirror-1.1.2.tgz#af57041062a9bcc92b4276b0e9c04c9a38f6993b"
+cypher-codemirror@1.1.3:
+  version "1.1.3"
+  resolved "https://neo.jfrog.io/neo/api/npm/npm/cypher-codemirror/-/cypher-codemirror-1.1.3.tgz#ca7230adc8b697baabfdc4d552bfea5652ef3dfc"
   dependencies:
-    cypher-editor-support "1.1.2"
+    cypher-editor-support "1.1.3"
 
-cypher-editor-support@1.1.2:
-  version "1.1.2"
-  resolved "https://neo.jfrog.io/neo/api/npm/npm/cypher-editor-support/-/cypher-editor-support-1.1.2.tgz#361c546a7618e5422872ed411e7e1e6b20e9f11c"
+cypher-editor-support@1.1.3:
+  version "1.1.3"
+  resolved "https://neo.jfrog.io/neo/api/npm/npm/cypher-editor-support/-/cypher-editor-support-1.1.3.tgz#5093f2de733b53adf334e382027f6d66615ab7db"
   dependencies:
     antlr4 "4.7.0"
     fuzzaldrin "2.1.0"