diff --git a/generator.js b/generator.js
index 3a6b37d..2401029 100644
--- a/generator.js
+++ b/generator.js
@@ -31,13 +31,12 @@ async function generate (dir, files, base = '', rootOptions = {}) {
})
}
-module.exports = (api, options, rootOptions) => {
+module.exports = (api, options, rootOptions) => {
api.extendPackage(pkg => {
return {
dependencies: {
'regenerator-runtime': '^0.12.1',// 锁定版本,避免高版本在小程序中出错
- '@dcloudio/uni-helper-json': '*',
- 'vuex': '^4.0.0-beta.4'
+ '@dcloudio/uni-helper-json': '*'
},
devDependencies: {
'postcss-comment': '^2.0.0',
diff --git a/preset.json b/preset.json
index 61133ba..e4921cc 100644
--- a/preset.json
+++ b/preset.json
@@ -1,4 +1,5 @@
{
+ "vueVersion": "3",
"useConfigFiles": false,
"plugins": {
"@dcloudio/vue-cli-plugin-uni": {
diff --git a/prompts.js b/prompts.js
index 2a7d921..418f446 100644
--- a/prompts.js
+++ b/prompts.js
@@ -5,6 +5,9 @@ module.exports = [{
choices: [{
name: '默认模板',
value: 'default'
+ },{
+ name: '默认模板(TypeScript)',
+ value: 'default-ts'
}
],
default: 'None'
diff --git a/template/default-ts/App.vue b/template/default-ts/App.vue
index 2a18a4d..b5c1a82 100755
--- a/template/default-ts/App.vue
+++ b/template/default-ts/App.vue
@@ -1,7 +1,8 @@
-
diff --git a/template/default-ts/main.ts b/template/default-ts/main.ts
index 255135b..01433bc 100755
--- a/template/default-ts/main.ts
+++ b/template/default-ts/main.ts
@@ -1,6 +1,4 @@
-import Vue from 'vue'
-import App from './App.vue'
-
-Vue.config.productionTip = false
-
-new App().$mount()
+import { createApp } from 'vue'
+import App from './App.vue'
+
+createApp(App).mount('#app')
diff --git a/template/default-ts/pages/index/index.vue b/template/default-ts/pages/index/index.vue
index 4382098..c8d2061 100644
--- a/template/default-ts/pages/index/index.vue
+++ b/template/default-ts/pages/index/index.vue
@@ -1,41 +1,39 @@
-
+
-
- {{title}}
+
+ {{ title }}
-
+
-
diff --git a/template/default-ts/sfc.d.ts b/template/default-ts/sfc.d.ts
deleted file mode 100644
index b5ea6b7..0000000
--- a/template/default-ts/sfc.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare module "*.vue" {
- import Vue from 'vue'
- export default Vue
-}
\ No newline at end of file
diff --git a/template/default-ts/shims-vue.d.ts b/template/default-ts/shims-vue.d.ts
new file mode 100644
index 0000000..d77b62b
--- /dev/null
+++ b/template/default-ts/shims-vue.d.ts
@@ -0,0 +1,5 @@
+declare module "*.vue" {
+ import type { DefineComponent } from "vue";
+ const component: DefineComponent<{}, {}, any>;
+ export default component;
+}
diff --git a/template/default-ts/uni-app.d.ts b/template/default-ts/uni-app.d.ts
new file mode 100644
index 0000000..8741a03
--- /dev/null
+++ b/template/default-ts/uni-app.d.ts
@@ -0,0 +1,5 @@
+import "vue";
+declare module "vue" {
+ type Hooks = App.AppInstance & Page.PageInstance;
+ interface ComponentCustomOptions extends Hooks {}
+}
diff --git a/template/default/App.vue b/template/default/App.vue
index 7d56dbe..fbbdbe0 100644
--- a/template/default/App.vue
+++ b/template/default/App.vue
@@ -1,18 +1,17 @@
-
-
-