From dce4f4b5f081d144f768c0bf929966b5cfd48eef Mon Sep 17 00:00:00 2001 From: Olivier Ligot Date: Fri, 25 Aug 2017 09:05:55 +0200 Subject: [PATCH 1/6] vue-template-compiler as a peer dependency `vue-template-compiler` is now a peer dependency instead of a direct dependency. This allows the user to pin `vue-template-compiler` to a specific version instead of relying on the implicit upgrades from a semver caret range. Without this change, updating Vue.js to version 2.4.2 can result in errors like this: Vue packages version mismatch: - vue@2.4.2 - vue-template-compiler@2.4.1 This may cause things to work incorrectly. Make sure to use the same version for both. If you are using vue-loader@>=10.0, simply update vue-template-compiler. If you are using vue-loader@<10.0 or vueify, re-installing vue-loader/vueify should bump vue-template-compiler to the latest. This was first reported in [vue-loader](https://github.com/vuejs/vue-loader/issues/470) and later [fixed in version 10.0.0](https://gist.github.com/yyx990803/faebe22e8763f5b17572b35ed96f52fe#vue-loader1000). There is also [an open issue on vueify](https://github.com/vuejs/vueify/issues/159) but it's not currently fixed. --- CHANGELOG.md | 3 +++ package.json | 4 ++-- yarn.lock | 6 +++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d04d1cd..29ccc1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ All Notable changes to `rollup-plugin-vue` will be documented in this file. ## [Unreleased] +### Fixed +- `vue-template-compiler` is now a peer dependency instead of a direct dependency. This allows the user to pin `vue-template-compiler` to a specific version instead of relying on the implicit upgrades from a semver caret range. + ## [Version 2.2.15][2.2.15] - 2017-01-10 ### Added diff --git a/package.json b/package.json index 75c449e..c444e19 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,6 @@ "posthtml-attrs-parser": "^0.1.1", "rollup-pluginutils": "^2.0.1", "typescript": "^2.4.1", - "vue-template-compiler": "*", "vue-template-es2015-compiler": "^1.5.0", "vue-template-validator": "^1.1.5" }, @@ -84,6 +83,7 @@ "stylus": "^0.54.5" }, "peerDependencies": { - "vue": "*" + "vue": "*", + "vue-template-compiler": "^2.0.0" } } diff --git a/yarn.lock b/yarn.lock index fda696f..b16cadc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3303,9 +3303,9 @@ void-elements@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" -vue-template-compiler@*: - version "2.2.1" - resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.2.1.tgz#ca5e43db50dc6e761e3c1296313de33091783511" +vue-template-compiler@^2.0.0: + version "2.4.2" + resolved "http://nexus.groups.local/content/groups/npm-all/vue-template-compiler/-/vue-template-compiler-2.4.2.tgz#5a45d843f148b098f6c1d1e35ac20c4956d30ad1" dependencies: de-indent "^1.0.2" he "^1.1.0" From e98ef5fdc7cc67dab61e4dd2ba0232dbd7a73b72 Mon Sep 17 00:00:00 2001 From: Olivier Ligot Date: Fri, 15 Sep 2017 09:46:54 +0200 Subject: [PATCH 2/6] Install vue-template-compiler as a dev dependency This is needed so that the tests work as expected --- package.json | 3 ++- yarn.lock | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index c444e19..1d8f910 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,8 @@ "rollup-plugin-buble": "^0.15.0", "rollup-plugin-css-only": "^0.2.0", "rollup-plugin-replace": "^1.1.1", - "uglify-js": "^2.7.5" + "uglify-js": "^2.7.5", + "vue-template-compiler": "^2.4.3" }, "optionalDependencies": { "coffee-script": "^1.12.4", diff --git a/yarn.lock b/yarn.lock index b16cadc..2ce2978 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3303,9 +3303,9 @@ void-elements@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" -vue-template-compiler@^2.0.0: - version "2.4.2" - resolved "http://nexus.groups.local/content/groups/npm-all/vue-template-compiler/-/vue-template-compiler-2.4.2.tgz#5a45d843f148b098f6c1d1e35ac20c4956d30ad1" +vue-template-compiler@^2.4.3: + version "2.4.3" + resolved "http://nexus.groups.local/content/groups/npm-all/vue-template-compiler/-/vue-template-compiler-2.4.3.tgz#ecf25f1f076d765de55789c124321fd8db042204" dependencies: de-indent "^1.0.2" he "^1.1.0" From d47b12996479f505781ec704a4041fb9c87ddf8f Mon Sep 17 00:00:00 2001 From: Olivier Ligot Date: Fri, 15 Sep 2017 09:55:37 +0200 Subject: [PATCH 3/6] Don't point to internal npm registry --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 1d8f910..64080c9 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "rollup-plugin-css-only": "^0.2.0", "rollup-plugin-replace": "^1.1.1", "uglify-js": "^2.7.5", - "vue-template-compiler": "^2.4.3" + "vue-template-compiler": "^2.4.4" }, "optionalDependencies": { "coffee-script": "^1.12.4", diff --git a/yarn.lock b/yarn.lock index 2ce2978..44bcc70 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3303,9 +3303,9 @@ void-elements@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" -vue-template-compiler@^2.4.3: - version "2.4.3" - resolved "http://nexus.groups.local/content/groups/npm-all/vue-template-compiler/-/vue-template-compiler-2.4.3.tgz#ecf25f1f076d765de55789c124321fd8db042204" +vue-template-compiler@^2.4.4: + version "2.4.4" + resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.4.4.tgz#2cde3b704124985c27d50b5387c9691ba515fb57" dependencies: de-indent "^1.0.2" he "^1.1.0" From c605d3ca7dbb37d247cf22d6c1882184e210193e Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Tue, 26 Sep 2017 06:25:58 +0530 Subject: [PATCH 4/6] chore: remove unnecessary log statement --- src/script/coffee.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/script/coffee.js b/src/script/coffee.js index c80da02..b1bea71 100644 --- a/src/script/coffee.js +++ b/src/script/coffee.js @@ -5,7 +5,6 @@ export default function (script) { coffee.compile(script.code, { bare: true }, (status, output) => { if (status === 0) { script.code = output.replace(/^\/\/ Generated by CoffeeScript [\d]+.[\d]+.[\d]+/i, '') - console.log(script.code) resolve(script) } else { From a7e6c6438221a45b40bda8d4bdc17bcdae5f09a8 Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Tue, 26 Sep 2017 06:57:22 +0530 Subject: [PATCH 5/6] fix: use any vue-template-compiler version which is >= 2.0 --- package.json | 5 ++--- yarn.lock | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 740f55b..5316d0f 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "rollup-plugin-css-only": "^0.2.0", "rollup-plugin-replace": "^1.1.1", "uglify-js": "^2.7.5", - "vue-template-compiler": "^2.4.4" + "vue-template-compiler": ">=2.0" }, "optionalDependencies": { "coffee-script": "^1.12.4", @@ -86,7 +86,6 @@ "stylus": "^0.54.5" }, "peerDependencies": { - "vue": "*", - "vue-template-compiler": "^2.0.0" + "vue": "*" } } diff --git a/yarn.lock b/yarn.lock index 2972485..b434a57 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3437,7 +3437,7 @@ void-elements@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" -vue-template-compiler@^2.4.4: +vue-template-compiler@>=2.0: version "2.4.4" resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.4.4.tgz#2cde3b704124985c27d50b5387c9691ba515fb57" dependencies: From 9cdd2f0dc93eb4eed33c65951cc3014b47ab98b1 Mon Sep 17 00:00:00 2001 From: Rahul Kadyan Date: Tue, 26 Sep 2017 06:58:53 +0530 Subject: [PATCH 6/6] chore: remove CHANGELOG.md; using release notes for change log. [ci skip] [skip ci] --- CHANGELOG.md | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 29ccc1c..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,26 +0,0 @@ -# Changelog - -All Notable changes to `rollup-plugin-vue` will be documented in this file. - -## [Unreleased] - -### Fixed -- `vue-template-compiler` is now a peer dependency instead of a direct dependency. This allows the user to pin `vue-template-compiler` to a specific version instead of relying on the implicit upgrades from a semver caret range. - -## [Version 2.2.15][2.2.15] - 2017-01-10 - -### Added -- Installation and configuration [docs](http://znck.me/rollup-plugin-vue) - -### Fixed -- Write styles to `bundle.css` by default (#49) - -## [Version 2.0][2.0.0] - -### Added -- Compile *.vue files. - -[Unreleased]: https://github.com/znck/rollup-plugin-vue/compare/v2.0.0...HEAD -[2.0.0]: https://github.com/znck/rollup-plugin-vue/compare/v1.0.3...v2.0.0 -[2.2.15]: https://github.com/znck/rollup-plugin-vue/compare/v2.2.14...v2.2.15 -