merge 3.4.0

.eslintrc.js

@@ -17,6 +17,9 @@ module.exports = {
     ],
     rules: {
         // disable linting of `this.get` until there's a reliable autofix
-        'ghost/ember/use-ember-get-and-set': 'off'
+        'ghost/ember/use-ember-get-and-set': 'off',
+
+        // disable linting of mixins until we migrate away
+        'ghost/ember/no-new-mixins': 'off'
     }
 };

.travis.yml

@@ -1,6 +1,7 @@
 dist: xenial
 language: node_js
 node_js:
+- '10'
 - '12'
 cache: yarn
 env:

app/adapters/base.js

@@ -1,6 +1,6 @@
 import AjaxServiceSupport from 'ember-ajax/mixins/ajax-support';
 import DataAdapterMixin from 'ember-simple-auth/mixins/data-adapter-mixin';
-import RESTAdapter from 'ember-data/adapters/rest';
+import RESTAdapter from '@ember-data/adapter/rest';
 import ghostPaths from 'ghost-admin/utils/ghost-paths';
 import {inject as service} from '@ember/service';
 

app/components/gh-basic-dropdown.js

@@ -1,19 +1,20 @@
 import BasicDropdown from 'ember-basic-dropdown/components/basic-dropdown';
-import layout from 'ember-basic-dropdown/templates/components/basic-dropdown';
+import templateLayout from 'ember-basic-dropdown/templates/components/basic-dropdown';
+import {layout} from '@ember-decorators/component';
 import {inject as service} from '@ember/service';
 
-export default BasicDropdown.extend({
-    dropdown: service(),
+@layout(templateLayout)
+class GhBasicDropdown extends BasicDropdown {
+    @service dropdown
 
-    layout,
-
-    didInsertElement() {
-        this._super(...arguments);
+    onInit() {
         this.dropdown.on('close', this, this.close);
-    },
+    }
 
-    willDestroyElement() {
-        this._super(...arguments);
+    willDestroy() {
         this.dropdown.off('close', this, this.close);
+        super.willDestroyElement(...arguments);
     }
-});
+}
+
+export default GhBasicDropdown;

app/components/gh-cm-editor.js

@@ -119,8 +119,4 @@ const CmEditorComponent = Component.extend({
     }
 });
 
-CmEditorComponent.reopenClass({
-    positionalParams: ['value']
-});
-
 export default CmEditorComponent;

app/components/gh-contentfilter.js

@@ -0,0 +1,6 @@
+import Component from '@glimmer/component';
+import {inject as service} from '@ember/service';
+
+export default class GhContentfilterComponent extends Component {
+    @service session
+}

app/components/gh-date-time-picker.js

@@ -161,7 +161,8 @@ export default Component.extend({
     }),
 
     onDateInput: action(function (datepicker, event) {
-        datepicker.actions.close();
+        let skipFocus = true;
+        datepicker.actions.close(event, skipFocus);
         this.set('_scratchDate', event.target.value);
     }),
 

app/components/gh-feature-flag.js

@@ -41,8 +41,4 @@ const FeatureFlagComponent = Component.extend({
     }
 });
 
-FeatureFlagComponent.reopenClass({
-    positionalParams: ['flag', '_disabled']
-});
-
 export default FeatureFlagComponent;

app/components/gh-fullscreen-modal.js

@@ -56,8 +56,4 @@ const FullScreenModalComponent = Component.extend({
     confirm: () => RSVP.resolve()
 });
 
-FullScreenModalComponent.reopenClass({
-    positionalParams: ['modal']
-});
-
 export default FullScreenModalComponent;

app/components/gh-markdown-editor.js

@@ -259,11 +259,8 @@ export default Component.extend(ShortcutsMixin, {
         if (!isEmpty(uploadedImageUrls) && uploadedImageUrls !== this._uploadedImageUrls) {
             this._uploadedImageUrls = uploadedImageUrls;
 
-            // must be done afterRender to avoid double modify of mobiledoc in
-            // a single render
-            run.scheduleOnce('afterRender', this, () => {
-                this._insertImages(uploadedImageUrls);
-            });
+            // must be done afterRender to avoid double modify of mobiledoc in a single render
+            run.scheduleOnce('afterRender', this, this._insertImages, uploadedImageUrls);
         }
 
         // focus the editor when the markdown value changes, this is necessary

app/components/gh-members-lab-setting.js

@@ -1,5 +1,6 @@
 import Component from '@ember/component';
 import {computed} from '@ember/object';
+import {reads} from '@ember/object/computed';
 import {inject as service} from '@ember/service';
 import {set} from '@ember/object';
 
@@ -12,6 +13,8 @@ export default Component.extend({
     mediaQueries: service(),
     intl: service(),
 
+    defaultContentVisibility: reads('settings.defaultContentVisibility'),
+
     mailgunRegion: computed('settings.bulkEmailSettings.baseUrl', function () {
         if (!this.settings.get('bulkEmailSettings.baseUrl')) {
             return US;
@@ -59,10 +62,6 @@ export default Component.extend({
         return !!bulkEmailSettings.isConfig;
     }),
 
-    defaultContentVisibility: computed('settings.defaultContentVisibility', function () {
-        return this.get('settings.defaultContentVisibility');
-    }),
-
     init() {
         this._super(...arguments);
         this.set('mailgunRegions', [US, EU]);

app/components/gh-navitem.js

@@ -52,9 +52,7 @@ export default Component.extend(ValidationState, {
         // enter key
         if (event.keyCode === 13 && this.get('navItem.isNew')) {
             event.preventDefault();
-            run.scheduleOnce('actions', this, function () {
-                this.send('addItem', this.get('navItem'));
-            });
+            run.scheduleOnce('actions', this, this.send, 'addItem', this.navItem);
         }
     }
 });

app/components/gh-notification.js

@@ -34,7 +34,7 @@ export default Component.extend({
         this._super(...arguments);
 
         this._animationEndHandler = run.bind(this, function () {
-            if (event.originalEvent.animationName === 'fade-out') {
+            if (event.animationName === 'fade-out') {
                 this.notifications.closeNotification(this.message);
             }
         });

app/components/gh-task-button.js

@@ -169,8 +169,4 @@ const GhTaskButton = Component.extend({
     })
 });
 
-GhTaskButton.reopenClass({
-    positionalParams: ['buttonText']
-});
-
 export default GhTaskButton;