Skip to content

Commit 06776ca

Browse files
committed
Bump tauri
1 parent 6f69fe0 commit 06776ca

File tree

6 files changed

+87
-22
lines changed

6 files changed

+87
-22
lines changed

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ description = "A hackable scratchpad for developers"
88
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
99

1010
[build-dependencies]
11-
tauri-build = { version = "1.0.0-beta.1" }
11+
tauri-build = { version = "1.0.0-beta.3" }
1212

1313
[features]
1414
default = [ "custom-protocol" ]

boop

Lines changed: 0 additions & 1 deletion
This file was deleted.

keys/bloop.key.pub

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/web/js/app.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { getCurrent } from "@tauri-apps/api/window";
1+
import { appWindow } from "@tauri-apps/api/window";
22
import { invoke } from "@tauri-apps/api/tauri";
33
import { Ace } from "ace-builds";
44

@@ -61,10 +61,9 @@ window.onload = () => {
6161
window.editorObj.focus();
6262
};
6363

64-
// todo restore focus?
65-
// getCurrent().listen("tauri://focus", () => {
66-
// window.focus();
67-
// console.log("kek");
64+
// Todo refocus input (Maybe not necessary with dev?)
65+
// appWindow.listen("tauri://focus", async () => {
66+
// await appWindow.setFocus();
6867
// if (window.spotlight.visible) {
6968
// window.spotlight.spotlight.focus();
7069
// } else {

yarn.lock

Lines changed: 80 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -771,6 +771,15 @@
771771
"@parcel/utils" "2.0.0-nightly.766+81293fc8"
772772
react-refresh "^0.9.0"
773773

774+
"@parcel/transformer-sass@2.0.0-nightly.766":
775+
version "2.0.0-nightly.766"
776+
resolved "https://registry.yarnpkg.com/@parcel/transformer-sass/-/transformer-sass-2.0.0-nightly.766.tgz#542c0b48987d5cffa4eb76d3327ec4058ea3ac90"
777+
integrity sha512-x3bovTO6LEzcqPEqtKxY8JNfnB13SFXtyl+uEIGqJzF65SGdnm+xc3sRIm/6SKDR6rZFT3s8L1D71nQeLpA34Q==
778+
dependencies:
779+
"@parcel/plugin" "2.0.0-nightly.766+81293fc8"
780+
"@parcel/source-map" "2.0.0-rc.5"
781+
sass "^1.32.4"
782+
774783
"@parcel/types@2.0.0-nightly.766+81293fc8":
775784
version "2.0.0-nightly.766"
776785
resolved "https://registry.yarnpkg.com/@parcel/types/-/types-2.0.0-nightly.766.tgz#98923849eeca9bf75ad04bcbf8990fce476f7466"
@@ -864,15 +873,15 @@
864873
dependencies:
865874
defer-to-connect "^2.0.0"
866875

867-
"@tauri-apps/api@^1.0.0-beta.2":
868-
version "1.0.0-beta.4"
869-
resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-1.0.0-beta.4.tgz#f78e443b7d34c6ca637c95586686d23e4ab3122c"
870-
integrity sha512-PWO3ULlMVW8p70wFWjkHVCfkI/ewRX/CwSDX016nn4xSOrMwFICswPsqOcYBdQDPClagIm/4FuRuqkn8dEj0qg==
871-
872-
"@tauri-apps/cli@^1.0.0-beta.2":
876+
"@tauri-apps/api@1.0.0-beta.5":
873877
version "1.0.0-beta.5"
874-
resolved "https://registry.yarnpkg.com/@tauri-apps/cli/-/cli-1.0.0-beta.5.tgz#b71007a9fa18617ffe1671f339bb3b6cbf8549c2"
875-
integrity sha512-1FdeLKhqA0wNAUnkfgJRZ0pf9qxcjBs4xFCSvTLY+uB5LQjoeQ0R0olwaNdise5OHm4Aoj8MEMP+tGTQA/QZtw==
878+
resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-1.0.0-beta.5.tgz#32727b3b478f67330a79409ceaf16a4a51410fce"
879+
integrity sha512-gecjskr6nCLyjky2rtth64Jsk1qyHeWykYO5wroEkoTwESJJEzFnpnqyZHCWgkRLJC1TIYEv+lddldKvH/O1RA==
880+
881+
"@tauri-apps/cli@1.0.0-beta.6":
882+
version "1.0.0-beta.6"
883+
resolved "https://registry.yarnpkg.com/@tauri-apps/cli/-/cli-1.0.0-beta.6.tgz#29e461036ea36a935cd91c0e290957c922ff9aa4"
884+
integrity sha512-zcF7+diZk3LHcS1/Rwo2f/6hRMY9fOVQYSgqSkjZDGGkTXhysrEiCCc4DwLmB1QES9P0lhRt4CPBJLpH0MdsWA==
876885
dependencies:
877886
"@tauri-apps/toml" "2.2.4"
878887
chalk "4.1.1"
@@ -1065,6 +1074,14 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
10651074
dependencies:
10661075
color-convert "^2.0.1"
10671076

1077+
anymatch@~3.1.2:
1078+
version "3.1.2"
1079+
resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
1080+
integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
1081+
dependencies:
1082+
normalize-path "^3.0.0"
1083+
picomatch "^2.0.4"
1084+
10681085
aproba@^1.0.3:
10691086
version "1.2.0"
10701087
resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
@@ -1292,6 +1309,11 @@ bin-wrapper@^4.0.0, bin-wrapper@^4.0.1:
12921309
os-filter-obj "^2.0.0"
12931310
pify "^4.0.1"
12941311

