Merge branch 'release/0.3.9'

issue_template.md → .github/ISSUE_TEMPLATE/bug_report.md

@@ -1,8 +1,14 @@
+---
+name: "\U0001F41C Bug report"
+about: Create a report to help us improve
+labels: bug
+---
+
 **Browser**: FILL WITH YOUR BROWSER (ex: Chrome Version 46.0.2490.80, Firefox Version 3.5.6, IE 11)
 
 **OS**: FILL WITH YOUR OS (ex: Mac OS 10.11.1, iOS9, android4.5)
 
-**Clappr Version**: 0.2.25
+**Clappr Version**: 0.3.8
 
 **Steps to reproduce**:
 
@@ -14,4 +20,3 @@ Did you try to reproduce this issue at http://cdn.clappr.io/
 
 ps: you can attach images, logs or whatever you think might be helpful.
 ps: feel free to clean this if your issue is different.
-

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: "\U0001F680 Feature request"
+about: Suggest an idea for this project
+labels: feature
+---
+
+<!--
+Thank you for suggesting an idea to make Clappr better.
+
+Please fill in as much of the template below as you're able.
+-->
+
+**Is your feature request related to a problem? Please describe.**
+Please describe the problem you are trying to solve.
+
+**Describe the solution you'd like**
+Please describe the desired behavior.
+
+**Describe alternatives you've considered**
+Please describe alternative solutions or features you have considered.

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,9 @@
+---
+name: "⁉️ Question"
+about: Need some help?
+labels: question
+---
+
+**What do you want to do with Clappr?**
+
+**What have you tried so far?**

bump

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+PROJECT_NAME='clappr'
+CDN_PATH="npm/$PROJECT_NAME@latest/dist/$PROJECT_NAME.min.js"
+
 update_dependencies() {
   echo 'updating dependencies' &&
   yarn install
@@ -12,14 +15,10 @@ update_version() {
   sed -i ".bkp" "s/\(version\":[ ]*\"\)$current_tag/\1$1/" yuidoc.json
 }
 
-update_bower() {
-  ./node_modules/sync-pkg/bin/sync.js
-}
-
 build() {
-  echo 'building clappr.js' &&
+  echo "building $PROJECT_NAME.js" &&
   yarn build &&
-  echo 'building clappr.min.js' &&
+  echo "building $PROJECT_NAME.min.js" &&
   yarn release
 }
 
@@ -29,7 +28,7 @@ run_tests() {
 }
 
 make_release_commit() {
-  git add package.json bower.json yarn.lock yuidoc.json dist &&
+  git add package.json yarn.lock yuidoc.json dist &&
   git commit -m 'chore(package): bump to '$1 &&
   git flow release finish $1
 }
@@ -48,15 +47,7 @@ npm_publish() {
 
 purge_cdn_cache() {
   echo 'purging cdn cache'
-  curl -q http://purge.jsdelivr.net/npm/clappr@latest/dist/clappr.min.js
-}
-
-send_mail() {
-  last_tag=$(git log --tags --no-walk --pretty="format:%d" | sed 2q | sed 's/[()]//g' | sed 's/ tag: //' | sed -n 2p)
-  changelog=$(git log --pretty='%h %s (%an)\n' $last_tag..master)
-  message="Clappr developers bumped a new version: $1\n\nChangelog:\n=========\n$changelog\n\nwith love,\nYour happy butler.\n"
-  echo -e $message | mail -s "$(echo -e "[clappr] new version released: $1\nFrom: Clappr Butler <butler@clappr.io>\n")" videos5@corp.globo.com
-  return 0
+  curl -q "http://purge.jsdelivr.net/$CDN_PATH"
 }
 
 main() {
@@ -68,7 +59,6 @@ main() {
   git flow release start $1 &&
   update_dependencies &&
   update_version $1 &&
-  update_bower &&
   build
   if (("$?" != "0")); then
     echo "something failed during dependency update, version update, or build"
@@ -79,14 +69,13 @@ main() {
     make_release_commit $1 &&
     git_push &&
     npm_publish &&
-    send_mail $1 &&
     purge_cdn_cache &&
     exit 0
 
     echo "something failed"
     exit 1
   else
-    echo "you broke the tests. fix it before bump another version."
+    echo "you broke the tests. fix it before bumping another version."
     exit 1
   fi
 }

dist/clappr.js

@@ -30386,7 +30386,7 @@ var _clapprZepto2 = _interopRequireDefault(_clapprZepto);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var version = "0.3.8"; // Copyright 2014 Globo.com Player authors. All rights reserved.
+var version = "0.3.9"; // Copyright 2014 Globo.com Player authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 

karma.conf.js

@@ -1,11 +1,14 @@
 /* eslint-disable no-var */
 const path = require('path')
-
+const webpack = require('webpack')
 const webpackConfig = require('./webpack.config.base')
 
 // add subject as webpack's postloader
 const webpackTestConfig = webpackConfig({
   mode: 'development',
+  plugins: [
+    new webpack.DefinePlugin({ PLAIN_HTML5_ONLY: false })
+  ],
   rules: [
     {
       test: /\.js$/,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "clappr",
-  "version": "0.3.8",
+  "version": "0.3.9",
   "description": "An extensible media player for the web",
   "main": "./dist/clappr.js",
   "scripts": {
@@ -15,6 +15,13 @@
     "lint:fix": "npm run lint -- --fix",
     "start": "./node_modules/.bin/webpack-dev-server --host 0.0.0.0 --content-base public/ --output-public-path latest/ --hot"
   },
+  "files": [
+    "/dist",
+    "/src"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
   "repository": {
     "type": "git",
     "url": "git@github.com:clappr/clappr.git"

public/index.html

@@ -59,11 +59,11 @@
 
 var player = new Clappr.Player({
   source: 'http://clappr.io/highline.mp4',
-  poster: 'http://clappr.io/poster.png', 
-  mute: true, 
-  height: 360, 
-  width: 640 
-}); 
+  poster: 'http://clappr.io/poster.png',
+  mute: true,
+  height: 360,
+  width: 640
+});
 
 player.attachTo(playerElement);
       </div>
@@ -157,4 +157,4 @@
   </script>
 </body>
 
-</html>
+</html>