create-pixi-vn 1.8.0 → 1.8.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "create-pixi-vn",
   "description": "Create a new Pixi’VN project",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "type": "module",
   "license": "GPL-3.0",
   "author": "DRincs-Productions",

package/template-game-engine/package.json

@@ -4,7 +4,7 @@
   "version": "0.1.0",
   "type": "module",
   "main": "./dist/index.cjs",
-  "module": "./dist/index.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "files": [
     "dist"

package/template-lib/package.json

@@ -4,7 +4,7 @@
   "version": "0.1.0",
   "type": "module",
   "main": "./dist/index.cjs",
-  "module": "./dist/index.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "files": [
     "dist"

package/template-nqtr-react-vite-muijoy/package.json

@@ -3,6 +3,7 @@
   "description": "my-app-description",
   "version": "0.1.0",
   "type": "module",
+  "license": "GPL-3.0",
   "scripts": {
     "start": "vite",
     "dev": "vite",

package/template-nqtr-react-vite-muijoy/src/App.tsx

@@ -1,6 +1,6 @@
 import { setupPixivnViteData } from "@drincs/pixi-vn/vite-listener";
-import { lazy, Suspense } from "react";
-import { ErrorBoundary } from "react-error-boundary";
+import { ComponentType, lazy, Suspense } from "react";
+import { ErrorBoundary, FallbackProps } from "react-error-boundary";
 import { useI18n } from "./i18n";
 import LoadingScreen from "./screens/LoadingScreen";
 import { defineAssets } from "./utils/assets-utility";
@@ -14,7 +14,7 @@ const Home = lazy(async () => {
     return import("./Home");
 });
 
-function ErrorFallback({ error }: { error: Error }) {
+const ErrorFallback: ComponentType<FallbackProps> = ({ error, resetErrorBoundary }) => {
     return (
         <div
             role='alert'
@@ -41,11 +41,30 @@ function ErrorFallback({ error }: { error: Error }) {
                     marginTop: "1rem",
                 }}
             >
-                {error.message}
+                {(error as Error).message}
             </p>
+            <div
+                style={{
+                    display: "flex",
+                    justifyContent: "center",
+                    marginTop: "1rem",
+                    paddingBottom: "1rem",
+                }}
+            >
+                <button
+                    style={{
+                        padding: "0.5rem 1rem",
+                        backgroundColor: "white",
+                        borderRadius: "0.5rem",
+                    }}
+                    onClick={resetErrorBoundary}
+                >
+                    Try again
+                </button>
+            </div>
         </div>
     );
-}
+};
 
 export default function App() {
     return (

package/template-nqtr-react-vite-muijoy/src/components/AnimatedDots.tsx

@@ -1,4 +1,4 @@
-import { motion } from "framer-motion";
+import { motion } from "motion/react";
 
 export default function AnimatedDots() {
     const dots = [".", ".", "."]; // I caratteri da animare

package/template-nqtr-react-vite-muijoy-ink/package.json

@@ -3,6 +3,7 @@
   "description": "my-app-description",
   "version": "0.1.0",
   "type": "module",
+  "license": "GPL-3.0",
   "scripts": {
     "start": "vite",
     "dev": "vite",

package/template-nqtr-react-vite-muijoy-ink/src/App.tsx

@@ -1,6 +1,6 @@
 import { setupPixivnViteData } from "@drincs/pixi-vn/vite-listener";
-import { lazy, Suspense } from "react";
-import { ErrorBoundary } from "react-error-boundary";
+import { ComponentType, lazy, Suspense } from "react";
+import { ErrorBoundary, FallbackProps } from "react-error-boundary";
 import { useI18n } from "./i18n";
 import LoadingScreen from "./screens/LoadingScreen";
 import { defineAssets } from "./utils/assets-utility";
@@ -15,7 +15,7 @@ const Home = lazy(async () => {
     return import("./Home");
 });
 
-function ErrorFallback({ error }: { error: Error }) {
+const ErrorFallback: ComponentType<FallbackProps> = ({ error, resetErrorBoundary }) => {
     return (
         <div
             role='alert'
@@ -42,11 +42,30 @@ function ErrorFallback({ error }: { error: Error }) {
                     marginTop: "1rem",
                 }}
             >
-                {error.message}
+                {(error as Error).message}
             </p>
+            <div
+                style={{
+                    display: "flex",
+                    justifyContent: "center",
+                    marginTop: "1rem",
+                    paddingBottom: "1rem",
+                }}
+            >
+                <button
+                    style={{
+                        padding: "0.5rem 1rem",
+                        backgroundColor: "white",
+                        borderRadius: "0.5rem",
+                    }}
+                    onClick={resetErrorBoundary}
+                >
+                    Try again
+                </button>
+            </div>
         </div>
     );
-}
+};
 
 export default function App() {
     return (

package/template-nqtr-react-vite-muijoy-ink/src/components/AnimatedDots.tsx

@@ -1,4 +1,4 @@
-import { motion } from "framer-motion";
+import { motion } from "motion/react";
 
 export default function AnimatedDots() {
     const dots = [".", ".", "."]; // I caratteri da animare

package/template-nqtr-react-vite-muijoy-ink/src/labels/variousActionsLabels.ts

@@ -77,7 +77,7 @@ export const talkAliceQuest = newLabel(
                 await showImage(BACKGROUND_ID, "alice_terrace0At");
             }
         },
-    }
+    },
 );
 export const aliceTalkMenuLabel = newLabel(ALICE_TALK_MENU_LABEL_KEY, [
     async () => {

package/template-nqtr-react-vite-muijoy-ink-tauri/_github/workflows/tauri.yml

@@ -1,5 +1,5 @@
 # https://tauri.app/distribute/pipelines/github/
-name: Tauri CI
+name: 'publish'
 
 on:
   push:
@@ -15,29 +15,19 @@ jobs:
       matrix:
         include:
           - platform: 'macos-latest' # for Arm based macs (M1 and above).
-            name: 'macOS Arm'
-            tauriScript: 'npm run tauri' # or yarn
             args: '--target aarch64-apple-darwin'
           - platform: 'macos-latest' # for Intel based macs.
-            name: 'macOS Intel'
-            tauriScript: 'npm run tauri' # or yarn
             args: '--target x86_64-apple-darwin'
           - platform: 'ubuntu-22.04'
-            name: 'Linux'
-            tauriScript: 'npm run tauri' # or yarn
             args: ''
           - platform: 'windows-latest'
-            name: 'Windows'
-            tauriScript: 'npm run tauri' # or yarn
             args: ''
-          # - platform: 'ubuntu-22.04'
-          #   name: 'Android'
-          #   tauriScript: 'npm run tauri android' # or yarn
-          #   args: '--aab'
-          # - platform: 'macos-latest' # for Intel based macs.
-          #   name: 'iOS'
-          #   tauriScript: 'npm run tauri ios' # or yarn
-          #   args: '--open'
+          - platform: 'macos-latest' # IOS
+            args: '--target x86_64-apple-darwin'
+            mobile: "ios"
+          - platform: 'ubuntu-22.04' # Android
+            args: ''
+            mobile: "android"
 
     runs-on: ${{ matrix.platform }}
     steps:
@@ -49,40 +39,21 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
 
-      - name: Set up JDK 17
-        if: matrix.name == 'Android' # This must match the platform value defined above.
-        uses: actions/setup-java@v3
+      - name: setup node
+        uses: actions/setup-node@v6
         with:
-          java-version: '17'
-          distribution: 'temurin'
-
-      - name: Setup Android SDK Manager (android only)
-        if: matrix.name == 'Android' # This must match the platform value defined above.
-        uses: android-actions/setup-android@v3
+          node-version: lts/*
 
-      - name: Setup Android NDK (for android)
-        uses: nttld/setup-ndk@v1.5.0
-        id: setup-ndk
+      - name: Update Java (only for Android builds)
+        if: matrix.mobile == 'android'
+        uses: actions/setup-java@v5
         with:
-          ndk-version: r27c
-          add-to-path: false
-
-      - name: install android SDK and NDK (android only)
-        if: matrix.name == 'Android' # This must match the platform value defined above.
-        run: |
-          wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip
-          unzip commandlinetools-linux-7583922_latest.zip -d $HOME/Android
-          export ANDROID_HOME="$HOME/Android/Sdk"
-          echo 'y' | sdkmanager --update --sdk_root=$ANDROID_HOME
-        # echo 'y' | sdkmanager --sdk_root=$ANDROID_HOME --install "ndk;21.4.7075529"
-        # rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android
-        # export NDK_HOME="$ANDROID_HOME/ndk/$(ls -1 $ANDROID_HOME/ndk)"
+          distribution: 'temurin'
+          java-version: '21'
 
-      - name: setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version: lts/*
-          cache: 'npm' # or 'yarn'
+      - name: setup Android SDK (only for Android builds)
+        if: matrix.mobile == 'android'
+        uses: android-actions/setup-android@v3
 
       - name: install Rust stable
         uses: dtolnay/rust-toolchain@stable # Set this to dtolnay/rust-toolchain@nightly
@@ -90,40 +61,26 @@ jobs:
           # Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds.
           targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
 
-      - name: Rust cache
-        uses: swatinem/rust-cache@v2
-        with:
-          workspaces: './src-tauri -> target'
-
       - name: install frontend dependencies
         # If you don't have `beforeBuildCommand` configured you may want to build your frontend here too.
-        run: npm install # this for npm, for yarn use `yarn install`
+        run: yarn install # change this to npm or pnpm depending on which one you use.
 
-      - name: init android tauri
-        if: matrix.name == 'Android' # This must match the platform value defined above.
-        run: |
-          npm run tauri icon public/pwa-512x512.png
-          export NDK_HOME="$ANDROID_NDK_HOME"
-          npm run tauri android init
-        env:
-          ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
+      - name: Upload Tauri icons
+        run: npm run tauri icon public/pwa-512x512.png
 
-      - name: init ios tauri
-        if: matrix.name == 'iOS' # This must match the platform value defined above.
-        run: |
-          npm run tauri icon public/pwa-512x512.png
-          npm run tauri ios init
-          softwareupdate --install -a
+      - name: Rust cache
+        uses: swatinem/rust-cache@v2
+        with:
+          workspaces: './src-tauri -> target'
 
       - uses: tauri-apps/tauri-action@v0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
         with:
           tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version.
           releaseName: 'App v__VERSION__'
           releaseBody: 'See the assets to download this version and install.'
           releaseDraft: true
           prerelease: false
-          tauriScript: ${{ matrix.tauriScript }}
           args: ${{ matrix.args }}
+          mobile: ${{ matrix.mobile || null }}

package/template-nqtr-react-vite-muijoy-ink-tauri/package.json

@@ -3,6 +3,7 @@
   "description": "my-app-description",
   "version": "0.1.0",
   "type": "module",
+  "license": "GPL-3.0",
   "scripts": {
     "start": "vite",
     "dev": "vite",

package/template-nqtr-react-vite-muijoy-ink-tauri/src/App.tsx

@@ -1,6 +1,6 @@
 import { setupPixivnViteData } from "@drincs/pixi-vn/vite-listener";
-import { lazy, Suspense } from "react";
-import { ErrorBoundary } from "react-error-boundary";
+import { ComponentType, lazy, Suspense } from "react";
+import { ErrorBoundary, FallbackProps } from "react-error-boundary";
 import { useI18n } from "./i18n";
 import LoadingScreen from "./screens/LoadingScreen";
 import { defineAssets } from "./utils/assets-utility";
@@ -15,7 +15,7 @@ const Home = lazy(async () => {
     return import("./Home");
 });
 
-function ErrorFallback({ error }: { error: Error }) {
+const ErrorFallback: ComponentType<FallbackProps> = ({ error, resetErrorBoundary }) => {
     return (
         <div
             role='alert'
@@ -42,11 +42,30 @@ function ErrorFallback({ error }: { error: Error }) {
                     marginTop: "1rem",
                 }}
             >
-                {error.message}
+                {(error as Error).message}
             </p>
+            <div
+                style={{
+                    display: "flex",
+                    justifyContent: "center",
+                    marginTop: "1rem",
+                    paddingBottom: "1rem",
+                }}
+            >
+                <button
+                    style={{
+                        padding: "0.5rem 1rem",
+                        backgroundColor: "white",
+                        borderRadius: "0.5rem",
+                    }}
+                    onClick={resetErrorBoundary}
+                >
+                    Try again
+                </button>
+            </div>
         </div>
     );
-}
+};
 
 export default function App() {
     return (

package/template-nqtr-react-vite-muijoy-ink-tauri/src/components/AnimatedDots.tsx

@@ -1,4 +1,4 @@
-import { motion } from "framer-motion";
+import { motion } from "motion/react";
 
 export default function AnimatedDots() {
     const dots = [".", ".", "."]; // I caratteri da animare

package/template-nqtr-react-vite-muijoy-ink-tauri/src/labels/variousActionsLabels.ts

@@ -77,7 +77,7 @@ export const talkAliceQuest = newLabel(
                 await showImage(BACKGROUND_ID, "alice_terrace0At");
             }
         },
-    }
+    },
 );
 export const aliceTalkMenuLabel = newLabel(ALICE_TALK_MENU_LABEL_KEY, [
     async () => {

package/template-nqtr-react-vite-muijoy-ink-tauri/src/locales/strings_en.json

@@ -46,6 +46,7 @@
 		"solid_color": "Solid Color",
 		"solid_color_description": "Choose the solid color for the theme. It can be black or white and will be contrasting with the primary color. So if the primary color is dark, the solid color will be white, and a the other way around.",
 		"start": "Start",
+		"quit": "Quit",
 		"success_delete": "Delete successful",
 		"success_load": "Load successful",
 		"success_save": "Save successful",

package/template-nqtr-react-vite-muijoy-ink-tauri/src/screens/MainMenu.tsx

@@ -94,6 +94,11 @@ export default function MainMenu() {
             <MenuButton onClick={() => setOpenSettings(true)} transitionDelay={0.4}>
                 {t("settings")}
             </MenuButton>
+            {window.__TAURI__ && (
+                <MenuButton onClick={() => window.close()} transitionDelay={0.4}>
+                    {t("quit")}
+                </MenuButton>
+            )}
             {loading && (
                 <Box
                     sx={{

package/template-nqtr-react-vite-muijoy-tauri/_github/workflows/tauri.yml

@@ -1,5 +1,5 @@
 # https://tauri.app/distribute/pipelines/github/
-name: Tauri CI
+name: 'publish'
 
 on:
   push:
@@ -15,29 +15,19 @@ jobs:
       matrix:
         include:
           - platform: 'macos-latest' # for Arm based macs (M1 and above).
-            name: 'macOS Arm'
-            tauriScript: 'npm run tauri' # or yarn
             args: '--target aarch64-apple-darwin'
           - platform: 'macos-latest' # for Intel based macs.
-            name: 'macOS Intel'
-            tauriScript: 'npm run tauri' # or yarn
             args: '--target x86_64-apple-darwin'
           - platform: 'ubuntu-22.04'
-            name: 'Linux'
-            tauriScript: 'npm run tauri' # or yarn
             args: ''
           - platform: 'windows-latest'
-            name: 'Windows'
-            tauriScript: 'npm run tauri' # or yarn
             args: ''
-          # - platform: 'ubuntu-22.04'
-          #   name: 'Android'
-          #   tauriScript: 'npm run tauri android' # or yarn
-          #   args: '--aab'
-          # - platform: 'macos-latest' # for Intel based macs.
-          #   name: 'iOS'
-          #   tauriScript: 'npm run tauri ios' # or yarn
-          #   args: '--open'
+          - platform: 'macos-latest' # IOS
+            args: '--target x86_64-apple-darwin'
+            mobile: "ios"
+          - platform: 'ubuntu-22.04' # Android
+            args: ''
+            mobile: "android"
 
     runs-on: ${{ matrix.platform }}
     steps:
@@ -49,40 +39,21 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
 
-      - name: Set up JDK 17
-        if: matrix.name == 'Android' # This must match the platform value defined above.
-        uses: actions/setup-java@v3
+      - name: setup node
+        uses: actions/setup-node@v6
         with:
-          java-version: '17'
-          distribution: 'temurin'
-
-      - name: Setup Android SDK Manager (android only)
-        if: matrix.name == 'Android' # This must match the platform value defined above.
-        uses: android-actions/setup-android@v3
+          node-version: lts/*
 
-      - name: Setup Android NDK (for android)
-        uses: nttld/setup-ndk@v1.5.0
-        id: setup-ndk
+      - name: Update Java (only for Android builds)
+        if: matrix.mobile == 'android'
+        uses: actions/setup-java@v5
         with:
-          ndk-version: r27c
-          add-to-path: false
-
-      - name: install android SDK and NDK (android only)
-        if: matrix.name == 'Android' # This must match the platform value defined above.
-        run: |
-          wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip
-          unzip commandlinetools-linux-7583922_latest.zip -d $HOME/Android
-          export ANDROID_HOME="$HOME/Android/Sdk"
-          echo 'y' | sdkmanager --update --sdk_root=$ANDROID_HOME
-        # echo 'y' | sdkmanager --sdk_root=$ANDROID_HOME --install "ndk;21.4.7075529"
-        # rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android
-        # export NDK_HOME="$ANDROID_HOME/ndk/$(ls -1 $ANDROID_HOME/ndk)"
+          distribution: 'temurin'
+          java-version: '21'
 
-      - name: setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version: lts/*
-          cache: 'npm' # or 'yarn'
+      - name: setup Android SDK (only for Android builds)
+        if: matrix.mobile == 'android'
+        uses: android-actions/setup-android@v3
 
       - name: install Rust stable
         uses: dtolnay/rust-toolchain@stable # Set this to dtolnay/rust-toolchain@nightly
@@ -90,40 +61,26 @@ jobs:
           # Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds.
           targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
 
-      - name: Rust cache
-        uses: swatinem/rust-cache@v2
-        with:
-          workspaces: './src-tauri -> target'
-
       - name: install frontend dependencies
         # If you don't have `beforeBuildCommand` configured you may want to build your frontend here too.
-        run: npm install # this for npm, for yarn use `yarn install`
+        run: yarn install # change this to npm or pnpm depending on which one you use.
 
-      - name: init android tauri
-        if: matrix.name == 'Android' # This must match the platform value defined above.
-        run: |
-          npm run tauri icon public/pwa-512x512.png
-          export NDK_HOME="$ANDROID_NDK_HOME"
-          npm run tauri android init
-        env:
-          ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
+      - name: Upload Tauri icons
+        run: npm run tauri icon public/pwa-512x512.png
 
-      - name: init ios tauri
-        if: matrix.name == 'iOS' # This must match the platform value defined above.
-        run: |
-          npm run tauri icon public/pwa-512x512.png
-          npm run tauri ios init
-          softwareupdate --install -a
+      - name: Rust cache
+        uses: swatinem/rust-cache@v2
+        with:
+          workspaces: './src-tauri -> target'
 
       - uses: tauri-apps/tauri-action@v0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
         with:
           tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version.
           releaseName: 'App v__VERSION__'
           releaseBody: 'See the assets to download this version and install.'
           releaseDraft: true
           prerelease: false
-          tauriScript: ${{ matrix.tauriScript }}
           args: ${{ matrix.args }}
+          mobile: ${{ matrix.mobile || null }}

package/template-nqtr-react-vite-muijoy-tauri/package.json

@@ -3,6 +3,7 @@
   "description": "my-app-description",
   "version": "0.1.0",
   "type": "module",
+  "license": "GPL-3.0",
   "scripts": {
     "start": "vite",
     "dev": "vite",

package/template-nqtr-react-vite-muijoy-tauri/src/App.tsx

@@ -1,6 +1,6 @@
 import { setupPixivnViteData } from "@drincs/pixi-vn/vite-listener";
-import { lazy, Suspense } from "react";
-import { ErrorBoundary } from "react-error-boundary";
+import { ComponentType, lazy, Suspense } from "react";
+import { ErrorBoundary, FallbackProps } from "react-error-boundary";
 import { useI18n } from "./i18n";
 import LoadingScreen from "./screens/LoadingScreen";
 import { defineAssets } from "./utils/assets-utility";
@@ -14,7 +14,7 @@ const Home = lazy(async () => {
     return import("./Home");
 });
 
-function ErrorFallback({ error }: { error: Error }) {
+const ErrorFallback: ComponentType<FallbackProps> = ({ error, resetErrorBoundary }) => {
     return (
         <div
             role='alert'
@@ -41,11 +41,30 @@ function ErrorFallback({ error }: { error: Error }) {
                     marginTop: "1rem",
                 }}
             >
-                {error.message}
+                {(error as Error).message}
             </p>
+            <div
+                style={{
+                    display: "flex",
+                    justifyContent: "center",
+                    marginTop: "1rem",
+                    paddingBottom: "1rem",
+                }}
+            >
+                <button
+                    style={{
+                        padding: "0.5rem 1rem",
+                        backgroundColor: "white",
+                        borderRadius: "0.5rem",
+                    }}
+                    onClick={resetErrorBoundary}
+                >
+                    Try again
+                </button>
+            </div>
         </div>
     );
-}
+};
 
 export default function App() {
     return (

package/template-nqtr-react-vite-muijoy-tauri/src/components/AnimatedDots.tsx

@@ -1,4 +1,4 @@
-import { motion } from "framer-motion";
+import { motion } from "motion/react";
 
 export default function AnimatedDots() {
     const dots = [".", ".", "."]; // I caratteri da animare

package/template-nqtr-react-vite-muijoy-tauri/src/locales/strings_en.json

@@ -46,6 +46,7 @@
 		"solid_color": "Solid Color",
 		"solid_color_description": "Choose the solid color for the theme. It can be black or white and will be contrasting with the primary color. So if the primary color is dark, the solid color will be white, and a the other way around.",
 		"start": "Start",
+		"quit": "Quit",
 		"success_delete": "Delete successful",
 		"success_load": "Load successful",
 		"success_save": "Save successful",

package/template-nqtr-react-vite-muijoy-tauri/src/screens/MainMenu.tsx

@@ -95,6 +95,11 @@ export default function MainMenu() {
             <MenuButton onClick={() => setOpenSettings(true)} transitionDelay={0.4}>
                 {t("settings")}
             </MenuButton>
+            {window.__TAURI__ && (
+                <MenuButton onClick={() => window.close()} transitionDelay={0.4}>
+                    {t("quit")}
+                </MenuButton>
+            )}
             {loading && (
                 <Box
                     sx={{