1312+
binary-extensions@^2.0.0:
1313+
version "2.2.0"
1314+
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
1315+
integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
1316+
12951317
bl@^1.0.0:
12961318
version "1.2.3"
12971319
resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.3.tgz#1e8dd80142eac80d7158c9dccc047fb620e035e7"
@@ -1362,7 +1384,7 @@ braces@^2.3.1:
13621384
split-string "^3.0.2"
13631385
to-regex "^3.0.1"
13641386

1365-
braces@^3.0.1:
1387+
braces@^3.0.1, braces@~3.0.2:
13661388
version "3.0.2"
13671389
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
13681390
integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -1655,6 +1677,21 @@ chardet@^0.7.0:
16551677
resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
16561678
integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
16571679

1680+
"chokidar@>=3.0.0 <4.0.0":
1681+
version "3.5.2"
1682+
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
1683+
integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==
1684+
dependencies:
1685+
anymatch "~3.1.2"
1686+
braces "~3.0.2"
1687+
glob-parent "~5.1.2"
1688+
is-binary-path "~2.1.0"
1689+
is-glob "~4.0.1"
1690+
normalize-path "~3.0.0"
1691+
readdirp "~3.6.0"
1692+
optionalDependencies:
1693+
fsevents "~2.3.2"
1694+
16581695
chownr@^1.1.1:
16591696
version "1.1.4"
16601697
resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
@@ -3032,6 +3069,11 @@ fs.realpath@^1.0.0:
30323069
resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
30333070
integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
30343071

3072+
fsevents@~2.3.2:
3073+
version "2.3.2"
3074+
resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
3075+
integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
3076+
30353077
function-bind@^1.1.1:
30363078
version "1.1.1"
30373079
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -3138,7 +3180,7 @@ github-from-package@0.0.0:
31383180
resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
31393181
integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=
31403182

3141-
glob-parent@^5.1.0, glob-parent@^5.1.2:
3183+
glob-parent@^5.1.0, glob-parent@^5.1.2, glob-parent@~5.1.2:
31423184
version "5.1.2"
31433185
resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
31443186
integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
@@ -3707,6 +3749,13 @@ is-bigint@^1.0.1:
37073749
resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a"
37083750
integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==
37093751

3752+
is-binary-path@~2.1.0:
3753+
version "2.1.0"
3754+
resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
3755+
integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
3756+
dependencies:
3757+
binary-extensions "^2.0.0"
3758+
37103759
is-boolean-object@^1.1.0:
37113760
version "1.1.1"
37123761
resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8"
@@ -3836,7 +3885,7 @@ is-generator-function@^1.0.7:
38363885
resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.9.tgz#e5f82c2323673e7fcad3d12858c83c4039f6399c"
38373886
integrity sha512-ZJ34p1uvIfptHCN7sFTjGibB9/oBg17sHqzDLfuwhvmN/qLVvIQXRQ8licZQ35WJ8KuEQt/etnnzQFI9C9Ue/A==
38383887

3839-
is-glob@^4.0.0, is-glob@^4.0.1:
3888+
is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
38403889
version "4.0.1"
38413890
resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
38423891
integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
@@ -4714,6 +4763,11 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
47144763
semver "2 || 3 || 4 || 5"
47154764
validate-npm-package-license "^3.0.1"
47164765

4766+
normalize-path@^3.0.0, normalize-path@~3.0.0:
4767+
version "3.0.0"
4768+
resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
4769+
integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
4770+
47174771
normalize-url@2.0.1:
47184772
version "2.0.1"
47194773
resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
@@ -5205,7 +5259,7 @@ performance-now@^2.1.0:
52055259
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
52065260
integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
52075261

5208-
picomatch@^2.2.3:
5262+
picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
52095263
version "2.3.0"
52105264
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
52115265
integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
@@ -5875,6 +5929,13 @@ readable-web-to-node-stream@^2.0.0:
58755929
resolved "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-2.0.0.tgz#751e632f466552ac0d5c440cc01470352f93c4b7"
58765930
integrity sha512-+oZJurc4hXpaaqsN68GoZGQAQIA3qr09Or4fqEsargABnbe5Aau8hFn6ISVleT3cpY/0n/8drn7huyyEvTbghA==
58775931

5932+
readdirp@~3.6.0:
5933+
version "3.6.0"
5934+
resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
5935+
integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
5936+
dependencies:
5937+
picomatch "^2.2.1"
5938+
58785939
redent@^1.0.0:
58795940
version "1.0.0"
58805941
resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
@@ -6112,6 +6173,13 @@ safe-regex@^1.1.0:
61126173
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
61136174
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
61146175

6176+
sass@^1.32.4:
6177+
version "1.35.2"
6178+
resolved "https://registry.yarnpkg.com/sass/-/sass-1.35.2.tgz#b732314fcdaf7ef8d0f1698698adc378043cb821"
6179+
integrity sha512-jhO5KAR+AMxCEwIH3v+4zbB2WB0z67V1X0jbapfVwQQdjHZUGUyukpnoM6+iCMfsIUC016w9OPKQ5jrNOS9uXw==
6180+
dependencies:
6181+
chokidar ">=3.0.0 <4.0.0"
6182+
61156183
saxes@^3.1.9:
61166184
version "3.1.11"
61176185
resolved "https://registry.yarnpkg.com/saxes/-/saxes-3.1.11.tgz#d59d1fd332ec92ad98a2e0b2ee644702384b1c5b"

0 commit comments

Comments
 (0)