Skip to content

Commit

Permalink
2024.1.2: Major package bumps, theme fixes, begin addition of Vircadi…
Browse files Browse the repository at this point in the history
…a World SDK. (#223)

* Update vircadia-world

* Minor improvements [pre-overhaul]

* Update vircadia-world-sdk structure.

* Remove Igloo experimental support.

* Bump vers number, also bump all packages (major).

* Fix keyword import, comment out Vircadia World init for now.

* Improve styling for light/dark modes.

* Improve log styling.

* Fix color issues with console. (color not working yet)
  • Loading branch information
digisomni authored Sep 6, 2024
1 parent 62f31f2 commit d127ef7
Show file tree
Hide file tree
Showing 18 changed files with 1,837 additions and 2,636 deletions.
11 changes: 3 additions & 8 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ module.exports = {
// Rules order is important, please avoid shuffling them
extends: [
// Base ESLint recommended rules
"eslint:recommended",
// "eslint:recommended",

// https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/eslint-plugin#usage
// ESLint typescript rules
"plugin:@typescript-eslint/recommended",
// "plugin:@typescript-eslint/recommended",
// consider disabling this class of rules if linting takes too long
"plugin:@typescript-eslint/recommended-requiring-type-checking",
// "plugin:@typescript-eslint/recommended-requiring-type-checking",

// Uncomment any of the lines below to choose desired strictness,
// but leave only one uncommented!
Expand Down Expand Up @@ -186,11 +186,6 @@ module.exports = {
"object-curly-spacing": "off",
"@typescript-eslint/object-curly-spacing": ["error", "always"],
quotes: "off",
"@typescript-eslint/quotes": [
"error",
"double",
{ allowTemplateLiterals: true },
],
"require-await": "off",
"@typescript-eslint/require-await": ["error"],
"no-return-await": "off",
Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<meta charset="utf-8">
<meta name="description" content="<%= process.env.VRCA_PRODUCT_DESCRIPTION %>">
<meta name="keywords" content="Vircadia, VR, virtual, reality, metaverse, game, 3D, open-world, open-source, open, future" />
<meta name="keywords" content="<%= process.env.VRCA_PRODUCT_KEYWORDS %>" />
<meta name="author" content="Vircadia Contributors" />
<meta name="format-detection" content="telephone=no">
<meta name="msapplication-tap-highlight" content="no">
Expand Down
3,157 changes: 1,228 additions & 1,929 deletions package-lock.json

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vircadia-web",
"version": "2024.1.0",
"version": "2024.2.0",
"description": "Vircadia open source metaverse web interface for agent-based virtual worlds.",
"productName": "Vircadia Web",
"author": "DigiSomni LLC | Vircadia Contributors",
Expand All @@ -20,25 +20,25 @@
"copy-workers": "node build_scripts/copyWorkers.mjs"
},
"dependencies": {
"@babylonjs/core": "^7.14.0",
"@babylonjs/inspector": "^7.14.0",
"@babylonjs/loaders": "^7.14.0",
"@quasar/extras": "^1.16.11",
"@babylonjs/core": "^7.24.0",
"@babylonjs/inspector": "^7.24.0",
"@babylonjs/loaders": "^7.24.0",
"@quasar/extras": "^1.16.12",
"@vircadia/web-sdk": "^2024.1.0",
"@vueuse/core": "^10.11.0",
"@vueuse/core": "^11.0.3",
"ammojs-typed": "^1.0.6",
"dompurify": "^3.0.3",
"pinia": "^2.1.7",
"quasar": "^2.16.5",
"eight-colors": "^1.3.0",
"pinia": "^2.2.2",
"quasar": "^2.16.10",
"unique-names-generator": "^4.7.1",
"vue": "^3.4.31",
"vue-router": "^4.3.0"
"vue": "^3.5.3",
"vue-router": "^4.4.3"
},
"devDependencies": {
"@jitsi/vue-sdk": "^1.0.4",
"@quasar/app-vite": "^1.9.3",
"@types/dompurify": "^3.0.2",
"@types/lodash": "^4.14.199",
"@types/node": "^12.20.21",
"@typescript-eslint/eslint-plugin": "^5.10.0",
"@typescript-eslint/parser": "^5.10.0",
Expand All @@ -49,9 +49,9 @@
"eslint-plugin-n": "^15.0.0",
"eslint-plugin-promise": "^6.0.0",
"eslint-plugin-vue": "^9.0.0",
"git-authors-cli": "^1.0.46",
"git-authors-cli": "^1.0.49",
"micro-test-runner": "^1.5.1",
"typescript": "^5.4.0"
"typescript": "^5.5.4"
},
"engines": {
"node": "^20 || ^18",
Expand Down
11 changes: 10 additions & 1 deletion quasar.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ module.exports = configure(function (ctx) {
// exclude = [],
// rawOptions = {},
warnings: true,
errors: true,
errors: false,
},

// https://v2.quasar.dev/quasar-cli-vite/prefetch-feature
Expand Down Expand Up @@ -92,6 +92,10 @@ module.exports = configure(function (ctx) {
"@Modules": path.resolve(__dirname, "./src/modules"),
"@Public": path.resolve(__dirname, "./public"),
"@Stores": path.resolve(__dirname, "./src/stores"),
"@World-Client": path.resolve(
__dirname,
"./src/vircadia-world/typescript/src/client"
),
},

env: {
Expand Down Expand Up @@ -119,6 +123,9 @@ module.exports = configure(function (ctx) {
VRCA_PRODUCT_DESCRIPTION:
process.env.VRCA_PRODUCT_DESCRIPTION ??
packageJSON.description,
VRCA_PRODUCT_KEYWORDS:
process.env.VRCA_PRODUCT_KEYWORDS ??
"Vircadia, VR, virtual, reality, metaverse, game, 3D, open-world, open-source, open, future",
VRCA_LOGO:
process.env.VRCA_LOGO ??
"assets/images/branding/vircadia-icon.svg",
Expand Down Expand Up @@ -146,6 +153,8 @@ module.exports = configure(function (ctx) {
VRCA_COLORS_SECONDARY:
process.env.VRCA_COLORS_SECONDARY ?? "#8300e9",
VRCA_COLORS_ACCENT: process.env.VRCA_COLORS_ACCENT ?? "#01bdff",
VRCA_COLORS_DARK: process.env.VRCA_COLORS_DARK ?? "#282828",
VRCA_COLORS_LIGHT: process.env.VRCA_COLORS_LIGHT ?? "#e8e8e8",
// Theme > Styles
VRCA_DEFAULT_MODE: process.env.VRCA_DEFAULT_MODE ?? "dark",
VRCA_GLOBAL_STYLE: process.env.VRCA_GLOBAL_STYLE ?? "mica",
Expand Down
12 changes: 8 additions & 4 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,14 @@
import { onMounted } from "vue";
import { applicationStore } from "@Stores/index";
import { Utility } from "@Modules/utility";
import { Client } from "@World-Client/client";

Check warning on line 17 in src/App.vue

View workflow job for this annotation

GitHub Actions / 🎉 Deploy

'Client' is defined but never used

Check warning on line 17 in src/App.vue

View workflow job for this annotation

GitHub Actions / desktop-build (macos-latest)

'Client' is defined but never used

Check warning on line 17 in src/App.vue

View workflow job for this annotation

GitHub Actions / desktop-build (ubuntu-20.04)

'Client' is defined but never used

Check warning on line 17 in src/App.vue

View workflow job for this annotation

GitHub Actions / desktop-build (windows-latest)

'Client' is defined but never used
import Log from "@Modules/debugging/log";
// FIXME: Apps - This should be handled properly.
window.useIgloo = window.location.toString().includes("?igloo=1");
// Fetch and initialize configuration info
Log.debug(Log.types.OTHER, `APP: Initialize`);
Utility.initializeConfig();
onMounted(() => {
onMounted(async () => {

Check failure on line 24 in src/App.vue

View workflow job for this annotation

GitHub Actions / 🎉 Deploy

Async arrow function has no 'await' expression

Check failure on line 24 in src/App.vue

View workflow job for this annotation

GitHub Actions / desktop-build (macos-latest)

Async arrow function has no 'await' expression

Check failure on line 24 in src/App.vue

View workflow job for this annotation

GitHub Actions / desktop-build (ubuntu-20.04)

Async arrow function has no 'await' expression

Check failure on line 24 in src/App.vue

View workflow job for this annotation

GitHub Actions / desktop-build (windows-latest)

Async arrow function has no 'await' expression
// Log the SDK version.
console.log("Starting Vircadia Web using SDK version:", applicationStore.globalConsts.SDK_VERSION_TAG);
// Called after the APP is visible. This starts the engines doing things.
Expand All @@ -34,5 +32,11 @@ onMounted(() => {
if (preloader) {
preloader.classList.add("hide");
}
// await Client.Setup.InitializeVircadiaWorld({
// host: "http://localhost",
// port: 3000,
// agentId: "1234567890",
// });
});
</script>
Loading

0 comments on commit d127ef7

Please sign in to comment.