From 1650069bcb62315398d0dd2c87d811d74bce542a Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@lookingsideways.co.uk>
Date: Wed, 29 Jun 2016 09:25:51 +0100
Subject: [PATCH] deps: codemirror@5.16.0 as npm module

---
 ghost/admin/bower.json         |  1 -
 ghost/admin/ember-cli-build.js | 22 +++++++++++++---------
 ghost/admin/package.json       |  1 +
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/ghost/admin/bower.json b/ghost/admin/bower.json
index 888c74d114..7cbdf8923a 100644
--- a/ghost/admin/bower.json
+++ b/ghost/admin/bower.json
@@ -2,7 +2,6 @@
   "name": "ghost",
   "dependencies": {
     "blueimp-md5": "2.3.0",
-    "codemirror": "5.15.2",
     "devicejs": "0.2.7",
     "ember": "2.6.1",
     "ember-cli-shims": "0.1.3",
diff --git a/ghost/admin/ember-cli-build.js b/ghost/admin/ember-cli-build.js
index 61f8f8181b..6aa219692f 100644
--- a/ghost/admin/ember-cli-build.js
+++ b/ghost/admin/ember-cli-build.js
@@ -41,6 +41,19 @@ module.exports = function (defaults) {
         },
         hinting: false,
         fingerprint: disabled,
+        nodeAssets: {
+            codemirror: {
+                import: [
+                    'lib/codemirror.js',
+                    'lib/codemirror.css',
+                    'theme/xq-light.css',
+                    'mode/htmlmixed/htmlmixed.js',
+                    'mode/xml/xml.js',
+                    'mode/css/css.js',
+                    'mode/javascript/javascript.js',
+                ]
+            }
+        },
         'ember-cli-selectize': {
             theme: false
         }
@@ -65,11 +78,6 @@ module.exports = function (defaults) {
     app.import('bower_components/jquery-file-upload/js/jquery.fileupload-image.js');
     app.import('bower_components/google-caja/html-css-sanitizer-bundle.js');
     app.import('bower_components/jqueryui-touch-punch/jquery.ui.touch-punch.js');
-    app.import('bower_components/codemirror/lib/codemirror.js');
-    app.import('bower_components/codemirror/mode/htmlmixed/htmlmixed.js');
-    app.import('bower_components/codemirror/mode/xml/xml.js');
-    app.import('bower_components/codemirror/mode/css/css.js');
-    app.import('bower_components/codemirror/mode/javascript/javascript.js');
     app.import('bower_components/password-generator/lib/password-generator.js');
     app.import('bower_components/blueimp-md5/js/md5.js');
 
@@ -78,9 +86,5 @@ module.exports = function (defaults) {
         app.import(app.bowerDirectory + '/jquery-deparam/jquery-deparam.js', {type: 'test'});
     }
 
-    // 'dem Styles
-    app.import('bower_components/codemirror/lib/codemirror.css');
-    app.import('bower_components/codemirror/theme/xq-light.css');
-
     return app.toTree();
 };
diff --git a/ghost/admin/package.json b/ghost/admin/package.json
index bd5e5e1393..a1c0ab56f3 100644
--- a/ghost/admin/package.json
+++ b/ghost/admin/package.json
@@ -28,6 +28,7 @@
     "bower": "1.7.9",
     "broccoli-asset-rev": "2.4.3",
     "chalk": "1.1.3",
+    "codemirror": "5.16.0",
     "csscomb": "3.1.8",
     "ember-ajax": "2.4.1",
     "ember-cli": "2.6.2",