feat: update @uni-helper/uni-types

uni-helper · Sep 23, 2024 · 9f3afdb · 9f3afdb
1 parent 368e5be
commit 9f3afdb
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 50 deletions.
diff --git a/template/UI/uni/jsconfig.json.data.mjs b/template/UI/uni/jsconfig.json.data.mjs
diff --git a/template/UI/uni/package.json b/template/UI/uni/package.json
@@ -1,8 +1,5 @@
 {
   "dependencies": {
     "@dcloudio/uni-ui": "^1.5.6"
-  },
-  "devDependencies": {
-    "@uni-helper/uni-ui-types": "^0.5.15"
   }
 }
diff --git a/template/base/jsconfig.json.ejs b/template/base/jsconfig.json.ejs
@@ -1,9 +1,4 @@
 {
-  <%_ for (const { extensions } of config) { _%>
-  <%_ if (extensions) { _%>
-  <%- extensions %>,
-  <%_ } _%>
-  <%_ } _%>
   "compilerOptions": {
     <%_ for (const { options } of config) { _%>
     <%_ if (options) { _%>
@@ -15,10 +10,10 @@
       "@/*": ["./src/*"]
     },
     "types": [
+      "vite/client",
       "@dcloudio/types",
+      "@mini-types/alipay",
       "miniprogram-api-typings",
-      "mini-types",
-      "@uni-helper/uni-cloud-types",
       <%_ for (const { types } of config) { _%>
       <%_ if (types) { _%>
       <%_ for (const  type  of types) { _%>
@@ -28,24 +23,24 @@
       <%_ } _%>
       <%_ } _%>
       <%_ } _%>
-      "@uni-helper/uni-app-types"
+      "@uni-helper/uni-types"
     ]
   },
+  <%_ for (const { includes } of config) { _%>
+  <%_ if (includes) { _%>
   "include": [
     "**/*.d.ts",
-    <%_ for (const { includes } of config) { _%>
-    <%_ if (includes) { _%>
     <%_ for (const  include  of includes) { _%>
     <%_ if (include) { _%>
     "<%- include %>",
     <%_ } _%>
     <%_ } _%>
-    <%_ } _%>
-    <%_ } _%>
     "src/**/*.jsx",
     "src/**/*.vue"
-  ],
+    ],
+  <%_ } _%>
+  <%_ } _%>
   "vueCompilerOptions": {
-    "plugins": ["@uni-helper/uni-app-types/volar-plugin"]
+    "plugins": ["@uni-helper/uni-types/volar-plugin"]
   }
 }
diff --git a/template/base/package.json b/template/base/package.json
@@ -65,10 +65,9 @@
     "@dcloudio/uni-cli-shared": "3.0.0-4020420240722002",
     "@dcloudio/uni-stacktracey": "3.0.0-4020420240722002",
     "@dcloudio/vite-plugin-uni": "3.0.0-4020420240722002",
-    "@uni-helper/uni-app-types": "^0.5.13",
-    "@uni-helper/uni-cloud-types": "^0.5.3",
+    "@mini-types/alipay": "^3.0.14",
+    "@uni-helper/uni-types": "^1.0.0-alpha.4",
     "@vue/runtime-core": "3.4.21",
-    "mini-types": "^0.1.7",
     "miniprogram-api-typings": "^3.12.3",
     "sass": "1.64.2",
     "vite": "5.2.8"

diff --git a/template/base/src/components/AppLogos.vue b/template/base/src/components/AppLogos.vue
@@ -1,3 +1,6 @@
+<script setup>
+</script>
+
 <template>
   <view class="container">
     <view class="uni-helper-logo">

diff --git a/template/config/typescript/env.d.ts b/template/config/typescript/env.d.ts
diff --git a/template/config/typescript/jsconfig.json.data.mjs b/template/config/typescript/jsconfig.json.data.mjs
@@ -1,10 +1,20 @@
 export default function getData({ oldData }) {
   const uniUIConfig = {
     id: 'tsConfig',
-    extensions: `"extends": "@vue/tsconfig/tsconfig.json"`,
-    options: `"ignoreDeprecations": "5.0",
-    "lib": ["esnext", "dom"],
-    "sourceMap": true,`,
+    options: `"lib": ["DOM", "DOM.Iterable", "ESNext"],
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
+    "resolveJsonModule": true,
+    "jsx": "preserve",
+    "jsxImportSource": "vue",
+    "noImplicitThis": true,
+    "strict": true,
+    "verbatimModuleSyntax": true,
+    "target": "ESNext",
+    "useDefineForClassFields": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "skipLibCheck": true,`,
     includes: ['src/**/*.ts', 'src/**/*.tsx'],
   }
   return {

diff --git a/template/config/typescript/shims.d.ts b/template/config/typescript/shims.d.ts