Update Cef and npm packages

This commit is contained in:
Natsumi
2024-08-28 13:55:49 +12:00
parent 6ac1a6570b
commit bc565abdae
7 changed files with 1740 additions and 1993 deletions

View File

@@ -29,7 +29,8 @@ namespace VRCX
PersistSessionCookies = true, PersistSessionCookies = true,
PersistUserPreferences = true, PersistUserPreferences = true,
UserAgent = Program.Version, UserAgent = Program.Version,
BrowserSubprocessPath = Environment.ProcessPath BrowserSubprocessPath = Environment.ProcessPath,
BackgroundColor = 0xFF101010
}; };
cefSettings.RegisterScheme(new CefCustomScheme cefSettings.RegisterScheme(new CefCustomScheme
@@ -60,8 +61,9 @@ namespace VRCX
if (Program.LaunchDebug) if (Program.LaunchDebug)
{ {
// it's dead fuck https://github.com/chromiumembedded/cef/issues/3740
logger.Info("Debug mode enabled"); logger.Info("Debug mode enabled");
cefSettings.RemoteDebuggingPort = 8088; cefSettings.RemoteDebuggingPort = 8089;
cefSettings.CefCommandLineArgs["remote-allow-origins"] = "*"; cefSettings.CefCommandLineArgs["remote-allow-origins"] = "*";
} }

View File

@@ -30,7 +30,6 @@ namespace VRCX
Instance = this; Instance = this;
InitializeComponent(); InitializeComponent();
// adding a 5s delay here to avoid excessive writes to disk // adding a 5s delay here to avoid excessive writes to disk
_saveTimer = new Timer(); _saveTimer = new Timer();
_saveTimer.Interval = 5000; _saveTimer.Interval = 5000;
@@ -42,8 +41,9 @@ namespace VRCX
Icon = icon; Icon = icon;
TrayIcon.Icon = icon; TrayIcon.Icon = icon;
} }
catch catch (Exception ex)
{ {
jslogger.Error(ex);
} }
Browser = new ChromiumWebBrowser("file://vrcx/index.html") Browser = new ChromiumWebBrowser("file://vrcx/index.html")
@@ -94,8 +94,9 @@ namespace VRCX
Size = size; Size = size;
} }
} }
catch catch (Exception ex)
{ {
jslogger.Error(ex);
} }
try try
@@ -123,8 +124,9 @@ namespace VRCX
WindowState = state; WindowState = state;
} }
} }
catch catch (Exception ex)
{ {
jslogger.Error(ex);
} }
// 가끔 화면 위치가 안맞음.. 이걸로 해결 될지는 모르겠음 // 가끔 화면 위치가 안맞음.. 이걸로 해결 될지는 모르겠음
@@ -148,6 +150,7 @@ namespace VRCX
SaveWindowState(); SaveWindowState();
_saveTimer?.Stop(); _saveTimer?.Stop();
} }
private void MainForm_Move(object sender, System.EventArgs e) private void MainForm_Move(object sender, System.EventArgs e)
{ {
if (WindowState != FormWindowState.Normal) if (WindowState != FormWindowState.Normal)
@@ -170,7 +173,6 @@ namespace VRCX
} }
} }
private void SaveWindowState() private void SaveWindowState()
{ {
VRCXStorage.Instance.Set("VRCX_LocationX", LastLocationX.ToString()); VRCXStorage.Instance.Set("VRCX_LocationX", LastLocationX.ToString());

View File

@@ -80,8 +80,8 @@
</Content> </Content>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CefSharp.OffScreen.NETCore" Version="126.2.180" /> <PackageReference Include="CefSharp.OffScreen.NETCore" Version="127.3.50" />
<PackageReference Include="CefSharp.WinForms.NETCore" Version="126.2.180" /> <PackageReference Include="CefSharp.WinForms.NETCore" Version="127.3.50" />
<PackageReference Include="DiscordRichPresence" Version="1.2.1.24" /> <PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" /> <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

3667
html/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -22,38 +22,38 @@
}, },
"homepage": "https://github.com/vrcx-team/VRCX#readme", "homepage": "https://github.com/vrcx-team/VRCX#readme",
"devDependencies": { "devDependencies": {
"@babel/eslint-parser": "^7.23.3", "@babel/eslint-parser": "^7.25.1",
"@babel/plugin-syntax-import-assertions": "^7.23.3", "@babel/plugin-syntax-import-assertions": "^7.24.7",
"@babel/preset-env": "^7.23.8", "@babel/preset-env": "^7.25.4",
"@fontsource/noto-sans-jp": "^5.0.17", "@fontsource/noto-sans-jp": "^5.0.20",
"@fontsource/noto-sans-kr": "^5.0.17", "@fontsource/noto-sans-kr": "^5.0.19",
"@fontsource/noto-sans-sc": "^5.0.17", "@fontsource/noto-sans-sc": "^5.0.20",
"@fontsource/noto-sans-tc": "^5.0.17", "@fontsource/noto-sans-tc": "^5.0.20",
"animate.css": "^4.1.1", "animate.css": "^4.1.1",
"copy-webpack-plugin": "^12.0.1", "copy-webpack-plugin": "^12.0.2",
"css-loader": "^6.9.0", "css-loader": "^7.1.2",
"default-passive-events": "^2.0.0", "default-passive-events": "^2.0.0",
"element-ui": "^2.15.14", "element-ui": "^2.15.14",
"eslint": "^8.56.0", "eslint": "^9.9.1",
"eslint-config-prettier": "^9.1.0", "eslint-config-prettier": "^9.1.0",
"html-webpack-plugin": "^5.6.0", "html-webpack-plugin": "^5.6.0",
"mini-css-extract-plugin": "^2.7.7", "mini-css-extract-plugin": "^2.9.1",
"normalize.css": "^8.0.1", "normalize.css": "^8.0.1",
"noty": "^3.2.0-beta-deprecated", "noty": "^3.2.0-beta-deprecated",
"prettier": "^3.2.2", "prettier": "^3.3.3",
"pug": "^3.0.3", "pug": "^3.0.3",
"pug-plain-loader": "^1.1.0", "pug-plain-loader": "^1.1.0",
"raw-loader": "^4.0.2", "raw-loader": "^4.0.2",
"sass": "^1.69.7", "sass": "^1.77.8",
"sass-loader": "^14.0.0", "sass-loader": "^16.0.1",
"vue": "^2.6.14", "vue": "^2.6.14",
"vue-data-tables": "^3.4.5", "vue-data-tables": "^3.4.5",
"vue-i18n": "^8.28.2", "vue-i18n": "^8.28.2",
"vue-lazyload": "^1.3.4", "vue-lazyload": "^1.3.4",
"vue-markdown": "^2.1.3", "vue-markdown": "^2.2.4",
"vue-marquee-text-component": "^1.2.0", "vue-marquee-text-component": "^1.2.0",
"webpack": "^5.89.0", "webpack": "^5.94.0",
"webpack-cli": "^5.1.4", "webpack-cli": "^5.1.4",
"worker-timers": "^7.1.1" "worker-timers": "^8.0.4"
} }
} }

