Change to 1.x state (#13)

videojs · Jul 24, 2017 · 2aa44eb · 2aa44eb
1 parent 3b5efa9
commit 2aa44eb
Show file tree

Hide file tree

Showing 21 changed files with 459 additions and 586 deletions.
diff --git a/.babelrc b/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": [ "es3", ["es2015", {"loose": true}] ],
+}
diff --git a/.gitignore b/.gitignore
@@ -31,5 +31,4 @@ node_modules/
 # Build-related directories
 dist/
 docs/api/
-es5/
 test/dist/
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,19 @@
 sudo: false
+dist: trusty
 language: node_js
 node_js:
-  - 'node'
-  - '4.2'
-  - '0.12'
-  - '0.10'
+  - '8'
+  - '6'
+  - '4'
 
 before_script:
-
-  # Set up a virtual screen for Firefox.
+  - export CHROME_BIN=/usr/bin/google-chrome
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
+addons:
+  firefox: latest
+  apt:
+    sources:
+    - google-chrome
+    packages:
+    - google-chrome-stable
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,9 @@ _(none)_
 * Use webcrypto for aes-cbc segment decryption when supported (#4)
 * Lock the linter to a specific version
 
+## 1.1.1 (2016-11-17)
+* version to revert 1.1.0
+
 ## 1.0.3 (2016-06-16)
 * dont do browserify-shim globally since we only use it in tests (#1)
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -12,7 +12,7 @@ Make sure you have NodeJS 0.10 or higher and npm installed.
 
 ### Making Changes
 
-Refer to the [video.js plugin standards][standards] for more detail on best practices and tooling for video.js plugin authorship.
+Refer to the [video.js plugin conventions][conventions] 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.
 
@@ -27,4 +27,4 @@ Testing is a crucial part of any software project. For all but the most trivial
 
 [karma]: http://karma-runner.github.io/
 [local]: http://localhost:9999/test/
-[standards]: https://github.com/videojs/generator-videojs-plugin/docs/standards.md
+[conventions]: https://github.com/videojs/generator-videojs-plugin/blob/master/docs/conventions.md
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2016 Brightcove, Inc.
+Copyright Brightcove, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/README.md b/README.md
@@ -57,32 +57,7 @@ var d = new Decrypter(
 });
 ```
 
-## Command Line Usage
-
-Using this module as a command is as easy as:
-```bash
-$ aes-decrypter
-  Usage: aes-decrypter [options] <input file> [output file]
-
-  Options:
-
-    -h, --help     output usage information
-    -k, --key <n>  The keyfile as a 128bit hex-string or the path to a file containing the key in raw binary
-    -i, --iv <n>   The initialization vector as a 128bit hex-string or the path to a file containing a hex-string
-```
-
-Examples:
-```bash
-# Decrypt encrypted.bin with a keyfile and an initialization vector provided
-# on the command-line saving the output to decrypted.bin
-aes-decrypter -k encrypted.key -i 0x00000000000000000000000000000001 encrypted.bin decrypted.bin
-
-# Decrypt encrypted.bin with a keyfile and an initialization vector file
-# outputing the data to stdout
-aes-decrypter -k encrypted.key -i encrypted.iv encrypted.bin
-```
-
-## License
+## [License](LICENSE)
 
 Apache-2.0. Copyright (c) Brightcove, Inc.
 
diff --git a/bin/index.js b/bin/index.js
diff --git a/index.html b/index.html
@@ -3,11 +3,13 @@
 <head>
   <meta charset="utf-8">
   <title>aes-decrypter Demo</title>
+  <script src="dist/aes-decrypter.js"></script>
 </head>
 <body>
+  <p>To test this out, open up your developer console.</p>
   <ul>
-    <li><a href="/test/">Run unit tests in browser.</a></li>
-    <li><a href="/docs/api/">Read generated docs.</a></li>
+    <li><a href="test/">Run unit tests in browser.</a></li>
+    <li><a href="docs/api/">Read generated docs.</a></li>
   </ul>
 </body>
 </html>
diff --git a/package.json b/package.json
@@ -1,52 +1,50 @@
 {
   "name": "aes-decrypter",
-  "version": "2.0.0",
+  "version": "1.1.1",
   "description": "decrypt aes-128 content using a key",
-  "main": "es5/index.js",
+  "main": "dist/aes-decrypter.cjs.js",
+  "module": "dist/aes-decrypter.es.js",
   "contributors": [
-    {
-      "name": "gkatsev",
-      "github": "https://github.com/gkatsev"
-    },
-    {
-      "name": "imbcmdth",
-      "github": "https://github.com/imbcmdth"
-    },
-    {
-      "name": "dmlap",
-      "github": "https://github.com/dmlap"
-    },
-    {
-      "name": "bcasey",
-      "github": "https://github.com/bcasey"
-    }
+    "gkatsev",
+    "imbcmdth",
+    "dmlap",
+    "bcasey"
   ],
-  "bin": "./bin/index.js",
   "scripts": {
     "prebuild": "npm run clean",
     "build": "npm-run-all -p build:*",
-    "build:js": "npm-run-all build:js:babel build:js:browserify build:js:bannerize build:js:uglify",
+    "build:js": "npm-run-all build:js:rollup-modules build:js:rollup-umd build:js:bannerize build:js:uglify",
     "build:js:babel": "babel src -d es5",
-    "build:js:bannerize": "bannerize dist/ase-decrypter.js --banner=scripts/banner.ejs",
+    "build:js:bannerize": "bannerize dist/aes-decrypter.js --banner=scripts/banner.ejs",
     "build:js:browserify": "browserify . -s aes-decrypter -o dist/aes-decrypter.js",
-    "build:js:uglify": "uglifyjs dist/aes-decrypter.js --comments --mangle --compress -o dist/aes-decrypter.min.js",
-    "build:test": "babel-node scripts/build-test.js",
+    "build:js:rollup-modules": "rollup -c scripts/modules.rollup.config.js",
+    "build:js:rollup-umd": "rollup -c scripts/umd.rollup.config.js",
+    "build:js:uglify": "uglifyjs dist/aes-decrypter.js --comments --mangle --compress  -o dist/aes-decrypter.min.js",
+    "build:test": "rollup -c scripts/test.rollup.config.js",
     "change": "chg add",
-    "clean": "rimraf dist test/dist es5 && mkdirp dist test/dist es5",
+    "clean": "rimraf dist test/dist",
+    "postclean": "mkdirp dist test/dist",
+    "assets": "babel-node scripts/assets.js",
     "docs": "npm-run-all docs:*",
     "docs:api": "jsdoc src -r -d docs/api",
     "docs:toc": "doctoc README.md",
     "lint": "vjsstandard",
-    "start": "babel-node scripts/server.js",
+    "prestart": "npm run build",
+    "start": "npm-run-all -p start:server watch",
+    "start:server": "static -a 0.0.0.0 -p 9999 -H '{\"Cache-Control\": \"no-cache, must-revalidate\"}' .",
     "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",
+    "version": "node scripts/version.js",
     "postversion": "babel-node scripts/postversion.js",
+    "watch": "npm-run-all -p watch:*",
+    "watch:js-modules": "rollup -c scripts/modules.rollup.config.js -w",
+    "watch:js-umd": "rollup -c scripts/umd.rollup.config.js -w",
+    "watch:test": "rollup -c scripts/test.rollup.config.js -w",
     "prepublish": "npm run build"
   },
   "author": "Brightcove, Inc.",
@@ -59,52 +57,83 @@
     "ignore": [
       "dist",
       "docs",
-      "es5",
       "test/dist",
-      "test/karma.conf.js"
+      "test/karma.conf.js",
+      "scripts",
+      "src/aes.js"
     ]
   },
   "files": [
     "CONTRIBUTING.md",
-    "bower.json",
     "dist/",
     "docs/",
-    "es5/",
     "index.html",
     "scripts/",
     "src/",
     "test/"
   ],
   "dependencies": {
-    "global": "^4.3.0",
     "commander": "^2.9.0",
-    "pkcs7": "^0.2.3"
+    "global": "^4.3.2",
+    "pkcs7": "^1.0.2"
   },
   "devDependencies": {
-    "babel": "^5.8.35",
-    "babelify": "^6.4.0",
+    "babel-cli": "^6.24.1",
+    "babel-plugin-external-helpers": "^6.22.0",
+    "babel-plugin-transform-object-assign": "^6.8.0",
+    "babel-preset-es2015": "^6.14.0",
+    "babel-preset-es3": "^1.0.1",
+    "babelify": "^7.3.0",
     "bannerize": "^1.0.2",
     "bluebird": "^3.2.2",
     "browserify": "^12.0.2",
     "browserify-shim": "^3.8.12",
     "budo": "^8.0.4",
     "chg": "^0.3.2",
+    "cli-table": "^0.3.1",
+    "conventional-changelog-cli": "^1.3.1",
+    "conventional-changelog-videojs": "^3.0.0",
     "doctoc": "^0.15.0",
+    "filesize": "^3.5.10",
     "glob": "^6.0.3",
     "jsdoc": "^3.4.0",
-    "karma": "^0.13.19",
-    "karma-chrome-launcher": "^0.2.2",
-    "karma-detect-browsers": "^2.0.2",
-    "karma-firefox-launcher": "^0.1.7",
-    "karma-ie-launcher": "^0.2.0",
-    "karma-qunit": "^0.1.9",
-    "karma-safari-launcher": "^0.1.1",
+    "karma": "^1.7.0",
+    "karma-chrome-launcher": "^2.1.1",
+    "karma-detect-browsers": "^2.2.5",
+    "karma-firefox-launcher": "^1.0.1",
+    "karma-ie-launcher": "^1.0.0",
+    "karma-qunit": "^1.2.1",
+    "karma-safari-launcher": "^1.0.0",
+    "klaw-sync": "^2.1.0",
     "mkdirp": "^0.5.1",
-    "npm-run-all": "^1.5.1",
-    "qunitjs": "^1.21.0",
-    "rimraf": "^2.5.1",
-    "sinon": "~1.14.0",
-    "uglify-js": "^2.6.1",
-    "videojs-standard": "4.0.3"
-  }
+    "node-static": "^0.7.9",
+    "npm-run-all": "^4.0.2",
+    "qunitjs": "^2.3.2",
+    "rimraf": "^2.6.1",
+    "rollup": "^0.41.6",
+    "rollup-plugin-babel": "^2.7.1",
+    "rollup-plugin-commonjs": "^8.0.2",
+    "rollup-plugin-json": "^2.1.1",
+    "rollup-plugin-multi-entry": "^2.0.1",
+    "rollup-plugin-node-resolve": "^3.0.0",
+    "rollup-watch": "^3.2.2",
+    "semver": "^5.3.0",
+    "sinon": "^2.2.0",
+    "uglify-js": "^3.0.7",
+    "videojs-standard": "^6.0.0"
+  },
+  "generator-videojs-plugin": {
+    "version": "5.0.0"
+  },
+  "directories": {
+    "test": "test"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/videojs/aes-decrypter.git"
+  },
+  "bugs": {
+    "url": "https://github.com/videojs/aes-decrypter/issues"
+  },
+  "homepage": "https://github.com/videojs/aes-decrypter#readme"
 }