Set up host app for gh-pages history location support

dfreeman · dfreeman · commit b398206cf976 · 2018-01-12T10:53:25.000-05:00
diff --git a/blueprints/ember-cli-addon-docs/index.js b/blueprints/ember-cli-addon-docs/index.js
@@ -23,10 +23,9 @@ module.exports = {
   afterInstall() {
     const configPath = require.resolve(this.project.configPath());
     const configContents = fs.readFileSync(configPath, 'utf-8')
-      .replace(/rootURL: .*,/, `rootURL: '/${this.project.name()}/',`)
-      .replace(/locationType: .*,/, `locationType: 'hash',`);
+      .replace(/rootURL: .*,/, `rootURL: '/${this.project.name()}/',`);
 
     fs.writeFileSync(configPath, configContents, 'utf-8');
-    this.ui.writeInfoLine('Updated dummy app rootURL and locationType for compatibility with GitHub Pages.');
+    this.ui.writeInfoLine('Updated dummy app rootURL for compatibility with GitHub Pages.');
   }
 };
diff --git a/index.js b/index.js
@@ -1,6 +1,7 @@
 /* eslint-env node */
 'use strict';
 
+const fs = require('fs');
 const path = require('path');
 const resolve = require('resolve');
 const MergeTrees = require('broccoli-merge-trees');
@@ -77,6 +78,7 @@ module.exports = {
 
     let importer = findImporter(this);
 
+    importer.import('vendor/404.html');
     importer.import(`${this._hasEmberSource() ? 'vendor' : 'bower_components'}/ember/ember-template-compiler.js`);
     importer.import('vendor/lunr/lunr.js', {
       using: [{ transformation: 'amd', as: 'lunr' }]
@@ -105,6 +107,12 @@ module.exports = {
     }
   },
 
+  contentFor(type) {
+    if (type === 'body') {
+      return fs.readFileSync(`${__dirname}/vendor/ember-cli-addon-docs/github-spa.html`, 'utf-8');
+    }
+  },
+
   treeForVendor(vendor) {
     return new MergeTrees([
       vendor,
@@ -134,7 +142,11 @@ module.exports = {
       config: this.project.config(EmberApp.env())
     });
 
-    return new MergeTrees([ defaultTree, docsTree, searchIndexTree ]);
+    let notFoundSnippet = new Funnel(`${__dirname}/vendor/ember-cli-addon-docs`, {
+      include: ['404.html']
+    });
+
+    return new MergeTrees([ defaultTree, notFoundSnippet, docsTree, searchIndexTree ]);
   },
 
   _lunrTree() {
diff --git a/tests/dummy/app/index.html b/tests/dummy/app/index.html
@@ -20,37 +20,6 @@
   <body>
     {{content-for "body"}}
 
-    <!-- Start Single Page Apps for GitHub Pages -->
-    <script type="text/javascript">
-      // Single Page Apps for GitHub Pages
-      // https://github.com/rafrex/spa-github-pages
-      // Copyright (c) 2016 Rafael Pedicini, licensed under the MIT License
-      // ----------------------------------------------------------------------
-      // This script checks to see if a redirect is present in the query string
-      // and converts it back into the correct url and adds it to the
-      // browser's history using window.history.replaceState(...),
-      // which won't cause the browser to attempt to load the new url.
-      // When the single page app is loaded further down in this file,
-      // the correct url will be waiting in the browser's history for
-      // the single page app to route accordingly.
-      (function(l) {
-        if (l.search) {
-          var q = {};
-          l.search.slice(1).split('&').forEach(function(v) {
-            var a = v.split('=');
-            q[a[0]] = a.slice(1).join('=').replace(/~and~/g, '&');
-          });
-          if (q.p !== undefined) {
-            window.history.replaceState(null, null,
-              l.pathname.slice(0, -1) + (q.p || '') +
-              (q.q ? ('?' + q.q) : '') +
-              l.hash
-            );
-          }
-        }
-      }(window.location))
-    </script>
-    <!-- End Single Page Apps for GitHub Pages -->
     <script src="{{rootURL}}assets/vendor.js"></script>
     <script src="{{rootURL}}assets/dummy.js"></script>
 
diff --git a/vendor/.gitkeep b/vendor/.gitkeep
diff --git a/vendor/ember-cli-addon-docs/404.html b/vendor/ember-cli-addon-docs/404.html
diff --git a/vendor/ember-cli-addon-docs/github-spa.html b/vendor/ember-cli-addon-docs/github-spa.html
@@ -0,0 +1,31 @@
+<!-- Start Single Page Apps for GitHub Pages -->
+<script type="text/javascript">
+  // Single Page Apps for GitHub Pages
+  // https://github.com/rafrex/spa-github-pages
+  // Copyright (c) 2016 Rafael Pedicini, licensed under the MIT License
+  // ----------------------------------------------------------------------
+  // This script checks to see if a redirect is present in the query string
+  // and converts it back into the correct url and adds it to the
+  // browser's history using window.history.replaceState(...),
+  // which won't cause the browser to attempt to load the new url.
+  // When the single page app is loaded further down in this file,
+  // the correct url will be waiting in the browser's history for
+  // the single page app to route accordingly.
+  (function(l) {
+    if (l.search) {
+      var q = {};
+      l.search.slice(1).split('&').forEach(function(v) {
+        var a = v.split('=');
+        q[a[0]] = a.slice(1).join('=').replace(/~and~/g, '&');
+      });
+      if (q.p !== undefined) {
+        window.history.replaceState(null, null,
+          l.pathname.slice(0, -1) + (q.p || '') +
+          (q.q ? ('?' + q.q) : '') +
+          l.hash
+        );
+      }
+    }
+  }(window.location))
+</script>
+<!-- End Single Page Apps for GitHub Pages -->
