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

c23fc2de · 方治民 · 36f51b77 · cdb21243 · c23fc2de · c23fc2de
--- a/build/getConfigFileName.ts
+++ b/build/getConfigFileName.ts
@@ -2,6 +2,6 @@
 * Get the configuration file variable name
 * @param env
 */
-export const getConfigFileName = (env: Record<string, any>) => {
+export function getConfigFileName(env: Record<string, any>) {
    return `__PRODUCTION__${env.VITE_GLOB_APP_SHORT_NAME || '__APP'}__CONF__`.toUpperCase().replace(/\s/g, '')
 }
--- a/package.json
+++ b/package.json
@@ -144,13 +144,13 @@
        "postcss-html": "^1.5.0",
        "postcss-less": "^6.0.0",
        "prettier": "^2.8.7",
-        "rimraf": "^4.4.1",
+        "rimraf": "^5.0.0",
        "sass": "^1.62.0",
        "sort-package-json": "^2.4.1",
        "stylelint": "^15.6.0",
        "stylelint-config-html": "^1.1.0",
-        "stylelint-config-recommended": "^11.0.0",
-        "stylelint-config-standard": "^32.0.0",
+        "stylelint-config-recommended": "^12.0.0",
+        "stylelint-config-standard": "^33.0.0",
        "stylelint-order": "^6.0.3",
        "typescript": "^5.0.4",
        "unocss": "^0.50.8",

--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -232,8 +232,8 @@ devDependencies:
    specifier: ^2.8.7
    version: 2.8.7
  rimraf:
-    specifier: ^4.4.1
-    version: 4.4.1
+    specifier: ^5.0.0
+    version: 5.0.0
  sass:
    specifier: ^1.62.0
    version: 1.62.0
@@ -247,11 +247,11 @@ devDependencies:
    specifier: ^1.1.0
    version: 1.1.0(postcss-html@1.5.0)(stylelint@15.6.0)
  stylelint-config-recommended:
-    specifier: ^11.0.0
-    version: 11.0.0(stylelint@15.6.0)
+    specifier: ^12.0.0
+    version: 12.0.0(stylelint@15.6.0)
  stylelint-config-standard:
-    specifier: ^32.0.0
-    version: 32.0.0(stylelint@15.6.0)
+    specifier: ^33.0.0
+    version: 33.0.0(stylelint@15.6.0)
  stylelint-order:
    specifier: ^6.0.3
    version: 6.0.3(stylelint@15.6.0)
@@ -3391,6 +3391,13 @@ packages:
      '@nodelib/fs.scandir': 2.1.5
      fastq: 1.15.0

+  /@pkgjs/parseargs@0.11.0:
+    resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
+    engines: {node: '>=14'}
+    requiresBuild: true
+    dev: true
+    optional: true
+
  /@polka/url@1.0.0-next.21:
    resolution: {integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==}
    dev: true
@@ -6451,6 +6458,14 @@ packages:
      is-callable: 1.2.7
    dev: true

+  /foreground-child@3.1.1:
+    resolution: {integrity: sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==}
+    engines: {node: '>=14'}
+    dependencies:
+      cross-spawn: 7.0.3
+      signal-exit: 4.0.1
+    dev: true
+
  /form-data@3.0.1:
    resolution: {integrity: sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==}
    engines: {node: '>= 6'}
@@ -6647,6 +6662,18 @@ packages:
      is-glob: 4.0.3
    dev: true

+  /glob@10.2.2:
+    resolution: {integrity: sha512-Xsa0BcxIC6th9UwNjZkhrMtNo/MnyRL8jGCP+uEwhA5oFOCY1f2s1/oNKY47xQ0Bg5nkjsfAEIej1VeH62bDDQ==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    hasBin: true
+    dependencies:
+      foreground-child: 3.1.1
+      jackspeak: 2.0.3
+      minimatch: 9.0.0
+      minipass: 5.0.0
+      path-scurry: 1.7.0
+    dev: true
+
  /glob@7.2.3:
    resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
    dependencies:
@@ -6658,16 +6685,6 @@ packages:
      path-is-absolute: 1.0.1
    dev: true

-  /glob@9.3.5:
-    resolution: {integrity: sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==}
-    engines: {node: '>=16 || 14 >=14.17'}
-    dependencies:
-      fs.realpath: 1.0.0
-      minimatch: 8.0.4
-      minipass: 4.2.8
-      path-scurry: 1.7.0
-    dev: true
-
  /global-dirs@0.1.1:
    resolution: {integrity: sha512-NknMLn7F2J7aflwFOlGdNIuCDpN3VGoSoB+aap3KABFWbHVn1TCgFC+np23J8W2BiZbjfEw3BFBycSMv1AFblg==}
    engines: {node: '>=4'}
@@ -7402,6 +7419,15 @@ packages:
      istanbul-lib-report: 3.0.0
    dev: true

+  /jackspeak@2.0.3:
+    resolution: {integrity: sha512-0Jud3OMUdMbrlr3PyUMKESq51LXVAB+a239Ywdvd+Kgxj3MaBRml/nVRxf8tQFyfthMjuRkxkv7Vg58pmIMfuQ==}
+    engines: {node: '>=14'}
+    dependencies:
+      cliui: 7.0.4
+    optionalDependencies:
+      '@pkgjs/parseargs': 0.11.0
+    dev: true
+
  /jest-changed-files@27.5.1:
    resolution: {integrity: sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==}
    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
@@ -8568,13 +8594,6 @@ packages:
      brace-expansion: 2.0.1
    dev: true

-  /minimatch@8.0.4:
-    resolution: {integrity: sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==}
-    engines: {node: '>=16 || 14 >=14.17'}
-    dependencies:
-      brace-expansion: 2.0.1
-    dev: true
-
  /minimatch@9.0.0:
    resolution: {integrity: sha512-0jJj8AvgKqWN05mrwuqi8QYKx1WmYSUoKSxu5Qhs9prezTz10sxAHGNZe9J9cqIJzta8DWsleh2KaVaLl6Ru2w==}
    engines: {node: '>=16 || 14 >=14.17'}
@@ -8598,11 +8617,6 @@ packages:
  /minimist@1.2.8:
    resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}

-  /minipass@4.2.8:
-    resolution: {integrity: sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==}
-    engines: {node: '>=8'}
-    dev: true
-
  /minipass@5.0.0:
    resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==}
    engines: {node: '>=8'}
