Selaa lähdekoodia

Merge branch 'base'

Burt 1 vuosi sitten
vanhempi
commit
06af5eb5f9
5 muutettua tiedostoa jossa 6962 lisäystä ja 5349 poistoa
  1. 1 0
      .gitignore
  2. 2 1
      .vscode/extensions.json
  3. 3 5
      .vscode/settings.json
  4. 3 3
      package.json
  5. 6953 5340
      pnpm-lock.yaml

+ 1 - 0
.gitignore

@@ -22,6 +22,7 @@ dist
 .hbuilderx
 
 .stylelintcache
+.eslintcache
 
 # lock 文件还是不要了,我主要的版本写死就好了
 # pnpm-lock.yaml

+ 2 - 1
.vscode/extensions.json

@@ -12,6 +12,7 @@
     "uni-helper.uni-highlight-vscode",
     "uni-helper.uni-ui-snippets-vscode",
     "uni-helper.uni-app-snippets-vscode",
-    "mrmlnc.vscode-json5"
+    "mrmlnc.vscode-json5",
+    "streetsidesoftware.code-spell-checker"
   ]
 }

+ 3 - 5
.vscode/settings.json

@@ -55,11 +55,9 @@
   "explorer.fileNesting.patterns": {
     "*.ts": "$(capture).test.ts, $(capture).test.tsx",
     "*.tsx": "$(capture).test.ts, $(capture).test.tsx",
-    "*.env": "$(capture).env.*",
+    // "*.env": "$(capture).env.*",
     "CHANGELOG.md": "CHANGELOG*",
-    "package.json": "pnpm-lock.yaml,pnpm-workspace.yaml,LICENSE,.gitattributes,.gitignore,.gitpod.yml,CNAME,README*,.npmrc,.browserslistrc",
-    ".eslintrc.cjs": ".eslintignore,.prettierignore,.stylelintignore,.commitlintrc.*,.prettierrc.*,.stylelintrc.*,.eslintrc-auto-import.json,.editorconfig,.commitlint.cjs",
-    "vite.config.ts": "tsconfig.*.json,uno.config.ts,tsconfig.json,uni-pages.d.ts",
-    "manifest.config.ts": "manifest.config.ts,pages.config.ts"
+    "package.json": "pnpm-lock.yaml,pnpm-workspace.yaml,LICENSE,.gitattributes,.gitignore,.gitpod.yml,CNAME,.npmrc,.browserslistrc",
+    ".eslintrc.cjs": ".eslintignore,.prettierignore,.stylelintignore,.commitlintrc.*,.prettierrc.*,.stylelintrc.*,.eslintrc-auto-import.json,.editorconfig,.commitlint.cjs"
   }
 }

+ 3 - 3
package.json

@@ -73,7 +73,7 @@
       "prettier --write"
     ],
     "**/*.{vue,js,ts,jsx,tsx}": [
-      "eslint --fix"
+      "eslint --cache --fix"
     ],
     "**/*.{vue,css,scss,html}": [
       "stylelint --fix"
@@ -88,13 +88,12 @@
     "@dcloudio/uni-components": "3.0.0-alpha-4010520240507001",
     "@dcloudio/uni-h5": "3.0.0-alpha-4010520240507001",
     "@dcloudio/uni-mp-weixin": "3.0.0-alpha-4010520240507001",
-    "czg": "^1.9.3",
     "dayjs": "1.11.10",
     "pinia": "2.0.36",
     "pinia-plugin-persistedstate": "3.2.1",
     "qs": "6.5.3",
     "vue": "3.4.21",
-    "wot-design-uni": "^1.2.26",
+    "wot-design-uni": "^1.3.9",
     "z-paging": "^2.7.10"
   },
   "devDependencies": {
@@ -122,6 +121,7 @@
     "@vue/tsconfig": "^0.1.3",
     "autoprefixer": "^10.4.19",
     "commitlint": "^18.6.1",
+    "czg": "^1.9.3",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-config-standard": "^17.1.0",

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 6953 - 5340
pnpm-lock.yaml