Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(templates): Rename primitives to core #558

Merged
merged 2 commits into from
Dec 20, 2023
Merged

fix(templates): Rename primitives to core #558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f431db4
fix(templates): Rename primitives to core
FabianLars Dec 20, 2023
57427a3
update versions
amrbashir Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changes/primitives-core.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"create-tauri-app": "patch"
"create-tauri-app-js": "patch"
---

Adapt templates to `@tauri-apps/[email protected]` by changing the `primitives` import to `core`.
4 changes: 2 additions & 2 deletions packages/cli/fragments/fragment-angular/package.json.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"rxjs": "~7.8.0",
"tslib": "^2.3.0",
"zone.js": "~0.14.2",
"@tauri-apps/api": "^{% if alpha %}2.0.0-alpha.12{% else %}1.5.2{% endif %}"{% if alpha %},
"@tauri-apps/api": "^{% if alpha %}2.0.0-alpha.13{% else %}1.5.2{% endif %}"{% if alpha %},
"@tauri-apps/plugin-shell": "^2.0.0-alpha.3"{% endif %}
},
"devDependencies": {
Expand All @@ -36,7 +36,7 @@
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.1.0",
"typescript": "~5.2.2",
"@tauri-apps/cli": "^{% if alpha %}2.0.0-alpha.18{% else %}1.5.7{% endif %}"{% if mobile %},
"@tauri-apps/cli": "^{% if alpha %}2.0.0-alpha.20{% else %}1.5.8{% endif %}"{% if mobile %},
"internal-ip": "^7.0.0"{% endif %}
}
}
2 changes: 1 addition & 1 deletion packages/cli/fragments/fragment-angular/src/app/app.component.ts.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component } from '@angular/core';
import { CommonModule } from '@angular/common';
import { RouterOutlet } from '@angular/router';
import { invoke } from "@tauri-apps/api/{% if alpha %}primitives{% else %}tauri{% endif %}";
import { invoke } from "@tauri-apps/api/{% if alpha %}core{% else %}tauri{% endif %}";

@Component({
selector: 'app-root',
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/fragments/fragment-leptos/src/app.rs.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use wasm_bindgen::prelude::*;

#[wasm_bindgen]
extern "C" {
#[wasm_bindgen(js_namespace = ["window", "__TAURI__", "{% if alpha %}primitives{% else %}tauri{% endif %}"])]
#[wasm_bindgen(js_namespace = ["window", "__TAURI__", "{% if alpha %}core{% else %}tauri{% endif %}"])]
async fn invoke(cmd: &str, args: JsValue) -> JsValue;
}

Expand Down
4 changes: 2 additions & 2 deletions packages/cli/fragments/fragment-preact-ts/package.json.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
},
"dependencies": {
"preact": "^10.16.0",
"@tauri-apps/api": "^{% if alpha %}2.0.0-alpha.12{% else %}1.5.2{% endif %}"{% if alpha %},
"@tauri-apps/api": "^{% if alpha %}2.0.0-alpha.13{% else %}1.5.2{% endif %}"{% if alpha %},
"@tauri-apps/plugin-shell": "^2.0.0-alpha.3"{% endif %}
},
"devDependencies": {
"@preact/preset-vite": "^2.5.0",
"typescript": "^5.0.2",
"vite": "^4.4.4",
"@tauri-apps/cli": "^{% if alpha %}2.0.0-alpha.18{% else %}1.5.7{% endif %}"{% if mobile %},
"@tauri-apps/cli": "^{% if alpha %}2.0.0-alpha.20{% else %}1.5.8{% endif %}"{% if mobile %},
"internal-ip": "^7.0.0"{% endif %}
}
}
2 changes: 1 addition & 1 deletion packages/cli/fragments/fragment-preact-ts/src/App.tsx.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useState } from "preact/hooks";
import preactLogo from "./assets/preact.svg";
import { invoke } from "@tauri-apps/api/{% if alpha %}primitives{% else %}tauri{% endif %}";
import { invoke } from "@tauri-apps/api/{% if alpha %}core{% else %}tauri{% endif %}";
import "./App.css";

