From 1afd1c82ef5f5f6c0057dcefa941bbf94bee5f76 Mon Sep 17 00:00:00 2001 From: gabrielburnworth Date: Thu, 22 Feb 2024 09:35:02 -0800 Subject: [PATCH 1/3] bring v1.7 selection option to top --- frontend/messages/__tests__/cards_test.tsx | 2 +- frontend/messages/cards.tsx | 64 +++++++++---------- .../os_download/__tests__/content_test.tsx | 21 ++++-- frontend/os_download/content.tsx | 44 ++++++------- .../firmware/__tests__/board_type_test.tsx | 13 ++-- .../firmware/firmware_hardware_support.ts | 28 ++++---- frontend/util/version.ts | 1 - frontend/wizard/index.tsx | 7 +- 8 files changed, 91 insertions(+), 89 deletions(-) diff --git a/frontend/messages/__tests__/cards_test.tsx b/frontend/messages/__tests__/cards_test.tsx index 8bcabf6678..fd6137aa45 100644 --- a/frontend/messages/__tests__/cards_test.tsx +++ b/frontend/messages/__tests__/cards_test.tsx @@ -259,7 +259,7 @@ describe("changeFirmwareHardware()", () => { describe("SEED_DATA_OPTIONS()", () => { it("returns options", () => { mockFeatureBoolean = false; - expect(SEED_DATA_OPTIONS().length).toEqual(13); + expect(SEED_DATA_OPTIONS().length).toEqual(15); }); it("returns more options", () => { diff --git a/frontend/messages/cards.tsx b/frontend/messages/cards.tsx index 51599f0499..0dfef738d2 100644 --- a/frontend/messages/cards.tsx +++ b/frontend/messages/cards.tsx @@ -165,19 +165,14 @@ const FirmwareChoiceTable = () => - {"Genesis v1.2"} - {"RAMPS"} - {FIRMWARE_CHOICES_DDI["arduino"].label} - - - {"Genesis v1.3"} + {"Genesis v1.7"} {"Farmduino"} - {FIRMWARE_CHOICES_DDI["farmduino"].label} + {FIRMWARE_CHOICES_DDI["farmduino_k17"].label} - {"Genesis v1.4"} + {"Genesis v1.6"} {"Farmduino"} - {FIRMWARE_CHOICES_DDI["farmduino_k14"].label} + {FIRMWARE_CHOICES_DDI["farmduino_k16"].label} {"Genesis v1.5"} @@ -185,29 +180,34 @@ const FirmwareChoiceTable = () => {FIRMWARE_CHOICES_DDI["farmduino_k15"].label} - {"Genesis v1.6"} + {"Genesis v1.4"} {"Farmduino"} - {FIRMWARE_CHOICES_DDI["farmduino_k16"].label} + {FIRMWARE_CHOICES_DDI["farmduino_k14"].label} - {"Genesis v1.7"} + {"Genesis v1.3"} {"Farmduino"} - {FIRMWARE_CHOICES_DDI["farmduino_k17"].label} + {FIRMWARE_CHOICES_DDI["farmduino"].label} - {"Express v1.0"} - {"Farmduino"} - {FIRMWARE_CHOICES_DDI["express_k10"].label} + {"Genesis v1.2"} + {"RAMPS"} + {FIRMWARE_CHOICES_DDI["arduino"].label} + {/* + {"Express v1.2"} + {"Farmduino"} + {FIRMWARE_CHOICES_DDI["express_k12"].label} + */} {"Express v1.1"} {"Farmduino"} {FIRMWARE_CHOICES_DDI["express_k11"].label} - {"Express v1.2"} + {"Express v1.0"} {"Farmduino"} - {FIRMWARE_CHOICES_DDI["express_k12"].label} + {FIRMWARE_CHOICES_DDI["express_k10"].label} ; @@ -252,30 +252,26 @@ const FirmwareMissing = (props: FirmwareMissingProps) => ; export const SEED_DATA_OPTIONS = (displayAll = false): DropDownItem[] => [ - { label: "Genesis v1.2", value: "genesis_1.2" }, - { label: "Genesis v1.3", value: "genesis_1.3" }, - { label: "Genesis v1.4", value: "genesis_1.4" }, - { label: "Genesis v1.5", value: "genesis_1.5" }, + { label: "Genesis v1.7", value: "genesis_1.7" }, { label: "Genesis v1.6", value: "genesis_1.6" }, - ...((shouldDisplayFeature(Feature.farmduino_k17) || displayAll) - ? [{ label: "Genesis v1.7", value: "genesis_1.7" }] - : []), - { label: "Genesis v1.4 XL", value: "genesis_xl_1.4" }, - { label: "Genesis v1.5 XL", value: "genesis_xl_1.5" }, + { label: "Genesis v1.5", value: "genesis_1.5" }, + { label: "Genesis v1.4", value: "genesis_1.4" }, + { label: "Genesis v1.3", value: "genesis_1.3" }, + { label: "Genesis v1.2", value: "genesis_1.2" }, + { label: "Genesis v1.7 XL", value: "genesis_xl_1.7" }, { label: "Genesis v1.6 XL", value: "genesis_xl_1.6" }, - ...((shouldDisplayFeature(Feature.farmduino_k17) || displayAll) - ? [{ label: "Genesis v1.7 XL", value: "genesis_xl_1.7" }] - : []), - { label: "Express v1.0", value: "express_1.0" }, - { label: "Express v1.1", value: "express_1.1" }, + { label: "Genesis v1.5 XL", value: "genesis_xl_1.5" }, + { label: "Genesis v1.4 XL", value: "genesis_xl_1.4" }, ...((shouldDisplayFeature(Feature.express_k12) || displayAll) ? [{ label: "Express v1.2", value: "express_1.2" }] : []), - { label: "Express v1.0 XL", value: "express_xl_1.0" }, - { label: "Express v1.1 XL", value: "express_xl_1.1" }, + { label: "Express v1.1", value: "express_1.1" }, + { label: "Express v1.0", value: "express_1.0" }, ...((shouldDisplayFeature(Feature.express_k12) || displayAll) ? [{ label: "Express v1.2 XL", value: "express_xl_1.2" }] : []), + { label: "Express v1.1 XL", value: "express_xl_1.1" }, + { label: "Express v1.0 XL", value: "express_xl_1.0" }, { label: "Custom Bot", value: "none" }, ]; diff --git a/frontend/os_download/__tests__/content_test.tsx b/frontend/os_download/__tests__/content_test.tsx index 12cb7f5f22..5395670a0a 100644 --- a/frontend/os_download/__tests__/content_test.tsx +++ b/frontend/os_download/__tests__/content_test.tsx @@ -5,8 +5,8 @@ import { clickButton } from "../../__test_support__/helpers"; describe("", () => { it("renders", () => { - globalConfig.rpi3_release_url = "fake rpi3 img url"; - globalConfig.rpi3_release_tag = "1.0.1"; + globalConfig.rpi4_release_url = "fake rpi4 img url"; + globalConfig.rpi4_release_tag = "1.0.1"; globalConfig.rpi_release_url = "fake rpi img url"; globalConfig.rpi_release_tag = "1.0.0"; @@ -16,7 +16,7 @@ describe("", () => { const rpi3Link = wrapper.find("a").first(); expect(rpi3Link.text()).toEqual("DOWNLOAD v1.0.1"); - expect(rpi3Link.props().href).toEqual("fake rpi3 img url"); + expect(rpi3Link.props().href).toEqual("fake rpi4 img url"); const rpiLink = wrapper.find("a").last(); expect(rpiLink.text()).toEqual("DOWNLOAD v1.0.0"); @@ -57,14 +57,14 @@ describe("", () => { it("runs the wizard: genesis", () => { const wrapper = mount(); clickButton(wrapper, 0, "genesis", { partial_match: true }); - clickButton(wrapper, 4, "genesis v1.2"); + clickButton(wrapper, 5, "genesis v1.2"); expect(wrapper.text().toLowerCase()).toContain("pi 3"); }); it("runs the wizard: genesis v1.6.0", () => { const wrapper = mount(); clickButton(wrapper, 0, "genesis", { partial_match: true }); - clickButton(wrapper, 0, "genesis v1.6"); + clickButton(wrapper, 1, "genesis v1.6"); clickButton(wrapper, 0, "black"); clickButton(wrapper, 0, "raspberry pi model 3"); expect(wrapper.text().toLowerCase()).toContain("pi 3"); @@ -73,7 +73,7 @@ describe("", () => { it("runs the wizard: genesis v1.6.1 & some v1.6.2", () => { const wrapper = mount(); clickButton(wrapper, 0, "genesis", { partial_match: true }); - clickButton(wrapper, 0, "genesis v1.6"); + clickButton(wrapper, 1, "genesis v1.6"); clickButton(wrapper, 1, "white"); expect(wrapper.text().toLowerCase()).toContain("pi 4"); }); @@ -81,9 +81,16 @@ describe("", () => { it("runs the wizard: genesis other v1.6.2", () => { const wrapper = mount(); clickButton(wrapper, 0, "genesis", { partial_match: true }); - clickButton(wrapper, 0, "genesis v1.6"); + clickButton(wrapper, 1, "genesis v1.6"); clickButton(wrapper, 0, "black"); clickButton(wrapper, 1, "raspberry pi model 4"); expect(wrapper.text().toLowerCase()).toContain("pi 4"); }); + + it("runs the wizard: genesis v1.7", () => { + const wrapper = mount(); + clickButton(wrapper, 0, "genesis", { partial_match: true }); + clickButton(wrapper, 0, "genesis v1.7"); + expect(wrapper.text().toLowerCase()).toContain("pi 4"); + }); }); diff --git a/frontend/os_download/content.tsx b/frontend/os_download/content.tsx index 6dbf3e4b23..365a46921e 100644 --- a/frontend/os_download/content.tsx +++ b/frontend/os_download/content.tsx @@ -41,36 +41,36 @@ interface PlatformContent { } const PLATFORM_DATA = (): PlatformContent[] => [ + { + computer: "Raspberry Pi 4", + imageUrl: RPI4().imageUrl, + releaseTag: RPI4().releaseTag, + kits: [ + "Genesis v1.7", + "Genesis XL v1.7", + "Genesis v1.6.2 (white cable or 2 HDMI ports)", + "Genesis XL v1.6.2 (white cable or 2 HDMI ports)", + "Genesis v1.6.1 (white cable)", + "Genesis XL v1.6.1 (white cable)", + ], + }, { computer: "Raspberry Pi 3\nRaspberry Pi Zero 2 W", imageUrl: RPI3().imageUrl, releaseTag: RPI3().releaseTag, kits: [ - "Genesis v1.2", - "Genesis v1.3", - "Genesis v1.4", - "Genesis v1.5", "Genesis v1.6 (black cable)", - "Genesis XL v1.4", - "Genesis XL v1.5", "Genesis XL v1.6 (black cable)", - "Express v1.1 (USB)", + "Genesis v1.5", + "Genesis XL v1.5", + "Genesis v1.4", + "Genesis XL v1.4", + "Genesis v1.3", + "Genesis v1.2", "Express v1.2 (USB)", - "Express XL v1.1 (USB)", "Express XL v1.2 (USB)", - ], - }, - { - computer: "Raspberry Pi 4", - imageUrl: RPI4().imageUrl, - releaseTag: RPI4().releaseTag, - kits: [ - "Genesis v1.6.1 (white cable)", - "Genesis XL v1.6.1 (white cable)", - "Genesis v1.6.2 (white cable or 2 HDMI ports)", - "Genesis XL v1.6.2 (white cable or 2 HDMI ports)", - "Genesis v1.7", - "Genesis XL v1.7", + "Express v1.1 (USB)", + "Express XL v1.1 (USB)", ], }, { @@ -149,7 +149,7 @@ const VERSIONS = () => ({ Version["v1.0"], ], [Model.Genesis]: [ - // Version["v1.7"], + Version["v1.7"], Version["v1.6"], Version["v1.5"], Version["v1.4"], diff --git a/frontend/settings/firmware/__tests__/board_type_test.tsx b/frontend/settings/firmware/__tests__/board_type_test.tsx index 477349fd8c..b6631d78fc 100644 --- a/frontend/settings/firmware/__tests__/board_type_test.tsx +++ b/frontend/settings/firmware/__tests__/board_type_test.tsx @@ -87,16 +87,17 @@ describe("", () => { const wrapper = mount(); const { list } = wrapper.find("FBSelect").props(); expect(list).toEqual([ - { label: "Arduino/RAMPS (Genesis v1.2)", value: "arduino" }, - { label: "Farmduino (Genesis v1.3)", value: "farmduino" }, - { label: "Farmduino (Genesis v1.4)", value: "farmduino_k14" }, - { label: "Farmduino (Genesis v1.5)", value: "farmduino_k15" }, + { label: "Farmduino (Genesis v1.7)", value: "farmduino_k17" }, { label: "Farmduino (Genesis v1.6)", value: "farmduino_k16" }, - { label: "Farmduino (Express v1.0)", value: "express_k10" }, + { label: "Farmduino (Genesis v1.5)", value: "farmduino_k15" }, + { label: "Farmduino (Genesis v1.4)", value: "farmduino_k14" }, + { label: "Farmduino (Genesis v1.3)", value: "farmduino" }, + { label: "Arduino/RAMPS (Genesis v1.2)", value: "arduino" }, { label: "Farmduino (Express v1.1)", value: "express_k11" }, + { label: "Farmduino (Express v1.0)", value: "express_k10" }, { label: "None", value: "none" }, ]); - expect(list?.length).toEqual(8); + expect(list?.length).toEqual(9); }); it("displays more boards", () => { diff --git a/frontend/settings/firmware/firmware_hardware_support.ts b/frontend/settings/firmware/firmware_hardware_support.ts index aea0d40a1d..cb196901e7 100644 --- a/frontend/settings/firmware/firmware_hardware_support.ts +++ b/frontend/settings/firmware/firmware_hardware_support.ts @@ -186,27 +186,27 @@ const EXPRESS_K12 = { label: BoardLabels.express_k12, value: "express_k12" }; const NONE = { label: BoardLabels.none, value: "none" }; export const FIRMWARE_CHOICES_DDI = { - [ARDUINO.value]: ARDUINO, - [FARMDUINO.value]: FARMDUINO, - [FARMDUINO_K14.value]: FARMDUINO_K14, - [FARMDUINO_K15.value]: FARMDUINO_K15, - [FARMDUINO_K16.value]: FARMDUINO_K16, [FARMDUINO_K17.value]: FARMDUINO_K17, - [EXPRESS_K10.value]: EXPRESS_K10, - [EXPRESS_K11.value]: EXPRESS_K11, + [FARMDUINO_K16.value]: FARMDUINO_K16, + [FARMDUINO_K15.value]: FARMDUINO_K15, + [FARMDUINO_K14.value]: FARMDUINO_K14, + [FARMDUINO.value]: FARMDUINO, + [ARDUINO.value]: ARDUINO, [EXPRESS_K12.value]: EXPRESS_K12, + [EXPRESS_K11.value]: EXPRESS_K11, + [EXPRESS_K10.value]: EXPRESS_K10, [NONE.value]: NONE, }; export const getFirmwareChoices = () => ([ - ARDUINO, - FARMDUINO, - FARMDUINO_K14, - FARMDUINO_K15, + FARMDUINO_K17, FARMDUINO_K16, - ...(shouldDisplayFeature(Feature.farmduino_k17) ? [FARMDUINO_K17] : []), - EXPRESS_K10, - EXPRESS_K11, + FARMDUINO_K15, + FARMDUINO_K14, + FARMDUINO, + ARDUINO, ...(shouldDisplayFeature(Feature.express_k12) ? [EXPRESS_K12] : []), + EXPRESS_K11, + EXPRESS_K10, NONE, ]); diff --git a/frontend/util/version.ts b/frontend/util/version.ts index 78e2ad166b..6233446737 100644 --- a/frontend/util/version.ts +++ b/frontend/util/version.ts @@ -86,7 +86,6 @@ export enum FbosVersionFallback { const fallbackData: MinOsFeatureLookup = { [Feature.express_k12]: MinVersionOverride.NEVER, // available: "15.4.6", - [Feature.farmduino_k17]: MinVersionOverride.DEMO, // available: "15.4.6", [Feature.planted_at_now]: MinVersionOverride.NEVER, }; diff --git a/frontend/wizard/index.tsx b/frontend/wizard/index.tsx index 19a04b79dd..98b2b233f9 100644 --- a/frontend/wizard/index.tsx +++ b/frontend/wizard/index.tsx @@ -15,10 +15,9 @@ import { } from "./data"; import { SetupWizardProps, SetupWizardState, WizardHeaderProps, WizardResults, - WizardSectionHeaderProps, WizardSectionsOpen, + WizardSectionHeaderProps, WizardSectionsOpen, WizardStepDataProps, } from "./interfaces"; import { - getDeviceAccountSettings, maybeGetDevice, maybeGetTimeSettings, selectAllWizardStepResults, } from "../resources/selectors"; @@ -48,10 +47,10 @@ export const mapStateToProps = (props: Everything): SetupWizardProps => ({ export class RawSetupWizard extends React.Component { - get stepDataProps() { + get stepDataProps(): WizardStepDataProps { return { firmwareHardware: this.props.firmwareHardware, - rpi: getDeviceAccountSettings(this.props.resources).body.rpi, + getConfigValue: this.props.getConfigValue, }; } From e755dd732fb5ed801bb3c91feefa718680a8369e Mon Sep 17 00:00:00 2001 From: gabrielburnworth Date: Thu, 22 Feb 2024 10:34:53 -0800 Subject: [PATCH 2/3] add temp fix for parcel npm install issue --- package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package.json b/package.json index c6babe5bba..ffb223ea6b 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,9 @@ ], "author": "farmbot.io", "license": "MIT", + "overrides": { + "@parcel/watcher": "2.1.0" + }, "dependencies": { "@blueprintjs/core": "5.9.1", "@blueprintjs/select": "5.1.1", From f0cd5c98204ab878e2516c222c42cc71551134f7 Mon Sep 17 00:00:00 2001 From: gabrielburnworth Date: Thu, 22 Feb 2024 10:37:51 -0800 Subject: [PATCH 3/3] upgrade deps --- Gemfile.lock | 128 ++++++++++++++++++++++++++------------------------- package.json | 18 ++++---- 2 files changed, 74 insertions(+), 72 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2b2c3b085a..7fc6dfead0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,40 +7,40 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (6.1.7.6) - actionpack (= 6.1.7.6) - activesupport (= 6.1.7.6) + actioncable (6.1.7.7) + actionpack (= 6.1.7.7) + activesupport (= 6.1.7.7) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.6) - actionpack (= 6.1.7.6) - activejob (= 6.1.7.6) - activerecord (= 6.1.7.6) - activestorage (= 6.1.7.6) - activesupport (= 6.1.7.6) + actionmailbox (6.1.7.7) + actionpack (= 6.1.7.7) + activejob (= 6.1.7.7) + activerecord (= 6.1.7.7) + activestorage (= 6.1.7.7) + activesupport (= 6.1.7.7) mail (>= 2.7.1) - actionmailer (6.1.7.6) - actionpack (= 6.1.7.6) - actionview (= 6.1.7.6) - activejob (= 6.1.7.6) - activesupport (= 6.1.7.6) + actionmailer (6.1.7.7) + actionpack (= 6.1.7.7) + actionview (= 6.1.7.7) + activejob (= 6.1.7.7) + activesupport (= 6.1.7.7) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.7.6) - actionview (= 6.1.7.6) - activesupport (= 6.1.7.6) + actionpack (6.1.7.7) + actionview (= 6.1.7.7) + activesupport (= 6.1.7.7) 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.7.6) - actionpack (= 6.1.7.6) - activerecord (= 6.1.7.6) - activestorage (= 6.1.7.6) - activesupport (= 6.1.7.6) + actiontext (6.1.7.7) + actionpack (= 6.1.7.7) + activerecord (= 6.1.7.7) + activestorage (= 6.1.7.7) + activesupport (= 6.1.7.7) nokogiri (>= 1.8.5) - actionview (6.1.7.6) - activesupport (= 6.1.7.6) + actionview (6.1.7.7) + activesupport (= 6.1.7.7) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -50,22 +50,22 @@ GEM activemodel (>= 4.1) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - activejob (6.1.7.6) - activesupport (= 6.1.7.6) + activejob (6.1.7.7) + activesupport (= 6.1.7.7) globalid (>= 0.3.6) - activemodel (6.1.7.6) - activesupport (= 6.1.7.6) - activerecord (6.1.7.6) - activemodel (= 6.1.7.6) - activesupport (= 6.1.7.6) - activestorage (6.1.7.6) - actionpack (= 6.1.7.6) - activejob (= 6.1.7.6) - activerecord (= 6.1.7.6) - activesupport (= 6.1.7.6) + activemodel (6.1.7.7) + activesupport (= 6.1.7.7) + activerecord (6.1.7.7) + activemodel (= 6.1.7.7) + activesupport (= 6.1.7.7) + activestorage (6.1.7.7) + actionpack (= 6.1.7.7) + activejob (= 6.1.7.7) + activerecord (= 6.1.7.7) + activesupport (= 6.1.7.7) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7.6) + activesupport (6.1.7.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -75,6 +75,7 @@ GEM public_suffix (>= 2.0.2, < 6.0) amq-protocol (2.3.2) ast (2.4.2) + base64 (0.2.0) bcrypt (3.1.20) bigdecimal (3.1.6) builder (3.2.4) @@ -86,7 +87,7 @@ GEM climate_control (1.2.0) coderay (1.1.3) concurrent-ruby (1.2.3) - crack (0.4.6) + crack (1.0.0) bigdecimal rexml crass (1.0.6) @@ -169,7 +170,7 @@ GEM google-cloud-env (2.1.1) faraday (>= 1.0, < 3.a) google-cloud-errors (1.3.1) - google-cloud-storage (1.48.1) + google-cloud-storage (1.49.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-core (~> 0.13) @@ -178,7 +179,7 @@ GEM google-cloud-core (~> 1.6) googleauth (~> 1.9) mini_mime (~> 1.0) - googleauth (1.9.2) + googleauth (1.11.0) faraday (>= 1.0, < 3.a) google-cloud-env (~> 2.1) jwt (>= 1.4, < 3.0) @@ -191,7 +192,8 @@ GEM i18n (1.14.1) concurrent-ruby (~> 1.0) jsonapi-renderer (0.2.2) - jwt (2.7.1) + jwt (2.8.0) + base64 kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) @@ -245,7 +247,7 @@ GEM passenger (6.0.20) rack rake (>= 0.8.1) - pg (1.5.4) + pg (1.5.5) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) @@ -259,27 +261,27 @@ GEM hashie (~> 4.1) multi_json (~> 1.15) racc (1.7.3) - rack (2.2.8) + rack (2.2.8.1) rack-attack (6.7.0) rack (>= 1.0, < 4) rack-cors (2.0.1) rack (>= 2.0.0) rack-test (2.1.0) rack (>= 1.3) - rails (6.1.7.6) - actioncable (= 6.1.7.6) - actionmailbox (= 6.1.7.6) - actionmailer (= 6.1.7.6) - actionpack (= 6.1.7.6) - actiontext (= 6.1.7.6) - actionview (= 6.1.7.6) - activejob (= 6.1.7.6) - activemodel (= 6.1.7.6) - activerecord (= 6.1.7.6) - activestorage (= 6.1.7.6) - activesupport (= 6.1.7.6) + rails (6.1.7.7) + actioncable (= 6.1.7.7) + actionmailbox (= 6.1.7.7) + actionmailer (= 6.1.7.7) + actionpack (= 6.1.7.7) + actiontext (= 6.1.7.7) + actionview (= 6.1.7.7) + activejob (= 6.1.7.7) + activemodel (= 6.1.7.7) + activerecord (= 6.1.7.7) + activestorage (= 6.1.7.7) + activesupport (= 6.1.7.7) bundler (>= 1.15.0) - railties (= 6.1.7.6) + railties (= 6.1.7.7) sprockets-rails (>= 2.0.0) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) @@ -293,9 +295,9 @@ GEM rails_stdout_logging rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.5) - railties (6.1.7.6) - actionpack (= 6.1.7.6) - activesupport (= 6.1.7.6) + railties (6.1.7.7) + actionpack (= 6.1.7.7) + activesupport (= 6.1.7.7) method_source rake (>= 12.2) thor (~> 1.0) @@ -306,14 +308,14 @@ GEM declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) - request_store (1.5.1) + request_store (1.6.0) rack (>= 1.4) responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) retriable (3.1.2) rexml (3.2.6) - rollbar (3.5.1) + rollbar (3.5.2) rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) @@ -345,7 +347,7 @@ GEM parser secure_headers (6.5.0) set (1.1.0) - signet (0.18.0) + signet (0.19.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) @@ -382,7 +384,7 @@ GEM rails warden (1.2.9) rack (>= 2.0.9) - webmock (3.20.0) + webmock (3.22.0) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) diff --git a/package.json b/package.json index ffb223ea6b..90ccf195ca 100644 --- a/package.json +++ b/package.json @@ -38,13 +38,13 @@ "@monaco-editor/react": "4.6.0", "@parcel/transformer-sass": "2.11.0", "@parcel/transformer-typescript-tsc": "2.11.0", - "@react-three/drei": "9.97.3", + "@react-three/drei": "9.99.0", "@react-three/fiber": "8.15.16", "@types/lodash": "4.14.202", "@types/markdown-it": "13.0.7", - "@types/node": "20.11.16", + "@types/node": "20.11.19", "@types/promise-timeout": "1.3.3", - "@types/react": "18.2.55", + "@types/react": "18.2.57", "@types/react-color": "3.0.11", "@types/react-dom": "18.2.19", "@types/three": "0.161.2", @@ -54,12 +54,12 @@ "browser-speech": "1.1.1", "events": "3.3.0", "farmbot": "15.8.7", - "i18next": "23.8.2", + "i18next": "23.10.0", "lodash": "4.17.21", "markdown-it": "14.0.0", "markdown-it-emoji": "3.0.0", "moment": "2.30.1", - "monaco-editor": "0.45.0", + "monaco-editor": "0.46.0", "mqtt": "5.1.4", "npm": "10.4.0", "parcel": "2.11.0", @@ -84,14 +84,14 @@ "@types/enzyme": "3.10.12", "@types/jest": "29.5.12", "@types/readable-stream": "4.0.10", - "@typescript-eslint/eslint-plugin": "6.21.0", - "@typescript-eslint/parser": "6.21.0", + "@typescript-eslint/eslint-plugin": "7.0.2", + "@typescript-eslint/parser": "7.0.2", "@wojtekmaj/enzyme-adapter-react-17": "0.8.0", "enzyme": "3.11.0", "eslint": "8.56.0", "eslint-plugin-eslint-comments": "3.2.0", "eslint-plugin-import": "2.29.1", - "eslint-plugin-jest": "27.6.3", + "eslint-plugin-jest": "27.9.0", "eslint-plugin-no-null": "1.0.2", "eslint-plugin-promise": "6.1.1", "eslint-plugin-react": "7.33.2", @@ -107,7 +107,7 @@ "raf": "3.4.1", "react-addons-test-utils": "15.6.2", "react-test-renderer": "18.2.0", - "sass": "1.70.0", + "sass": "1.71.1", "sass-lint": "1.13.1", "ts-jest": "29.1.2", "tslint": "6.1.3"