Update to generator 2.0-prerelease

Author: misteroneill

.gitignore

@@ -30,6 +30,6 @@ node_modules/
 
 # Build-related directories
 dist/
-dist-test/
 docs/api/
 es5/
+test/dist/

.npmignore

@@ -1,4 +1,3 @@
-!dist/
-!dist-test/
-!docs/
-!es5/
+# Intentionally left blank, so that npm does not ignore anything by default,
+# but relies on the package.json "files" array to explicitly define what ends
+# up in the package.

CONTRIBUTING.md

@@ -1 +1,30 @@
 # CONTRIBUTING
+
+We welcome contributions from everyone!
+
+## Getting Started
+
+Make sure you have NodeJS 0.10 or higher and npm installed.
+
+1. Fork this repository and clone your fork
+1. Install dependencies: `npm install`
+1. Run a development server: `npm start`
+
+### Making Changes
+
+Refer to the [video.js plugin standards][standards] for more detail on best practices and tooling for video.js plugin authorship.
+
+When you've made your changes, push your commit(s) to your fork and issue a pull request against the original repository.
+
+### Running Tests
+
+Testing is a crucial part of any software project. For all but the most trivial changes (typos, etc) test cases are expected. Tests are run in actual browsers using [Karma][karma].
+
+- In all available and supported browsers: `npm test`
+- In a specific browser: `npm run test:chrome`, `npm run test:firefox`, etc.
+- While development server is running (`npm start`), navigate to [`http://localhost:9999/test/`][local]
+
+
+[karma]: http://karma-runner.github.io/
+[local]: http://localhost:9999/test/
+[standards]: https://github.com/videojs/generator-videojs-plugin/docs/standards.md

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2015 Brightcove, Inc.
+Copyright 2016 Brightcove, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

bower.json

