From 75cbfbbfe64466ceef9f8ba5b1d7341fdbcee01e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9D=92=E8=8F=9C=E7=99=BD=E7=8E=89=E6=B1=A4?= <79054161+Azir-11@users.noreply.github.com> Date: Tue, 15 Oct 2024 19:55:18 +0800 Subject: [PATCH 1/4] style(projects): reduce ambiguity in theme configuration instructions. --- src/locales/langs/en-us.ts | 2 +- src/locales/langs/zh-cn.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts index 8b331859..8908cf2f 100644 --- a/src/locales/langs/en-us.ts +++ b/src/locales/langs/en-us.ts @@ -113,7 +113,7 @@ const local: App.I18n.Schema = { }, tab: { visible: 'Tab Visible', - cache: 'Tab Cache', + cache: 'Tag Bar Info Cache', height: 'Tab Height', mode: { title: 'Tab Mode', diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts index 630b2910..c84e9593 100644 --- a/src/locales/langs/zh-cn.ts +++ b/src/locales/langs/zh-cn.ts @@ -113,7 +113,7 @@ const local: App.I18n.Schema = { }, tab: { visible: '显示标签栏', - cache: '缓存标签页', + cache: '标签栏信息缓存', height: '标签栏高度', mode: { title: '标签栏风格', From 4726498faa6cf823c6f2c68e75b810b17984d94a Mon Sep 17 00:00:00 2001 From: Soybean Date: Wed, 16 Oct 2024 12:10:00 +0800 Subject: [PATCH 2/4] fix(utils): fix `isPC`. fixed #644 --- src/utils/agent.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/utils/agent.ts b/src/utils/agent.ts index 736cbd8f..a8416b2a 100644 --- a/src/utils/agent.ts +++ b/src/utils/agent.ts @@ -1,5 +1,7 @@ export function isPC() { const agents = ['Android', 'iPhone', 'webOS', 'BlackBerry', 'SymbianOS', 'Windows Phone', 'iPad', 'iPod']; - return !agents.includes(window.navigator.userAgent); + const isMobile = agents.some(agent => window.navigator.userAgent.includes(agent)); + + return !isMobile; } From 24bb6d95cbb7d561cb3ec0a4fe5645f3b3af907c Mon Sep 17 00:00:00 2001 From: Soybean Date: Wed, 16 Oct 2024 12:12:00 +0800 Subject: [PATCH 3/4] chore(projects): update vscode extensions --- .vscode/extensions.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index d2f675d7..00f22234 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -6,9 +6,6 @@ "dbaeumer.vscode-eslint", "editorconfig.editorconfig", "esbenp.prettier-vscode", - "formulahendry.auto-close-tag", - "formulahendry.auto-complete-tag", - "formulahendry.auto-rename-tag", "lokalise.i18n-ally", "mhutchie.git-graph", "mikestead.dotenv", From 4b3ac11bd51ae905330edd108e77d23f763bdc5c Mon Sep 17 00:00:00 2001 From: Scott Hu Date: Thu, 17 Oct 2024 17:20:21 +0800 Subject: [PATCH 4/4] feat(packages): optimistic subpackage `@sa/alova` (#646) --- packages/alova/package.json | 5 ++++- packages/alova/src/fetch.ts | 2 ++ packages/alova/src/mock.ts | 1 + pnpm-lock.yaml | 18 ++++++++++++++++++ 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 packages/alova/src/fetch.ts create mode 100644 packages/alova/src/mock.ts diff --git a/packages/alova/package.json b/packages/alova/package.json index a6d3fb15..14c150d6 100644 --- a/packages/alova/package.json +++ b/packages/alova/package.json @@ -3,7 +3,9 @@ "version": "0.1.0", "exports": { ".": "./src/index.ts", - "./client": "./src/client.ts" + "./fetch": "./src/fetch.ts", + "./client": "./src/client.ts", + "./mock": "./src/mock.ts" }, "typesVersions": { "*": { @@ -11,6 +13,7 @@ } }, "dependencies": { + "@alova/mock": "2.0.7", "@sa/utils": "workspace:*", "alova": "3.0.20" } diff --git a/packages/alova/src/fetch.ts b/packages/alova/src/fetch.ts new file mode 100644 index 00000000..8511ce46 --- /dev/null +++ b/packages/alova/src/fetch.ts @@ -0,0 +1,2 @@ +import adapterFetch from 'alova/fetch'; +export default adapterFetch; diff --git a/packages/alova/src/mock.ts b/packages/alova/src/mock.ts new file mode 100644 index 00000000..f3aaf087 --- /dev/null +++ b/packages/alova/src/mock.ts @@ -0,0 +1 @@ +export * from '@alova/mock'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9ba61d7b..7e9d2fcb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -162,6 +162,9 @@ importers: packages/alova: dependencies: + '@alova/mock': + specifier: 2.0.7 + version: 2.0.7(alova@3.0.20) '@sa/utils': specifier: workspace:* version: link:../utils @@ -284,9 +287,17 @@ importers: packages: + '@alova/mock@2.0.7': + resolution: {integrity: sha512-4W8Ncsmj7cdjzZk7f2zFqc32aoYQNoDJS3z7W0nqAkTJ7KR8ZiGaHA5dJovyXnLphmTeyWS3yHMVWnesI7y4ig==} + peerDependencies: + alova: ^3.0.20 + '@alova/shared@1.0.5': resolution: {integrity: sha512-/a2Qm+xebQJ1OlIgpslK+UL1J7yhkt1/Mqdq58a22+fSVdANukmUcF4j4w1DF3lxZ04SrqP+2oJprJ8UOvM+9Q==} + '@alova/shared@1.0.6': + resolution: {integrity: sha512-W89j64InjFIsW/u5YmYvpXGWz8JerBAYWyu/Fc7xfc5B+95SSA3ybW4nyHacBUW6yYQyGZwa8S8bVPePqa7bmA==} + '@ampproject/remapping@2.3.0': resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==} engines: {node: '>=6.0.0'} @@ -4224,8 +4235,15 @@ packages: snapshots: + '@alova/mock@2.0.7(alova@3.0.20)': + dependencies: + '@alova/shared': 1.0.6 + alova: 3.0.20 + '@alova/shared@1.0.5': {} + '@alova/shared@1.0.6': {} + '@ampproject/remapping@2.3.0': dependencies: '@jridgewell/gen-mapping': 0.3.5