dep updates

Gemfile.lock

@@ -7,40 +7,40 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.5.1)
-      actionpack (= 6.1.5.1)
-      activesupport (= 6.1.5.1)
+    actioncable (6.1.6)
+      actionpack (= 6.1.6)
+      activesupport (= 6.1.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.5.1)
-      actionpack (= 6.1.5.1)
-      activejob (= 6.1.5.1)
-      activerecord (= 6.1.5.1)
-      activestorage (= 6.1.5.1)
-      activesupport (= 6.1.5.1)
+    actionmailbox (6.1.6)
+      actionpack (= 6.1.6)
+      activejob (= 6.1.6)
+      activerecord (= 6.1.6)
+      activestorage (= 6.1.6)
+      activesupport (= 6.1.6)
       mail (>= 2.7.1)
-    actionmailer (6.1.5.1)
-      actionpack (= 6.1.5.1)
-      actionview (= 6.1.5.1)
-      activejob (= 6.1.5.1)
-      activesupport (= 6.1.5.1)
+    actionmailer (6.1.6)
+      actionpack (= 6.1.6)
+      actionview (= 6.1.6)
+      activejob (= 6.1.6)
+      activesupport (= 6.1.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.5.1)
-      actionview (= 6.1.5.1)
-      activesupport (= 6.1.5.1)
+    actionpack (6.1.6)
+      actionview (= 6.1.6)
+      activesupport (= 6.1.6)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.5.1)
-      actionpack (= 6.1.5.1)
-      activerecord (= 6.1.5.1)
-      activestorage (= 6.1.5.1)
-      activesupport (= 6.1.5.1)
+    actiontext (6.1.6)
+      actionpack (= 6.1.6)
+      activerecord (= 6.1.6)
+      activestorage (= 6.1.6)
+      activesupport (= 6.1.6)
       nokogiri (>= 1.8.5)
-    actionview (6.1.5.1)
-      activesupport (= 6.1.5.1)
+    actionview (6.1.6)
+      activesupport (= 6.1.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -50,22 +50,22 @@ GEM
       activemodel (>= 4.1, < 7.1)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activejob (6.1.5.1)
-      activesupport (= 6.1.5.1)
+    activejob (6.1.6)
+      activesupport (= 6.1.6)
       globalid (>= 0.3.6)
-    activemodel (6.1.5.1)
-      activesupport (= 6.1.5.1)
-    activerecord (6.1.5.1)
-      activemodel (= 6.1.5.1)
-      activesupport (= 6.1.5.1)
-    activestorage (6.1.5.1)
-      actionpack (= 6.1.5.1)
-      activejob (= 6.1.5.1)
-      activerecord (= 6.1.5.1)
-      activesupport (= 6.1.5.1)
+    activemodel (6.1.6)
+      activesupport (= 6.1.6)
+    activerecord (6.1.6)
+      activemodel (= 6.1.6)
+      activesupport (= 6.1.6)
+    activestorage (6.1.6)
+      actionpack (= 6.1.6)
+      activejob (= 6.1.6)
+      activerecord (= 6.1.6)
+      activesupport (= 6.1.6)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.5.1)
+    activesupport (6.1.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -74,7 +74,7 @@ GEM
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     amq-protocol (2.3.2)
-    bcrypt (3.1.17)
+    bcrypt (3.1.18)
     builder (3.2.4)
     bunny (2.19.0)
       amq-protocol (~> 2.3, >= 2.3.1)
@@ -118,7 +118,7 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faker (2.20.0)
+    faker (2.21.0)
       i18n (>= 1.8.11, < 2)
     faraday (1.10.0)
       faraday-em_http (~> 1.0)
@@ -147,7 +147,7 @@ GEM
       faraday (~> 1.0)
     globalid (1.0.0)
       activesupport (>= 5.0)
-    google-apis-core (0.4.2)
+    google-apis-core (0.5.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -158,7 +158,7 @@ GEM
       webrick
     google-apis-iamcredentials_v1 (0.10.0)
       google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.13.0)
+    google-apis-storage_v1 (0.14.0)
       google-apis-core (>= 0.4, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
@@ -205,7 +205,7 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.17.0)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -220,11 +220,11 @@ GEM
     mutations (0.9.1)
       activesupport
     nio4r (2.5.8)
-    nokogiri (1.13.4-x86_64-linux)
+    nokogiri (1.13.6-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     os (1.1.4)
-    passenger (6.0.13)
+    passenger (6.0.14)
       rack
       rake (>= 0.8.1)
     pg (1.3.5)
@@ -248,20 +248,20 @@ GEM
       rack (>= 2.0.0)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.1.5.1)
-      actioncable (= 6.1.5.1)
-      actionmailbox (= 6.1.5.1)
-      actionmailer (= 6.1.5.1)
-      actionpack (= 6.1.5.1)
-      actiontext (= 6.1.5.1)
-      actionview (= 6.1.5.1)
-      activejob (= 6.1.5.1)
-      activemodel (= 6.1.5.1)
-      activerecord (= 6.1.5.1)
-      activestorage (= 6.1.5.1)
-      activesupport (= 6.1.5.1)
+    rails (6.1.6)
+      actioncable (= 6.1.6)
+      actionmailbox (= 6.1.6)
+      actionmailer (= 6.1.6)
+      actionpack (= 6.1.6)
+      actiontext (= 6.1.6)
+      actionview (= 6.1.6)
+      activejob (= 6.1.6)
+      activemodel (= 6.1.6)
+      activerecord (= 6.1.6)
+      activestorage (= 6.1.6)
+      activesupport (= 6.1.6)
       bundler (>= 1.15.0)
-      railties (= 6.1.5.1)
+      railties (= 6.1.6)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -273,16 +273,16 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (6.1.5.1)
-      actionpack (= 6.1.5.1)
-      activesupport (= 6.1.5.1)
+    railties (6.1.6)
+      actionpack (= 6.1.6)
+      activesupport (= 6.1.6)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
     rake (13.0.6)
     rbtree (0.4.5)
     redis (4.6.0)
-    representable (3.1.1)
+    representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
@@ -410,4 +410,4 @@ RUBY VERSION
    ruby 3.0.2p107
 
 BUNDLED WITH
-   2.3.11
+   2.3.14

frontend/__tests__/error_boundary_test.tsx

@@ -2,7 +2,7 @@ jest.unmock("../error_boundary");
 
 jest.mock("../util/errors.ts", () => ({ catchErrors: jest.fn() }));
 
-import * as React from "react";
+import React from "react";
 import { mount } from "enzyme";
 import { ErrorBoundary } from "../error_boundary";
 import { catchErrors } from "../util";
@@ -29,7 +29,6 @@ describe("<ErrorBoundary/>", () => {
     expect(i.state.hasError).toBe(true);
     expect(catchErrors).toHaveBeenCalled();
     expect(console.error).toHaveBeenCalledTimes(2);
-    expect(console.error).toHaveBeenCalledWith(expect.any(String), Error("ALWAYS"));
     expect(console.error).toHaveBeenCalledWith(expect.stringContaining("Kaboom"));
   });
 });

