Merge branch 'release/0.4.2'

README.md

@@ -105,6 +105,7 @@ You can check the plugins used on Clappr player via `@clappr/plugins` [here](htt
 |Scroll Text Overlay | Ready | Yes | https://github.com/Lethea/clappr-marquee-overlay |
 |Playback Speed Controller | Ready | Yes | https://github.com/Lethea/clapper-playback-speed-plugin-extended |
 |FLV | Ready | Yes | https://github.com/andrefilimono/clappr-flvjs-playback |
+|Context Menu | Ready | Yes | https://github.com/joaopaulovieira/clappr-context-menu-plugin |
 
 #### External Integrations
 

bump

@@ -1,7 +1,6 @@
 #!/bin/bash
 
-PROJECT_NAME='clappr'
-CDN_PATH="npm/$PROJECT_NAME@latest/dist/$PROJECT_NAME.min.js"
+CDN_PATH="npm/@clappr/player@latest/dist/clappr.min.js"
 
 update_dependencies() {
   echo 'updating dependencies' &&
@@ -15,9 +14,9 @@ update_version() {
 }
 
 build() {
-  echo "building $PROJECT_NAME.js" &&
+  echo "building clappr.js" &&
   yarn build &&
-  echo "building $PROJECT_NAME.min.js" &&
+  echo "building clappr.min.js" &&
   yarn release
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clappr/player",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "An extensible media player for the web",
   "main": "dist/clappr.js",
   "scripts": {
@@ -32,28 +32,28 @@
   },
   "homepage": "https://github.com/clappr/clappr",
   "devDependencies": {
-    "@babel/core": "^7.8.7",
-    "@babel/preset-env": "^7.8.7",
-    "@clappr/core": "^0.4.14",
-    "@clappr/hlsjs-playback": "^0.4.1",
-    "@clappr/plugins": "^0.4.7",
-    "@rollup/plugin-commonjs": "^14.0.0",
-    "@rollup/plugin-node-resolve": "^7.1.1",
-    "@rollup/plugin-replace": "^2.3.1",
-    "coveralls": "^3.0.0",
-    "cz-conventional-changelog": "^2.1.0",
-    "eslint": "^4.18.2",
-    "rollup": "^2.0.0",
-    "rollup-plugin-babel": "^4.3.3",
-    "rollup-plugin-filesize": "^6.2.1",
+    "@babel/core": "^7.12.3",
+    "@babel/preset-env": "^7.12.1",
+    "@clappr/core": "^0.4.15",
+    "@clappr/hlsjs-playback": "^0.5.0",
+    "@clappr/plugins": "^0.4.9",
+    "@rollup/plugin-babel": "^5.2.1",
+    "@rollup/plugin-commonjs": "^16.0.0",
+    "@rollup/plugin-node-resolve": "^10.0.0",
+    "@rollup/plugin-replace": "^2.3.4",
+    "coveralls": "^3.1.0",
+    "cz-conventional-changelog": "^3.3.0",
+    "eslint": "^7.13.0",
+    "rollup": "^2.33.3",
+    "rollup-plugin-filesize": "^9.0.2",
     "rollup-plugin-html": "^0.2.1",
-    "rollup-plugin-livereload": "^1.0.4",
-    "rollup-plugin-postcss": "^2.2.0",
-    "rollup-plugin-serve": "^1.0.1",
-    "rollup-plugin-sizes": "^1.0.1",
+    "rollup-plugin-livereload": "^2.0.0",
+    "rollup-plugin-postcss": "^3.1.8",
+    "rollup-plugin-serve": "^1.1.0",
+    "rollup-plugin-sizes": "^1.0.3",
     "rollup-plugin-svg": "^2.0.0",
-    "rollup-plugin-terser": "^5.2.0",
-    "rollup-plugin-visualizer": "^3.3.1"
+    "rollup-plugin-terser": "^7.0.2",
+    "rollup-plugin-visualizer": "^4.2.0"
   },
   "config": {
     "commitizen": {

rollup.config.js

@@ -3,7 +3,7 @@ import commonjs from '@rollup/plugin-commonjs'
 import replace from '@rollup/plugin-replace'
 import html from 'rollup-plugin-html'
 import postcss from 'rollup-plugin-postcss'
-import babel from 'rollup-plugin-babel'
+import babel from '@rollup/plugin-babel'
 import livereload from 'rollup-plugin-livereload'
 import serve from 'rollup-plugin-serve'
 import filesize from 'rollup-plugin-filesize'
@@ -17,83 +17,65 @@ const dev = !!process.env.DEV
 const analyzeBundle = !!process.env.ANALYZE_BUNDLE
 const minimize = !!process.env.MINIMIZE
 
+const servePluginOptions = { contentBase: ['dist', 'public'], host: '0.0.0.0', port: '8080' }
+const livereloadPluginOptions = { watch: ['dist', 'public'] }
+const visualizePluginOptions = { open: true }
+
 const plugins = [
   replace({
     VERSION: JSON.stringify(pkg.version),
     CLAPPR_CORE_VERSION: JSON.stringify(clapprCoreVersion),
   }),
   resolve(),
   commonjs(),
-  babel({ exclude: 'node_modules/**' }),
+  babel({ exclude: 'node_modules/**', babelHelpers: 'bundled' }),
   html(),
   postcss(),
   size(),
   filesize(),
+  dev && serve(servePluginOptions),
+  dev && livereload(livereloadPluginOptions),
+  analyzeBundle && visualize(visualizePluginOptions),
 ]
 
-dev && plugins.push(
-  serve({ contentBase: ['dist', 'public'], host: '0.0.0.0', port: '8080' }),
-  livereload({ watch: ['dist', 'public'] }),
-)
-
-analyzeBundle && plugins.push(visualize({ open: true }))
-
-const rollupConfig = [
-  {
-    input: 'src/base_bundle.js',
-    output: {
-      name: 'Clappr',
-      file: 'dist/clappr.plainhtml5.js',
-      format: 'umd',
-      sourcemap: true,
-    },
-    plugins,
-  },
-  {
-    input: 'src/main.js',
-    output: {
-      name: 'Clappr',
-      file: pkg.main,
-      format: 'umd',
-      sourcemap: true,
-    },
-    plugins,
-  },
-]
-
-minimize && rollupConfig.push(
+export default [
   {
     input: 'src/base_bundle.js',
     output: [
       {
         name: 'Clappr',
-        file: 'dist/clappr.plainhtml5.min.js',
+        file: 'dist/clappr.plainhtml5.js',
         format: 'umd',
         sourcemap: true,
       },
+      minimize && {
+        name: 'Clappr',
+        file: 'dist/clappr.plainhtml5.min.js',
+        format: 'iife',
+        sourcemap: true,
+        plugins: terser(),
+      }
     ],
-    plugins: [
-      ...plugins,
-      terser({ include: [/^.+\.min\.js$/] }),
-    ],
+    plugins,
   },
   {
     input: 'src/main.js',
     output: [
       {
-        file: 'dist/clappr.min.js',
-        format: 'umd',
         name: 'Clappr',
+        file: pkg.main,
+        format: 'umd',
         sourcemap: true,
       },
+      minimize && {
+        file: 'dist/clappr.min.js',
+        format: 'iife',
+        name: 'Clappr',
+        sourcemap: true,
+        plugins: terser(),
+      }
     ],
-    plugins: [
-      ...plugins,
-      terser({
-        include: [/^.+\.min\.js$/],
-      }),
-    ],
+    plugins,
   }
-)
+]
 
-export default rollupConfig