Skip to content

Commit

Permalink
Merge branch 'base'
Browse files Browse the repository at this point in the history
  • Loading branch information
codercup2 committed May 19, 2024
2 parents e4f393e + c4f3da8 commit 6c38d3a
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 33 deletions.
10 changes: 0 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,6 @@ dist

.stylelintcache

# unplugin-auto-import 生成的类型文件,因为变化较小,还是加入版本管理吧
# auto-import.d.ts

# vite-plugin-uni-pages 生成的类型文件,每次切换分支都一堆不同的,所以直接 .gitignore
# uni-pages.d.ts

# 插件生成的文件
# src/pages.json
# src/manifest.json

# lock 文件还是不要了,我主要的版本写死就好了
# pnpm-lock.yaml
# package-lock.json
Expand Down
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"climblee",
"commitlint",
"dcloudio",
"iconfont",
"qrcode",
"refresherrefresh",
"scrolltolower",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"build:quickapp-webview": "uni build -p quickapp-webview",
"build:quickapp-webview-huawei": "uni build -p quickapp-webview-huawei",
"build:quickapp-webview-union": "uni build -p quickapp-webview-union",
"prepare": "node ./shell/postinstall.js & git init && husky install ",
"prepare": "git init && husky install ",
"type-check": "vue-tsc --noEmit"
},
"lint-staged": {
Expand Down
21 changes: 0 additions & 21 deletions shell/postinstall.js

This file was deleted.

2 changes: 1 addition & 1 deletion src/style/index.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import './iconfont.css';
// @import './iconfont.css';

.test {
// 可以通过 @apply 多个样式封装整体样式
Expand Down

0 comments on commit 6c38d3a

Please sign in to comment.