upgrade CodeMirror to 4.7.0 in Helios

app.js

@@ -2,12 +2,12 @@ define([
 	'amber/helpers', // pre-fetch, dep of amber/deploy
 	'amber/deploy', // pre-fetch, dep of amber/lang
 	'amber/lang',
-    'codemirror3/lib/codemirror',
-    'codemirror3/mode/smalltalk/smalltalk',
-    'codemirror3/addon/hint/show-hint',
-    'css!codemirror3/theme/ambiance',
-    'css!codemirror3/lib/codemirror',
-    'css!codemirror3/addon/hint/show-hint',
+    'codemirror/lib/codemirror',
+    'codemirror/mode/smalltalk/smalltalk',
+    'codemirror/addon/hint/show-hint',
+    'css!codemirror/theme/ambiance',
+    'css!codemirror/lib/codemirror',
+    'css!codemirror/addon/hint/show-hint',
     'jquery-ui',
     'amber_core/Examples',
     'amber_core/Benchfib',

bower.json

@@ -13,7 +13,7 @@
     "jquery": ">=1.7.0",
     "jquery-ui": ">=1.9.2",
     "bootstrap2.3.2": "^2.3.2",
-    "codemirror3": "codemirror#^3.24.0",
+    "codemirror": "^4.7.0",
     "showdown": "^0.3.1"
   }
 }

codemirror.amd.json

@@ -0,0 +1,10 @@
+{
+    "paths": {
+        "codemirror": "."
+    },
+    "shim": {
+        "codemirror/lib/codemirror": {
+            "deps": [ "css!codemirror/lib/codemirror" ]
+        }
+    }
+}

codemirror3.amd.json

@@ -1,17 +0,0 @@
-{
-    "paths": {
-        "codemirror3": "."
-    },
-    "shim": {
-        "codemirror3/lib/codemirror": {
-            "deps": [ "css!codemirror3/lib/codemirror" ],
-            "exports": "CodeMirror"
-        },
-        "codemirror3/mode/smalltalk/smalltalk": {
-            "deps": [ "../../lib/codemirror" ]
-        },
-        "codemirror3/addon/hint/show-hint": {
-            "deps": [ "../../lib/codemirror" ]
-        }
-    }
-}

src/Helios-Workspace.js

@@ -1666,7 +1666,7 @@ var self=this;
 return $core.withContext(function($ctx1) { 
 //>>excludeEnd("ctx");
 var $1;
-$1=$recv(require)._value_("codemirror3/lib/codemirror");
+$1=$recv(require)._value_("codemirror/lib/codemirror");
 return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"codeMirror",{},$globals.HLCodeWidget.klass)});
@@ -1674,7 +1674,7 @@ return $1;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: [],
-source: "codeMirror\x0a\x09^ require value: 'codemirror3/lib/codemirror'",
+source: "codeMirror\x0a\x09^ require value: 'codemirror/lib/codemirror'",
 referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["value:"]

src/Helios-Workspace.st

@@ -353,7 +353,7 @@ updateState
 !HLCodeWidget class methodsFor: 'accessing'!
 
 codeMirror
-	^ require value: 'codemirror3/lib/codemirror'
+	^ require value: 'codemirror/lib/codemirror'
 !
 
 keyMap