From ac0eea5d202062ae26215366c59d2aafdc213cd2 Mon Sep 17 00:00:00 2001 From: ktsn Date: Wed, 16 Aug 2017 01:00:22 +0900 Subject: [PATCH 1/4] feat(typings): adapt to the new vue typings BREAKING CHANGE: It is no longer compatible with the old Vue typings --- package.json | 6 +++--- types/helpers.d.ts | 2 +- types/index.d.ts | 8 ++++++-- types/test/helpers.ts | 2 +- types/test/index.ts | 2 +- types/test/tsconfig.json | 6 +++--- types/test/vue.ts | 2 +- types/tsconfig.json | 6 +++--- types/typings.json | 4 ---- types/vue.d.ts | 4 ++-- yarn.lock | 18 +++++++++--------- 11 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 types/typings.json diff --git a/package.json b/package.json index b49959f12..b59c116df 100644 --- a/package.json +++ b/package.json @@ -60,11 +60,11 @@ "rollup-watch": "^3.2.2", "selenium-server": "^2.53.1", "todomvc-app-css": "^2.1.0", - "typescript": "^2.1.5", + "typescript": "^2.4.2", "uglify-js": "^2.7.5", - "vue": "^2.3.3", + "vue": "DanielRosenwasser/vue#e4a8545", "vue-loader": "^12.0.0", - "vue-template-compiler": "^2.3.3", + "vue-template-compiler": "^2.4.2", "webpack": "^2.6.1", "webpack-dev-middleware": "^1.10.0", "webpack-hot-middleware": "^2.16.1" diff --git a/types/helpers.d.ts b/types/helpers.d.ts index dc0fbd505..a98602166 100644 --- a/types/helpers.d.ts +++ b/types/helpers.d.ts @@ -1,4 +1,4 @@ -import Vue = require("vue"); +import Vue from "vue"; type Dictionary = { [key: string]: T }; diff --git a/types/index.d.ts b/types/index.d.ts index b2a21f0db..e58c68fa2 100644 --- a/types/index.d.ts +++ b/types/index.d.ts @@ -1,5 +1,4 @@ -import _Vue = require("vue"); -import { WatchOptions } from "vue"; +import _Vue, { WatchOptions } from "vue"; // augment typings of Vue.js import "./vue"; @@ -111,3 +110,8 @@ export interface MutationTree { export interface ModuleTree { [key: string]: Module; } + +export default { + Store, + install +}; diff --git a/types/test/helpers.ts b/types/test/helpers.ts index 3279be1ca..930a824a6 100644 --- a/types/test/helpers.ts +++ b/types/test/helpers.ts @@ -1,4 +1,4 @@ -import Vue = require("vue"); +import Vue from "vue"; import { mapState, diff --git a/types/test/index.ts b/types/test/index.ts index 63c42ccff..d2e09c69c 100644 --- a/types/test/index.ts +++ b/types/test/index.ts @@ -1,4 +1,4 @@ -import Vue = require("vue"); +import Vue from "vue"; import * as Vuex from "../index"; import createLogger from "../../dist/logger"; diff --git a/types/test/tsconfig.json b/types/test/tsconfig.json index ee3bd8553..28f595aca 100644 --- a/types/test/tsconfig.json +++ b/types/test/tsconfig.json @@ -1,15 +1,15 @@ { "compilerOptions": { - "module": "commonjs", "target": "es5", + "module": "es2015", + "moduleResolution": "node", "lib": [ "es5", "dom", "es2015.promise", "es2015.core" ], - "noImplicitAny": true, - "strictNullChecks": true, + "strict": true, "noEmit": true }, "include": [ diff --git a/types/test/vue.ts b/types/test/vue.ts index e9e280ba9..3c23b7124 100644 --- a/types/test/vue.ts +++ b/types/test/vue.ts @@ -1,4 +1,4 @@ -import Vue = require("vue"); +import Vue from "vue"; import * as Vuex from "../index"; const store = new Vuex.Store({ diff --git a/types/tsconfig.json b/types/tsconfig.json index cb89141da..7010dd28a 100644 --- a/types/tsconfig.json +++ b/types/tsconfig.json @@ -1,14 +1,14 @@ { "compilerOptions": { - "module": "commonjs", "target": "es5", + "module": "es2015", + "moduleResolution": "node", "lib": [ "es5", "dom", "es2015.promise" ], - "noImplicitAny": true, - "strictNullChecks": true, + "strict": true, "noEmit": true }, "include": [ diff --git a/types/typings.json b/types/typings.json deleted file mode 100644 index 81e904cf3..000000000 --- a/types/typings.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "vuex", - "main": "index.d.ts" -} diff --git a/types/vue.d.ts b/types/vue.d.ts index 482abe12d..bc0d13f60 100644 --- a/types/vue.d.ts +++ b/types/vue.d.ts @@ -2,11 +2,11 @@ * Extends interfaces in Vue.js */ -import Vue = require("vue"); +import Vue, { ComponentOptions } from "vue"; import { Store } from "./index"; declare module "vue/types/options" { - interface ComponentOptions { + interface ComponentOptions { store?: Store; } } diff --git a/yarn.lock b/yarn.lock index 25189496c..72e674bfe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4602,9 +4602,9 @@ typedarray@^0.0.6, typedarray@~0.0.5: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" -typescript@^2.1.5: - version "2.3.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.3.4.tgz#3d38321828231e434f287514959c37a82b629f42" +typescript@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.2.tgz#f8395f85d459276067c988aa41837a8f82870844" uglify-js@^2.7.5, uglify-js@^2.8.27: version "2.8.27" @@ -4732,9 +4732,9 @@ vue-style-loader@^3.0.0: hash-sum "^1.0.2" loader-utils "^1.0.2" -vue-template-compiler@^2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.3.3.tgz#b5bab9ec57309c906b82a78c81a02179dbc2f470" +vue-template-compiler@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.4.2.tgz#5a45d843f148b098f6c1d1e35ac20c4956d30ad1" dependencies: de-indent "^1.0.2" he "^1.1.0" @@ -4743,9 +4743,9 @@ vue-template-es2015-compiler@^1.2.2: version "1.5.2" resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.2.tgz#a0a6c50c941d2a4abda963f2f42c337ac450ee95" -vue@^2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/vue/-/vue-2.3.3.tgz#d1eaa8fde5240735a4563e74f2c7fead9cbb064c" +vue@DanielRosenwasser/vue#e4a8545: + version "2.4.2" + resolved "https://codeload.github.com/DanielRosenwasser/vue/tar.gz/e4a8545" watchpack@^1.3.1: version "1.3.1" From c23d9f1e9844fea83823e3cb614cb7069e69ecb4 Mon Sep 17 00:00:00 2001 From: ktsn Date: Tue, 12 Sep 2017 23:39:08 +0900 Subject: [PATCH 2/4] chore(package): bump typescript and vue core typings --- package-lock.json | 16 ++++++---------- package.json | 4 ++-- types/vue.d.ts | 2 +- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index a9c6118fd..9db3f5deb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3186,8 +3186,7 @@ "jsbn": { "version": "0.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "json-schema": { "version": "0.2.3", @@ -3604,8 +3603,7 @@ "tweetnacl": { "version": "0.14.5", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "uid-number": { "version": "0.0.6", @@ -7308,9 +7306,9 @@ "dev": true }, "typescript": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz", - "integrity": "sha1-+DlfhdRZJ2BnyYiqQYN6j4KHCEQ=", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.2.tgz", + "integrity": "sha1-A4qV99m7tCCxvzW6MdTFwd0//jQ=", "dev": true }, "uglify-js": { @@ -7477,9 +7475,7 @@ } }, "vue": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/vue/-/vue-2.4.2.tgz", - "integrity": "sha512-GB5r+CsrCHIB1PoXt4wgBienjF3WGYOIaTK27tDk96sZxpL5RwRrsi9I3ECwFt8x8qAmxT2xk1vsY2Vpcn9nIw==", + "version": "github:HerringtonDarkholme/vue#8901752473c605e3dee1b8312d8dcf1fd72b43ad", "dev": true }, "vue-hot-reload-api": { diff --git a/package.json b/package.json index e3d0670f9..424648a42 100644 --- a/package.json +++ b/package.json @@ -61,9 +61,9 @@ "rollup-watch": "^3.2.2", "selenium-server": "^2.53.1", "todomvc-app-css": "^2.1.0", - "typescript": "^2.4.2", + "typescript": "^2.5.2", "uglify-js": "^2.7.5", - "vue": "DanielRosenwasser/vue#e4a8545", + "vue": "HerringtonDarkholme/vue#8901752", "vue-loader": "^12.0.0", "vue-template-compiler": "^2.4.2", "webpack": "^2.6.1", diff --git a/types/vue.d.ts b/types/vue.d.ts index bc0d13f60..302fc4eb6 100644 --- a/types/vue.d.ts +++ b/types/vue.d.ts @@ -6,7 +6,7 @@ import Vue, { ComponentOptions } from "vue"; import { Store } from "./index"; declare module "vue/types/options" { - interface ComponentOptions { + interface ComponentOptions { store?: Store; } } From 9c32d06c4ad0f3e895d02c8b988240d8a9d57107 Mon Sep 17 00:00:00 2001 From: ktsn Date: Mon, 9 Oct 2017 22:41:26 +0900 Subject: [PATCH 3/4] chore: bump vue --- package-lock.json | 8 ++++---- package.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 050860b4a..0cb412176 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7941,7 +7941,7 @@ } }, "vue": { - "version": "github:HerringtonDarkholme/vue#8901752473c605e3dee1b8312d8dcf1fd72b43ad", + "version": "github:vuejs/vue#96b97448118de0939bf5f77c9b74cf1613a5a107", "dev": true }, "vue-hot-reload-api": { @@ -8030,9 +8030,9 @@ } }, "vue-template-compiler": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.4.3.tgz", - "integrity": "sha512-rtHVKIFjd3Ynb+9FSoA64m2h2SPTEVKk6PywkqbugpM0nxT3ykLFyhbLTdSX1qV5wI9h5DAR4ib4RubEFfyiBQ==", + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.4.4.tgz", + "integrity": "sha512-XdHsNi8Z5WqwuFl/Z5eLKgE2DOEEOdMk1aA459uSgvwyy+pjKLBlQWsUpAtoR6o6Wmpujw6NtinAUGuqSTituQ==", "dev": true, "requires": { "de-indent": "1.0.2", diff --git a/package.json b/package.json index 24351de5f..00219878d 100644 --- a/package.json +++ b/package.json @@ -67,9 +67,9 @@ "todomvc-app-css": "^2.1.0", "typescript": "^2.1.5", "uglify-js": "^3.1.2", - "vue": "HerringtonDarkholme/vue#8901752", + "vue": "github:vuejs/vue#96b9744", "vue-loader": "^13.0.5", - "vue-template-compiler": "^2.4.3", + "vue-template-compiler": "^2.4.4", "webpack": "^3.6.0", "webpack-dev-middleware": "^1.10.0", "webpack-hot-middleware": "^2.16.1" From fb073928f5ededce9b6ee7f6c0e5ae84f3e9f247 Mon Sep 17 00:00:00 2001 From: Evan You Date: Wed, 11 Oct 2017 15:07:53 -0400 Subject: [PATCH 4/4] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 830979c54..4fb9a301e 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "todomvc-app-css": "^2.1.0", "typescript": "^2.1.5", "uglify-js": "^3.1.2", - "vue": "github:vuejs/vue#96b9744", + "vue": "github:vuejs/vue#dev", "vue-loader": "^13.0.5", "vue-template-compiler": "^2.4.4", "webpack": "^3.6.0",