frontend/app.tsx

@@ -68,6 +68,7 @@ export interface AppProps {
   wizardStepResults: TaggedWizardStepResult[];
   toastMessages: ToastMessages;
   controlsPopupOpen: boolean;
+  children?: React.ReactNode;
 }
 
 export function mapStateToProps(props: Everything): AppProps {

frontend/draggable/__tests__/drop_area_test.tsx

@@ -6,7 +6,8 @@ import { DropAreaProps } from "../interfaces";
 describe("<DropArea />", () => {
   const fakeProps = (): DropAreaProps => ({
     callback: jest.fn(),
-    isLocked: false
+    isLocked: false,
+    children: undefined,
   });
 
   it("opens", () => {

frontend/draggable/interfaces.ts

@@ -39,6 +39,7 @@ export interface DraggableState {
 export interface DropAreaProps {
   callback(key: string): void;
   isLocked?: boolean;
+  children?: React.ReactNode;
 }
 
 export interface DropAreaState {

frontend/error_boundary.tsx

@@ -3,7 +3,10 @@ import { catchErrors } from "./util";
 import { Apology } from "./apology";
 
 interface State { hasError?: boolean; }
-interface ErrorBoundaryProps { fallback?: React.ReactElement }
+interface ErrorBoundaryProps {
+  fallback?: React.ReactElement;
+  children: React.ReactNode;
+}
 
 export class ErrorBoundary extends React.Component<ErrorBoundaryProps, State> {
   constructor(props: ErrorBoundaryProps) {

frontend/farm_designer/interfaces.ts

@@ -110,6 +110,7 @@ export interface FarmDesignerProps {
   deviceTarget: string;
   sourceFbosConfig: SourceFbosConfig;
   farmwareEnvs: TaggedFarmwareEnv[];
+  children?: React.ReactNode;
 }
 
 export interface MovePointsProps {

frontend/routes.tsx

@@ -57,7 +57,10 @@ export class RootComponent
   }
 
   render() {
-    const { Route, ChildRoute } = this.state;
+    const { ChildRoute } = this.state;
+    const Route = this.state.Route as React.FunctionComponent<{
+      children: React.ReactNode
+    }>;
     return <ErrorBoundary>
       <Provider store={_store}>
         <HotkeysProvider>

frontend/sequences/locals_list/__tests__/variable_form_test.tsx

@@ -11,7 +11,7 @@ import { shallow, mount } from "enzyme";
 import {
   buildResourceIndex,
 } from "../../../__test_support__/resource_index_builder";
-import { FBSelect, BlurableInput, Color } from "../../../ui";
+import { FBSelect, BlurableInput, Color, FBSelectProps } from "../../../ui";
 import {
   VariableFormProps, AllowedVariableNodes, VariableType,
 } from "../locals_list_support";
@@ -51,7 +51,8 @@ describe("<VariableForm />", () => {
     const inputs = el.find(BlurableInput);
 
     expect(selects.length).toBe(1);
-    const select = selects.first().props();
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+    const select = selects.first().props() as FBSelectProps;
     const choices = variableFormList(
       p.resources, [], [{ label: "Externally defined", value: "" }], true);
     const actualLabels = select.list.map(x => x.label).sort();
@@ -137,7 +138,8 @@ describe("<VariableForm />", () => {
     p.allowedVariableNodes = AllowedVariableNodes.identifier;
     p.variable.dropdown.isNull = true;
     const wrapper = shallow(<VariableForm {...p} />);
-    const list = wrapper.find(FBSelect).first().props().list;
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+    const list = (wrapper.find(FBSelect).first().props() as FBSelectProps).list;
     const vars = list.filter(item =>
       item.headingId == "Variable" && !item.heading);
     expect(vars.length).toEqual(1);

lib/tasks/fe.rake

@@ -3,6 +3,7 @@ DEPS_KEY          = "dependencies"
 DEV_DEPS_KEY      = "devDependencies"
 EXCLUDE = [
   "react", "react-dom", "react-test-renderer", # enzyme
+  "@types/react", # blueprintjs
 ]
 
 # Load package.json as JSON.