From 48ea2e338856040c424cb4d4a740880f38e79bb7 Mon Sep 17 00:00:00 2001 From: Nicolas Coden Date: Fri, 22 Jun 2018 22:39:47 +0200 Subject: [PATCH 1/4] fix: revise Meteor "fourseven:scss" compatibility for Meteor>1.4.0 support Foundation support all `fourseven:scss` versions from `v3.4`. Changes: * revise `fourseven:scss` compatibility to `3.4.1 || 4.0.0` to support older and newer Meteor versions --- package.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.js b/package.js index 89cd4f3..fbb2aeb 100644 --- a/package.js +++ b/package.js @@ -8,8 +8,8 @@ Package.describe({ Package.onUse(function(api) { api.versionsFrom('1.2.1'); - api.imply('fourseven:scss@3.4.1'); - api.use(['ecmascript', 'jquery', 'fourseven:scss@3.4.1'], 'client'); + api.imply('fourseven:scss@3.4.1 || 4.0.0'); + api.use(['ecmascript', 'jquery', 'fourseven:scss@3.4.1 || 4.0.0'], 'client'); api.addFiles('dist/motion-ui.js', 'client'); api.addFiles([ 'src/_settings.scss', From 7a98524d69a39dc4b671147d2765575a26d4960c Mon Sep 17 00:00:00 2001 From: Nicolas Coden Date: Sat, 23 Jun 2018 22:25:50 +0200 Subject: [PATCH 2/4] chore: bump version for v2.0.3 --- bower.json | 2 +- composer.json | 2 +- package-lock.json | 7 +++++-- package.js | 2 +- package.json | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/bower.json b/bower.json index 29e3303..acb09fa 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "motion-ui", - "version": "2.0.2", + "version": "2.0.3", "authors": [ "ZURB " ], diff --git a/composer.json b/composer.json index eefb506..4ee7551 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "zurb/motion-ui", "description": "Sass library for creating transitions and animations.", - "version": "2.0.2", + "version": "2.0.3", "keywords": [ "css", "sass", diff --git a/package-lock.json b/package-lock.json index 433d9f3..5b90d62 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "motion-ui", - "version": "2.0.2", + "version": "2.0.3", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -30,6 +30,7 @@ "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, + "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -41,6 +42,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, + "optional": true, "requires": { "is-buffer": "^1.1.5" } @@ -4514,7 +4516,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true + "dev": true, + "optional": true }, "loud-rejection": { "version": "1.6.0", diff --git a/package.js b/package.js index fbb2aeb..9fb5604 100644 --- a/package.js +++ b/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'zurb:motion-ui', - version: '2.0.2', + version: '2.0.3', summary: 'Sass library for creating transitions and animations', git: 'https://github.com/zurb/motion-ui.git', documentation: 'meteor-README.md' diff --git a/package.json b/package.json index 264e286..99378fc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "motion-ui", - "version": "2.0.2", + "version": "2.0.3", "description": "Sass library for creating transitions and animations.", "main": "dist/motion-ui.js", "scripts": { From a95908d841855d05075868873bfa8ed9a470c942 Mon Sep 17 00:00:00 2001 From: Nicolas Coden Date: Sat, 23 Jun 2018 22:26:18 +0200 Subject: [PATCH 3/4] docs: update CHANGELOG for v2.0.3 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b34001..cdd9fc3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +# 2.0.3 (23 June 2018) + +This version makes Motion UI compatible with Meteor > 1.4.1 by allowing Meteor to use newer versions of the `fourseven:scss` dependency. Motion UI stays compatible with Meteor v1.2.1 and above. + +## 📄 Changes +* 🐛 #125 - Revise Meteor `fourseven:scss` compatibility to support Meteor>1.4.1 support (@ncoden) + # 2.0.2 (13 June 2018) This version fixes an issue introduced in `v2.0.1` preventing Meteor build and update Meteor installation documentation. It is fully compatible with `v2.0.1` and do not introduce any API change. From 149886c67b988908d07abe35fdad2c20dfa7998e Mon Sep 17 00:00:00 2001 From: Nicolas Coden Date: Sat, 23 Jun 2018 23:32:27 +0200 Subject: [PATCH 4/4] chore: update Meteor .versions for v2.0.3 --- .versions | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .versions diff --git a/.versions b/.versions new file mode 100644 index 0000000..9161f5e --- /dev/null +++ b/.versions @@ -0,0 +1,15 @@ +babel-compiler@5.8.24_1 +babel-runtime@0.1.4 +base64@1.0.4 +caching-compiler@1.0.0 +check@1.1.0 +ecmascript@0.1.6 +ecmascript-runtime@0.2.6 +ejson@1.0.7 +fourseven:scss@3.4.3 +jquery@1.11.4 +meteor@1.1.10 +promise@0.5.1 +random@1.0.5 +underscore@1.0.4 +zurb:motion-ui@2.0.3