提交 f505a7a4 作者: 方治民

Merge branch '3.x' of https://gitlab.yiring.com/basic/basic-uniapp-v3 into examples

...@@ -19,22 +19,6 @@ ...@@ -19,22 +19,6 @@
"url": "https://yiring.com" "url": "https://yiring.com"
}, },
"scripts": { "scripts": {
"cz": "czg",
"dev": "uni",
"dev:app": "uni -p app",
"dev:custom": "uni -p",
"dev:h5": "uni",
"dev:h5:ssr": "uni --ssr",
"dev:mp-alipay": "uni -p mp-alipay",
"dev:mp-baidu": "uni -p mp-baidu",
"dev:mp-kuaishou": "uni -p mp-kuaishou",
"dev:mp-lark": "uni -p mp-lark",
"dev:mp-qq": "uni -p mp-qq",
"dev:mp-toutiao": "uni -p mp-toutiao",
"dev:mp-weixin": "uni -p mp-weixin",
"dev:quickapp-webview": "uni -p quickapp-webview",
"dev:quickapp-webview-huawei": "uni -p quickapp-webview-huawei",
"dev:quickapp-webview-union": "uni -p quickapp-webview-union",
"build:app": "uni build -p app", "build:app": "uni build -p app",
"build:custom": "uni build -p", "build:custom": "uni build -p",
"build:h5": "uni build", "build:h5": "uni build",
...@@ -51,14 +35,30 @@ ...@@ -51,14 +35,30 @@
"build:quickapp-webview-union": "uni build -p quickapp-webview-union", "build:quickapp-webview-union": "uni build -p quickapp-webview-union",
"clean:cache": "rimraf node_modules/.cache/ && rimraf node_modules/.vite", "clean:cache": "rimraf node_modules/.cache/ && rimraf node_modules/.vite",
"clean:lib": "rimraf node_modules", "clean:lib": "rimraf node_modules",
"cz": "czg",
"dev": "uni",
"dev:app": "uni -p app",
"dev:custom": "uni -p",
"dev:h5": "uni",
"dev:h5:ssr": "uni --ssr",
"dev:mp-alipay": "uni -p mp-alipay",
"dev:mp-baidu": "uni -p mp-baidu",
"dev:mp-kuaishou": "uni -p mp-kuaishou",
"dev:mp-lark": "uni -p mp-lark",
"dev:mp-qq": "uni -p mp-qq",
"dev:mp-toutiao": "uni -p mp-toutiao",
"dev:mp-weixin": "uni -p mp-weixin",
"dev:quickapp-webview": "uni -p quickapp-webview",
"dev:quickapp-webview-huawei": "uni -p quickapp-webview-huawei",
"dev:quickapp-webview-union": "uni -p quickapp-webview-union",
"lint": "npm run lint:eslint && npm run lint:stylelint && npm run lint:prettier", "lint": "npm run lint:eslint && npm run lint:stylelint && npm run lint:prettier",
"lint:eslint": "eslint --cache --max-warnings 0 \"{src,mock}/**/*.{vue,ts,tsx}\" --fix", "lint:eslint": "eslint --cache --max-warnings 0 \"{src,mock}/**/*.{vue,ts,tsx}\" --fix",
"lint:lint-staged": "lint-staged -c ./.husky/lintstagedrc.js",
"lint:prettier": "prettier --write \"src/**/*.{js,ts,json,ts,tsx,css,less,scss,vue,html,md}\"", "lint:prettier": "prettier --write \"src/**/*.{js,ts,json,ts,tsx,css,less,scss,vue,html,md}\"",
"lint:stylelint": "stylelint --cache --fix \"**/*.{vue,less,postcss,css,scss}\" --cache --cache-location node_modules/.cache/stylelint/", "lint:stylelint": "stylelint --cache --fix \"**/*.{vue,less,postcss,css,scss}\" --cache --cache-location node_modules/.cache/stylelint/",
"lint:lint-staged": "lint-staged -c ./.husky/lintstagedrc.js",
"log": "conventional-changelog -p angular -i CHANGELOG.md -s", "log": "conventional-changelog -p angular -i CHANGELOG.md -s",
"u": "pnpx @dcloudio/uvm vue3", "prepare": "husky install",
"prepare": "husky install" "u": "pnpx @dcloudio/uvm vue3"
}, },
"config": { "config": {
"commitizen": { "commitizen": {
...@@ -66,30 +66,30 @@ ...@@ -66,30 +66,30 @@
} }
}, },
"dependencies": { "dependencies": {
"@dcloudio/uni-app": "3.0.0-4040520250104002", "@dcloudio/uni-app": "3.0.0-4060620250520001",
"@dcloudio/uni-app-plus": "3.0.0-4040520250104002", "@dcloudio/uni-app-plus": "3.0.0-4060620250520001",
"@dcloudio/uni-components": "3.0.0-4040520250104002", "@dcloudio/uni-components": "3.0.0-4060620250520001",
"@dcloudio/uni-h5": "3.0.0-4040520250104002", "@dcloudio/uni-h5": "3.0.0-4060620250520001",
"@dcloudio/uni-mp-alipay": "3.0.0-4040520250104002", "@dcloudio/uni-mp-alipay": "3.0.0-4060620250520001",
"@dcloudio/uni-mp-baidu": "3.0.0-4040520250104002", "@dcloudio/uni-mp-baidu": "3.0.0-4060620250520001",
"@dcloudio/uni-mp-jd": "3.0.0-4040520250104002", "@dcloudio/uni-mp-jd": "3.0.0-4060620250520001",
"@dcloudio/uni-mp-kuaishou": "3.0.0-4040520250104002", "@dcloudio/uni-mp-kuaishou": "3.0.0-4060620250520001",
"@dcloudio/uni-mp-lark": "3.0.0-4040520250104002", "@dcloudio/uni-mp-lark": "3.0.0-4060620250520001",
"@dcloudio/uni-mp-qq": "3.0.0-4040520250104002", "@dcloudio/uni-mp-qq": "3.0.0-4060620250520001",
"@dcloudio/uni-mp-toutiao": "3.0.0-4040520250104002", "@dcloudio/uni-mp-toutiao": "3.0.0-4060620250520001",
"@dcloudio/uni-mp-weixin": "3.0.0-4040520250104002", "@dcloudio/uni-mp-weixin": "3.0.0-4060620250520001",
"@dcloudio/uni-quickapp-webview": "3.0.0-4040520250104002", "@dcloudio/uni-quickapp-webview": "3.0.0-4060620250520001",
"@dcloudio/uni-ui": "^1.5.7", "@dcloudio/uni-ui": "^1.5.7",
"@faker-js/faker": "^8.4.1", "@faker-js/faker": "^9.8.0",
"@turf/turf": "^7.2.0", "@turf/turf": "^7.2.0",
"@vue/runtime-core": "3.4.21", "@vue/runtime-core": "3.4.21",
"@vueuse/core": "^12.3.0", "@vueuse/core": "^12.3.0",
"@vueuse/shared": "^12.3.0", "@vueuse/shared": "^12.3.0",
"axios": "^1.7.9", "axios": "^1.9.0",
"crypto-js": "^4.2.0", "crypto-js": "^4.2.0",
"dayjs": "^1.11.13", "dayjs": "^1.11.13",
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"nanoid": "^5.0.9", "nanoid": "^5.1.5",
"pinia": "2.0.36", "pinia": "2.0.36",
"pinyin-pro": "^3.26.0", "pinyin-pro": "^3.26.0",
"qs": "6.9.7", "qs": "6.9.7",
...@@ -103,20 +103,20 @@ ...@@ -103,20 +103,20 @@
}, },
"devDependencies": { "devDependencies": {
"@antfu/eslint-config": "^0.43.1", "@antfu/eslint-config": "^0.43.1",
"@commitlint/cli": "^19.6.1", "@commitlint/cli": "^19.8.1",
"@commitlint/config-conventional": "^19.6.0", "@commitlint/config-conventional": "^19.8.1",
"@dcloudio/types": "^3.4.14", "@dcloudio/types": "^3.4.15",
"@dcloudio/uni-automator": "3.0.0-4040520250104002", "@dcloudio/uni-automator": "3.0.0-4060620250520001",
"@dcloudio/uni-cli-shared": "3.0.0-4040520250104002", "@dcloudio/uni-cli-shared": "3.0.0-4060620250520001",
"@dcloudio/uni-helper-json": "^1.0.13", "@dcloudio/uni-helper-json": "^1.0.13",
"@dcloudio/uni-stacktracey": "3.0.0-4040520250104002", "@dcloudio/uni-stacktracey": "3.0.0-4060620250520001",
"@dcloudio/uni-uts-v1": "3.0.0-4040520250104002", "@dcloudio/uni-uts-v1": "3.0.0-4060620250520001",
"@dcloudio/vite-plugin-uni": "3.0.0-4040520250104002", "@dcloudio/vite-plugin-uni": "3.0.0-4060620250520001",
"@iconify/json": "^2.2.292", "@iconify/json": "^2.2.345",
"@types/crypto-js": "^4.2.2", "@types/crypto-js": "^4.2.2",
"@types/lodash-es": "^4.17.12", "@types/lodash-es": "^4.17.12",
"@types/node": "^22.10.5", "@types/node": "^22.15.29",
"@types/qs": "^6.9.17", "@types/qs": "^6.14.0",
"@types/stompjs": "^2.3.9", "@types/stompjs": "^2.3.9",
"@types/urijs": "^1.19.25", "@types/urijs": "^1.19.25",
"@typescript-eslint/eslint-plugin": "^7.18.0", "@typescript-eslint/eslint-plugin": "^7.18.0",
...@@ -125,40 +125,40 @@ ...@@ -125,40 +125,40 @@
"conventional-changelog-cli": "^5.0.0", "conventional-changelog-cli": "^5.0.0",
"cz-conventional-changelog": "^3.3.0", "cz-conventional-changelog": "^3.3.0",
"cz-customizable": "^7.4.0", "cz-customizable": "^7.4.0",
"cz-git": "^1.11.0", "cz-git": "^1.11.1",
"czg": "^1.11.0", "czg": "^1.11.1",
"dotenv": "^16.4.7", "dotenv": "^16.5.0",
"eslint": "^8.57.1", "eslint": "^8.57.1",
"eslint-config-prettier": "^9.1.0", "eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.2.1", "eslint-plugin-prettier": "^5.4.1",
"eslint-plugin-vue": "^9.32.0", "eslint-plugin-vue": "^9.33.0",
"husky": "^8.0.3", "husky": "^8.0.3",
"jest": "27.0.4", "jest": "27.0.4",
"jest-environment-node": "27.5.1", "jest-environment-node": "27.5.1",
"less": "^4.2.1", "less": "^4.3.0",
"lint-staged": "^15.3.0", "lint-staged": "^16.1.0",
"mapbox-gl": "^2.15.0", "mapbox-gl": "^2.15.0",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"picocolors": "^1.1.1", "picocolors": "^1.1.1",
"pont-engine": "^1.6.3", "pont-engine": "^1.6.3",
"postcss": "^8.4.49", "postcss": "^8.5.4",
"postcss-html": "^1.7.0", "postcss-html": "^1.8.0",
"postcss-less": "^6.0.0", "postcss-less": "^6.0.0",
"prettier": "^3.4.2", "prettier": "^3.5.3",
"rimraf": "^6.0.1", "rimraf": "^6.0.1",
"sass": "^1.83.1", "sass": "^1.89.1",
"sort-package-json": "^2.12.0", "sort-package-json": "^3.2.1",
"stylelint": "^16.12.0", "stylelint": "^16.20.0",
"stylelint-config-html": "^1.1.0", "stylelint-config-html": "^1.1.0",
"stylelint-config-recommended": "^14.0.1", "stylelint-config-recommended": "^14.0.1",
"stylelint-config-standard": "^36.0.1", "stylelint-config-standard": "^36.0.1",
"stylelint-order": "^6.0.4", "stylelint-order": "^6.0.4",
"typescript": "~5.4.5", "typescript": "~5.4.5",
"unocss": "^0.58.9", "unocss": "^0.58.9",
"unocss-preset-weapp": "^0.58.8", "unocss-preset-weapp": "^0.58.9",
"unplugin-auto-import": "^0.17.8", "unplugin-auto-import": "^0.17.8",
"unplugin-vue-components": "^0.28.0", "unplugin-vue-components": "^0.28.0",
"vite": "^5.4.11", "vite": "^5.4.19",
"vue-eslint-parser": "^9.4.3" "vue-eslint-parser": "^9.4.3"
}, },
"engines": { "engines": {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -4,8 +4,9 @@ page { ...@@ -4,8 +4,9 @@ page {
font-size: 32rpx; font-size: 32rpx;
font-weight: 500; font-weight: 500;
color: var(--fui-color-title, #181818); color: var(--fui-color-title, #181818);
font-family: -apple-system-font, BlinkMacSystemFont, 'Droid Sans', 'Noto Sans', 'PingFang SC', 'Heiti SC', font-family:
'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', SimSun, sans-serif; -apple-system-font, BlinkMacSystemFont, 'Droid Sans', 'Noto Sans', 'PingFang SC', 'Heiti SC', 'Helvetica Neue',
Helvetica, Arial, 'Microsoft YaHei', SimSun, sans-serif;
} }
/* #endif */ /* #endif */
......
import type { App } from 'vue' import type { App } from 'vue'
const config: Application = { const config: Application = {
appName: __APP__.appName,
name: __APP__.name, name: __APP__.name,
version: __APP__.version, version: __APP__.version,
description: __APP__.description, description: __APP__.description,
......
...@@ -43,6 +43,14 @@ export default ({ mode }: ConfigEnv): UserConfig => { ...@@ -43,6 +43,14 @@ export default ({ mode }: ConfigEnv): UserConfig => {
}, },
}, },
}, },
css: {
preprocessorOptions: {
scss: {
api: 'modern-compiler',
silenceDeprecations: ['legacy-js-api'],
},
},
},
define: { define: {
__APP__: { __APP__: {
appName: pkg.appName || pkg.description, appName: pkg.appName || pkg.description,
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论