fix webpack, prepare for release
connor rigby
parent
f1a421af8d
commit
c73714b52e
12
Makefile
12
Makefile
|
|
@ -1,7 +1,7 @@
|
|||
# THIS FILE WAS GENERATED BY `build_makefile.exs`
|
||||
# 67eb7a8
|
||||
# Wed Feb 15 13:25:33 2017 -0800
|
||||
# fix-farmware-env-vars-saving
|
||||
# f1a421a
|
||||
# Thu Feb 16 12:42:27 2017 -0800
|
||||
# fix-tests
|
||||
|
||||
default: rpi3
|
||||
|
||||
|
|
@ -49,7 +49,7 @@ firmware-rpi:
|
|||
scripts/build_firmware.sh rpi
|
||||
|
||||
release-rpi: rpi
|
||||
scripts/build_release_images.sh rpi 3.0.5-staging
|
||||
scripts/build_release_images.sh rpi 3.0.5
|
||||
|
||||
## end rpi portion.
|
||||
## begin rpi3 portion.
|
||||
|
|
@ -77,7 +77,7 @@ firmware-rpi3:
|
|||
scripts/build_firmware.sh rpi3
|
||||
|
||||
release-rpi3: rpi3
|
||||
scripts/build_release_images.sh rpi3 3.0.5-staging
|
||||
scripts/build_release_images.sh rpi3 3.0.5
|
||||
|
||||
## end rpi3 portion.
|
||||
## begin rpi2 portion.
|
||||
|
|
@ -105,7 +105,7 @@ firmware-rpi2:
|
|||
scripts/build_firmware.sh rpi2
|
||||
|
||||
release-rpi2: rpi2
|
||||
scripts/build_release_images.sh rpi2 3.0.5-staging
|
||||
scripts/build_release_images.sh rpi2 3.0.5
|
||||
|
||||
## end rpi2 portion.
|
||||
|
||||
|
|
|
|||
|
|
@ -14,3 +14,5 @@ ttb_last_config
|
|||
cover
|
||||
|
||||
doc
|
||||
cache
|
||||
node_modules
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
3.0.5-staging
|
||||
3.0.5
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ defmodule Farmbot.ImageWatcher do
|
|||
Uploads all images if they exist.
|
||||
"""
|
||||
@spec start_link :: :ok | {:error, atom}
|
||||
def force_upload, do: do_checkup(false)
|
||||
def force_upload, do: do_checkup()
|
||||
|
||||
@spec init([]) :: {:ok, any}
|
||||
def init([]) do
|
||||
|
|
@ -33,8 +33,8 @@ defmodule Farmbot.ImageWatcher do
|
|||
{:noreply, []}
|
||||
end
|
||||
|
||||
@spec do_checkup(boolean) :: no_return
|
||||
defp do_checkup(recurse? \\ true) do
|
||||
@spec do_checkup :: no_return
|
||||
defp do_checkup do
|
||||
images = File.ls!(@images_path)
|
||||
|
||||
images
|
||||
|
|
|
|||
|
|
@ -43,48 +43,13 @@ module.exports = {
|
|||
],
|
||||
module: {
|
||||
rules: [
|
||||
{
|
||||
test: /\.tsx?$/,
|
||||
loader: "ts-loader"
|
||||
},
|
||||
{
|
||||
test: [/\.scss$/, /\.css$/],
|
||||
loader: [
|
||||
"style-loader",
|
||||
ExtractTextPlugin.extract("css-loader!sass-loader")
|
||||
]
|
||||
},
|
||||
// {
|
||||
// test: /\.scss$/,
|
||||
// use: [
|
||||
// 'style-loader',
|
||||
// 'css-loader',
|
||||
// 'sass-loader'
|
||||
// ]
|
||||
// },
|
||||
// {
|
||||
// test: /\.css$/,
|
||||
// use: [
|
||||
// 'style-loader',
|
||||
// 'css-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: /\.tsx?$/, loader: "ts-loader" },
|
||||
{ test: [/\.scss$/, /\.css$/], loader: ExtractTextPlugin.extract("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" }
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
2
mix.lock
2
mix.lock
|
|
@ -29,7 +29,7 @@
|
|||
"mime": {:hex, :mime, "1.0.1", "05c393850524767d13a53627df71beeebb016205eb43bfbd92d14d24ec7a1b51", [:mix], []},
|
||||
"mimerl": {:hex, :mimerl, "1.0.2", "993f9b0e084083405ed8252b99460c4f0563e41729ab42d9074fd5e52439be88", [:rebar3], []},
|
||||
"mustache": {:hex, :mustache, "0.0.2", "870fbef411c47d17df06a57b8b3f69e26eb110cba0177c34e273db5d94369d9b", [:mix], []},
|
||||
"nerves": {:git, "https://github.com/nerves-project/nerves.git", "084e3acecdc0d838671441bd75a9f4b1250bb689", [branch: "target"]},
|
||||
"nerves": {:hex, :nerves, "0.4.7", "c8d08348e6f717cf140da26dc374bcf2f6f7c2bec646073aeab049e08b588173", [:mix], [{:distillery, "~> 1.0", [hex: :distillery, optional: false]}]},
|
||||
"nerves_firmware": {:git, "https://github.com/nerves-project/nerves_firmware.git", "b783df3867c82dc0abe6770079077a6f922c00a9", []},
|
||||
"nerves_firmware_http": {:git, "https://github.com/nerves-project/nerves_firmware_http.git", "aec1a9301f965e9fdd6c76d0e435c3cc48d38425", []},
|
||||
"nerves_interim_wifi": {:hex, :nerves_interim_wifi, "0.1.1", "88c65ced1440e96b954189ccfc8a55cb4575cb64a8725907c3e8a9900adb2a70", [:make, :mix], [{:elixir_make, "~> 0.3", [hex: :elixir_make, optional: false]}, {:nerves_network_interface, "~> 0.3.1", [hex: :nerves_network_interface, optional: false]}, {:nerves_wpa_supplicant, "~> 0.2.2", [hex: :nerves_wpa_supplicant, optional: false]}]},
|
||||
|
|
|
|||
Loading…
Reference in New Issue