diff --git a/.github/workflows/demo-build.yml b/.github/workflows/demo-build.yml new file mode 100644 index 000000000..15bda1728 --- /dev/null +++ b/.github/workflows/demo-build.yml @@ -0,0 +1,53 @@ +# Simple workflow for deploying static content to GitHub Pages +name: Deploy static content to Pages + +on: + # Runs on pushes targeting the default branch + push: + branches: ["master"] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages +permissions: + contents: read + pages: write + id-token: write + +# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued. +# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete. +concurrency: + group: "pages" + cancel-in-progress: false + +jobs: + # Single deploy job since we're just deploying + deploy: + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Setup Pages + uses: actions/configure-pages@v5 + - name: Setup Node.js + uses: actions/setup-node@v3 + with: + node-version: '18' + - name: Install dependencies + run: npm ci --prefix ./Demo/ + - name: Build the React app + run: npm run build --prefix ./Demo/ + - name: Move Build Files + run: ls ./Demo/ && mkdir ./Demo/dist/Build && cp -r ./Demo/Build/* ./Demo/dist/Build + - name: Upload artifact + uses: actions/upload-pages-artifact@v3 + with: + # Upload entire repository + path: './Demo/dist/' + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v4 diff --git a/Assets/WebGLTemplates/SequenceReact/src/App.tsx b/Assets/WebGLTemplates/SequenceReact/src/App.tsx index 76ba75458..51bf74f83 100644 --- a/Assets/WebGLTemplates/SequenceReact/src/App.tsx +++ b/Assets/WebGLTemplates/SequenceReact/src/App.tsx @@ -1,3 +1,4 @@ +import {ReactUnityEventParameter} from "react-unity-webgl/distribution/types/react-unity-event-parameters"; import { Unity, useUnityContext } from "react-unity-webgl"; import { useCallback, useEffect, useState } from "react"; import { @@ -25,11 +26,14 @@ import "./App.css"; const loadingPercentage = Math.round(loadingProgression * 100); - const handleGoogleSignIn = useCallback((googleClientId: string, nonce: string) => { - setGoogleClientId(googleClientId); - setNonce(nonce); - setShowLogin(true); - }, []); + const handleGoogleSignIn = useCallback((...parameters: ReactUnityEventParameter[]): ReactUnityEventParameter => { + const googleClientId = parameters[0] as string; + const nonce = parameters[1] as string; + setGoogleClientId(googleClientId); + setNonce(nonce); + setShowLogin(true); + return ''; + }, []); const [googleClientIdState, setGoogleClientId] = useState(""); const [nonce, setNonce] = useState(""); diff --git a/Assets/WebGLTemplates/SequenceReact/vite.config.ts b/Assets/WebGLTemplates/SequenceReact/vite.config.ts index 5a33944a9..186b7f30b 100644 --- a/Assets/WebGLTemplates/SequenceReact/vite.config.ts +++ b/Assets/WebGLTemplates/SequenceReact/vite.config.ts @@ -4,4 +4,9 @@ import react from '@vitejs/plugin-react' // https://vitejs.dev/config/ export default defineConfig({ plugins: [react()], + base: './', + build: { + assetsDir: '.', + outDir: 'dist', + }, }) diff --git a/Demo/Build/Demo.data b/Demo/Build/Demo.data index 359084d10..abfbc588b 100644 Binary files a/Demo/Build/Demo.data and b/Demo/Build/Demo.data differ diff --git a/Demo/src/App.tsx b/Demo/src/App.tsx index e29665ac5..173cafa94 100644 --- a/Demo/src/App.tsx +++ b/Demo/src/App.tsx @@ -1,3 +1,4 @@ +import {ReactUnityEventParameter} from "react-unity-webgl/distribution/types/react-unity-event-parameters"; import { Unity, useUnityContext } from "react-unity-webgl"; import { useCallback, useEffect, useState } from "react"; import { @@ -25,11 +26,14 @@ import "./App.css"; const loadingPercentage = Math.round(loadingProgression * 100); - const handleGoogleSignIn = useCallback((googleClientId: string, nonce: string) => { - setGoogleClientId(googleClientId); - setNonce(nonce); - setShowLogin(true); - }, []); + const handleGoogleSignIn = useCallback((...parameters: ReactUnityEventParameter[]): ReactUnityEventParameter => { + const googleClientId = parameters[0] as string; + const nonce = parameters[1] as string; + setGoogleClientId(googleClientId); + setNonce(nonce); + setShowLogin(true); + return ''; + }, []); const [googleClientIdState, setGoogleClientId] = useState(""); const [nonce, setNonce] = useState(""); diff --git a/Demo/vite.config.ts b/Demo/vite.config.ts index 5a33944a9..186b7f30b 100644 --- a/Demo/vite.config.ts +++ b/Demo/vite.config.ts @@ -4,4 +4,9 @@ import react from '@vitejs/plugin-react' // https://vitejs.dev/config/ export default defineConfig({ plugins: [react()], + base: './', + build: { + assetsDir: '.', + outDir: 'dist', + }, }) diff --git a/Packages/Sequence-Unity/WebGLTemplates/SequenceReact/src/App.tsx b/Packages/Sequence-Unity/WebGLTemplates/SequenceReact/src/App.tsx index b0eb80819..644d42859 100644 --- a/Packages/Sequence-Unity/WebGLTemplates/SequenceReact/src/App.tsx +++ b/Packages/Sequence-Unity/WebGLTemplates/SequenceReact/src/App.tsx @@ -1,3 +1,4 @@ +import {ReactUnityEventParameter} from "react-unity-webgl/distribution/types/react-unity-event-parameters"; import { Unity, useUnityContext } from "react-unity-webgl"; import { useCallback, useEffect, useState } from "react"; import { @@ -25,10 +26,13 @@ import "./App.css"; const loadingPercentage = Math.round(loadingProgression * 100); - const handleGoogleSignIn = useCallback((googleClientId: string, nonce: string) => { + const handleGoogleSignIn = useCallback((...parameters: ReactUnityEventParameter[]): ReactUnityEventParameter => { + const googleClientId = parameters[0] as string; + const nonce = parameters[1] as string; setGoogleClientId(googleClientId); setNonce(nonce); setShowLogin(true); + return ''; }, []); const [googleClientIdState, setGoogleClientId] = useState(""); diff --git a/Packages/Sequence-Unity/WebGLTemplates/SequenceReact/vite.config.ts b/Packages/Sequence-Unity/WebGLTemplates/SequenceReact/vite.config.ts index 5a33944a9..186b7f30b 100644 --- a/Packages/Sequence-Unity/WebGLTemplates/SequenceReact/vite.config.ts +++ b/Packages/Sequence-Unity/WebGLTemplates/SequenceReact/vite.config.ts @@ -4,4 +4,9 @@ import react from '@vitejs/plugin-react' // https://vitejs.dev/config/ export default defineConfig({ plugins: [react()], + base: './', + build: { + assetsDir: '.', + outDir: 'dist', + }, }) diff --git a/Packages/Sequence-Unity/package.json b/Packages/Sequence-Unity/package.json index 178eb6b86..712cbb2c1 100644 --- a/Packages/Sequence-Unity/package.json +++ b/Packages/Sequence-Unity/package.json @@ -1,6 +1,6 @@ { "name": "xyz.0xsequence.waas-unity", - "version": "3.17.2", + "version": "3.17.3", "displayName": "Sequence Embedded Wallet SDK", "description": "A Unity SDK for the Sequence WaaS API", "unity": "2021.3",