Skip to content

Commit b58736d

Browse files
committed
chore: upgrade generator
Upgrade generator.
1 parent 5cc8a5c commit b58736d

15 files changed

+158
-96
lines changed

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ npm-debug.log*
2525
bower_components/
2626
node_modules/
2727

28-
# Yeoman meta-data
29-
.yo-rc.json
30-
3128
# Build-related directories
3229
dist/
3330
docs/api/

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
lts/*

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ sudo: false
22
dist: trusty
33
language: node_js
44
node_js:
5-
- 'node'
6-
- 'lts/argon'
5+
- 'lts/*'
76
before_script:
87

98
# Check if the current version is equal to the major version for the env.

.yo-rc.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"generator-videojs-plugin": {
3+
"bcov": false,
4+
"scope": "",
5+
"name": "offset",
6+
"description": "VideoJs plugin to virtually \"cut\" an ondemand video",
7+
"author": "Carles Galan Cladera <cgcladera@gmail.com>",
8+
"license": "mit",
9+
"css": false,
10+
"ie8": true,
11+
"docs": true,
12+
"lang": false,
13+
"bower": true,
14+
"ghooks": "test",
15+
"sass": false,
16+
"husky": "test"
17+
}
18+
}

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ We welcome contributions from everyone!
44

55
## Getting Started
66

7-
Make sure you have NodeJS 0.10 or higher and npm installed.
7+
Make sure you have Node.js 4.8 or higher and npm installed.
88

99
1. Fork this repository and clone your fork
1010
1. Install dependencies: `npm install`

README.md

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,25 @@
1-
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
2-
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
3-
**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)*
4-
5-
- [videojs-offset](#videojs-offset)
6-
- [Installation](#installation)
7-
- [Usage](#usage)
8-
- [`<script>` Tag](#script-tag)
9-
- [Browserify](#browserify)
10-
- [RequireJS/AMD](#requirejsamd)
11-
- [License](#license)
12-
13-
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
14-
151
# videojs-offset
162

17-
[![Build Status](https://travis-ci.org/cladera/videojs-offset.svg?branch=master)](https://travis-ci.org/cladera/videojs-offset)
3+
VideoJs plugin to virtually &#34;cut&#34; an ondemand video
184

19-
[![npm version](https://badge.fury.io/js/videojs-offset.svg)](https://badge.fury.io/js/videojs-offset)
5+
## Table of Contents
206

7+
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
8+
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
219
## Installation
2210

23-
```sh
24-
npm install --save videojs-offset
25-
```
11+
- [Installation](#installation)
12+
- [Usage](#usage)
13+
- [`<script>` Tag](#script-tag)
14+
- [Browserify/CommonJS](#browserifycommonjs)
15+
- [RequireJS/AMD](#requirejsamd)
16+
- [License](#license)
2617

27-
The npm installation is preferred, but Bower works, too.
18+
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
19+
## Installation
2820

2921
```sh
30-
bower install --save videojs-offset
22+
npm install --save videojs-offset
3123
```
3224

3325
## Usage
@@ -52,7 +44,7 @@ This is the simplest case. Get the script in whatever way you prefer and include
5244
</script>
5345
```
5446

55-
### Browserify
47+
### Browserify/CommonJS
5648

5749
When using with Browserify, install videojs-offset via npm and `require` the plugin as you would any other module.
5850

@@ -91,7 +83,7 @@ require(['video.js', 'videojs-offset'], function(videojs) {
9183

9284
## License
9385

94-
MIT. Copyright 2017(c) Carles Galan Cladera &lt;cgcladera@gmail.com&gt;
86+
MIT. Copyright (c) Carles Galan Cladera &lt;cgcladera@gmail.com&gt;
9587

9688

9789
[videojs]: http://videojs.com/

index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
</video>
1313
<ul>
1414
<li><a href="test/">Run unit tests in browser.</a></li>
15-
<li><a href="dist/docs/api/">Read generated api docs.</a></li>
16-
<li><a href="dist/docs/manual/">Read generated manual docs.</a></li>
15+
<li><a href="docs/api/">Read generated docs.</a></li>
1716
</ul>
17+
<script src="node_modules/es5-shim/es5-shim.js"></script>
1818
<script src="node_modules/video.js/dist/video.js"></script>
19-
<script src="dist/browser/videojs-offset.js"></script>
19+
<script src="dist/videojs-offset.js"></script>
2020
<script>
2121
(function(window, videojs) {
2222
var player = window.player = videojs('videojs-offset-player');

package-lock.json

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"node": ">=4.4.0"
99
},
1010
"generator-videojs-plugin": {
11-
"version": "5.0.0"
11+
"version": "5.2.1"
1212
},
1313
"scripts": {
1414
"prebuild": "npm run clean",
@@ -27,7 +27,7 @@
2727
"lint": "vjsstandard",
2828
"prestart": "npm run build",
2929
"start": "npm-run-all -p start:server watch",
30-
"start:server": "static -a 0.0.0.0 -p 9999 -H '{\"Cache-Control\": \"no-cache, must-revalidate\"}' .",
30+
"start:server": "node scripts/server.js",
3131
"pretest": "npm-run-all lint build",
3232
"test": "karma start test/karma.conf.js",
3333
"preversion": "npm test",
@@ -37,9 +37,9 @@
3737
"watch:js-modules": "rollup -c scripts/modules.rollup.config.js -w",
3838
"watch:js-umd": "rollup -c scripts/umd.rollup.config.js -w",
3939
"watch:test": "rollup -c scripts/test.rollup.config.js -w",
40-
"prepublish": "npm run build",
41-
"prepush": "npm run lint",
42-
"precommit": "npm run docs && git add README.md"
40+
"prepublish": "not-in-install && npm run build || in-install",
41+
"prepush": "npm run test",
42+
"precommit": "npm run docs:toc && git add README.md"
4343
},
4444
"keywords": [
4545
"videojs",
@@ -64,45 +64,47 @@
6464
],
6565
"dependencies": {
6666
"global": "^4.3.2",
67-
"video.js": "^5.19.2"
67+
"video.js": "^5.19.2 || ^6.6.0"
6868
},
6969
"devDependencies": {
7070
"babel-plugin-external-helpers": "^6.22.0",
71-
"babel-plugin-transform-object-assign": "^6.8.0",
72-
"babel-preset-es2015": "^6.14.0",
71+
"babel-plugin-transform-object-assign": "^6.22.0",
72+
"babel-preset-es2015": "^6.24.1",
7373
"babel-preset-es3": "^1.0.1",
74-
"bannerize": "^1.0.2",
75-
"conventional-changelog-cli": "^1.3.1",
74+
"bannerize": "^1.1.3",
75+
"conventional-changelog-cli": "^1.3.5",
7676
"conventional-changelog-videojs": "^3.0.0",
7777
"doctoc": "^1.3.0",
78-
"es5-shim": "^4.5.9",
78+
"es5-shim": "^4.5.10",
7979
"ghooks": "^1.3.2",
80-
"husky": "^0.13.3",
80+
"husky": "^0.13.4",
81+
"in-publish": "^2.0.0",
8182
"jsdoc": "^3.4.3",
8283
"karma": "~1.3.0",
83-
"karma-chrome-launcher": "^2.1.1",
84-
"karma-detect-browsers": "^2.2.5",
85-
"karma-firefox-launcher": "^1.0.1",
84+
"karma-chrome-launcher": "^2.2.0",
85+
"karma-detect-browsers": "^2.2.6",
86+
"karma-firefox-launcher": "^1.1.0",
8687
"karma-ie-launcher": "^1.0.0",
8788
"karma-qunit": "^1.2.1",
8889
"karma-safari-launcher": "^1.0.0",
8990
"mkdirp": "^0.5.1",
90-
"node-static": "^0.7.9",
91-
"npm-run-all": "^4.0.2",
92-
"qunitjs": "^1.21.0",
93-
"rimraf": "^2.6.1",
94-
"rollup": "^0.50.0",
91+
"node-static": "^0.7.10",
92+
"npm-run-all": "^4.1.2",
93+
"portscanner": "^2.1.1",
94+
"qunitjs": "^1.23.1",
95+
"rimraf": "^2.6.2",
96+
"rollup": "^0.53.4",
9597
"rollup-plugin-babel": "^2.7.1",
96-
"rollup-plugin-commonjs": "^8.0.2",
97-
"rollup-plugin-json": "^2.1.1",
98-
"rollup-plugin-multi-entry": "^2.0.1",
98+
"rollup-plugin-commonjs": "^8.2.6",
99+
"rollup-plugin-json": "^2.3.0",
100+
"rollup-plugin-multi-entry": "^2.0.2",
99101
"rollup-plugin-node-resolve": "^3.0.0",
100102
"rollup-watch": "^3.2.2",
101-
"semver": "^5.3.0",
102-
"sinon": "^2.2.0",
103-
"uglify-js": "^3.0.7",
103+
"semver": "^5.4.1",
104+
"sinon": "^2.4.1",
105+
"uglify-js": "^3.3.5",
104106
"videojs-spellbook": "^2.0.2",
105-
"videojs-standard": "^6.0.0"
107+
"videojs-standard": "^6.0.1"
106108
},
107109
"config": {
108110
"ghooks": {

scripts/modules.rollup.config.js

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,21 @@ import babel from 'rollup-plugin-babel';
99
import json from 'rollup-plugin-json';
1010

1111
export default {
12-
moduleName: 'videojsOffset',
13-
entry: 'src/plugin.js',
14-
external: ['video.js'],
12+
name: 'videojsOffset',
13+
input: 'src/plugin.js',
14+
output: [{
15+
file: 'dist/videojs-offset.cjs.js',
16+
format: 'cjs'
17+
}, {
18+
file: 'dist/videojs-offset.es.js',
19+
format: 'es'
20+
}],
21+
external: [
22+
'global',
23+
'global/document',
24+
'global/window',
25+
'video.js'
26+
],
1527
globals: {
1628
'video.js': 'videojs'
1729
},
@@ -33,9 +45,5 @@ export default {
3345
'transform-object-assign'
3446
]
3547
})
36-
],
37-
targets: [
38-
{dest: 'dist/videojs-offset.cjs.js', format: 'cjs'},
39-
{dest: 'dist/videojs-offset.es.js', format: 'es'}
4048
]
4149
};

0 commit comments

Comments
 (0)