合并分支 '3.x' 到 'main'

3.x 查看合并请求 !23

合并分支 '3.x' 到 'main'
3.x 查看合并请求 !23
e12b6c20 · 方治民 · b9d93e94 · 7981f81b · e12b6c20 · e12b6c20
--- a/.gitignore
+++ b/.gitignore
 node_modules
 .DS_Store
 dist
-.npmrc
 .cache

 tests/server/static

--- a/.npmrc
+++ b/.npmrc
+strict-peer-dependencies=false
+shell-emulator=true
--- a/.nvmrc
+++ b/.nvmrc
+v18
--- a/.prettierignore
+++ b/.prettierignore
 /dist/*
 .local
 .output.js
+.npmrc
+.nvmrc
 /node_modules/**

 **/*.svg

--- a/build/vite/uni.ts
+++ b/build/vite/uni.ts
@@ -21,7 +21,9 @@ function generateUniComponentsTypes() {
            type ComponentCustomOptions = Hooks

            // uni-app components
-            type UniComponent = HTMLElement
+            interface UniComponent {
+                [key in string]: any
+            }
            export interface GlobalComponents {
                ${components.join(',\n\t')}
            }

--- a/package.json
+++ b/package.json
@@ -66,19 +66,19 @@
        }
    },
    "dependencies": {
-        "@dcloudio/uni-app": "3.0.0-alpha-3071220230331002",
-        "@dcloudio/uni-app-plus": "3.0.0-alpha-3071220230331002",
-        "@dcloudio/uni-components": "3.0.0-alpha-3071220230331002",
-        "@dcloudio/uni-h5": "3.0.0-alpha-3071220230331002",
-        "@dcloudio/uni-mp-alipay": "3.0.0-alpha-3071220230331002",
-        "@dcloudio/uni-mp-baidu": "3.0.0-alpha-3071220230331002",
-        "@dcloudio/uni-mp-jd": "3.0.0-alpha-3071220230331002",
-        "@dcloudio/uni-mp-kuaishou": "3.0.0-alpha-3071220230331002",
-        "@dcloudio/uni-mp-lark": "3.0.0-alpha-3071220230331002",
-        "@dcloudio/uni-mp-qq": "3.0.0-alpha-3071220230331002",
-        "@dcloudio/uni-mp-toutiao": "3.0.0-alpha-3071220230331002",
-        "@dcloudio/uni-mp-weixin": "3.0.0-alpha-3071220230331002",
-        "@dcloudio/uni-quickapp-webview": "3.0.0-alpha-3071220230331002",
+        "@dcloudio/uni-app": "3.0.0-alpha-3071320230407001",
+        "@dcloudio/uni-app-plus": "3.0.0-alpha-3071320230407001",
+        "@dcloudio/uni-components": "3.0.0-alpha-3071320230407001",
+        "@dcloudio/uni-h5": "3.0.0-alpha-3071320230407001",
+        "@dcloudio/uni-mp-alipay": "3.0.0-alpha-3071320230407001",
+        "@dcloudio/uni-mp-baidu": "3.0.0-alpha-3071320230407001",
+        "@dcloudio/uni-mp-jd": "3.0.0-alpha-3071320230407001",
+        "@dcloudio/uni-mp-kuaishou": "3.0.0-alpha-3071320230407001",
+        "@dcloudio/uni-mp-lark": "3.0.0-alpha-3071320230407001",
+        "@dcloudio/uni-mp-qq": "3.0.0-alpha-3071320230407001",
+        "@dcloudio/uni-mp-toutiao": "3.0.0-alpha-3071320230407001",
+        "@dcloudio/uni-mp-weixin": "3.0.0-alpha-3071320230407001",
+        "@dcloudio/uni-quickapp-webview": "3.0.0-alpha-3071320230407001",
        "@dcloudio/uni-ui": "^1.4.26",
        "@faker-js/faker": "^7.6.0",
        "@vue/runtime-core": "^3.2.47",
@@ -88,7 +88,7 @@
        "dayjs": "^1.11.7",
        "lodash-es": "^4.17.21",
        "nanoid": "^4.0.2",
-        "pinia": "^2.0.33",
+        "pinia": "^2.0.34",
        "qs": "~6.9.7",
        "stompjs": "^2.3.3",
        "urijs": "^1.19.11",
@@ -98,16 +98,16 @@
        "vue-types": "^5.0.2"
    },
    "devDependencies": {
-        "@antfu/eslint-config": "^0.38.2",
+        "@antfu/eslint-config": "^0.38.4",
        "@commitlint/cli": "^17.5.1",
        "@commitlint/config-conventional": "^17.4.4",
        "@dcloudio/types": "^3.3.2",
-        "@dcloudio/uni-automator": "3.0.0-alpha-3071220230331002",
-        "@dcloudio/uni-cli-shared": "3.0.0-alpha-3071220230331002",
+        "@dcloudio/uni-automator": "3.0.0-alpha-3071320230407001",
+        "@dcloudio/uni-cli-shared": "3.0.0-alpha-3071320230407001",
        "@dcloudio/uni-helper-json": "^1.0.13",
-        "@dcloudio/uni-stacktracey": "3.0.0-alpha-3071220230331002",
-        "@dcloudio/vite-plugin-uni": "3.0.0-alpha-3071220230331002",
-        "@iconify/json": "^2.2.43",
+        "@dcloudio/uni-stacktracey": "3.0.0-alpha-3071320230407001",
+        "@dcloudio/vite-plugin-uni": "3.0.0-alpha-3071320230407001",
+        "@iconify/json": "^2.2.48",
        "@types/crypto-js": "^4.1.1",
        "@types/lodash-es": "^4.17.7",
        "@types/node": "^18.15.11",
@@ -115,8 +115,8 @@
        "@types/qs": "^6.9.7",
        "@types/stompjs": "^2.3.5",
        "@types/urijs": "^1.19.19",
-        "@typescript-eslint/eslint-plugin": "^5.57.0",
-        "@typescript-eslint/parser": "^5.57.0",
+        "@typescript-eslint/eslint-plugin": "^5.58.0",
+        "@typescript-eslint/parser": "^5.58.0",
        "commitizen": "^4.3.0",
        "conventional-changelog-cli": "^2.2.2",
        "cz-conventional-changelog": "^3.3.0",
@@ -124,7 +124,7 @@
        "cz-git": "^1.6.1",
        "czg": "^1.6.1",
        "dotenv": "^16.0.3",
-        "eslint": "^8.37.0",
+        "eslint": "^8.38.0",
        "eslint-config-prettier": "^8.8.0",
        "eslint-plugin-prettier": "^4.2.1",
        "eslint-plugin-vue": "^9.10.0",
@@ -132,7 +132,7 @@
        "jest": "27.0.4",
        "jest-environment-node": "27.5.1",
        "less": "^4.1.3",
-        "lint-staged": "^13.2.0",
+        "lint-staged": "^13.2.1",
        "npm-run-all": "^4.1.5",
        "picocolors": "^1.0.0",
        "pont-engine": "^1.5.7",
@@ -141,17 +141,16 @@
        "postcss-less": "^6.0.0",
        "prettier": "^2.8.7",
        "rimraf": "^4.4.1",
-        "sass": "^1.60.0",
+        "sass": "^1.61.0",
        "sort-package-json": "^2.4.1",
        "stylelint": "^15.4.0",
        "stylelint-config-html": "^1.1.0",
        "stylelint-config-recommended": "^11.0.0",
        "stylelint-config-standard": "^32.0.0",
        "stylelint-order": "^6.0.3",
-        "terser": "^5.16.8",
-        "typescript": "^5.0.3",
-        "unocss": "^0.50.6",
-        "unocss-preset-weapp": "^0.5.2",
+        "typescript": "^5.0.4",
+        "unocss": "^0.50.8",
+        "unocss-preset-weapp": "^0.5.3",
        "unplugin-auto-import": "^0.15.2",
        "unplugin-vue-components": "^0.24.1",
        "vite": "^4.2.1",

--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/types/uni.d.ts
+++ b/types/uni.d.ts
@@ -6,7 +6,9 @@ declare module 'vue' {
    type ComponentCustomOptions = Hooks

    // uni-app components
-    type UniComponent = HTMLElement
+    interface UniComponent {
+        [key in string]: any
+    }
    export interface GlobalComponents {
        block: UniComponent
        view: UniComponent

--- a/unocss.config.ts
+++ b/unocss.config.ts
 import { defineConfig } from 'unocss'
+// https://github.com/MellowCo/unocss-preset-weapp
 import presetWeapp from 'unocss-preset-weapp'
 import { defaultAttributes, transformerAttributify, transformerClass } from 'unocss-preset-weapp/transformer'


--- a/vite.config.ts
+++ b/vite.config.ts
@@ -30,6 +30,9 @@ export default ({ mode }: ConfigEnv): UserConfig => {
        optimizeDeps: {
            include: ['lodash-es', '@vueuse/core'],
        },
+        esbuild: {
+            drop: ['console', 'debugger'],
+        },
        build: {
            target: 'es2015',
            sourcemap: !!isDevFn(mode),