From d67ab30b68edc75f0056d07ab5b1b0aaee3ccc9d Mon Sep 17 00:00:00 2001 From: Sacha Weatherstone Date: Fri, 12 Aug 2022 09:12:06 +1000 Subject: [PATCH] fix build --- package.json | 4 +- pnpm-lock.yaml | 90 ++++++------------- src/components/SlideSheets/NewDevice.tsx | 6 +- .../SlideSheets/tabs/nodes/Location.tsx | 2 +- .../SlideSheets/tabs/nodes/Overview.tsx | 2 +- 5 files changed, 34 insertions(+), 70 deletions(-) diff --git a/package.json b/package.json index baf990ff..7aafced4 100644 --- a/package.json +++ b/package.json @@ -53,14 +53,14 @@ "@types/react-dom": "^18.0.6", "@types/w3c-web-serial": "^1.0.2", "@types/web-bluetooth": "^0.0.15", - "@vitejs/plugin-react": "^2.0.0", + "@vitejs/plugin-react": "^2.0.1", "gzipper": "^7.1.0", "rollup-plugin-visualizer": "^5.7.1", "tar": "^6.1.11", "tslib": "^2.4.0", "typescript": "^4.7.4", "unimported": "^1.21.0", - "vite": "^3.0.5", + "vite": "^3.0.6", "vite-plugin-cdn-import": "^0.3.5" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b45cd98a..6e622c56 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -13,7 +13,7 @@ specifiers: '@types/react-dom': ^18.0.6 '@types/w3c-web-serial': ^1.0.2 '@types/web-bluetooth': ^0.0.15 - '@vitejs/plugin-react': ^2.0.0 + '@vitejs/plugin-react': ^2.0.1 base64-js: ^1.5.1 class-transformer: ^0.5.1 class-validator: ^0.13.2 @@ -37,7 +37,7 @@ specifiers: tslib: ^2.4.0 typescript: ^4.7.4 unimported: ^1.21.0 - vite: ^3.0.5 + vite: ^3.0.6 vite-plugin-cdn-import: ^0.3.5 vite-plugin-environment: ^1.1.2 zustand: 4.0.0 @@ -65,7 +65,7 @@ dependencies: rfc4648: 1.5.2 snarkdown: 2.0.0 swr: 1.3.0_react@18.2.0 - vite-plugin-environment: 1.1.2_vite@3.0.5 + vite-plugin-environment: 1.1.2_vite@3.0.6 zustand: 4.0.0_immer@9.0.15+react@18.2.0 devDependencies: @@ -76,14 +76,14 @@ devDependencies: '@types/react-dom': 18.0.6 '@types/w3c-web-serial': 1.0.2 '@types/web-bluetooth': 0.0.15 - '@vitejs/plugin-react': 2.0.0_vite@3.0.5 + '@vitejs/plugin-react': 2.0.1_vite@3.0.6 gzipper: 7.1.0 rollup-plugin-visualizer: 5.7.1 tar: 6.1.11 tslib: 2.4.0 typescript: 4.7.4 unimported: 1.21.0 - vite: 3.0.5 + vite: 3.0.6 vite-plugin-cdn-import: 0.3.5 packages: @@ -97,7 +97,7 @@ packages: engines: {node: '>=6.0.0'} dependencies: '@jridgewell/gen-mapping': 0.1.1 - '@jridgewell/trace-mapping': 0.3.14 + '@jridgewell/trace-mapping': 0.3.15 dev: true /@arcgis/core/4.24.7: @@ -528,7 +528,7 @@ packages: dependencies: '@jridgewell/set-array': 1.1.2 '@jridgewell/sourcemap-codec': 1.4.14 - '@jridgewell/trace-mapping': 0.3.14 + '@jridgewell/trace-mapping': 0.3.15 dev: true /@jridgewell/resolve-uri/3.1.0: @@ -545,8 +545,8 @@ packages: resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==} dev: true - /@jridgewell/trace-mapping/0.3.14: - resolution: {integrity: sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==} + /@jridgewell/trace-mapping/0.3.15: + resolution: {integrity: sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==} dependencies: '@jridgewell/resolve-uri': 3.1.0 '@jridgewell/sourcemap-codec': 1.4.14 @@ -1017,9 +1017,9 @@ packages: '@typescript-eslint/types': 5.33.0 eslint-visitor-keys: 3.3.0 - /@vitejs/plugin-react/2.0.0_vite@3.0.5: - resolution: {integrity: sha512-zHkRR+X4zqEPNBbKV2FvWSxK7Q6crjMBVIAYroSU8Nbb4M3E5x4qOiLoqJBHtXgr27kfednXjkwr3lr8jS6Wrw==} - engines: {node: '>=14.18.0'} + /@vitejs/plugin-react/2.0.1_vite@3.0.6: + resolution: {integrity: sha512-uINzNHmjrbunlFtyVkST6lY1ewSfz/XwLufG0PIqvLGnpk2nOIOa/1CACTDNcKi1/RwaCzJLmsXwm1NsUVV/NA==} + engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: vite: ^3.0.0 dependencies: @@ -1030,7 +1030,7 @@ packages: '@babel/plugin-transform-react-jsx-source': 7.18.6_@babel+core@7.18.10 magic-string: 0.26.2 react-refresh: 0.14.0 - vite: 3.0.5 + vite: 3.0.6 transitivePeerDependencies: - supports-color dev: true @@ -1202,7 +1202,7 @@ packages: hasBin: true dependencies: caniuse-lite: 1.0.30001375 - electron-to-chromium: 1.4.215 + electron-to-chromium: 1.4.216 node-releases: 2.0.6 update-browserslist-db: 1.0.5_browserslist@4.21.3 dev: true @@ -1505,8 +1505,8 @@ packages: stream-shift: 1.0.1 dev: true - /electron-to-chromium/1.4.215: - resolution: {integrity: sha512-vqZxT8C5mlDZ//hQFhneHmOLnj1LhbzxV0+I1yqHV8SB1Oo4Y5Ne9+qQhwHl7O1s9s9cRuo2l5CoLEHdhMTwZg==} + /electron-to-chromium/1.4.216: + resolution: {integrity: sha512-jDkyyqIy2n+dtl3isE0Y8znnN936BGobE8SDnwErubJ3zOophPDFPMr7rCoIH+EUae6T7+t1cbBggGtvVf3ZtQ==} dev: true /emoji-regex/8.0.0: @@ -1830,17 +1830,20 @@ packages: - supports-color dev: false - /eslint-module-utils/2.7.3_rtbhofbsy3gzv73dx4xodd3q4u: - resolution: {integrity: sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==} + /eslint-module-utils/2.7.4_zw4cvwcnfxxgmribiuqjo5pjku: + resolution: {integrity: sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==} engines: {node: '>=4'} peerDependencies: '@typescript-eslint/parser': '*' + eslint: '*' eslint-import-resolver-node: '*' eslint-import-resolver-typescript: '*' eslint-import-resolver-webpack: '*' peerDependenciesMeta: '@typescript-eslint/parser': optional: true + eslint: + optional: true eslint-import-resolver-node: optional: true eslint-import-resolver-typescript: @@ -1850,9 +1853,9 @@ packages: dependencies: '@typescript-eslint/parser': 5.33.0_qugx7qdu5zevzvxaiqyxfiwquq debug: 3.2.7 + eslint: 8.21.0 eslint-import-resolver-node: 0.3.6 eslint-import-resolver-typescript: 2.7.1_jatgrcxl4x7ywe7ak6cnjca2ae - find-up: 2.1.0 transitivePeerDependencies: - supports-color dev: false @@ -1885,7 +1888,7 @@ packages: doctrine: 2.1.0 eslint: 8.21.0 eslint-import-resolver-node: 0.3.6 - eslint-module-utils: 2.7.3_rtbhofbsy3gzv73dx4xodd3q4u + eslint-module-utils: 2.7.4_zw4cvwcnfxxgmribiuqjo5pjku has: 1.0.3 is-core-module: 2.10.0 is-glob: 4.0.3 @@ -2206,13 +2209,6 @@ packages: dependencies: to-regex-range: 5.0.1 - /find-up/2.1.0: - resolution: {integrity: sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==} - engines: {node: '>=4'} - dependencies: - locate-path: 2.0.0 - dev: false - /find-up/4.1.0: resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==} engines: {node: '>=8'} @@ -2790,14 +2786,6 @@ packages: resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} dev: true - /locate-path/2.0.0: - resolution: {integrity: sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==} - engines: {node: '>=4'} - dependencies: - p-locate: 2.0.0 - path-exists: 3.0.0 - dev: false - /locate-path/5.0.0: resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==} engines: {node: '>=8'} @@ -3108,13 +3096,6 @@ packages: engines: {node: '>=0.10.0'} dev: true - /p-limit/1.3.0: - resolution: {integrity: sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==} - engines: {node: '>=4'} - dependencies: - p-try: 1.0.0 - dev: false - /p-limit/2.3.0: resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==} engines: {node: '>=6'} @@ -3129,13 +3110,6 @@ packages: yocto-queue: 0.1.0 dev: false - /p-locate/2.0.0: - resolution: {integrity: sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==} - engines: {node: '>=4'} - dependencies: - p-limit: 1.3.0 - dev: false - /p-locate/4.1.0: resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==} engines: {node: '>=8'} @@ -3150,11 +3124,6 @@ packages: p-limit: 3.1.0 dev: false - /p-try/1.0.0: - resolution: {integrity: sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==} - engines: {node: '>=4'} - dev: false - /p-try/2.2.0: resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} engines: {node: '>=6'} @@ -3176,11 +3145,6 @@ packages: lines-and-columns: 1.2.4 dev: true - /path-exists/3.0.0: - resolution: {integrity: sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==} - engines: {node: '>=4'} - dev: false - /path-exists/4.0.0: resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==} engines: {node: '>=8'} @@ -4031,16 +3995,16 @@ packages: - rollup dev: true - /vite-plugin-environment/1.1.2_vite@3.0.5: + /vite-plugin-environment/1.1.2_vite@3.0.6: resolution: {integrity: sha512-WFgM/ibceOEIuficZVaLcmJvcMZiyTkGzeS8+pzfByGYRdewqil7LSLDV1DwJfFQIx/YzcW9YRSWQG7cJ2XT1w==} peerDependencies: vite: '>= 2.7' dependencies: - vite: 3.0.5 + vite: 3.0.6 dev: false - /vite/3.0.5: - resolution: {integrity: sha512-bRvrt9Tw8EGW4jj64aYFTnVg134E8hgDxyl/eEHnxiGqYk7/pTPss6CWlurqPOUzqvEoZkZ58Ws+Iu8MB87iMA==} + /vite/3.0.6: + resolution: {integrity: sha512-pjfsWIzfUlQME/VAmU6SsjdHkTt6WAHysuqPkHDcjzNu6IGtxDSZ/VfRYOwHaCqX4M3Ivz0kxuSfAPM6gAIX+w==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true peerDependencies: diff --git a/src/components/SlideSheets/NewDevice.tsx b/src/components/SlideSheets/NewDevice.tsx index c96ad1d6..600bddb1 100644 --- a/src/components/SlideSheets/NewDevice.tsx +++ b/src/components/SlideSheets/NewDevice.tsx @@ -12,10 +12,10 @@ import { } from "evergreen-ui"; import { FiBluetooth, FiTerminal, FiWifi } from "react-icons/fi"; -import { BLE } from "../connect/BLE.js"; -import { HTTP } from "../connect/HTTP.js"; -import { Serial } from "../connect/Serial.js"; import type { TabType } from "../layout/page/TabbedContent.js"; +import { BLE } from "./tabs/connect/BLE.js"; +import { HTTP } from "./tabs/connect/HTTP.js"; +import { Serial } from "./tabs/connect/Serial.js"; export interface NewDeviceProps { open: boolean; diff --git a/src/components/SlideSheets/tabs/nodes/Location.tsx b/src/components/SlideSheets/tabs/nodes/Location.tsx index 3bd22ae9..69e535ae 100644 --- a/src/components/SlideSheets/tabs/nodes/Location.tsx +++ b/src/components/SlideSheets/tabs/nodes/Location.tsx @@ -12,7 +12,7 @@ export interface LocationProps { export const Location = ({ node }: LocationProps): JSX.Element => { return ( - + ); }; diff --git a/src/components/SlideSheets/tabs/nodes/Overview.tsx b/src/components/SlideSheets/tabs/nodes/Overview.tsx index 802c3f99..c6d94437 100644 --- a/src/components/SlideSheets/tabs/nodes/Overview.tsx +++ b/src/components/SlideSheets/tabs/nodes/Overview.tsx @@ -11,7 +11,7 @@ export interface OverviewProps { export const Overview = ({ node }: OverviewProps): JSX.Element => { return ( - + ); };