From afdedb89a9e53dce21e8ac2a4c4d4d937e80b7c8 Mon Sep 17 00:00:00 2001
From: Akira Sudoh <asudoh@gmail.com>
Date: Thu, 15 Feb 2018 01:33:58 +0900
Subject: [PATCH] chore(devenv): remove JS build from dev server prereq (#564)

As dev server code (server.js) itself runs WebPack to build JS code.

Also changed the route of dev env's static content so that WebPack dev middleware can handle the route.
---
 demo/views/demo-live.dust | 4 ++--
 demo/views/demo-nav.dust  | 4 ++--
 gulpfile.js               | 2 +-
 server.js                 | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/demo/views/demo-live.dust b/demo/views/demo-live.dust
index 17f48b401aeb..703a5bd4fb56 100644
--- a/demo/views/demo-live.dust
+++ b/demo/views/demo-live.dust
@@ -6,7 +6,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width">
   <title>Carbon Components</title>
-  <link rel="stylesheet" href="/demo.css">
+  <link rel="stylesheet" href="/demo/demo.css">
   <style>
     .offleft {
       position: absolute;
@@ -29,7 +29,7 @@
 
   <!-- Scripts -->
   <!-- <script src="/carbon-components.min.js"></script> -->
-  <script src="/demo.js"></script>
+  <script src="/demo/demo.js"></script>
   <!-- Disable Auto Init with this flag -->
   <!-- true = JavaScript will not initialize automatically -->
   <!-- false = JavaScript will initialize automatically -->
diff --git a/demo/views/demo-nav.dust b/demo/views/demo-nav.dust
index 94e242383647..e3f19854d800 100644
--- a/demo/views/demo-nav.dust
+++ b/demo/views/demo-nav.dust
@@ -5,7 +5,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width">
     <title>Carbon Components</title>
-    <link rel="stylesheet" href="/demo.css">
+    <link rel="stylesheet" href="/demo/demo.css">
     <style>
       .offleft {
         position: absolute;
@@ -24,6 +24,6 @@
       var componentItems = {componentItems|js|s};
       var docItems = {docItems|js|s};
     </script>
-    <script src="/demo.js"></script>
+    <script src="/demo/demo.js"></script>
   </body>
 </html>
diff --git a/gulpfile.js b/gulpfile.js
index 7439b5820ae8..cd9d007d5ac9 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -60,7 +60,7 @@ const axe = require('gulp-axe-webdriver');
  * BrowserSync
  */
 
-gulp.task('browser-sync', ['build:dev'], cb => {
+gulp.task('browser-sync', ['sass:dev'], cb => {
   let started;
   nodemon({
     script: './server.js',
diff --git a/server.js b/server.js
index 715454336e1a..15a8d1787384 100644
--- a/server.js
+++ b/server.js
@@ -32,7 +32,7 @@ fractal.docs.set('path', path.join(__dirname, 'docs'));
 app.engine('dust', adaro.dust());
 app.set('view engine', 'dust');
 app.set('views', path.resolve(__dirname, 'demo/views'));
-app.use(express.static('demo'));
+app.use('/demo', express.static('demo'));
 app.use(express.static('src'));
 app.use(express.static('scripts'));
 app.use('/docs/js', express.static('docs/js'));