Merge branch 'main' into renovate/babel-monorepo

web-infra-dev · Nov 5, 2024 · 5b644ca · 5b644ca
2 parents fe976c3 + c3a64ca
commit 5b644ca
Show file tree

Hide file tree

Showing 19 changed files with 124 additions and 60 deletions.
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/cli",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/client",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "main": "dist/index.html",
   "repository": {
     "type": "git",
@@ -43,7 +43,7 @@
     "normalize.css": "8.0.1",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "react-error-boundary": "^4.0.13",
+    "react-error-boundary": "^4.1.2",
     "react-router-dom": "6.4.3",
     "serve-static": "1.16.2",
     "typescript": "^5.2.2"

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/components",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "main": "./dist/index.js",
   "license": "MIT",
   "module": "dist/index.js",
@@ -81,7 +81,7 @@
     "react-markdown": "^9.0.1",
     "react-router-dom": "6.4.3",
     "socket.io-client": "4.6.1",
-    "terser": "^5.34.1",
+    "terser": "^5.36.0",
     "typescript": "^5.2.2",
     "url-parse": "1.5.10"
   },

diff --git a/packages/components/src/components/Layout/index.tsx b/packages/components/src/components/Layout/index.tsx
@@ -1,8 +1,14 @@
 import { PropsWithChildren, useContext, useEffect } from 'react';
 import { FloatButton, Layout as L } from 'antd';
-import { MAIN_BG, Size } from '../../constants';
+import { Language, MAIN_BG, Size } from '../../constants';
 import { Header } from './header';
-import { useLocale, useI18n } from '../../utils';
+import {
+  useLocale,
+  useI18n,
+  getFirstVisitFromStorage,
+  setFirstVisitToStorage,
+  getLanguage,
+} from '../../utils';
 import { Progress } from './progress';
 import { ConfigContext } from '../../config';
 
