From dcca18c2de3bd14304bee849015c33880304d647 Mon Sep 17 00:00:00 2001
From: Fabian-Lars <fabianlars@fabianlars.de>
Date: Sat, 1 Oct 2022 21:48:12 +0200
Subject: [PATCH] fix: Use `import` in vanilla-ts fragment. (#198)

* fix: Use `import` in vanilla-ts fragment.

* Create vanilla-ts-import.md

* Add greet to `window` type declaration

* Update vite-env.d.ts

* Update vite-env.d.ts

* move api package to dependencies
---
 .changes/vanilla-ts-import.md                             | 5 +++++
 packages/cli/fragments/fragment-vanilla-ts/package.json   | 5 +++--
 packages/cli/fragments/fragment-vanilla-ts/src/main.ts    | 2 +-
 .../cli/fragments/fragment-vanilla-ts/src/vite-env.d.ts   | 8 ++------
 4 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 .changes/vanilla-ts-import.md

diff --git a/.changes/vanilla-ts-import.md b/.changes/vanilla-ts-import.md
new file mode 100644
index 0000000000..32403b6d76
--- /dev/null
+++ b/.changes/vanilla-ts-import.md
@@ -0,0 +1,5 @@
+---
+"create-tauri-app": "patch"
+---
+
+Use `import` in vanilla-ts instead of the global Tauri object.
diff --git a/packages/cli/fragments/fragment-vanilla-ts/package.json b/packages/cli/fragments/fragment-vanilla-ts/package.json
index 539df4e838..263b622a92 100644
--- a/packages/cli/fragments/fragment-vanilla-ts/package.json
+++ b/packages/cli/fragments/fragment-vanilla-ts/package.json
@@ -9,9 +9,10 @@
     "preview": "vite preview",
     "tauri": "tauri"
   },
-  "dependencies": {},
+  "dependencies": {
+    "@tauri-apps/api": "^1.1.0"
+  },
   "devDependencies": {
-    "@tauri-apps/api": "^1.1.0",
     "@tauri-apps/cli": "^1.1.0",
     "vite": "^3.0.2",
     "typescript": "^4.8.2"
diff --git a/packages/cli/fragments/fragment-vanilla-ts/src/main.ts b/packages/cli/fragments/fragment-vanilla-ts/src/main.ts
index 2c88fb102b..5617ef0cca 100644
--- a/packages/cli/fragments/fragment-vanilla-ts/src/main.ts
+++ b/packages/cli/fragments/fragment-vanilla-ts/src/main.ts
@@ -1,4 +1,4 @@
-const { invoke } = window.__TAURI__.tauri;
+import { invoke } from "@tauri-apps/api/tauri";
 
 let greetInputEl: HTMLInputElement | null;
 let greetMsgEl: HTMLElement | null;
diff --git a/packages/cli/fragments/fragment-vanilla-ts/src/vite-env.d.ts b/packages/cli/fragments/fragment-vanilla-ts/src/vite-env.d.ts
index 85b250d1a8..7e900f5e9e 100644
--- a/packages/cli/fragments/fragment-vanilla-ts/src/vite-env.d.ts
+++ b/packages/cli/fragments/fragment-vanilla-ts/src/vite-env.d.ts
@@ -1,7 +1,3 @@
-import type * as TauriApiTypes from "@tauri-apps/api";
-
-declare global {
-  interface Window {
-    __TAURI__: typeof TauriApiTypes;
-  }
+interface Window {
+  greet: () => Promise<void>;
 }