Commit 493a3ddd authored by Jens-Christian Fischer's avatar Jens-Christian Fischer
Browse files

Revert back to single JS file for now

parent 1dc870b0
......@@ -2,16 +2,19 @@ exports.config = {
// See http://brunch.io/#documentation for docs.
files: {
javascripts: {
joinTo: {
'js/app.js' : [/^(?!node_modules\/p5)/,
/^(?!node_modules\/osc)/,
/(?!presencesketch.js$)/
],
'js/myp5.js' : [/^(node_modules\/p5)/,
/^(node_modules\/osc)/,
/presencesketch.js$/
]
}
joinTo: 'js/app.js',
// {
// 'js/app.js' : [/^(?!node_modules\/p5)/,
// /^(?!node_modules\/osc)/,
// /(?!presencesketch.js$)/
// ],
// 'js/myp5.js' : [/^(node_modules\/p5)/,
// /^(node_modules\/osc)/,
// /presencesketch.js$/
// ]
// }
// To use a separate vendor.js bundle, specify two files path
// http://brunch.io/docs/config#-files-
......
......@@ -3,7 +3,7 @@ defmodule Grains.Mixfile do
def project do
[app: :grains,
version: "0.0.60",
version: "0.0.61",
elixir: "~> 1.2",
elixirc_paths: elixirc_paths(Mix.env),
compilers: [:phoenix, :gettext] ++ Mix.compilers,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment