Merge branch 'base' into i18n

.eslintignore

@@ -0,0 +1,4 @@
+vite.config.ts
+uno.config.ts
+pages.config.ts
+manifest.config.ts

.oxlintrc.json

@@ -0,0 +1,25 @@
+{
+  "$schema": "./node_modules/oxlint/configuration_schema.json",
+  "extends": ["config:recommended"],
+  "plugins": ["import", "typescript", "unicorn"],
+  "rules": {
+    "no-console": "off",
+    "no-unused-vars": "off"
+  },
+  "env": {
+    "es6": true
+  },
+  "globals": {
+    "foo": "readonly"
+  },
+  "ignorePatterns": ["node_modules", "dist", "src/static/**", "src/uni_modules/**"],
+  "settings": {},
+  "overrides": [
+    {
+      "files": ["*.test.ts", "*.spec.ts"],
+      "rules": {
+        "@typescript-eslint/no-explicit-any": "off"
+      }
+    }
+  ]
+}

.prettierrc.cjs

@@ -10,7 +10,7 @@ module.exports = {
   htmlWhitespaceSensitivity: 'ignore',
   overrides: [
     {
-      files: '*.json',
+      files: '*.{json,jsonc}',
       options: {
         trailingComma: 'none',
       },

.vscode/settings.json

@@ -60,6 +60,6 @@
     "README.md": "index.html,favicon.ico,robots.txt,CHANGELOG.md",
     "pages.config.ts": "manifest.config.ts,openapi-ts-request.config.ts",
     "package.json": "pnpm-lock.yaml,pnpm-workspace.yaml,LICENSE,.gitattributes,.gitignore,.gitpod.yml,CNAME,.npmrc,.browserslistrc",
-    "tsconfig.json": ".commitlintrc.*,.prettier*,.editorconfig,.commitlint.cjs"
+    ".oxlintrc.json": "tsconfig.json,.commitlintrc.*,.prettier*,.editorconfig,.commitlint.cjs,.eslint*"
   }
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "unibest",
   "type": "commonjs",
-  "version": "2.12.0",
+  "version": "2.12.1",
   "description": "unibest - 最好的 uniapp 开发模板",
   "update-time": "2025-05-28",
   "author": {
@@ -71,13 +71,14 @@
     "type-check": "vue-tsc --noEmit",
     "openapi-ts-request": "openapi-ts",
     "prepare": "git init && husky",
-    "lint:oxlint": "oxlint src/**/*.{ts,js,vue}"
+    "lint": "oxlint",
+    "lint-fix": "oxlint --fix"
   },
   "lint-staged": {
     "**/*.{html,cjs,json,md,scss,css,txt}": [
       "prettier --write --cache"
     ],
-    "**/*.{js,ts,vue}": [
+    "**/*.{js,jsx,ts,tsx,vue,mjs,cjs,mts,cts}": [
       "oxlint --fix",
       "prettier --write --cache"
     ],

src/hooks/useUpload.ts

@@ -20,7 +20,7 @@ export default function useUpload<T extends TfileType>(options: TOptions<T> = {}
   const {
     formData = {},
     maxSize = 5 * 1024 * 1024,
-    // accept = ['*'],
+    accept = ['*'],
     fileType = 'image',
     success,
     error: onError,

src/pages/about/about.vue

@@ -26,6 +26,17 @@ import UploadComp from './components/upload.vue'
 
 // 获取屏幕边界到安全区域距离
 const { safeAreaInsets } = uni.getSystemInfoSync()
+const toSubPage = () => {
+  uni.navigateTo({
+    url: '/pages-sub/demo/index',
+  })
+}
+
+// 奇怪：同样的代码放在 vue 里面不会校验到错误，放在 .ts 文件里面会校验到错误
+// const testOxlint = (name: string) => {
+//   console.log('oxlint')
+// }
+// testOxlint('oxlint')
 </script>
 
 <style lang="scss" scoped>

src/pages/index/index.vue

@@ -15,7 +15,7 @@
     <view class="mt-12">
       <image src="/static/logo.svg" alt="" class="w-28 h-28 block mx-auto" />
     </view>
-    <view class="text-center text-4xl main-title-color mt-4">unibest</view>
+    <view class="text-center text-4xl text-[#d14328] mt-4">unibest</view>
     <view class="text-center text-2xl mt-2 mb-8">最好用的 uniapp 开发模板</view>
 
     <view class="text-justify max-w-100 m-auto text-4 indent mb-2">{{ description }}</view>
@@ -40,9 +40,11 @@ defineOptions({
 
 // 获取屏幕边界到安全区域距离
 let safeAreaInsets
+let systemInfo
+
 // #ifdef MP-WEIXIN
 // 微信小程序使用新的API
-const systemInfo = wx.getWindowInfo()
+systemInfo = uni.getWindowInfo()
 safeAreaInsets = systemInfo.safeArea
   ? {
       top: systemInfo.safeArea.top,
@@ -55,7 +57,7 @@ safeAreaInsets = systemInfo.safeArea
 
 // #ifndef MP-WEIXIN
 // 其他平台继续使用uni API
-const systemInfo = uni.getSystemInfoSync()
+systemInfo = uni.getSystemInfoSync()
 safeAreaInsets = systemInfo.safeAreaInsets
 // #endif
 const author = ref('菲鸽')
@@ -67,9 +69,3 @@ onLoad(() => {
   console.log('项目作者:', author.value)
 })
 </script>
-
-<style>
-.main-title-color {
-  color: #d14328;
-}
-</style>