diff --git a/package.json b/package.json index 33212048..7e3de52b 100644 --- a/package.json +++ b/package.json @@ -159,7 +159,7 @@ "eslint-config-react-app": "^7.0.1", "eslint-config-typed-fp": "^3.3.0", "eslint-plugin-functional": "^4.4.1", - "eslint-plugin-import": "^2.26.0", + "eslint-plugin-import": "^2.27.2", "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-react": "^7.32.0", "eslint-plugin-total-functions": "^6.0.0", diff --git a/src/hub/reducers.test.ts b/src/hub/reducers.test.ts index a5dbb227..a6886d96 100644 --- a/src/hub/reducers.test.ts +++ b/src/hub/reducers.test.ts @@ -2,9 +2,9 @@ // Copyright (c) 2021-2022 The Pybricks Authors import { AnyAction } from 'redux'; +import { bleDidConnectPybricks, bleDidDisconnectPybricks } from '../ble/actions'; import { didReceiveStatusReport } from '../ble-pybricks-service/actions'; import { Status, statusToFlag } from '../ble-pybricks-service/protocol'; -import { bleDidConnectPybricks, bleDidDisconnectPybricks } from '../ble/actions'; import { didFailToFinishDownload, didFinishDownload, diff --git a/src/hub/reducers.ts b/src/hub/reducers.ts index ec219b4c..4791e33d 100644 --- a/src/hub/reducers.ts +++ b/src/hub/reducers.ts @@ -3,6 +3,7 @@ import { Reducer, combineReducers } from 'redux'; import * as semver from 'semver'; +import { bleDidConnectPybricks, bleDidDisconnectPybricks } from '../ble/actions'; import { HubType } from '../ble-lwp3-service/protocol'; import { blePybricksServiceDidNotReceiveHubCapabilities, @@ -15,7 +16,6 @@ import { Status, statusToFlag, } from '../ble-pybricks-service/protocol'; -import { bleDidConnectPybricks, bleDidDisconnectPybricks } from '../ble/actions'; import { pythonVersionToSemver } from '../utils/version'; import { didFailToFinishDownload, diff --git a/src/hub/sagas.ts b/src/hub/sagas.ts index ad4a0400..2bdc5d37 100644 --- a/src/hub/sagas.ts +++ b/src/hub/sagas.ts @@ -14,6 +14,7 @@ import { takeEvery, } from 'typed-redux-saga/macro'; import { alertsShowAlert } from '../alerts/actions'; +import { bleDidConnectPybricks } from '../ble/actions'; import { didFailToWrite, didWrite, write } from '../ble-nordic-uart-service/actions'; import { nordicUartSafeTxCharLength } from '../ble-nordic-uart-service/protocol'; import { @@ -26,7 +27,6 @@ import { sendWriteUserRamCommand, } from '../ble-pybricks-service/actions'; import { FileFormat } from '../ble-pybricks-service/protocol'; -import { bleDidConnectPybricks } from '../ble/actions'; import { editorGetValue } from '../editor/sagaLib'; import { compile, diff --git a/src/sagas.ts b/src/sagas.ts index 33ae0b9b..a3008011 100644 --- a/src/sagas.ts +++ b/src/sagas.ts @@ -5,8 +5,8 @@ import { eventChannel } from 'redux-saga'; import { all, spawn, take } from 'typed-redux-saga/macro'; import alerts, { AlertsSagaContext } from './alerts/sagas'; import app from './app/sagas'; -import blePybricksService from './ble-pybricks-service/sagas'; import ble from './ble/sagas'; +import blePybricksService from './ble-pybricks-service/sagas'; import errorLog from './error-log/sagas'; import explorer from './explorer/sagas'; import fileStorage, { FileStorageSageContext } from './fileStorage/sagas'; diff --git a/yarn.lock b/yarn.lock index 0319e0d0..9cb97f81 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2468,7 +2468,7 @@ __metadata: eslint-config-react-app: ^7.0.1 eslint-config-typed-fp: ^3.3.0 eslint-plugin-functional: ^4.4.1 - eslint-plugin-import: ^2.26.0 + eslint-plugin-import: ^2.27.2 eslint-plugin-prettier: ^4.2.1 eslint-plugin-react: ^7.32.0 eslint-plugin-total-functions: ^6.0.0 @@ -5797,7 +5797,19 @@ __metadata: languageName: node linkType: hard -"array.prototype.flatmap@npm:^1.3.1": +"array.prototype.flat@npm:^1.3.1": + version: 1.3.1 + resolution: "array.prototype.flat@npm:1.3.1" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.1.4 + es-abstract: ^1.20.4 + es-shim-unscopables: ^1.0.0 + checksum: 5a8415949df79bf6e01afd7e8839bbde5a3581300e8ad5d8449dea52639e9e59b26a467665622783697917b43bf39940a6e621877c7dd9b3d1c1f97484b9b88b + languageName: node + linkType: hard + +"array.prototype.flatmap@npm:^1.3.0, array.prototype.flatmap@npm:^1.3.1": version: 1.3.1 resolution: "array.prototype.flatmap@npm:1.3.1" dependencies: @@ -7929,6 +7941,17 @@ __metadata: languageName: node linkType: hard +"eslint-import-resolver-node@npm:^0.3.7": + version: 0.3.7 + resolution: "eslint-import-resolver-node@npm:0.3.7" + dependencies: + debug: ^3.2.7 + is-core-module: ^2.11.0 + resolve: ^1.22.1 + checksum: 3379aacf1d2c6952c1b9666c6fa5982c3023df695430b0d391c0029f6403a7775414873d90f397e98ba6245372b6c8960e16e74d9e4a3b0c0a4582f3bdbe3d6e + languageName: node + linkType: hard + "eslint-module-utils@npm:^2.7.3": version: 2.7.3 resolution: "eslint-module-utils@npm:2.7.3" @@ -7939,6 +7962,18 @@ __metadata: languageName: node linkType: hard +"eslint-module-utils@npm:^2.7.4": + version: 2.7.4 + resolution: "eslint-module-utils@npm:2.7.4" + dependencies: + debug: ^3.2.7 + peerDependenciesMeta: + eslint: + optional: true + checksum: 5da13645daff145a5c922896b258f8bba560722c3767254e458d894ff5fbb505d6dfd945bffa932a5b0ae06714da2379bd41011c4c20d2d59cc83e23895360f7 + languageName: node + linkType: hard + "eslint-plugin-flowtype@npm:^8.0.3": version: 8.0.3 resolution: "eslint-plugin-flowtype@npm:8.0.3" @@ -7974,7 +8009,7 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-import@npm:^2.25.3, eslint-plugin-import@npm:^2.26.0": +"eslint-plugin-import@npm:^2.25.3": version: 2.26.0 resolution: "eslint-plugin-import@npm:2.26.0" dependencies: @@ -7997,6 +8032,30 @@ __metadata: languageName: node linkType: hard +"eslint-plugin-import@npm:^2.27.2": + version: 2.27.2 + resolution: "eslint-plugin-import@npm:2.27.2" + dependencies: + array-includes: ^3.1.6 + array.prototype.flat: ^1.3.1 + array.prototype.flatmap: ^1.3.0 + debug: ^3.2.7 + doctrine: ^2.1.0 + eslint-import-resolver-node: ^0.3.7 + eslint-module-utils: ^2.7.4 + has: ^1.0.3 + is-core-module: ^2.11.0 + is-glob: ^4.0.3 + minimatch: ^3.1.2 + object.values: ^1.1.6 + resolve: ^1.22.1 + tsconfig-paths: ^3.14.1 + peerDependencies: + eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 + checksum: 246f6bf54a7e2070b18471a38a8e1d085f745679eb893e4e5baf95272f5156ebddd88e611f757ceb3793ae170f56bc6de60b4fe320183d62aa23e58ff248b141 + languageName: node + linkType: hard + "eslint-plugin-jest@npm:^25.3.0": version: 25.7.0 resolution: "eslint-plugin-jest@npm:25.7.0" @@ -9565,6 +9624,15 @@ __metadata: languageName: node linkType: hard +"is-core-module@npm:^2.11.0": + version: 2.11.0 + resolution: "is-core-module@npm:2.11.0" + dependencies: + has: ^1.0.3 + checksum: f96fd490c6b48eb4f6d10ba815c6ef13f410b0ba6f7eb8577af51697de523e5f2cd9de1c441b51d27251bf0e4aebc936545e33a5d26d5d51f28d25698d4a8bab + languageName: node + linkType: hard + "is-core-module@npm:^2.2.0, is-core-module@npm:^2.8.1, is-core-module@npm:^2.9.0": version: 2.9.0 resolution: "is-core-module@npm:2.9.0"