Merge branch 'release/2.0.2'

* release/2.0.2: release 2.0.2 fix build workflow in README [#259] fix bower main entry [#259] update package-lock.json
heiseonline · Nov 2, 2017 · 696851b · 696851b
2 parents 48c2761 + 6c82098
commit 696851b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## v2.0.2, 2017-11-02
+
+- Fixed bower `main` entry. ([#259](https://github.com/heiseonline/shariff/issues/259))
+- Updated build workflow in README.md. ([#259](https://github.com/heiseonline/shariff/issues/259))
+
 ## v2.0.1, 2017-10-25
 
 - Fixed broken test call.

diff --git a/README-de.md b/README-de.md
@@ -71,17 +71,15 @@ new Shariff(buttonsContainer, {
 
 ## Demo-Webseite starten
 
-Nach dem Download von Shariff mit `npm install` die Abhängigkeiten installieren. Anschließend kann mit `grunt demo` ein lokaler Webserver gestartet werden, der eine Seite mit verschiedenen Konfigurations-Beispielen bereitstellt:
+Nach dem Download von Shariff mit `npm install` die Abhängigkeiten installieren. Anschließend kann mit `npm run dev` ein lokaler Webserver gestartet werden, der eine Seite mit verschiedenen Konfigurations-Beispielen bereitstellt:
 
 ```sh
 $ git clone https://github.com/heiseonline/shariff.git
 $ cd shariff
 $ npm install
-$ grunt demo
+$ npm run dev
 ```
 
-Für den Aufruf von `grunt demo` muss [Grunt CLI](http://gruntjs.com/getting-started#installing-the-cli) installiert sein. Die Beispielseite verwendet [`shariff-backend-node`](https://github.com/heiseonline/shariff-backend-node), um die Share-Counts für die Buttons bereitzustellen.
-
 ## Optionen (data-Attribute)
 
 | Attribut         | Beschreibung | Default |

diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ Shariff consists of two parts: a simple JavaScript client library and an optiona
 1. Download the [latest release](https://github.com/heiseonline/shariff/releases/latest)
 2. Include CSS in `<head>`:
     * `build/shariff.complete.css` contains all dependencies
-    * if [Font Awesome](https://github.com/FortAwesome/Font-Awesome) is already included in your site, use `build/shariff.min.css` 
+    * if [Font Awesome](https://github.com/FortAwesome/Font-Awesome) is already included in your site, use `build/shariff.min.css`
 3. Include JavaScript right before `</body>`:
     * `build/shariff.complete.js` contains all dependencies
     * if [jQuery](https://github.com/jquery/jquery) is already included in your site, use `build/shariff.min.js`
@@ -78,11 +78,9 @@ After downloading Shariff, install its dependencies by running `npm install`.
 $ git clone https://github.com/heiseonline/shariff.git
 $ cd shariff
 $ npm install
-$ grunt demo
+$ npm run dev
 ```
 
-Make sure you have installed the [Grunt CLI](http://gruntjs.com/getting-started#installing-the-cli). Run `grunt demo` to start a local web server which displays several button configurations. The demo page uses [`shariff-backend-node`](https://github.com/heiseonline/shariff-backend-node) to request and display share counts.
-
 ## Options (data attributes)
 
 | Attribute        | Description | Default |

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "shariff",
-  "version": "1.26.1",
+  "version": "2.0.2",
   "homepage": "http://ct.de/-2467514",
   "authors": [
     "Ines Pauer <[email protected]>",
@@ -10,8 +10,8 @@
     "Deniz Sesli <[email protected]>"
   ],
   "main": [
-    "build/shariff.min.css",
-    "build/shariff.min.js"
+    "dist/shariff.min.css",
+    "dist/shariff.min.js"
   ],
   "description": "Shariff enables website users to share their favorite content without compromising their privacy.",
   "keywords": [

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "shariff",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Shariff enables website users to share their favorite content without compromising their privacy.",
   "main": "src/js/shariff.js",
   "scripts": {