function App() {
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/fragments/fragment-preact/package.json.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
},
"dependencies": {
"preact": "^10.16.0",
"@tauri-apps/api": "^{% if alpha %}2.0.0-alpha.12{% else %}1.5.2{% endif %}"{% if alpha %},
"@tauri-apps/api": "^{% if alpha %}2.0.0-alpha.13{% else %}1.5.2{% endif %}"{% if alpha %},
"@tauri-apps/plugin-shell": "^2.0.0-alpha.3"{% endif %}
},
"devDependencies": {
"@preact/preset-vite": "^2.5.0",
"vite": "^4.4.4",
"@tauri-apps/cli": "^{% if alpha %}2.0.0-alpha.18{% else %}1.5.7{% endif %}"{% if mobile %},
"@tauri-apps/cli": "^{% if alpha %}2.0.0-alpha.20{% else %}1.5.8{% endif %}"{% if mobile %},
"internal-ip": "^7.0.0"{% endif %}
}
}
2 changes: 1 addition & 1 deletion packages/cli/fragments/fragment-preact/src/App.jsx.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useState } from "preact/hooks";
import preactLogo from "./assets/preact.svg";
import { invoke } from "@tauri-apps/api/{% if alpha %}primitives{% else %}tauri{% endif %}";
import { invoke } from "@tauri-apps/api/{% if alpha %}core{% else %}tauri{% endif %}";
import "./App.css";

function App() {
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/fragments/fragment-react-ts/package.json.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"react": "^18.2.0",
"react-dom": "^18.2.0",
"@tauri-apps/api": "^{% if alpha %}2.0.0-alpha.12{% else %}1.5.2{% endif %}"{% if alpha %},
"@tauri-apps/api": "^{% if alpha %}2.0.0-alpha.13{% else %}1.5.2{% endif %}"{% if alpha %},
"@tauri-apps/plugin-shell": "^2.0.0-alpha.3"{% endif %}
},
"devDependencies": {
Expand All @@ -21,7 +21,7 @@
"@vitejs/plugin-react": "^4.0.3",
"typescript": "^5.0.2",
"vite": "^4.4.4",
"@tauri-apps/cli": "^{% if alpha %}2.0.0-alpha.18{% else %}1.5.7{% endif %}"{% if mobile %},
"@tauri-apps/cli": "^{% if alpha %}2.0.0-alpha.20{% else %}1.5.8{% endif %}"{% if mobile %},
"internal-ip": "^7.0.0"{% endif %}
}
}
2 changes: 1 addition & 1 deletion packages/cli/fragments/fragment-react-ts/src/App.tsx.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useState } from "react";
import reactLogo from "./assets/react.svg";
import { invoke } from "@tauri-apps/api/{% if alpha %}primitives{% else %}tauri{% endif %}";
import { invoke } from "@tauri-apps/api/{% if alpha %}core{% else %}tauri{% endif %}";
import "./App.css";

function App() {
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/fragments/fragment-react/package.json.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
"dependencies": {
"react": "^18.2.0",
"react-dom": "^18.2.0",
"@tauri-apps/api": "^{% if alpha %}2.0.0-alpha.12{% else %}1.5.2{% endif %}"{% if alpha %},
"@tauri-apps/api": "^{% if alpha %}2.0.0-alpha.13{% else %}1.5.2{% endif %}"{% if alpha %},
"@tauri-apps/plugin-shell": "^2.0.0-alpha.3"{% endif %}
},
"devDependencies": {
"@vitejs/plugin-react": "^4.0.3",
"vite": "^4.4.4",
"@tauri-apps/cli": "^{% if alpha %}2.0.0-alpha.18{% else %}1.5.7{% endif %}"{% if mobile %},
"@tauri-apps/cli": "^{% if alpha %}2.0.0-alpha.20{% else %}1.5.8{% endif %}"{% if mobile %},
"internal-ip": "^7.0.0"{% endif %}
}
}
2 changes: 1 addition & 1 deletion packages/cli/fragments/fragment-react/src/App.jsx.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useState } from "react";
import reactLogo from "./assets/react.svg";
import { invoke } from "@tauri-apps/api/{% if alpha %}primitives{% else %}tauri{% endif %}";
import { invoke } from "@tauri-apps/api/{% if alpha %}core{% else %}tauri{% endif %}";
import "./App.css";

