Browse Source

Merge branch 'master' into issue-123-canned-messages

pull/296/head
Hunter Thornsberry 2 years ago
parent
commit
288e0da5bc
  1. 2
      package.json
  2. 10
      pnpm-lock.yaml
  3. 2
      vite.config.ts

2
package.json

@ -23,7 +23,7 @@
"dependencies": { "dependencies": {
"@bufbuild/protobuf": "^1.10.0", "@bufbuild/protobuf": "^1.10.0",
"@emeraldpay/hashicon-react": "^0.5.2", "@emeraldpay/hashicon-react": "^0.5.2",
"@meshtastic/js": "2.3.7-4", "@meshtastic/js": "2.3.7-5",
"@noble/curves": "^1.5.0", "@noble/curves": "^1.5.0",
"@radix-ui/react-accordion": "^1.2.0", "@radix-ui/react-accordion": "^1.2.0",
"@radix-ui/react-checkbox": "^1.1.0", "@radix-ui/react-checkbox": "^1.1.0",

10
pnpm-lock.yaml

@ -15,8 +15,8 @@ importers:
specifier: ^0.5.2 specifier: ^0.5.2
version: 0.5.2 version: 0.5.2
'@meshtastic/js': '@meshtastic/js':
specifier: 2.3.7-4 specifier: 2.3.7-5
version: 2.3.7-4 version: 2.3.7-5
'@noble/curves': '@noble/curves':
specifier: ^1.5.0 specifier: ^1.5.0
version: 1.5.0 version: 1.5.0
@ -593,8 +593,8 @@ packages:
resolution: {integrity: sha512-eSiQ3E5LUSxAOY9ABXGyfNhout2iEa6mUxKeaQ9nJ8NL1NuaQYU7zKqzx/LEYcXe1neT4uYAgM1wYZj3fTSXtA==} resolution: {integrity: sha512-eSiQ3E5LUSxAOY9ABXGyfNhout2iEa6mUxKeaQ9nJ8NL1NuaQYU7zKqzx/LEYcXe1neT4uYAgM1wYZj3fTSXtA==}
hasBin: true hasBin: true
'@meshtastic/[email protected]4': '@meshtastic/[email protected]5':
resolution: {integrity: sha512-+HuXNoBMS669JZXhhcNSap58rTPv/OuylvMKht4gPnpzk8Stb/oj3O5wVchyAaVmCR64kK/wPstNMxWcP7PORQ==} resolution: {integrity: sha512-77wYoCl83PgRLkvWE8ko0YFm5LbolrfFPqoBkwLd2AFgZOHGsHTlUwA7cj82yhZM3f4mf7yTFxl+8CBawEAXRA==}
'@noble/[email protected]': '@noble/[email protected]':
resolution: {integrity: sha512-J5EKamIHnKPyClwVrzmaf5wSdQXgdHcPZIZLu3bwnbeCx8/7NPK5q2ZBWF+5FvYGByjiQQsJYX6jfgB2wDPn3A==} resolution: {integrity: sha512-J5EKamIHnKPyClwVrzmaf5wSdQXgdHcPZIZLu3bwnbeCx8/7NPK5q2ZBWF+5FvYGByjiQQsJYX6jfgB2wDPn3A==}
@ -3886,7 +3886,7 @@ snapshots:
sort-object: 3.0.3 sort-object: 3.0.3
tinyqueue: 2.0.3 tinyqueue: 2.0.3
'@meshtastic/[email protected]4': '@meshtastic/[email protected]5':
dependencies: dependencies:
crc: 4.3.2 crc: 4.3.2
serialport: 12.0.0 serialport: 12.0.0

2
vite.config.ts

@ -4,7 +4,6 @@ import react from "@vitejs/plugin-react";
import { visualizer } from "rollup-plugin-visualizer"; import { visualizer } from "rollup-plugin-visualizer";
import { defineConfig } from "vite"; import { defineConfig } from "vite";
import EnvironmentPlugin from "vite-plugin-environment"; import EnvironmentPlugin from "vite-plugin-environment";
import { nodePolyfills } from "vite-plugin-node-polyfills";
let hash = ""; let hash = "";
@ -17,7 +16,6 @@ try {
export default defineConfig({ export default defineConfig({
plugins: [ plugins: [
react(), react(),
nodePolyfills(),
EnvironmentPlugin({ EnvironmentPlugin({
COMMIT_HASH: hash, COMMIT_HASH: hash,
}), }),

Loading…
Cancel
Save