fix a derp in the configurate task, and clean up webpack config for some reason

pull/285/head
connor rigby 2017-04-03 07:41:13 -07:00
parent 60dc2cdc6a
commit 0bb744b346
3 changed files with 11 additions and 31 deletions

View File

@ -56,7 +56,7 @@ defmodule Mix.Tasks.Farmbot.Configurate do
{server, user, pass}
end
def configure_network(false), do: false
def configure_network(false, _), do: false
def configure_network(%{"interfaces" => ifaces} = netconfig, ip) do
blerp = Enum.map(ifaces, fn({iface, config}) ->
configure_iface(iface, config, ip)

View File

@ -3,6 +3,8 @@ defmodule Farmbot.Serial.Gcode.Parser do
Parses farmbot_arduino_firmware G-Codes.
"""
require Logger
@spec parse_code(binary) :: {binary, tuple}
# / ???
@ -328,7 +330,6 @@ defmodule Farmbot.Serial.Gcode.Parser do
do: param_string |> String.to_atom |> parse_param
def parse_param(uhh) do
require Logger
Logger.error("LOOK AT ME IM IMPORTANT: #{inspect uhh}")
nil
end

View File

@ -18,38 +18,17 @@ module.exports = {
],
module: {
rules: [
{
test: /\.tsx?$/,
loader: "ts-loader"
},
{
test: [/\.scss$/, /\.css$/],
use: [
{ test: /\.tsx?$/, loader: "ts-loader" },
{ test: [/\.scss$/, /\.css$/], use: [
'style-loader',
'css-loader',
'sass-loader'
]
},
{
test: /\.woff/,
loader: "url-loader"
},
{
test: /\.woff2/,
loader: "url-loader"
},
{
test: /\.ttf/,
loader: "url-loader"
},
{
test: /\.eot/,
loader: "file-loader"
},
{
test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
loader: "url-loader"
}
] },
{ test: /\.woff/, loader: "url-loader" },
{ test: /\.woff2/, loader: "url-loader" },
{ test: /\.ttf/, loader: "url-loader" },
{ test: /\.eot/, loader: "file-loader" },
{ test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: "url-loader" }
]
}
}