View File

@@ -7,8 +7,8 @@ import elements_es from 'element-ui/lib/locale/lang/es';
import fr from './fr/en.json' assert { type: 'JSON' }; import fr from './fr/en.json' assert { type: 'JSON' };
import elements_fr from 'element-ui/lib/locale/lang/fr'; import elements_fr from 'element-ui/lib/locale/lang/fr';
import hu from './hu/en.json' assert { type: 'JSON' }; // import hu from './hu/en.json' assert { type: 'JSON' };
import elements_hu from 'element-ui/lib/locale/lang/hu'; // import elements_hu from 'element-ui/lib/locale/lang/hu';
import ja from './ja/en.json' assert { type: 'JSON' }; import ja from './ja/en.json' assert { type: 'JSON' };
import elements_ja from 'element-ui/lib/locale/lang/ja'; import elements_ja from 'element-ui/lib/locale/lang/ja';
@@ -37,7 +37,7 @@ import elements_zh_TW from 'element-ui/lib/locale/lang/zh-TW';
const localized_en = { ...en, ...elements_en }; const localized_en = { ...en, ...elements_en };
const localized_es = { ...es, ...elements_es }; const localized_es = { ...es, ...elements_es };
const localized_fr = { ...fr, ...elements_fr }; const localized_fr = { ...fr, ...elements_fr };
const localized_hu = { ...hu, ...elements_hu }; // const localized_hu = { ...hu, ...elements_hu };
const localized_ja = { ...ja, ...elements_ja }; const localized_ja = { ...ja, ...elements_ja };
const localized_ko = { ...ko, ...elements_ko }; const localized_ko = { ...ko, ...elements_ko };
const localized_pl = { ...pl, ...elements_pl }; const localized_pl = { ...pl, ...elements_pl };
@@ -51,7 +51,7 @@ export {
localized_en as en, localized_en as en,
localized_es as es, localized_es as es,
localized_fr as fr, localized_fr as fr,
localized_hu as hu, // localized_hu as hu,
localized_ja as ja_JP, localized_ja as ja_JP,
localized_ko as ko, localized_ko as ko,
localized_pl as pl, localized_pl as pl,

View File

@@ -784,7 +784,7 @@
}, },
"actions": { "actions": {
"delete_cache_tooltip": "從快取中刪除角色", "delete_cache_tooltip": "從快取中刪除角色",
"favorite_tooltip": "收藏", "favorite_tooltip": "新增到我的收藏",
"unfavorite_tooltip": "從我的收藏中移除", "unfavorite_tooltip": "從我的收藏中移除",
"refresh": "重新整理", "refresh": "重新整理",
"select": "選擇角色", "select": "選擇角色",