@@ -16,8 +22,21 @@ export const Layout = (props: PropsWithChildren<LayoutProps>): JSX.Element => {
   const { children } = props;
 
   useEffect(() => {
-    if (i18n.language !== locale) {
-      i18n.changeLanguage(locale);
+    let currentLocale = locale;
+    // Check if the user is visiting the site for the first time
+    const visited = getFirstVisitFromStorage();
+    if (!visited) {
+      setFirstVisitToStorage('1');
+      const targetLang = window.navigator.language.split('-')[0];
+      const userLang = getLanguage(targetLang);
+
+      if (Object.values(Language).includes(userLang)) {
+        currentLocale = userLang;
+      }
+    }
+
+    if (i18n.language !== currentLocale) {
+      i18n.changeLanguage(currentLocale);
     }
   }, [locale]);
 

diff --git a/packages/components/src/utils/locale.ts b/packages/components/src/utils/locale.ts
@@ -1,8 +1,14 @@
 import cn from 'antd/es/locale/zh_CN';
 import en from 'antd/es/locale/en_GB';
 import type { Locale } from 'antd/es/locale';
+import { Language } from '../constants';
 
 export function getLocale(locale: string): Locale {
   const res = locale === 'cn' || locale === 'zh-CN' ? cn : en;
   return res;
 }
+
+export function getLanguage(locale: string): Language {
+  const res = locale === 'cn' || locale === 'zh' ? Language.Cn : Language.En;
+  return res;
+}
diff --git a/packages/components/src/utils/storage.tsx b/packages/components/src/utils/storage.tsx
@@ -7,6 +7,7 @@ enum Keys {
   Locale = 'LOCALE',
   ViewMode = 'VIEWMODE',
   APILoaderMode4Dev = 'APILOADERMODE_DEV',
+  FirstVisit = 'FIRST_VISIT'
 }
 
 export function getStorage(key: string): string | null {
@@ -67,3 +68,11 @@ export function setAPILoaderModeToStorage(mode: APILoaderMode4Dev) {
 export function getAPILoaderModeFromStorage() {
   return getStorage(Keys.APILoaderMode4Dev) || APILoaderMode4Dev.Default;
 }
+
+export function getFirstVisitFromStorage() {
+  return getStorage(Keys.FirstVisit);
+}
+
+export function setFirstVisitToStorage(value: '1') {
+  setStorage(Keys.FirstVisit, value);
+}
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/core",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",

diff --git a/packages/document/docs/zh/config/options/options-shared.mdx b/packages/document/docs/zh/config/options/options-shared.mdx
@@ -35,7 +35,7 @@ features 属性是用于分析功能开关的，具体的功能项如下：
 - **resolver**：resolver 分析，默认关闭。
 - **lite**: **(废弃，参考：[mode.lite]())** lite 模式。lite 模式和普通模式的区别就是不再缓存源码信息，只缓存打包后的代码信息，这样分析页面上的代码也将是打包后的。默认普通模式。
 
-所以，**默认配置是开启了 Bundle 分析能力、 Loader he Plugin 构建时分析**。没有开启 Resolver 分析能力， Rspack 暂不支持 Resolver 分析能力。
+所以，**默认配置是开启了 Bundle 分析能力、 Loader 和 Plugin 构建时分析**。没有开启 Resolver 分析能力， Rspack 暂不支持 Resolver 分析能力。
 
 :::tip
 **如果出现了 out of memory 的报错，可以尝试：**

diff --git a/packages/document/docs/zh/config/options/options.mdx b/packages/document/docs/zh/config/options/options.mdx
@@ -105,7 +105,7 @@ features 属性是用于分析功能开关的，具体的功能项如下：
 - **resolver**：resolver 分析，默认关闭。
 - **lite**: **(废弃，使用 [mode.lite](#mode))** lite 模式。lite 模式和普通模式的区别就是不再展示源码信息，只展示打包后的代码信息，这样分析页面上的代码也将是打包后的。默认普通模式。
 
-所以，**默认配置是开启了 Bundle 分析能力、 Loader he Plugin 构建时分析**。没有开启 Resolver 分析能力， Rspack 暂不支持 Resolver 分析能力。
+所以，**默认配置是开启了 Bundle 分析能力、 Loader 和 Plugin 构建时分析**。没有开启 Resolver 分析能力， Rspack 暂不支持 Resolver 分析能力。
 
 :::tip
 **如果出现了 out of memory 的报错，可以尝试：**

diff --git a/packages/document/package.json b/packages/document/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/docs",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "scripts": {
     "dev": "rspress dev",
     "build": "rspress build",

diff --git a/packages/graph/package.json b/packages/graph/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/graph",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",

diff --git a/packages/rspack-plugin/package.json b/packages/rspack-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/rspack-plugin",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",

diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/sdk",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",

diff --git a/packages/types/package.json b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/types",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/utils",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",

diff --git a/packages/webpack-plugin/package.json b/packages/webpack-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/webpack-plugin",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",

diff --git a/packages/webpack-plugin/src/plugin.ts b/packages/webpack-plugin/src/plugin.ts
@@ -44,8 +44,6 @@ export class RsdoctorWebpackPlugin<Rules extends Linter.ExtendRuleData[]>
 
   public modulesGraph: ModuleGraph;
 
-  private outsideInstance = false;
-
   public _bootstrapTask!: Promise<unknown>;
 
   protected browserIsOpened = false;
@@ -69,7 +67,6 @@ export class RsdoctorWebpackPlugin<Rules extends Linter.ExtendRuleData[]>
           brief: this.options.brief,
         },
       });
-    this.outsideInstance = Boolean(this.options.sdkInstance);
     this.modulesGraph = new ModuleGraph();
     this.chunkGraph = new ChunkGraph();
     this.isRsdoctorPlugin = true;
@@ -86,9 +83,8 @@ export class RsdoctorWebpackPlugin<Rules extends Linter.ExtendRuleData[]>
     }
 
     // External instances do not need to be injected into the global.
-    if (!this.outsideInstance) {
-      setSDK(this.sdk);
-    }
+    setSDK(this.sdk);
+
     // TODO: to fix the TypeError: Type instantiation is excessively deep and possibly infinite.
     // @ts-ignore
     new InternalSummaryPlugin<Compiler>(this).apply(compiler);