Merge branch 'master' of https://github.com/ember-cli/ember-twiddle

ember-cli · Feb 12, 2016 · 2e7f3a1 · 2e7f3a1
2 parents dfead12 + 30a2b2e
commit 2e7f3a1
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -114,6 +114,9 @@ function getEmberCLIBlueprints() {
     fileMap[blueprintName] = fs.readFileSync(filePath).toString();
   }
 
+  // Location should be 'none' in router.js
+  fileMap['router'] = fileMap['router'].replace(/config\.locationType/, "'none'");
+
   fileMap['resolver'] = fs.readFileSync('app/resolver.js').toString();
   fileMap['twiddle.json'] = fs.readFileSync('blueprints/twiddle.json').toString();
   fileMap['initializers/router'] = fs.readFileSync('blueprints/router_initializer.js').toString();