From 7b3347e0bbc1ce5605e57438796034d40b31640b Mon Sep 17 00:00:00 2001 From: leezng Date: Sun, 13 Dec 2020 22:48:18 +0800 Subject: [PATCH 1/4] docs: update demo. --- .github/workflows/gh-pages.yml | 4 ++-- example/SelectControl.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index d55143f..6318558 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -2,8 +2,8 @@ name: Gh Pages on: push: - branches: - - "master" + branches: + - 'dev' jobs: build-and-deploy: diff --git a/example/SelectControl.vue b/example/SelectControl.vue index c65e54a..37ac039 100644 --- a/example/SelectControl.vue +++ b/example/SelectControl.vue @@ -154,7 +154,7 @@ export default defineComponent({ state.itemData = !data ? data + '' : data; // 处理 data = null 的情况 }; - const handleChange = (newVal, oldVal) => { + const handleChange = () => { // console.log('newVal: ', newVal, ' oldVal: ', oldVal); }; From f2982ba4dd421c9b283e729cf12941090385a022 Mon Sep 17 00:00:00 2001 From: leezng Date: Sun, 13 Dec 2020 22:51:21 +0800 Subject: [PATCH 2/4] docs: update demo. --- .github/workflows/gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 6318558..3176bdc 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -3,7 +3,7 @@ name: Gh Pages on: push: branches: - - 'dev' + - 'master' jobs: build-and-deploy: From b9a46255608c747a991d4082f18d5d9bc5d8adfa Mon Sep 17 00:00:00 2001 From: leezng Date: Mon, 21 Dec 2020 12:30:01 +0800 Subject: [PATCH 3/4] fix: build type error. #99 --- build/build.js | 7 +------ package.json | 1 + src/index.ts | 3 ++- tsconfig.dts.json | 6 +++--- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/build/build.js b/build/build.js index 8e5fa9f..ba556e8 100644 --- a/build/build.js +++ b/build/build.js @@ -44,12 +44,7 @@ webpack(webpackConfig, (err, stats) => { }); buildTypesProcess.on('close', () => { - console.log(chalk.cyan('Build types complete.\n')); - - fs.copyFile('types/components/Tree/index.d.ts', 'lib/vue-json-pretty.d.ts', err => { - if (err) throw err; - console.log(chalk.cyan('Build major d.ts complete.\n')); - }); + console.log(chalk.cyan('Build types(.d.ts) complete.\n')); }); } }); diff --git a/package.json b/package.json index ac241e6..a6a025d 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "test": "cypress open", "lint": "eslint --ext .ts,.tsx,.vue src example" }, + "typings": "types/index.d.ts", "repository": { "type": "git", "url": "git@github.com:leezng/vue-json-pretty.git" diff --git a/src/index.ts b/src/index.ts index 5222e77..5d803dd 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,3 +1,4 @@ +import { defineComponent } from 'vue'; import Tree from './components/Tree'; -export default Tree; +export default defineComponent(Tree); diff --git a/tsconfig.dts.json b/tsconfig.dts.json index fdf8131..c0935ea 100644 --- a/tsconfig.dts.json +++ b/tsconfig.dts.json @@ -9,8 +9,8 @@ "declarationDir": "types" }, "include": [ - "src/components/**/*.ts", - "src/components/**/*.tsx", - "src/components/**/*.vue" + "src/**/*.ts", + "src/**/*.tsx", + "src/**/*.vue" ], } From 6e5c0376cf58c6871761d25f67d107170ddf7fb4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Dec 2020 02:10:42 +0000 Subject: [PATCH 4/4] chore(deps): bump ini from 1.3.5 to 1.3.8 Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.8. - [Release notes](https://github.com/isaacs/ini/releases) - [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.8) Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 525cbc5..80f243a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4890,9 +4890,9 @@ "dev": true }, "ini": { - "version": "1.3.5", - "resolved": "https://registry.npm.taobao.org/ini/download/ini-1.3.5.tgz", - "integrity": "sha1-7uJfVtscnsYIXgwid4CD9Zar+Sc=", + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", "dev": true }, "interpret": {