Merge pull request #179 from ember-learn/fastboot

Use fetch in a FastBoot-compatible way

Author: dfreeman

addon/adapters/-addon-docs.js

@@ -1,10 +1,11 @@
 import DS from 'ember-data';
 import config from 'dummy/config/environment';
-import fetch from 'fetch';
+import { inject as service } from '@ember/service';
 
 export default DS.Adapter.extend({
   defaultSerializer: '-addon-docs',
   namespace: `${config.rootURL.replace(/\/$/, '')}/docs`,
+  docsFetch: service(),
 
   shouldBackgroundReloadAll() {
     return false;
@@ -16,7 +17,7 @@ export default DS.Adapter.extend({
 
   findRecord(store, modelClass, id, snapshot) {
     if (modelClass.modelName === 'project') {
-      return fetch(`${this.namespace}/${id}.json`).then(response => response.json());
+      return this.get('docsFetch').fetch({ url: `${this.namespace}/${id}.json` }).json();
     } else {
       return store.peekRecord(modelClass.modelName, id);
     }

addon/components/docs-demo/x-live-example/component.js

@@ -1,5 +1,5 @@
 import Component from '@ember/component';
-import Ember from 'ember';
+import { compileTemplate } from '@ember/template-compilation';
 import layout from './template';
 import snippets from 'dummy/snippets';
 
@@ -23,7 +23,7 @@ export default Component.extend({
       let compiledTemplate;
       let error = false;
       try {
-        compiledTemplate = Ember.HTMLBars.compile(this.get('rawTemplate'));
+        compiledTemplate = compileTemplate(this.get('rawTemplate'));
       } catch (e) {
         console.error(e);
         error = e;

addon/services/docs-fetch.js

@@ -0,0 +1 @@
+export { default } from 'ember-fetch-adapter';

addon/services/docs-search.js

@@ -1,11 +1,13 @@
-import Service from '@ember/service';
+import Service, { inject as service } from '@ember/service';
 import { getOwner } from '@ember/application';
 import { computed } from '@ember/object';
 import lunr from 'lunr';
 
 const { Index, Query } = lunr;
 
 export default Service.extend({
+  docsFetch: service(),
+
   search(phrase) {
     return this.loadSearchIndex()
       .then(({ index, documents }) => {
@@ -72,8 +74,7 @@ export default Service.extend({
 
   loadSearchIndex() {
     if (!this._searchIndex) {
-      this._searchIndex = fetch(this.get('_indexURL'))
-        .then(res => res.json())
+      this._searchIndex = this.get('docsFetch').fetch({ url: this.get('_indexURL') }).json()
         .then(json => {
           return {
             index: Index.load(json.index),

addon/services/project-version.js

@@ -1,12 +1,13 @@
-import Service from '@ember/service';
+import Service, { inject as service } from '@ember/service';
 import { getOwner } from '@ember/application';
-import fetch from 'fetch';
 import { computed } from '@ember/object';
 import { task } from 'ember-concurrency';
 
 export default Service.extend({
+  docsFetch: service(),
+
   _loadAvailableVersions: task(function*() {
-    let response = yield fetch(`${this.get('root')}versions.json`);
+    let response = yield this.get('docsFetch').fetch({ url: `${this.get('root')}versions.json` }).response();
     let json = yield response.ok ? response.json() : { latest: this.get('currentVersion') };
 
     this.set('versions', Object.keys(json).map(key => {

package.json

@@ -44,7 +44,8 @@
     "ember-component-css": "^0.3.5",
     "ember-concurrency": "^0.8.16",
     "ember-data": "^2.18.0",
-    "ember-fetch": "^3.4.4",
+    "ember-fetch": "^4.0.2",
+    "ember-fetch-adapter": "^0.4.2",
     "ember-href-to": "^1.15.1",
     "ember-keyboard": "^3.0.0",
     "ember-modal-dialog": "2.4.3",

tests/dummy/app/pods/docs/deploying/template.md

@@ -133,7 +133,7 @@ This method returns a name for a given version of your documentation. By default
 
 ### `shouldUpdateLatest()`
 
-This method determines whether the `/latest` directory will also be updated with the current deploy. By default, this will return true for builds from a tagged commit where the tag is a [semver non-prerelease version]([node-semver](https://github.com/npm/node-semver), and false otherwise. You can explicitly set the `ADDON_DOCS_UPDATE_LATEST` environment variable to `true` or `false` to override this behavior.
+This method determines whether the `/latest` directory will also be updated with the current deploy. By default, this will return true for builds from a tagged commit where the tag is a [semver non-prerelease version](https://github.com/npm/node-semver), and false otherwise. You can explicitly set the `ADDON_DOCS_UPDATE_LATEST` environment variable to `true` or `false` to override this behavior.
 
 ### `getRootURL()`