update brunch to use bower's installed components

jschoch · Aug 4, 2015 · 1b3c6d9 · 1b3c6d9
1 parent 07c8861
commit 1b3c6d9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 17 deletions.
diff --git a/brunch-config.js b/brunch-config.js
@@ -2,22 +2,13 @@ exports.config = {
   // See http://brunch.io/#documentation for docs.
   files: {
     javascripts: {
-      joinTo: 'js/app.js'
+      joinTo: 'js/app.js',
-      // To use a separate vendor.js bundle, specify two files path
+      order: {
-      // https://github.com/brunch/brunch/blob/stable/docs/config.md#files
+        before: [
-      // joinTo: {
+          /^bower_components/,
-      //  'js/app.js': /^(web\/static\/js)/,
+          /^web\/static\/vendor/
-      //  'js/vendor.js': /^(web\/static\/vendor)/
+        ]
-      // }
+      }
-      //
-      // To change the order of concatenation of files, explictly mention here
-      // https://github.com/brunch/brunch/tree/master/docs#concatenation
-      // order: {
-      //   before: [
-      //     'web/static/vendor/js/jquery-2.1.1.js',
-      //     'web/static/vendor/js/bootstrap.min.js'
-      //   ]
-      // }
     },
     stylesheets: {
       joinTo: 'css/app.css'

diff --git a/config/dev.exs b/config/dev.exs
@@ -7,7 +7,7 @@ use Mix.Config
 # watchers to your application. For example, we use it
 # with brunch.io to recompile .js and .css sources.
 config :reflux_eventbroker_react_phoenix_elixir, RefluxEventbrokerReactPhoenixElixir.Endpoint,
-  http: [port: 4000],
+  http: [port: 7777],
   debug_errors: true,
   code_reloader: true,
   cache_static_lookup: false,