Set src dir before .tmp to fix index.html conflicts for SystemJS

FountainJS · Jul 18, 2016 · de62a7e · de62a7e
1 parent d0bf337
commit de62a7e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/generators/app/conf.js b/generators/app/conf.js
@@ -12,7 +12,11 @@ module.exports = function browsersyncConf(templateVars) {
     conf.server.baseDir.push(lit`conf.paths.dist`);
   } else {
     conf.server.baseDir.push(lit`conf.paths.tmp`);
-    conf.server.baseDir.push(lit`conf.paths.src`);
+    if (templateVars.modules === 'systemjs') {
+      conf.server.baseDir.unshift(lit`conf.paths.src`);
+    } else {
+      conf.server.baseDir.push(lit`conf.paths.src`);
+    }
     if (templateVars.modules === 'inject') {
       conf.server.routes = {
         '/bower_components': 'bower_components'

diff --git a/test/app/index/conf.js b/test/app/index/conf.js
@@ -37,7 +37,7 @@ test(`browsersyncConf when modules is 'systemjs'`, t => {
   const templateVars = {modules: 'systemjs'};
   const expected = {
     server: {
-      baseDir: ['lit>>conf.paths.tmp<<lit', 'lit>>conf.paths.src<<lit'],
+      baseDir: ['lit>>conf.paths.src<<lit', 'lit>>conf.paths.tmp<<lit'],
       routes: {
         '/jspm_packages': 'jspm_packages',
         '/jspm.config.js': 'jspm.config.js',