chore: bump vue to 2.7.16 (#1163)

package-lock.json

@@ -43,14 +43,14 @@
                 "raw-loader": "^4.0.2",
                 "sass": "^1.85.0",
                 "sass-loader": "^16.0.5",
-                "vue": "^2.6.14",
+                "vue": "^2.7.16",
                 "vue-data-tables": "^3.4.5",
+                "vue-demi": "^0.14.10",
                 "vue-i18n": "^8.28.2",
                 "vue-lazyload": "^1.3.4",
                 "vue-loader": "^15.11.1",
                 "vue-markdown": "^2.2.4",
                 "vue-marquee-text-component": "^1.2.0",
-                "vue-template-compiler": "^2.6.14",
                 "webpack": "^5.98.0",
                 "webpack-cli": "^6.0.1",
                 "worker-timers": "^8.0.15",
@@ -2188,6 +2188,37 @@
                 "@types/node": "*"
             }
         },
+        "node_modules/@vue/compiler-sfc": {
+            "version": "2.7.16",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz",
+            "integrity": "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/parser": "^7.23.5",
+                "postcss": "^8.4.14",
+                "source-map": "^0.6.1"
+            },
+            "optionalDependencies": {
+                "prettier": "^1.18.2 || ^2.0.0"
+            }
+        },
+        "node_modules/@vue/compiler-sfc/node_modules/prettier": {
+            "version": "2.8.8",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+            "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "bin": {
+                "prettier": "bin-prettier.js"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            },
+            "funding": {
+                "url": "https://github.com/prettier/prettier?sponsor=1"
+            }
+        },
         "node_modules/@vue/component-compiler-utils": {
             "version": "3.3.0",
             "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz",
@@ -4033,6 +4064,13 @@
                 "node": ">=4"
             }
         },
+        "node_modules/csstype": {
+            "version": "3.1.3",
+            "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+            "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/dayjs": {
             "version": "1.11.13",
             "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
@@ -4040,13 +4078,6 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/de-indent": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
-            "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
-            "dev": true,
-            "license": "MIT"
-        },
         "node_modules/debug": {
             "version": "4.3.7",
             "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
@@ -9643,11 +9674,16 @@
             }
         },
         "node_modules/vue": {
-            "version": "2.6.14",
+            "version": "2.7.16",
-            "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz",
+            "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.16.tgz",
-            "integrity": "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==",
+            "integrity": "sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==",
             "deprecated": "Vue 2 has reached EOL and is no longer actively maintained. See https://v2.vuejs.org/eol/ for more details.",
-            "dev": true
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@vue/compiler-sfc": "2.7.16",
+                "csstype": "^3.1.0"
+            }
         },
         "node_modules/vue-data-tables": {
             "version": "3.4.5",
@@ -9664,6 +9700,33 @@
                 "npm": ">= 3.0.0"
             }
         },
+        "node_modules/vue-demi": {
+            "version": "0.14.10",
+            "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+            "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+            "dev": true,
+            "hasInstallScript": true,
+            "license": "MIT",
+            "bin": {
+                "vue-demi-fix": "bin/vue-demi-fix.js",
+                "vue-demi-switch": "bin/vue-demi-switch.js"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/antfu"
+            },
+            "peerDependencies": {
+                "@vue/composition-api": "^1.0.0-rc.1",
+                "vue": "^3.0.0-0 || ^2.6.0"
+            },
+            "peerDependenciesMeta": {
+                "@vue/composition-api": {
+                    "optional": true
+                }
+            }
+        },
         "node_modules/vue-eslint-parser": {
             "version": "9.4.3",
             "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.4.3.tgz",
@@ -9861,17 +9924,6 @@
                 "loader-utils": "^1.0.2"
             }
         },
