Merge pull request #25 from elwayman02/fastboot

Fastboot Compatibility

Author: elwayman02

addon/mixins/component-interactivity.js

@@ -5,6 +5,7 @@ import Mixin from '@ember/object/mixin';
 import { assign } from '@ember/polyfills';
 import { bind } from '@ember/runloop';
 import { inject as injectService } from '@ember/service';
+import IsFastbootMixin from 'ember-is-fastboot/mixins/is-fastboot';
 import getConfig from 'ember-interactivity/utils/config';
 import { getTimeAsFloat } from 'ember-interactivity/utils/date';
 import {
@@ -19,7 +20,7 @@ import { getOwner } from '@ember/application';
  *
  * In your component, you MUST call `reportInteractive` or define `isInteractive`.
  */
-export default Mixin.create({
+export default Mixin.create(IsFastbootMixin, {
   interactivity: injectService(),
   interactivityTracking: injectService(),
   fastboot: computed(function() {
@@ -182,7 +183,8 @@ export default Mixin.create({
       return;
     }
     let options = getConfig(this);
-    if (options.timelineMarking && (options.timelineMarking.disableComponents || (options.timelineMarking.disableLeafComponents && !this._isSubscriber()))) {
+    if (options.timelineMarking && (options.timelineMarking.disableComponents ||
+        (options.timelineMarking.disableLeafComponents && !this._isSubscriber())) || this.get('_isFastBoot')) {
       return;
     }
 

addon/mixins/route-interactivity.js

@@ -4,6 +4,7 @@ import Mixin from '@ember/object/mixin';
 import { assign } from '@ember/polyfills';
 import { bind, run } from '@ember/runloop';
 import { inject as injectService } from '@ember/service';
+import IsFastbootMixin from 'ember-is-fastboot/mixins/is-fastboot';
 import getConfig from 'ember-interactivity/utils/config';
 import { getTimeAsFloat } from 'ember-interactivity/utils/date';
 import { INITIALIZING_LABEL, INTERACTIVE_LABEL, markTimeline } from 'ember-interactivity/utils/timeline-marking';
@@ -19,7 +20,7 @@ let hasFirstTransitionCompleted = false;
  *   2.) execute  (i.e. we are executing the transition by activating the route and scheduling render tasks)
  *   3.) interactive (i.e. we have completed the transition and the route is now interactive)
  */
-export default Mixin.create({
+export default Mixin.create(IsFastbootMixin, {
   interactivity: injectService(),
   interactivityTracking: injectService(),
   visibility: injectService(),
@@ -137,7 +138,7 @@ export default Mixin.create({
       let time = getTimeAsFloat();
       data = {
         isAppLaunch: true,
-        timeElapsed: (time*1000) - window.performance.timing.fetchStart,
+        timeElapsed: (time*1000) - performance.timing.fetchStart,
         clientTime: time
       };
     }
@@ -201,7 +202,7 @@ export default Mixin.create({
     }
     let options = getConfig(this);
 
-    if ((options.timelineMarking && options.timelineMarking.disableRoutes) || !this._isLeafRoute()) {
+    if ((options.timelineMarking && options.timelineMarking.disableRoutes) || !this._isLeafRoute() || this.get('_isFastBoot')) {
       return;
     }
 

package.json

@@ -24,6 +24,7 @@
   "dependencies": {
     "ember-cli-babel": "^6.6.0",
     "ember-cli-htmlbars": "^2.0.1",
+    "ember-is-fastboot": "^0.1.1",
     "ember-is-visible": "^0.1.2"
   },
   "devDependencies": {

yarn.lock

@@ -2426,6 +2426,12 @@ ember-getowner-polyfill@^2.0.0:
     ember-cli-version-checker "^2.1.0"
     ember-factory-for-polyfill "^1.3.1"
 
+ember-is-fastboot@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ember-is-fastboot/-/ember-is-fastboot-0.1.1.tgz#3af2e11ffac81ce0715b3b2c84f910a1f631bfe4"
+  dependencies:
+    ember-cli-babel "^6.6.0"
+
 ember-is-visible@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ember-is-visible/-/ember-is-visible-0.1.2.tgz#bc1e8c4b8c10024b9e0e2ffc3d9aae97b376d33d"