function App() {
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/fragments/fragment-solid-ts/package.json.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
"license": "MIT",
"dependencies": {
"solid-js": "^1.7.8",
"@tauri-apps/api": "^{% if alpha %}2.0.0-alpha.12{% else %}1.5.2{% endif %}"{% if alpha %},
"@tauri-apps/api": "^{% if alpha %}2.0.0-alpha.13{% else %}1.5.2{% endif %}"{% if alpha %},
"@tauri-apps/plugin-shell": "^2.0.0-alpha.3"{% endif %}
},
"devDependencies": {
"typescript": "^5.0.2",
"vite": "^4.4.4",
"vite-plugin-solid": "^2.7.0",
"@tauri-apps/cli": "^{% if alpha %}2.0.0-alpha.18{% else %}1.5.7{% endif %}"{% if mobile %},
"@tauri-apps/cli": "^{% if alpha %}2.0.0-alpha.20{% else %}1.5.8{% endif %}"{% if mobile %},
"internal-ip": "^7.0.0"{% endif %}
}
}
2 changes: 1 addition & 1 deletion packages/cli/fragments/fragment-solid-ts/src/App.tsx.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { createSignal } from "solid-js";
import logo from "./assets/logo.svg";
import { invoke } from "@tauri-apps/api/{% if alpha %}primitives{% else %}tauri{% endif %}";
import { invoke } from "@tauri-apps/api/{% if alpha %}core{% else %}tauri{% endif %}";
import "./App.css";

function App() {
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/fragments/fragment-solid/package.json.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
"license": "MIT",
"dependencies": {
"solid-js": "^1.7.8",
"@tauri-apps/api": "^{% if alpha %}2.0.0-alpha.12{% else %}1.5.2{% endif %}"{% if alpha %},
"@tauri-apps/api": "^{% if alpha %}2.0.0-alpha.13{% else %}1.5.2{% endif %}"{% if alpha %},
"@tauri-apps/plugin-shell": "^2.0.0-alpha.3"{% endif %}
},
"devDependencies": {
"vite": "^4.4.4",
"vite-plugin-solid": "^2.7.0",
"@tauri-apps/cli": "^{% if alpha %}2.0.0-alpha.18{% else %}1.5.7{% endif %}"{% if mobile %},
"@tauri-apps/cli": "^{% if alpha %}2.0.0-alpha.20{% else %}1.5.8{% endif %}"{% if mobile %},
"internal-ip": "^7.0.0"{% endif %}
}
}
2 changes: 1 addition & 1 deletion packages/cli/fragments/fragment-solid/src/App.jsx.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { createSignal } from "solid-js";
import logo from "./assets/logo.svg";
import { invoke } from "@tauri-apps/api/{% if alpha %}primitives{% else %}tauri{% endif %}";
import { invoke } from "@tauri-apps/api/{% if alpha %}core{% else %}tauri{% endif %}";
import "./App.css";

function App() {
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/fragments/fragment-svelte-ts/package.json.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"tauri": "tauri"
},
"dependencies": {
"@tauri-apps/api": "^{% if alpha %}2.0.0-alpha.12{% else %}1.5.2{% endif %}"{% if alpha %},
"@tauri-apps/api": "^{% if alpha %}2.0.0-alpha.13{% else %}1.5.2{% endif %}"{% if alpha %},
"@tauri-apps/plugin-shell": "^2.0.0-alpha.3"{% endif %}
},
"devDependencies": {
Expand All @@ -22,7 +22,7 @@
"tslib": "^2.6.0",
"typescript": "^5.0.2",
"vite": "^4.4.4",
"@tauri-apps/cli": "^{% if alpha %}2.0.0-alpha.18{% else %}1.5.7{% endif %}"{% if mobile %},
"@tauri-apps/cli": "^{% if alpha %}2.0.0-alpha.20{% else %}1.5.8{% endif %}"{% if mobile %},
"internal-ip": "^7.0.0"{% endif %}
}
}
2 changes: 1 addition & 1 deletion packages/cli/fragments/fragment-svelte-ts/src/lib/Greet.svelte.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import { invoke } from "@tauri-apps/api/{% if alpha %}primitives{% else %}tauri{% endif %}"
import { invoke } from "@tauri-apps/api/{% if alpha %}core{% else %}tauri{% endif %}"

