deps: ember-cli@2.12.1 (#604)

no issue
- https://emberjs.com/blog/2017/03/19/ember-2-12-released.html#toc_changes-in-ember-cli-2-12

ghost/admin/config/environment.js

@@ -1,9 +1,10 @@
 /* eslint-env node */
+'use strict';
 
 module.exports = function (environment) {
-    var ENV = {
+    let ENV = {
         modulePrefix: 'ghost-admin',
-        environment: environment,
+        environment,
         rootURL: '/',
         locationType: 'trailing-hash',
         EmberENV: {

ghost/admin/ember-cli-build.js

@@ -1,25 +1,24 @@
-/* eslint-disable */
-/* global require, module */
+/* eslint-env node */
+'use strict';
 
-var EmberApp = require('ember-cli/lib/broccoli/ember-app'),
-    concat = require('broccoli-concat'),
-    mergeTrees = require('broccoli-merge-trees'),
-    uglify = require('broccoli-uglify-js'),
-    CleanCSS = require('broccoli-clean-css'),
-    environment = EmberApp.env(),
-    isProduction = environment === 'production',
-    disabled = {enabled: false},
-    assetLocation, codemirrorAssets;
+const EmberApp = require('ember-cli/lib/broccoli/ember-app');
+const concat = require('broccoli-concat');
+const mergeTrees = require('broccoli-merge-trees');
+const uglify = require('broccoli-uglify-js');
+const CleanCSS = require('broccoli-clean-css');
+const environment = EmberApp.env();
+const isProduction = environment === 'production';
+let assetLocation, codemirrorAssets;
 
 assetLocation = function (fileName) {
     if (isProduction) {
         fileName = fileName.replace('.', '.min.');
     }
-    return '/assets/' + fileName;
+    return `/assets/${fileName}`;
 };
 
 codemirrorAssets = function () {
-    var codemirrorFiles = [
+    let codemirrorFiles = [
         'lib/codemirror.css',
         'theme/xq-light.css',
         'lib/codemirror.js',
@@ -37,15 +36,15 @@ codemirrorAssets = function () {
         public: {
             include: codemirrorFiles,
             destDir: '/',
-            processTree: function (tree) {
-                var jsTree = concat(tree, {
+            processTree(tree) {
+                let jsTree = concat(tree, {
                     outputFile: 'assets/codemirror/codemirror.js',
                     headerFiles: ['lib/codemirror.js'],
                     inputFiles: ['mode/**/*'],
                     sourceMapConfig: {enabled: false}
                 });
 
-                var cssTree = concat(tree, {
+                let cssTree = concat(tree, {
                     outputFile: 'assets/codemirror/codemirror.css',
                     inputFiles: ['**/*.css']
                 });
@@ -62,7 +61,7 @@ codemirrorAssets = function () {
 };
 
 function postcssPlugins() {
-    var plugins = [{
+    let plugins = [{
         module: require('postcss-easy-import')
     }, {
         module: require('postcss-custom-properties')
@@ -85,7 +84,7 @@ function postcssPlugins() {
 }
 
 module.exports = function (defaults) {
-    var app = new EmberApp(defaults, {
+    let app = new EmberApp(defaults, {
         'ember-cli-babel': {
             optional: ['es6.spec.symbols'],
             includePolyfill: true
@@ -179,7 +178,7 @@ module.exports = function (defaults) {
     app.import('bower_components/jqueryui-touch-punch/jquery.ui.touch-punch.js');
 
     if (app.env === 'test') {
-        app.import(app.bowerDirectory + '/jquery.simulate.drag-sortable/jquery.simulate.drag-sortable.js', {type: 'test'});
+        app.import(`${app.bowerDirectory}/jquery.simulate.drag-sortable/jquery.simulate.drag-sortable.js`, {type: 'test'});
     }
 
     return app.toTree();

ghost/admin/package.json

@@ -23,7 +23,7 @@
     "coverage": "cat ./coverage/lcov.info | coveralls"
   },
   "engines": {
-    "node": "~0.12.0 || ^4.2.0"
+    "node": ">= 4"
   },
   "devDependencies": {
     "autoprefixer": "6.7.7",
@@ -41,7 +41,7 @@
     "csscomb": "4.0.1",
     "cssnano": "3.10.0",
     "ember-ajax": "2.5.6",
-    "ember-cli": "2.11.1",
+    "ember-cli": "2.12.1",
     "ember-cli-active-link-wrapper": "0.3.2",
     "ember-cli-app-version": "2.0.2",
     "ember-cli-babel": "5.2.4",

ghost/admin/tests/helpers/start-app.js

@@ -9,16 +9,13 @@ import fileUpload from './file-upload';
 registerPowerSelectHelpers();
 
 export default function startApp(attrs) {
-    let application;
-
     let attributes = assign({}, config.APP);
     attributes = assign(attributes, attrs); // use defaults, but you can override;
 
-    run(function () {
-        application = Application.create(attributes);
+    return run(() => {
+        let application = Application.create(attributes);
         application.setupForTesting();
         application.injectTestHelpers();
+        return application;
     });
-
-    return application;
 }