diff --git a/.github/workflows/build-development.yml b/.github/workflows/build-development.yml index e2f18f1e..ed558589 100644 --- a/.github/workflows/build-development.yml +++ b/.github/workflows/build-development.yml @@ -13,8 +13,8 @@ jobs: fail-fast: false matrix: platform: [ windows-latest ] - runs-on: ${{ matrix.platform }} + steps: - uses: actions/checkout@v2 - name: Setup NodeJS @@ -22,7 +22,7 @@ jobs: with: node-version: 16 - name: Install NodeJS dependencies - run: npm install --force + run: npm install - name: Set app version to DEV version run: npm run set-version DEV - name: Lint Angular project @@ -53,14 +53,6 @@ jobs: cd src-tauri cargo clippy --all-features --no-deps # Check Rust code in core module rm src-elevated-sidecar/target/release/oyasumi-elevated-sidecar*.exe # Clean up dummy sidecar executable(s) - - name: Delete new development release and tag if they exist - uses: dev-drprasad/delete-tag-and-release@v0.2.1 - continue-on-error: true - with: - delete_release: true - tag_name: oyasumi-vDEV-new - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Get Changelog Entry id: changelog_reader uses: mindsers/changelog-reader-action@v2 @@ -75,64 +67,59 @@ jobs: TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} with: - tagName: oyasumi-vDEV-new - releaseName: Oyasumi Development Build - releaseBody: ${{ steps.changelog_reader.outputs.changes }} + releaseId: 102092545 + tagName: oyasumi-vDEV releaseDraft: false prerelease: true includeDebug: true includeRelease: false - args: --verbose - - name: Get current development release ID if it exists - uses: actions/github-script@v6 - continue-on-error: true - id: get-current-release-id - with: - script: | - const release = await github.rest.repos.getReleaseByTag({ - owner: context.repo.owner, - repo: context.repo.repo, - tag: "oyasumi-vDEV" - }) - return release.data.id - - name: Get new development release ID - uses: actions/github-script@v6 - id: get-new-release-id - with: - script: | - const release = await github.rest.repos.getReleaseByTag({ - owner: context.repo.owner, - repo: context.repo.repo, - tag: "oyasumi-vDEV-new" - }) - return release.data.id - - name: Delete current development release and tag if they exist - uses: dev-drprasad/delete-tag-and-release@v0.2.1 - continue-on-error: true - with: - delete_release: true # default: false - tag_name: oyasumi-vDEV - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Create development tag on current commit - uses: EndBug/latest-tag@latest - with: - ref: oyasumi-vDEV - - name: Set new tag on new development release - uses: actions/github-script@v6 - env: - release_id: ${{ steps.get-new-release-id.outputs.result }} + includeUpdaterJson: true + - name: Update release data + uses: actions/github-script@v3 with: + github-token: ${{secrets.GITHUB_TOKEN}} script: | - github.rest.repos.updateRelease({ - owner: context.repo.owner, - repo: context.repo.repo, - release_id: process.env.release_id, - tag_name: "oyasumi-vDEV" - }) - - name: Delete temporary development tag - uses: dev-drprasad/delete-tag-and-release@v0.2.1 + console.log("Deleting existing oyasumi-vDEV tag..."); + try { + await github.git.deleteRef({ + owner: context.repo.owner, + repo: context.repo.repo, + ref: "tags/oyasumi-vDEV" + }) + console.log("Deleted existing oyasumi-vDEV tag!"); + } catch (e) { + console.log("The oyasumi-vDEV tag doesn't exist yet: " + e) + } + console.log("Recreating oyasumi-vDEV tag on current commit..."); + try { + await github.git.createRef({ + owner: context.repo.owner, + repo: context.repo.repo, + ref: "refs/tags/oyasumi-vDEV", + sha: context.sha + }) + console.log("Recreated oyasumi-vDEV tag!"); + } catch (e) { + console.log("Could not recreate oyasumi-vDEV tag: " + e) + } + console.log("Updating release data..."); + try { + await github.request('PATCH /repos/Raphiiko/Oyasumi/releases/102092545', { + tag_name: 'oyasumi-vDEV', + name: 'Oyasumi Development Build', + body: `${{ steps.changelog_reader.outputs.changes }}`, + draft: false, + prerelease: true + }) + console.log("Updated release data!"); + } catch (e) { + console.log("Could not update release data: " + e) + } + - name: Update the update manifest + uses: exuanbo/actions-deploy-gist@v1 with: - tag_name: oyasumi-vDEV-new - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.GH_TOKEN_GIST }} + gist_id: 8af3d105fe9a59db304cca2cfea216c8 + file_path: latest.json + gist_file_name: 'oyasumi_update_manifest_dev.json' + gist_description: Oyasumi Update Manifest [Development Channel] diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index c49711a3..efc06295 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -11,20 +11,19 @@ jobs: fail-fast: false matrix: platform: [ windows-latest ] - runs-on: ${{ matrix.platform }} + steps: - uses: actions/checkout@v2 - name: Get Package Version id: get-package-version uses: stevenbenitez/get-package-version-action@v1 - - name: Setup NodeJS uses: actions/setup-node@v1 with: node-version: 16 - name: Install NodeJS dependencies - run: npm install --force + run: npm install - name: Install Rust stable toolchain uses: actions-rs/toolchain@v1 with: @@ -56,3 +55,12 @@ jobs: releaseName: Oyasumi v${{ steps.get-package-version.outputs.version }} releaseBody: ${{ steps.changelog_reader.outputs.changes }} releaseDraft: false + includeUpdaterJson: true + - name: Update the update manifest + uses: exuanbo/actions-deploy-gist@v1 + with: + token: ${{ secrets.GH_TOKEN_GIST }} + gist_id: 16ed38d8ccd9282675d04478f887f76f + file_path: latest.json + gist_file_name: 'oyasumi_update_manifest.json' + gist_description: Oyasumi Update Manifest [Release Channel] diff --git a/.github/workflows/pr-and-feature-check.yml b/.github/workflows/pr-and-feature-check.yml index 517b1831..c740bffd 100644 --- a/.github/workflows/pr-and-feature-check.yml +++ b/.github/workflows/pr-and-feature-check.yml @@ -14,8 +14,8 @@ jobs: fail-fast: false matrix: platform: [ windows-latest ] - runs-on: ${{ matrix.platform }} + steps: - uses: actions/checkout@v2 - name: Setup NodeJS @@ -23,7 +23,7 @@ jobs: with: node-version: 16 - name: Install NodeJS dependencies - run: npm install --force + run: npm install - name: Lint Angular project run: npm run lint - name: Set app version to DEV version @@ -34,11 +34,6 @@ jobs: toolchain: stable default: true override: true - # - name: install dependencies (ubuntu only) - # if: matrix.platform == 'ubuntu-20.04' - # run: | - # sudo apt-get update - # sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf - name: Configure Rust cache uses: Swatinem/rust-cache@v2 with: diff --git a/package-lock.json b/package-lock.json index 76271feb..b42c7656 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,7 @@ "@fortawesome/fontawesome-free": "^6.2.0", "@ngx-translate/core": "^14.0.0", "@ngx-translate/http-loader": "^7.0.0", - "@tauri-apps/api": "^1.2.0", + "@tauri-apps/api": "^1.3.0", "cookie": "^0.5.0", "eslint-plugin-json": "^3.1.0", "flag-icons": "^6.6.6", @@ -35,7 +35,7 @@ "marked": "^4.2.2", "material-icons": "^1.12.1", "moment": "^2.29.4", - "ngx-pipes": "^3.2.0", + "ngx-pipes": "^3.2.2", "p-min-delay": "^4.0.2", "rxjs": "^7.5.7", "sass-material-colors": "^0.0.5", @@ -59,7 +59,7 @@ "@angular-eslint/template-parser": "16.0.1", "@angular/cli": "^16.0.0", "@angular/compiler-cli": "^16.0.0", - "@tauri-apps/cli": "^1.2.0", + "@tauri-apps/cli": "^1.3.0", "@types/jasmine": "^4.3.0", "@types/lodash": "^4.14.188", "@types/marked": "^4.0.7", @@ -11226,16 +11226,16 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" }, "node_modules/ngx-pipes": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ngx-pipes/-/ngx-pipes-3.2.0.tgz", - "integrity": "sha512-ISfWCtGeaY1XEl4rbwXcBOH+EOq+IVgqjo0Q+4uExfjrcVkAuHe8LjLHJbpDzp80ln3yClNcLwnS5OkcFbwwpA==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/ngx-pipes/-/ngx-pipes-3.2.2.tgz", + "integrity": "sha512-nhNIUJe/bud5ir4RD2YDA6MdrJUh3YASIcNrMFX9WljTxuvAb99SZ88PaKSFGy9SXjHg8MxjxHfCoOLlTkxxlQ==", "dependencies": { "postcss": "^8.4.19", "tslib": "^2.3.0", "webpack": "^5.75.0" }, "peerDependencies": { - "@angular/core": "14 - 15" + "@angular/core": ">=14" } }, "node_modules/nice-napi": { @@ -14536,8 +14536,7 @@ }, "node_modules/tauri-plugin-fs-extra-api": { "version": "0.0.0", - "resolved": "https://codeload.github.com/tauri-apps/tauri-plugin-fs-extra/tar.gz/ea47666db97e48e2230dd330fd791a7180d0586d", - "integrity": "sha512-yTt33/ZgkyiHVzk7TEQtBiumEyiSEcRPMeG+h6QJnZeVfl6edsB+AJz9EmSZ0LV+PCazaoaWpzSgoGv31/qb+Q==", + "resolved": "git+ssh://git@github.com/tauri-apps/tauri-plugin-fs-extra.git#ea47666db97e48e2230dd330fd791a7180d0586d", "license": "MIT or APACHE-2.0", "dependencies": { "@tauri-apps/api": "^1.2.0" @@ -14545,8 +14544,7 @@ }, "node_modules/tauri-plugin-log-api": { "version": "0.0.0", - "resolved": "https://codeload.github.com/tauri-apps/tauri-plugin-log/tar.gz/be811332676ff73e1e891f31ce3de8d447fdf07e", - "integrity": "sha512-bZFjquDs762oit4/o47xqslBrPXK3P1+Wqq30X86FbjNW9cwPBfY/hId1w/BOeW3BialMQQ9Sf1zmafHyAEtnA==", + "resolved": "git+ssh://git@github.com/tauri-apps/tauri-plugin-log.git#be811332676ff73e1e891f31ce3de8d447fdf07e", "license": "MIT or APACHE-2.0", "dependencies": { "@tauri-apps/api": "^1.2.0" @@ -14554,8 +14552,7 @@ }, "node_modules/tauri-plugin-store-api": { "version": "0.0.0", - "resolved": "https://codeload.github.com/tauri-apps/tauri-plugin-store/tar.gz/f4ef29684e4a32eddf51befaae98a5e498df8574", - "integrity": "sha512-b4Pr2f6aGNxK8oI1ZPApag9a2DIO9BOwexuMKsGdAVTsPLniic1oXXJjuk9JognFDLIpLzAN9wTaHUYNI2rZ9A==", + "resolved": "git+ssh://git@github.com/tauri-apps/tauri-plugin-store.git#f4ef29684e4a32eddf51befaae98a5e498df8574", "license": "MIT or APACHE-2.0", "dependencies": { "@tauri-apps/api": "^1.2.0" @@ -15313,8 +15310,7 @@ }, "node_modules/vrchat": { "version": "1.7.7", - "resolved": "https://codeload.github.com/Raphiiko/vrchatapi-javascript/tar.gz/cc9e0402c8c193fe49f0d46e364157da0418d4c2", - "integrity": "sha512-YrZ0T93G7fMtxISPe6rYWwbtizw3dSm9hi/KIDiwOSWZlbWg4h3h+X4snjSD1PTrohw/P5LNDDkfeNAIbazxeA==", + "resolved": "git+ssh://git@github.com/Raphiiko/vrchatapi-javascript.git#cc9e0402c8c193fe49f0d46e364157da0418d4c2", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -24208,9 +24204,9 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" }, "ngx-pipes": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ngx-pipes/-/ngx-pipes-3.2.0.tgz", - "integrity": "sha512-ISfWCtGeaY1XEl4rbwXcBOH+EOq+IVgqjo0Q+4uExfjrcVkAuHe8LjLHJbpDzp80ln3yClNcLwnS5OkcFbwwpA==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/ngx-pipes/-/ngx-pipes-3.2.2.tgz", + "integrity": "sha512-nhNIUJe/bud5ir4RD2YDA6MdrJUh3YASIcNrMFX9WljTxuvAb99SZ88PaKSFGy9SXjHg8MxjxHfCoOLlTkxxlQ==", "requires": { "postcss": "^8.4.19", "tslib": "^2.3.0", @@ -26668,22 +26664,22 @@ } }, "tauri-plugin-fs-extra-api": { - "version": "https://codeload.github.com/tauri-apps/tauri-plugin-fs-extra/tar.gz/ea47666db97e48e2230dd330fd791a7180d0586d", - "integrity": "sha512-yTt33/ZgkyiHVzk7TEQtBiumEyiSEcRPMeG+h6QJnZeVfl6edsB+AJz9EmSZ0LV+PCazaoaWpzSgoGv31/qb+Q==", + "version": "git+ssh://git@github.com/tauri-apps/tauri-plugin-fs-extra.git#ea47666db97e48e2230dd330fd791a7180d0586d", + "from": "tauri-plugin-fs-extra-api@github:tauri-apps/tauri-plugin-fs-extra", "requires": { "@tauri-apps/api": "^1.2.0" } }, "tauri-plugin-log-api": { - "version": "https://codeload.github.com/tauri-apps/tauri-plugin-log/tar.gz/be811332676ff73e1e891f31ce3de8d447fdf07e", - "integrity": "sha512-bZFjquDs762oit4/o47xqslBrPXK3P1+Wqq30X86FbjNW9cwPBfY/hId1w/BOeW3BialMQQ9Sf1zmafHyAEtnA==", + "version": "git+ssh://git@github.com/tauri-apps/tauri-plugin-log.git#be811332676ff73e1e891f31ce3de8d447fdf07e", + "from": "tauri-plugin-log-api@github:tauri-apps/tauri-plugin-log#dev", "requires": { "@tauri-apps/api": "^1.2.0" } }, "tauri-plugin-store-api": { - "version": "https://codeload.github.com/tauri-apps/tauri-plugin-store/tar.gz/f4ef29684e4a32eddf51befaae98a5e498df8574", - "integrity": "sha512-b4Pr2f6aGNxK8oI1ZPApag9a2DIO9BOwexuMKsGdAVTsPLniic1oXXJjuk9JognFDLIpLzAN9wTaHUYNI2rZ9A==", + "version": "git+ssh://git@github.com/tauri-apps/tauri-plugin-store.git#f4ef29684e4a32eddf51befaae98a5e498df8574", + "from": "tauri-plugin-store-api@github:tauri-apps/tauri-plugin-store#dev", "requires": { "@tauri-apps/api": "^1.2.0" } @@ -27207,8 +27203,8 @@ "dev": true }, "vrchat": { - "version": "https://codeload.github.com/Raphiiko/vrchatapi-javascript/tar.gz/cc9e0402c8c193fe49f0d46e364157da0418d4c2", - "integrity": "sha512-YrZ0T93G7fMtxISPe6rYWwbtizw3dSm9hi/KIDiwOSWZlbWg4h3h+X4snjSD1PTrohw/P5LNDDkfeNAIbazxeA==", + "version": "git+ssh://git@github.com/Raphiiko/vrchatapi-javascript.git#cc9e0402c8c193fe49f0d46e364157da0418d4c2", + "from": "vrchat@github:Raphiiko/vrchatapi-javascript#oyasumi-patch", "requires": { "axios": "^0.21.4" }, diff --git a/package.json b/package.json index 1c57f634..ad5a2c11 100644 --- a/package.json +++ b/package.json @@ -6,9 +6,9 @@ "type": "module", "scripts": { "ng": "ng", - "start": "npm run build-preload-assets && ng serve", - "build": "npm run build-preload-assets && node scripts/splashscreen-blurhash.js && ng build && npm run build:sidecar && node scripts/copy-dependencies.js", - "build:sidecar": "cd src-elevated-sidecar && cargo build --release && cd .. && node scripts/move-sidecar-build.js", + "start": "npm run pre-build && ng serve", + "build": "npm run pre-build && ng build && npm run build:sidecar", + "build:sidecar": "cd src-elevated-sidecar && cargo build --release && cd .. && npm run sidecar-post-build", "watch": "ng build --watch --configuration development", "test": "ng test", "tauri": "tauri", @@ -17,7 +17,8 @@ "tl:get-placeholders": "node scripts/translation-converter.js jsonToXLS --placeholders", "tl": "node scripts/translation-utils.js", "lint": "ng lint", - "build-preload-assets": "node scripts/build-preload-assets.js" + "pre-build": "node scripts/pre-build.js", + "sidecar-post-build": "node scripts/sidecar-post-build.js" }, "private": true, "dependencies": { @@ -38,7 +39,7 @@ "@fortawesome/fontawesome-free": "^6.2.0", "@ngx-translate/core": "^14.0.0", "@ngx-translate/http-loader": "^7.0.0", - "@tauri-apps/api": "^1.2.0", + "@tauri-apps/api": "^1.3.0", "cookie": "^0.5.0", "eslint-plugin-json": "^3.1.0", "flag-icons": "^6.6.6", @@ -47,7 +48,7 @@ "marked": "^4.2.2", "material-icons": "^1.12.1", "moment": "^2.29.4", - "ngx-pipes": "^3.2.0", + "ngx-pipes": "^3.2.2", "p-min-delay": "^4.0.2", "rxjs": "^7.5.7", "sass-material-colors": "^0.0.5", @@ -71,7 +72,7 @@ "@angular-eslint/template-parser": "16.0.1", "@angular/cli": "^16.0.0", "@angular/compiler-cli": "^16.0.0", - "@tauri-apps/cli": "^1.2.0", + "@tauri-apps/cli": "^1.3.0", "@types/jasmine": "^4.3.0", "@types/lodash": "^4.14.188", "@types/marked": "^4.0.7", diff --git a/scripts/build-preload-assets.js b/scripts/build-preload-assets.js deleted file mode 100644 index 21823173..00000000 --- a/scripts/build-preload-assets.js +++ /dev/null @@ -1,16 +0,0 @@ -import fs from 'fs'; - -function getFilePaths(folder, prefix) { - return fs.readdirSync(folder).map((file) => `${prefix}/${file}`); -} - -const imageUrls = [ - ...getFilePaths('./src/assets/img', '/assets/img'), - 'https://avatars.githubusercontent.com/u/111654848', // Raphiiko Avatar -]; - -const preloadAssetsData = { - imageUrls, -}; - -fs.writeFileSync('./src/assets/preload-assets.json', JSON.stringify(preloadAssetsData)); diff --git a/scripts/copy-dependencies.js b/scripts/copy-dependencies.js deleted file mode 100644 index 4bcc0f80..00000000 --- a/scripts/copy-dependencies.js +++ /dev/null @@ -1,10 +0,0 @@ -import fs from 'fs'; - -async function main() { - fs.copyFileSync('CHANGELOG.md', 'src/assets/CHANGELOG.md'); - fs.copyFileSync('src-tauri/icons/Square150x150Logo.png', 'src/assets/img/icon_150x150.png'); -} - -main().catch((e) => { - throw e; -}); diff --git a/scripts/splashscreen-blurhash.js b/scripts/pre-build.js similarity index 59% rename from scripts/splashscreen-blurhash.js rename to scripts/pre-build.js index 02c7494f..62d952b7 100644 --- a/scripts/splashscreen-blurhash.js +++ b/scripts/pre-build.js @@ -1,9 +1,30 @@ -import { blurhashToCss } from 'blurhash-to-css'; import fs from 'fs'; +import { blurhashToCss } from 'blurhash-to-css'; import sharp from 'sharp'; import { encode } from 'blurhash'; import Css from 'json-to-css'; +// +// BUILD PRELOAD ASSETS JSON +// +function getFilePaths(folder, prefix) { + return fs.readdirSync(folder).map((file) => `${prefix}/${file}`); +} + +const imageUrls = [ + ...getFilePaths('./src/assets/img', '/assets/img'), + 'https://avatars.githubusercontent.com/u/111654848', // Raphiiko Avatar +]; + +const preloadAssetsData = { + imageUrls, +}; + +fs.writeFileSync('./src/assets/preload-assets.json', JSON.stringify(preloadAssetsData)); + +// +// GENERATE BLURHASH CSS FOR SPLASH SCREEN IMAGE +// const kebabize = (str) => str.replace(/[A-Z]+(?![a-z])|[A-Z]/g, ($, ofs) => (ofs ? '-' : '') + $.toLowerCase()); @@ -30,3 +51,9 @@ encodeImageToBlurhash('./src/assets/splashscreen/splash.jpg').then((hash) => { '/* GENERATED FILE, DO NOT EDIT!*/\n' + css ); }); + +// +// COPY DEPENDENCIES +// +fs.copyFileSync('CHANGELOG.md', 'src/assets/CHANGELOG.md'); +fs.copyFileSync('src-tauri/icons/Square150x150Logo.png', 'src/assets/img/icon_150x150.png'); diff --git a/scripts/move-sidecar-build.js b/scripts/sidecar-post-build.js similarity index 100% rename from scripts/move-sidecar-build.js rename to scripts/sidecar-post-build.js diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index ccd8dbaa..c0e4bba9 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -9,8 +9,6 @@ default-run = "oyasumi" edition = "2021" rust-version = "1.64.0" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [build-dependencies] tauri-build = { version = "1.3.0", features = [] } @@ -68,20 +66,12 @@ features = ["path-all", "process-relaunch", [dependencies.openvr] git = "https://github.com/Raphiiko/oyasumi-rust-openvr" +[patch.crates-io] # Fix for broken window transparency in Tauri v1.3.0. # https://github.com/tauri-apps/tauri/issues/6868 # Remove once fixed. -[patch.crates-io] tao = { git = "https://github.com/tauri-apps/tao", branch = "v0.16" } -# Fix for broken installer generation in Tauri v1.3.0. -# https://github.com/tauri-apps/tauri/issues/6853 -# https://github.com/tauri-apps/tauri/pull/6855 -# Remove once fix is released -[patch.crates-io] -#tauri = { git = "https://github.com/tauri-apps/tauri", branch = "dev" } -tauri-build = { git = "https://github.com/tauri-apps/tauri", branch = "dev" } - [features] # by default Tauri runs in production mode # when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL diff --git a/src-tauri/images/installer_header.bmp b/src-tauri/images/installer_header.bmp new file mode 100644 index 00000000..0b5bd5bf Binary files /dev/null and b/src-tauri/images/installer_header.bmp differ diff --git a/src-tauri/images/installer_sidebar.bmp b/src-tauri/images/installer_sidebar.bmp new file mode 100644 index 00000000..94a91787 Binary files /dev/null and b/src-tauri/images/installer_sidebar.bmp differ diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 04364ade..6b7edf3e 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -79,19 +79,26 @@ "sounds/*.ogg" ], "shortDescription": "", - "targets": "all", + "targets": [ + "nsis", + "updater" + ], "windows": { "certificateThumbprint": null, "digestAlgorithm": "sha256", "timestampUrl": "", - "wix": { - "language": [ - "en-US", - "nl-NL", - "ja-JP", - "ko-KR", - "zh-TW", - "zh-CN" + "nsis": { + "license": "../LICENSE.md", + "installerIcon": "icons/icon.ico", + "headerImage": "images/installer_header.bmp", + "sidebarImage": "images/installer_sidebar.bmp", + "displayLanguageSelector": true, + "installMode": "both", + "languages": [ + "English", + "French", + "SimpChinese", + "TradChinese" ] } } @@ -140,4 +147,4 @@ } ] } -} \ No newline at end of file +} diff --git a/yarn.lock b/yarn.lock index b27d550e..7493f284 100644 --- a/yarn.lock +++ b/yarn.lock @@ -240,7 +240,7 @@ dependencies: "tslib" "^2.3.0" -"@angular/core@^16.0.0", "@angular/core@>=13.0.0", "@angular/core@14 - 15", "@angular/core@16.0.0": +"@angular/core@^16.0.0", "@angular/core@>=13.0.0", "@angular/core@>=14", "@angular/core@16.0.0": "integrity" "sha512-scppDxtXubum6ZiGu3ogmReBtMuA5XXk5FL3YKLb3c9O7q9Z5PC8KNQ6SsaOwEb6oW+0BWXMV698p/zmd0J4tA==" "resolved" "https://registry.npmjs.org/@angular/core/-/core-16.0.0.tgz" "version" "16.0.0" @@ -1612,7 +1612,7 @@ "resolved" "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz" "version" "3.1.0" -"@tauri-apps/api@^1.2.0": +"@tauri-apps/api@^1.2.0", "@tauri-apps/api@^1.3.0": "integrity" "sha512-AH+3FonkKZNtfRtGrObY38PrzEj4d+1emCbwNGu0V2ENbXjlLHMZQlUh+Bhu/CRmjaIwZMGJ3yFvWaZZgTHoog==" "resolved" "https://registry.npmjs.org/@tauri-apps/api/-/api-1.3.0.tgz" "version" "1.3.0" @@ -1622,7 +1622,7 @@ "resolved" "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.3.0.tgz" "version" "1.3.0" -"@tauri-apps/cli@^1.2.0": +"@tauri-apps/cli@^1.3.0": "integrity" "sha512-H65YQQkE6SBTQ+KlqTmzx7oCL/2p36v2jPFVNHBhZ5EN7g0VLYmImh9TFcB/QsO2aT+sVlRZSmTpL3R0Iiu8pA==" "resolved" "https://registry.npmjs.org/@tauri-apps/cli/-/cli-1.3.0.tgz" "version" "1.3.0" @@ -5867,10 +5867,10 @@ "resolved" "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz" "version" "2.6.2" -"ngx-pipes@^3.2.0": - "integrity" "sha512-ISfWCtGeaY1XEl4rbwXcBOH+EOq+IVgqjo0Q+4uExfjrcVkAuHe8LjLHJbpDzp80ln3yClNcLwnS5OkcFbwwpA==" - "resolved" "https://registry.npmjs.org/ngx-pipes/-/ngx-pipes-3.2.0.tgz" - "version" "3.2.0" +"ngx-pipes@^3.2.2": + "integrity" "sha512-nhNIUJe/bud5ir4RD2YDA6MdrJUh3YASIcNrMFX9WljTxuvAb99SZ88PaKSFGy9SXjHg8MxjxHfCoOLlTkxxlQ==" + "resolved" "https://registry.npmjs.org/ngx-pipes/-/ngx-pipes-3.2.2.tgz" + "version" "3.2.2" dependencies: "postcss" "^8.4.19" "tslib" "^2.3.0" @@ -7602,22 +7602,19 @@ "yallist" "^4.0.0" "tauri-plugin-fs-extra-api@github:tauri-apps/tauri-plugin-fs-extra": - "integrity" "sha512-yTt33/ZgkyiHVzk7TEQtBiumEyiSEcRPMeG+h6QJnZeVfl6edsB+AJz9EmSZ0LV+PCazaoaWpzSgoGv31/qb+Q==" - "resolved" "https://codeload.github.com/tauri-apps/tauri-plugin-fs-extra/tar.gz/ea47666db97e48e2230dd330fd791a7180d0586d" + "resolved" "git+ssh://git@github.com/tauri-apps/tauri-plugin-fs-extra.git#ea47666db97e48e2230dd330fd791a7180d0586d" "version" "0.0.0" dependencies: "@tauri-apps/api" "^1.2.0" "tauri-plugin-log-api@github:tauri-apps/tauri-plugin-log#dev": - "integrity" "sha512-bZFjquDs762oit4/o47xqslBrPXK3P1+Wqq30X86FbjNW9cwPBfY/hId1w/BOeW3BialMQQ9Sf1zmafHyAEtnA==" - "resolved" "https://codeload.github.com/tauri-apps/tauri-plugin-log/tar.gz/be811332676ff73e1e891f31ce3de8d447fdf07e" + "resolved" "git+ssh://git@github.com/tauri-apps/tauri-plugin-log.git#be811332676ff73e1e891f31ce3de8d447fdf07e" "version" "0.0.0" dependencies: "@tauri-apps/api" "^1.2.0" "tauri-plugin-store-api@github:tauri-apps/tauri-plugin-store#dev": - "integrity" "sha512-b4Pr2f6aGNxK8oI1ZPApag9a2DIO9BOwexuMKsGdAVTsPLniic1oXXJjuk9JognFDLIpLzAN9wTaHUYNI2rZ9A==" - "resolved" "https://codeload.github.com/tauri-apps/tauri-plugin-store/tar.gz/f4ef29684e4a32eddf51befaae98a5e498df8574" + "resolved" "git+ssh://git@github.com/tauri-apps/tauri-plugin-store.git#f4ef29684e4a32eddf51befaae98a5e498df8574" "version" "0.0.0" dependencies: "@tauri-apps/api" "^1.2.0" @@ -7987,8 +7984,7 @@ "version" "2.0.1" "vrchat@github:Raphiiko/vrchatapi-javascript#oyasumi-patch": - "integrity" "sha512-YrZ0T93G7fMtxISPe6rYWwbtizw3dSm9hi/KIDiwOSWZlbWg4h3h+X4snjSD1PTrohw/P5LNDDkfeNAIbazxeA==" - "resolved" "https://codeload.github.com/Raphiiko/vrchatapi-javascript/tar.gz/cc9e0402c8c193fe49f0d46e364157da0418d4c2" + "resolved" "git+ssh://git@github.com/Raphiiko/vrchatapi-javascript.git#cc9e0402c8c193fe49f0d46e364157da0418d4c2" "version" "1.7.7" dependencies: "axios" "^0.21.4"