let name = "";
let greetMsg = ""
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/fragments/fragment-svelte/package.json.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
"tauri": "tauri"
},
"dependencies": {
"@tauri-apps/api": "^{% if alpha %}2.0.0-alpha.12{% else %}1.5.2{% endif %}"{% if alpha %},
"@tauri-apps/api": "^{% if alpha %}2.0.0-alpha.13{% else %}1.5.2{% endif %}"{% if alpha %},
"@tauri-apps/plugin-shell": "^2.0.0-alpha.3"{% endif %}
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "^2.4.2",
"svelte": "^4.0.5",
"vite": "^4.4.4",
"@tauri-apps/cli": "^{% if alpha %}2.0.0-alpha.18{% else %}1.5.7{% endif %}"{% if mobile %},
"@tauri-apps/cli": "^{% if alpha %}2.0.0-alpha.20{% else %}1.5.8{% endif %}"{% if mobile %},
"internal-ip": "^7.0.0"{% endif %}
}
}
2 changes: 1 addition & 1 deletion packages/cli/fragments/fragment-svelte/src/lib/Greet.svelte.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script>
import { invoke } from "@tauri-apps/api/{% if alpha %}primitives{% else %}tauri{% endif %}"
import { invoke } from "@tauri-apps/api/{% if alpha %}core{% else %}tauri{% endif %}"

let name = "";
let greetMsg = ""
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/fragments/fragment-sycamore/src/app.rs.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use wasm_bindgen::prelude::*;

#[wasm_bindgen]
extern "C" {
#[wasm_bindgen(js_namespace = ["window", "__TAURI__", "{% if alpha %}primitives{% else %}tauri{% endif %}"])]
#[wasm_bindgen(js_namespace = ["window", "__TAURI__", "{% if alpha %}core{% else %}tauri{% endif %}"])]
async fn invoke(cmd: &str, args: JsValue) -> JsValue;

#[wasm_bindgen(js_namespace = console)]
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/fragments/fragment-vanilla-ts/package.json.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
"tauri": "tauri"
},
"dependencies": {
"@tauri-apps/api": "^{% if alpha %}2.0.0-alpha.12{% else %}1.5.2{% endif %}"{% if alpha %},
"@tauri-apps/api": "^{% if alpha %}2.0.0-alpha.13{% else %}1.5.2{% endif %}"{% if alpha %},
"@tauri-apps/plugin-shell": "^2.0.0-alpha.3"{% endif %}
},
"devDependencies": {
"@tauri-apps/cli": "^{% if alpha %}2.0.0-alpha.18{% else %}1.5.7{% endif %}"{% if mobile %},
"@tauri-apps/cli": "^{% if alpha %}2.0.0-alpha.20{% else %}1.5.8{% endif %}"{% if mobile %},
"internal-ip": "^7.0.0"{% endif %},
"vite": "^4.4.4",
"typescript": "^5.0.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/fragments/fragment-vanilla-ts/src/main.ts.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { invoke } from "@tauri-apps/api/{% if alpha %}primitives{% else %}tauri{% endif %}";
import { invoke } from "@tauri-apps/api/{% if alpha %}core{% else %}tauri{% endif %}";

let greetInputEl: HTMLInputElement | null;
let greetMsgEl: HTMLElement | null;
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/fragments/fragment-vanilla/%(pnpm-yarn-npm-bun)%package.json.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"tauri": "tauri"
},
"devDependencies": {
"@tauri-apps/cli": "^{% if alpha %}2.0.0-alpha.18{% else %}1.5.7{% endif %}"
"@tauri-apps/cli": "^{% if alpha %}2.0.0-alpha.20{% else %}1.5.8{% endif %}"
}
}
2 changes: 1 addition & 1 deletion packages/cli/fragments/fragment-vanilla/src/main.js.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { invoke } = window.__TAURI__.{% if alpha %}primitives{% else %}tauri{% endif %};
const { invoke } = window.__TAURI__.{% if alpha %}core{% else %}tauri{% endif %};

