Merge pull request #1271 from RickCarlino/monday

Parcel Updates

Gemfile.lock

@@ -30,9 +30,9 @@ GEM
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    active_model_serializers (0.10.9)
-      actionpack (>= 4.1, < 6)
-      activemodel (>= 4.1, < 6)
+    active_model_serializers (0.10.10)
+      actionpack (>= 4.1, < 6.1)
+      activemodel (>= 4.1, < 6.1)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
     activejob (5.2.3)
@@ -212,7 +212,7 @@ GEM
       hashie (~> 3.6)
       multi_json (~> 1.13.1)
     rack (2.0.7)
-    rack-attack (6.0.0)
+    rack-attack (6.1.0)
       rack (>= 1.0, < 3)
     rack-cors (1.0.3)
     rack-test (1.1.0)
@@ -263,8 +263,7 @@ GEM
       actionpack (>= 5.0)
       railties (>= 5.0)
     retriable (3.1.2)
-    rollbar (2.20.2)
-      multi_json
+    rollbar (2.21.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)

lib/tasks/api.rake

@@ -64,12 +64,18 @@ namespace :api do
     sh [intro, opts].join(" ")
   end
 
+  def clean_assets
+    # Clear out cache and previous builds on initial load.
+    sh [
+      "rm -rf",
+      DashboardController::CACHE_DIR,
+      DashboardController::PUBLIC_OUTPUT_DIR,
+    ].join(" ") unless ENV["NO_CLEAN"]
+  end
+
   desc "Serve javascript assets (via Parcel bundler)."
   task serve_assets: :environment do
-    # Clear out cache and previous builds on initial load.
-    sh ["rm -rf",
-        DashboardController::CACHE_DIR,
-        DashboardController::PUBLIC_OUTPUT_DIR].join(" ") unless ENV["NO_CLEAN"]
+    clean_assets
     parcel "watch", DashboardController::PARCEL_HMR_OPTS
   end
 

package.json

@@ -24,6 +24,7 @@
   "author": "farmbot.io",
   "license": "MIT",
   "dependencies": {
+    "@babel/core": "7.5.4",
     "@blueprintjs/core": "3.17.1",
     "@blueprintjs/datetime": "3.11.0",
     "@blueprintjs/select": "3.9.0",