-        "node_modules/vue-template-compiler": {
-            "version": "2.6.14",
-            "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz",
-            "integrity": "sha512-ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "de-indent": "^1.0.2",
-                "he": "^1.1.0"
-            }
-        },
         "node_modules/vue-template-es2015-compiler": {
             "version": "1.9.1",
             "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz",

package.json

@@ -59,14 +59,14 @@
         "raw-loader": "^4.0.2",
         "sass": "^1.85.0",
         "sass-loader": "^16.0.5",
-        "vue": "^2.6.14",
+        "vue": "^2.7.16",
         "vue-data-tables": "^3.4.5",
+        "vue-demi": "^0.14.10",
         "vue-i18n": "^8.28.2",
         "vue-lazyload": "^1.3.4",
         "vue-loader": "^15.11.1",
         "vue-markdown": "^2.2.4",
         "vue-marquee-text-component": "^1.2.0",
-        "vue-template-compiler": "^2.6.14",
         "webpack": "^5.98.0",
         "webpack-cli": "^6.0.1",
         "worker-timers": "^8.0.15",

src/app.js

@@ -67,6 +67,8 @@ import _groups from './classes/groups.js';
 import _vrcRegistry from './classes/vrcRegistry.js';
 import _restoreFriendOrder from './classes/restoreFriendOrder.js';
 
+import pugTemplate from './app.pug';
+
 // API classes
 import _config from './classes/API/config.js';
 
@@ -152,6 +154,7 @@ console.log(`isLinux: ${LINUX}`);
     await configRepository.init();
 
     const app = {
+        template: pugTemplate,
         data: {
             API,
             isGameRunning: false,
@@ -198,7 +201,10 @@ console.log(`isLinux: ${LINUX}`);
                 userStatusClass: this.userStatusClass
             };
         },
-        el: '#x-app',
+        el: '#root',
+        beforeMount() {
+            this.changeThemeMode();
+        },
         async mounted() {
             await this.initLanguage();
             try {
@@ -206,7 +212,6 @@ console.log(`isLinux: ${LINUX}`);
             } catch (err) {
                 console.error(err);
             }
-            await this.changeThemeMode();
             await AppApi.SetUserAgent();
             this.appVersion = await AppApi.GetVersion();
             await this.compareAppVersion();

src/app.pug

@@ -0,0 +1,155 @@
+doctype html
+#x-app.x-app(@dragenter.prevent @dragover.prevent @drop.prevent)
+    //- login
+    include ./mixins/loginPage.pug
+    +loginPage
+
+    //- menu
+    .x-menu-container
+        //- download progress, update pending
+        .pending-update(v-if='updateInProgress' @click='showVRCXUpdateDialog')
+            el-progress(
+                type='circle'
+                width='50'
+                stroke-width='3'
+                :percentage='updateProgress'
+                :format='updateProgressText')
+        .pending-update(v-else-if='pendingVRCXUpdate || pendingVRCXInstall')
+            el-button(
+                type='default'
+                @click='showVRCXUpdateDialog'
+                size='mini'
+                icon='el-icon-download'
+                circle
+                style='font-size: 14px; height: 50px; width: 50px')
+
+        nav-menu(ref='menu' @select='selectMenu' :menu-active-index='menuActiveIndex')
+
+    //- ### Tabs ###
+    template(v-if='API.isLoggedIn')
+        //- feed
+        include ./mixins/tabs/feed.pug
+        +feedTab
+
+        //- gameLog
+        include ./mixins/tabs/gameLog.pug
+        +gameLogTab
+
+        //- playerList
+        include ./mixins/tabs/playerList.pug
+        +playerListTab
+
+        //- search
+        include ./mixins/tabs/search.pug
+        +searchTab
+
+        //- favorite
+        include ./mixins/tabs/favorites.pug
+        +favoritesTab
+
+        //- friendLog
+        include ./mixins/tabs/friendLog.pug
+        +friendLogTab
+
+        //- moderation
+        moderation-tab(
+            v-if='menuActiveIndex === "moderation"'
+            :table-data='playerModerationTable'
+            :shift-held='shiftHeld'
+            :hide-tooltips='hideTooltips')
+
+        //- notification
+        include ./mixins/tabs/notifications.pug
+        +notificationsTab
+
+        //- profile
+        include ./mixins/tabs/profile.pug
+        +profileTab
+
+        //- friends list
+        include ./mixins/tabs/friendsList.pug
+        +friendsListTab
+
+        //- charts
+        keep-alive
+            charts-tab(
+                v-if='menuActiveIndex === "charts"'
+                :get-world-name='getWorldName'
+                :is-dark-mode='isDarkMode'
+                :dt-hour12='dtHour12'
+                :friends-map='friends'
+                :local-favorite-friends='localFavoriteFriends'
+                @open-previous-instance-info-dialog='showPreviousInstanceInfoDialog')
+
+        //- settings
+        include ./mixins/tabs/settings.pug
+        +settingsTab
+
+        side-bar(
+            v-show='isSideBarTabShow'
+            v-bind='sideBarTabProps'
+            @show-group-dialog='showGroupDialog'
+            @quick-search-change='quickSearchChange'
+            @direct-access-paste='directAccessPaste'
+            @refresh-friends-list='refreshFriendsList'
+            @confirm-delete-friend='confirmDeleteFriend')
+
+    //- ## Dialogs ## -\\
+    include ./mixins/dialogs/userDialog.pug
+    +userDialog
+
+    include ./mixins/dialogs/worldDialog.pug
+    +worldDialog
+
+    include ./mixins/dialogs/avatarDialog.pug
+    +avatarDialog
+
+    include ./mixins/dialogs/groupDialog.pug
+    +groupDialog
+
+    include ./mixins/dialogs/favoritesDialog.pug
+    +favoritesDialog
+
+    include ./mixins/dialogs/images.pug
+    +images
+
+    include ./mixins/dialogs/newInstance.pug
+    +newInstance
+
+    include ./mixins/dialogs/feedFilters.pug
+    +feedFilters
+
+    include ./mixins/dialogs/openSourceSoftwareNotice.pug
+    +openSourceSoftwareNotice
+
+    include ./mixins/dialogs/groups.pug
+    +groups
+
+    include ./mixins/dialogs/currentUser.pug
+    +currentUser
+
+    include ./mixins/dialogs/invites.pug
+    +invites
+
+    include ./mixins/dialogs/launch.pug
+    +launch
+
+    include ./mixins/dialogs/screenshotMetadata.pug
+    +screenshotMetadata
+
+    include ./mixins/dialogs/vrcx.pug
+    +vrcx
+
+    include ./mixins/dialogs/settings.pug
+    +settings
+
+    include ./mixins/dialogs/previousInstances.pug
+    +previousInstances
+
+    include ./mixins/dialogs/tags.pug
+    +tags
+
+    include ./mixins/dialogs/boops.pug
+    +boops
+
+    //- el-dialog.x-dialog(:before-close="beforeDialogClose" @mousedown.native="dialogMouseDown" @mouseup.native="dialogMouseUp" ref="templateDialog" :visible.sync="templateDialog.visible" :title="$t('dialog.template_dialog.header')" width="450px")

src/index.pug

@@ -1,171 +0,0 @@
-doctype html
-html
-    head
-        meta(http-equiv='Content-Type' content='text/html;charset=utf-8')
-        meta(http-equiv='Cache-Control' content='no-cache')
-        meta(http-equiv='referrer' content='no-referrer')
-        meta(http-equiv='viewport' content='width=device-width,initial-scale=1,user-scalable=no')
-        title VRCX
-        link(rel='preconnect' href='https://api.vrchat.cloud')
-        link(rel='preconnect' href='https://d348imysud55la.cloudfront.net')
-        link(rel='stylesheet' href='app.css')
-        link(rel='stylesheet' href='flags.css')
-        link(rel='stylesheet' href='animated-emoji.css')
-    body
-        #x-app.x-app(style='display: none' @dragenter.prevent @dragover.prevent @drop.prevent)
-            //- login
-            include ./mixins/loginPage.pug
-            +loginPage
-
-            //- menu
-            .x-menu-container
-                //- download progress, update pending
-                .pending-update(v-if='updateInProgress' @click='showVRCXUpdateDialog')
-                    el-progress(
-                        type='circle'
-                        width='50'
-                        stroke-width='3'
-                        :percentage='updateProgress'
-                        :format='updateProgressText')
-                .pending-update(v-else-if='pendingVRCXUpdate || pendingVRCXInstall')
-                    el-button(
-                        type='default'
-                        @click='showVRCXUpdateDialog'
-                        size='mini'
-                        icon='el-icon-download'
-                        circle
-                        style='font-size: 14px; height: 50px; width: 50px')
-
-                nav-menu(ref='menu' @select='selectMenu' :menu-active-index='menuActiveIndex')
-
-            //- ### Tabs ###
-            template(v-if='API.isLoggedIn')
-                //- feed
-                include ./mixins/tabs/feed.pug
-                +feedTab
-
-                //- gameLog
-                include ./mixins/tabs/gameLog.pug
-                +gameLogTab
-
-                //- playerList
-                include ./mixins/tabs/playerList.pug
-                +playerListTab
-
-                //- search
-                include ./mixins/tabs/search.pug
-                +searchTab
-
-                //- favorite
-                include ./mixins/tabs/favorites.pug
-                +favoritesTab
-
-                //- friendLog
-                include ./mixins/tabs/friendLog.pug
-                +friendLogTab
-
-                //- moderation
-                moderation-tab(
-                    v-if='menuActiveIndex === "moderation"'
-                    :table-data='playerModerationTable'
-                    :shift-held='shiftHeld'
-                    :hide-tooltips='hideTooltips')
-
-                //- notification
-                include ./mixins/tabs/notifications.pug
-                +notificationsTab
-
-                //- profile
-                include ./mixins/tabs/profile.pug
-                +profileTab
-
-                //- friends list
-                include ./mixins/tabs/friendsList.pug
-                +friendsListTab
-
-                //- charts
-                keep-alive
-                    charts-tab(
-                        v-if='menuActiveIndex === "charts"'
-                        :get-world-name='getWorldName'
-                        :is-dark-mode='isDarkMode'
-                        :dt-hour12='dtHour12'
-                        :friends-map='friends'
-                        :local-favorite-friends='localFavoriteFriends'
-                        @open-previous-instance-info-dialog='showPreviousInstanceInfoDialog')
-
-                //- settings
-                include ./mixins/tabs/settings.pug
-                +settingsTab
-
-                side-bar(
-                    v-show='isSideBarTabShow'
-                    v-bind='sideBarTabProps'
-                    @show-group-dialog='showGroupDialog'
-                    @quick-search-change='quickSearchChange'
-                    @direct-access-paste='directAccessPaste'
-                    @refresh-friends-list='refreshFriendsList'
-                    @confirm-delete-friend='confirmDeleteFriend')
-
-            //- ## Dialogs ## -\\
-            include ./mixins/dialogs/userDialog.pug
-            +userDialog
-
-            include ./mixins/dialogs/worldDialog.pug
-            +worldDialog
-
-            include ./mixins/dialogs/avatarDialog.pug
-            +avatarDialog
-
-            include ./mixins/dialogs/groupDialog.pug
-            +groupDialog
-
-            include ./mixins/dialogs/favoritesDialog.pug
-            +favoritesDialog
-
-            include ./mixins/dialogs/images.pug
-            +images
-
-            include ./mixins/dialogs/newInstance.pug
-            +newInstance
-
-            include ./mixins/dialogs/feedFilters.pug
-            +feedFilters
-
-            include ./mixins/dialogs/openSourceSoftwareNotice.pug
-            +openSourceSoftwareNotice
-
-            include ./mixins/dialogs/groups.pug
-            +groups
-
-            include ./mixins/dialogs/currentUser.pug
-            +currentUser
-
-            include ./mixins/dialogs/invites.pug
-            +invites
-
-            include ./mixins/dialogs/launch.pug
-            +launch
-
-            include ./mixins/dialogs/screenshotMetadata.pug
-            +screenshotMetadata
-
-            include ./mixins/dialogs/vrcx.pug
-            +vrcx
-
-            include ./mixins/dialogs/settings.pug
-            +settings
-
-            include ./mixins/dialogs/previousInstances.pug
-            +previousInstances
-
-            include ./mixins/dialogs/tags.pug
-            +tags
-
-            include ./mixins/dialogs/boops.pug
-            +boops
-
-            //- el-dialog.x-dialog(:before-close="beforeDialogClose" @mousedown.native="dialogMouseDown" @mouseup.native="dialogMouseUp" ref="templateDialog" :visible.sync="templateDialog.visible" :title="$t('dialog.template_dialog.header')" width="450px")
-
-        script(src='vendor.js')
-        script(src='app.js')

src/static/index.html

@@ -0,0 +1,23 @@
+<!doctype html>
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+        <meta http-equiv="Cache-Control" content="no-cache" />
+        <meta http-equiv="referrer" content="no-referrer" />
+        <meta
+            http-equiv="viewport"
+            content="width=device-width,initial-scale=1,user-scalable=no"
+        />
+        <title>VRCX</title>
+        <link rel="preconnect" href="https://api.vrchat.cloud" />
+        <link rel="preconnect" href="https://d348imysud55la.cloudfront.net" />
+        <link rel="stylesheet" href="app.css" />
+        <link rel="stylesheet" href="flags.css" />
+        <link rel="stylesheet" href="animated-emoji.css" />
+    </head>
+    <body>
+        <div id="root"></div>
+        <script src="vendor.js"></script>
+        <script src="app.js"></script>
+    </body>
+</html>

src/static/vr.html

@@ -0,0 +1,20 @@
+<!doctype html>
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+        <meta http-equiv="Cache-Control" content="no-cache" />
+        <meta http-equiv="referrer" content="no-referrer" />
+        <meta
+            http-equiv="viewport"
+            content="width=device-width,initial-scale=1,user-scalable=no"
+        />
+        <title>VRCXVR</title>
+        <link rel="stylesheet" href="vr.css" />
+        <link rel="stylesheet" href="flags.css" />
+    </head>
+    <body>
+        <div id="root"></div>
+        <script src="vendor.js"></script>
+        <script src="vr.js"></script>
+    </body>
+</html>

src/vr.js

@@ -19,6 +19,8 @@ import * as localizedStrings from './localization/localizedStrings.js';
 
 import $utils from './classes/utils.js';
 
+import pugTemplate from './vr.pug';
+
 Vue.component('marquee-text', MarqueeText);
 
 (async function () {
@@ -124,6 +126,7 @@ Vue.component('marquee-text', MarqueeText);
     });
 
     const app = {
+        template: pugTemplate,
         i18n,
         data: {
             // 1 = 대시보드랑 손목에 보이는거
@@ -169,7 +172,7 @@ Vue.component('marquee-text', MarqueeText);
             ...$utils
         },
         watch: {},
-        el: '#x-app',
+        el: '#root',
         async mounted() {
             this.isRunningUnderWine = await AppApiVr.IsRunningUnderWine();
             await this.applyWineEmojis();

webpack.config.js

@@ -100,13 +100,13 @@ module.exports = {
         }),
         new HtmlWebpackPlugin({
             filename: 'index.html',
-            template: './src/index.pug',
+            template: './src/static/index.html',
             inject: false,
             minify: false
         }),
         new HtmlWebpackPlugin({
             filename: 'vr.html',
-            template: './src/vr.pug',
+            template: './src/static/vr.html',
             inject: false,
             minify: false
         }),