@@ -9782,12 +9796,12 @@ packages:
      glob: 7.2.3
    dev: true

-  /rimraf@4.4.1:
-    resolution: {integrity: sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==}
+  /rimraf@5.0.0:
+    resolution: {integrity: sha512-Jf9llaP+RvaEVS5nPShYFhtXIrb3LRKP281ib3So0KkeZKo2wIKyq0Re7TOSwanasA423PSr6CCIL4bP6T040g==}
    engines: {node: '>=14'}
    hasBin: true
    dependencies:
-      glob: 9.3.5
+      glob: 10.2.2
    dev: true

  /rollup@3.20.7:
@@ -9977,6 +9991,11 @@ packages:
    resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
    dev: true

+  /signal-exit@4.0.1:
+    resolution: {integrity: sha512-uUWsN4aOxJAS8KOuf3QMyFtgm1pkb6I+KRZbRF/ghdf5T7sM+B1lLLzPDxswUjkmHyxQAVzEgG35E3NzDM9GVw==}
+    engines: {node: '>=14'}
+    dev: true
+
  /sirv@2.0.2:
    resolution: {integrity: sha512-4Qog6aE29nIjAOKe/wowFTxOdmbEZKb+3tsLljaBRzJwtqto0BChD2zzH0LhgCSXiI+V7X+Y45v14wBZQ1TK3w==}
    engines: {node: '>= 10'}
@@ -10292,21 +10311,21 @@ packages:
      stylelint: 15.6.0
    dev: true

-  /stylelint-config-recommended@11.0.0(stylelint@15.6.0):
-    resolution: {integrity: sha512-SoGIHNI748OCZn6BxFYT83ytWoYETCINVHV3LKScVAWQQauWdvmdDqJC5YXWjpBbxg2E761Tg5aUGKLFOVhEkA==}
+  /stylelint-config-recommended@12.0.0(stylelint@15.6.0):
+    resolution: {integrity: sha512-x6x8QNARrGO2sG6iURkzqL+Dp+4bJorPMMRNPScdvaUK8PsynriOcMW7AFDKqkWAS5wbue/u8fUT/4ynzcmqdQ==}
    peerDependencies:
-      stylelint: ^15.3.0
+      stylelint: ^15.5.0
    dependencies:
      stylelint: 15.6.0
    dev: true

-  /stylelint-config-standard@32.0.0(stylelint@15.6.0):
-    resolution: {integrity: sha512-UnGJxYDyYFrIE9CjDMZRkrNh2o4lOtO+MVZ9qG5b8yARfsWho0GMx4YvhHfsv8zKKgHeWX2wfeyxmuoqcaYZ4w==}
+  /stylelint-config-standard@33.0.0(stylelint@15.6.0):
+    resolution: {integrity: sha512-eyxnLWoXImUn77+ODIuW9qXBDNM+ALN68L3wT1lN2oNspZ7D9NVGlNHb2QCUn4xDug6VZLsh0tF8NyoYzkgTzg==}
    peerDependencies:
-      stylelint: ^15.4.0
+      stylelint: ^15.5.0
    dependencies:
      stylelint: 15.6.0
-      stylelint-config-recommended: 11.0.0(stylelint@15.6.0)
+      stylelint-config-recommended: 12.0.0(stylelint@15.6.0)
    dev: true

  /stylelint-order@6.0.3(stylelint@15.6.0):