@@ -1,6 +1,5 @@
 {
   "name": "videojs-overlay",
-  "version": "0.1.1",
   "author": "Brightcove, Inc.",
   "license": "Apache-2.0",
   "main": [

package.json

@@ -22,55 +22,58 @@
   "vjsstandard": {
     "ignore": [
       "dist",
-      "dist-test",
       "docs",
       "es5",
-      "test/karma",
-      "scripts"
+      "test/dist",
+      "test/karma.conf.js"
     ]
   },
   "scripts": {
     "prebuild": "npm run clean",
     "build": "npm-run-all -p build:*",
-    "build:css": "npm-run-all mkdirs build:css:sass build:css:bannerize",
+    "build:css": "npm-run-all build:css:sass build:css:bannerize",
     "build:css:bannerize": "bannerize dist/videojs-overlay.css --banner=scripts/banner.ejs",
-    "build:css:sass": "node-sass --output-style=compressed --linefeed=lf src/plugin.scss -o dist &&  mv dist/plugin.css dist/videojs-overlay.css",
-    "build:js": "npm-run-all mkdirs build:js:babel build:js:browserify build:js:bannerize build:js:uglify",
+    "build:css:sass": "node-sass src/plugin.scss dist/videojs-overlay.css --output-style=compressed --linefeed=lf",
+    "build:js": "npm-run-all build:js:babel build:js:browserify build:js:bannerize build:js:uglify",
     "build:js:babel": "babel src -d es5",
     "build:js:bannerize": "bannerize dist/videojs-overlay.js --banner=scripts/banner.ejs",
     "build:js:browserify": "browserify . -s videojs-overlay -o dist/videojs-overlay.js",
     "build:js:uglify": "uglifyjs dist/videojs-overlay.js --comments --mangle --compress -o dist/videojs-overlay.min.js",
-    "build:test": "npm-run-all mkdirs build:test:browserify",
+    "build:test": "babel-node scripts/build-test.js",
     "build:test:browserify": "browserify  `find test -name '*.test.js'` -t babelify -o dist-test/videojs-overlay.js",
-    "clean": "rm -rf dist dist-test es5",
+    "change": "chg add",
+    "clean": "rimraf dist test/dist es5 && mkdirp dist test/dist es5",
     "lint": "vjsstandard",
-    "mkdirs": "mkdir -p dist dist-test es5",
     "prestart": "npm-run-all build",
-    "start": "npm-run-all -p start:* watch:*",
+    "start": "babel-node scripts/server.js",
     "start:serve": "static -a 0.0.0.0 -p 9999",
-    "pretest": "npm-run-all lint build:test",
-    "test": "karma start test/karma/detected.js",
-    "test:chrome": "npm run pretest && karma start test/karma/chrome.js",
-    "test:firefox": "npm run pretest && karma start test/karma/firefox.js",
-    "test:ie": "npm run pretest && karma start test/karma/ie.js",
-    "test:safari": "npm run pretest && karma start test/karma/safari.js",
-    "preversion": "./scripts/npm-preversion-for-bower.sh",
-    "version": "./scripts/npm-version-for-bower.sh",
-    "postversion": "./scripts/npm-postversion-for-bower.sh",
+    "pretest": "npm-run-all lint build",
+    "test": "karma start test/karma.conf.js",
+    "test:chrome": "npm run pretest && karma start test/karma.conf.js --browsers Chrome",
+    "test:firefox": "npm run pretest && karma start test/karma.conf.js --browsers Firefox",
+    "test:ie": "npm run pretest && karma start test/karma.conf.js --browsers IE",
+    "test:safari": "npm run pretest && karma start test/karma.conf.js --browsers Safari",
+    "preversion": "npm test",
+    "version": "babel-node scripts/version.js",
+    "postversion": "babel-node scripts/postversion.js",
     "watch": "npm run mkdirs && npm-run-all -p watch:*",
     "watch:css": "node-sass --output-style=nested --linefeed=lf src/plugin.scss -o dist -w src && mv dist/plugin.css dist/videojs-overlay.css",
     "watch:js": "watchify src/plugin.js -t babelify -v -o dist/videojs-overlay.js",
-    "watch:test": "watchify `find test -name '*.test.js'` -t babelify -o dist-test/videojs-overlay.js"
+    "watch:test": "watchify `find test -name '*.test.js'` -t babelify -o dist-test/videojs-overlay.js",
+    "prepublish": "npm run build"
   },
   "dependencies": {
-    "video.js": "^5.0.0"
+    "video.js": "^5.6.0"
   },
   "devDependencies": {
     "babel": "^5.8.0",
     "babelify": "^6.0.0",
     "bannerize": "^1.0.0",
-    "browserify": "^11.0.0",
+    "browserify": "^12.0.0",
     "browserify-shim": "^3.0.0",
+    "budo": "^8.0.0",
+    "chg": "^0.3.2",
+    "glob": "^6.0.3",
     "global": "^4.3.0",
     "grunt-contrib-clean": "^0.4",
     "grunt-contrib-compress": "~0.6.1",
@@ -91,14 +94,32 @@
     "karma-safari-launcher": "^0.1.0",
     "load-grunt-tasks": "~0.3.0",
     "lodash-compat": "^3.10.0",
+    "mkdirp": "^0.5.1",
     "node-sass": "^3.4.0",
     "node-static": "^0.7.0",
-    "npm-run-all": "~1.2.0",
+    "npm-run-all": "^1.2.0",
     "qunitjs": "^1.0.0",
+    "rimraf": "^2.5.1",
     "sinon": "^1.0.0",
     "uglify-js": "^2.5.0",
     "video.js": "^4.5",
     "videojs-standard": "^4.0.0",
     "watchify": "^3.6.0"
-  }
-}
+  },
+  "style": "dist/videojs-overlay.css",
+  "videojs-plugin": {
+    "style": "dist/videojs-overlay.css",
+    "script": "dist/videojs-overlay.min.js"
+  },
+  "files": [
+    "CONTRIBUTING.md",
+    "bower.json",
+    "dist/",
+    "docs/",
+    "es5/",
+    "index.html",
+    "scripts/",
+    "src/",
+    "test/"
+  ]
+}

scripts/build-test.js

@@ -0,0 +1,15 @@
+import browserify from 'browserify';
+import fs from 'fs';
+import glob from 'glob';
+
+/* eslint no-console: 0 */
+
+glob('test/**/*.test.js', (err, files) => {
+  if (err) {
+    throw err;
+  }
+  browserify(files)
+    .transform('babelify')
+    .bundle()
+    .pipe(fs.createWriteStream('test/dist/bundle.js'));
+});

scripts/npm-postversion-for-bower.sh

@@ -0,0 +1,33 @@
+import {exec} from 'child_process';
+import fs from 'fs';
+import path from 'path';
+
+/* eslint no-console: 0 */
+
+/**
+ * Determines whether or not the project has the Bower setup by checking for
+ * the presence of a bower.json file.
+ *
+ * @return {Boolean}
+ */
+const hasBower = () => {
+  try {
+    fs.statSync(path.join(__dirname, '../bower.json'));
+    return true;
+  } catch (x) {
+    return false;
+  }
+};
+
+// If the project supports Bower, roll HEAD back one commit to avoid having
+// the tagged commit - with `dist/` - in the main history.
+if (hasBower()) {
+  exec('git reset --hard HEAD~1', (err, stdout, stderr) => {
+    if (err) {
+      process.stdout.write(err.stack);
+      process.exit(err.status || 1);
+    } else {
+      process.stdout.write(stdout);
+    }
+  });
+}