let greetInputEl;
let greetMsgEl;
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/fragments/fragment-vue-ts/package.json.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
},
"dependencies": {
"vue": "^3.3.4",
"@tauri-apps/api": "^{% if alpha %}2.0.0-alpha.12{% else %}1.5.2{% endif %}"{% if alpha %},
"@tauri-apps/api": "^{% if alpha %}2.0.0-alpha.13{% else %}1.5.2{% endif %}"{% if alpha %},
"@tauri-apps/plugin-shell": "^2.0.0-alpha.3"{% endif %}
},
"devDependencies": {
"@vitejs/plugin-vue": "^4.2.3",
"typescript": "^5.0.2",
"vite": "^4.4.4",
"vue-tsc": "^1.8.5",
"@tauri-apps/cli": "^{% if alpha %}2.0.0-alpha.18{% else %}1.5.7{% endif %}"{% if mobile %},
"@tauri-apps/cli": "^{% if alpha %}2.0.0-alpha.20{% else %}1.5.8{% endif %}"{% if mobile %},
"internal-ip": "^7.0.0"{% endif %}
}
}
2 changes: 1 addition & 1 deletion packages/cli/fragments/fragment-vue-ts/src/components/Greet.vue.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script setup lang="ts">
import { ref } from "vue";
import { invoke } from "@tauri-apps/api/{% if alpha %}primitives{% else %}tauri{% endif %}";
import { invoke } from "@tauri-apps/api/{% if alpha %}core{% else %}tauri{% endif %}";

const greetMsg = ref("");
const name = ref("");
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/fragments/fragment-vue/package.json.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
},
"dependencies": {
"vue": "^3.3.4",
"@tauri-apps/api": "^{% if alpha %}2.0.0-alpha.12{% else %}1.5.2{% endif %}"{% if alpha %},
"@tauri-apps/api": "^{% if alpha %}2.0.0-alpha.13{% else %}1.5.2{% endif %}"{% if alpha %},
"@tauri-apps/plugin-shell": "^2.0.0-alpha.3"{% endif %}
},
"devDependencies": {
"@vitejs/plugin-vue": "^4.2.3",
"vite": "^4.4.4",
"@tauri-apps/cli": "^{% if alpha %}2.0.0-alpha.18{% else %}1.5.7{% endif %}"{% if mobile %},
"@tauri-apps/cli": "^{% if alpha %}2.0.0-alpha.20{% else %}1.5.8{% endif %}"{% if mobile %},
"internal-ip": "^7.0.0"{% endif %}
}
}
2 changes: 1 addition & 1 deletion packages/cli/fragments/fragment-vue/src/components/Greet.vue.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script setup>
import { ref } from "vue";
import { invoke } from "@tauri-apps/api/{% if alpha %}primitives{% else %}tauri{% endif %}";
import { invoke } from "@tauri-apps/api/{% if alpha %}core{% else %}tauri{% endif %}";

const greetMsg = ref("");
const name = ref("");
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/fragments/fragment-yew/src/app.rs.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use yew::prelude::*;

#[wasm_bindgen]
extern "C" {
#[wasm_bindgen(js_namespace = ["window", "__TAURI__", "{% if alpha %}primitives{% else %}tauri{% endif %}"])]
#[wasm_bindgen(js_namespace = ["window", "__TAURI__", "{% if alpha %}core{% else %}tauri{% endif %}"])]
async fn invoke(cmd: &str, args: JsValue) -> JsValue;
}

Expand Down