rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-14 02:24:00 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #19378 from twbs/v3-deps

Browse Source 
Update devDependencies
This commit is contained in:
XhmikosR 2016-03-11 10:58:57 +02:00
commit 2744e4042f
30 changed files with 3097 additions and 2262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.travis.yml
View File

@ -1,39 +1,35 @@
sudo: required
dist: trusty
language: node_js language: node_js
git: git:
depth: 10 depth: 10
node_js: node_js:
- "0.12" - "0.12"
before_install: before_install:
- travis_retry sudo pip install -r test-infra/requirements.txt # Remove ./node_modules/.bin from PATH so node-which doesn't replace Unix which and cause RVM to barf. See https://github.com/travis-ci/travis-ci/issues/5092
- rvm install 2.0.0 - export PATH=$(python -c 'from sys import argv;from collections import OrderedDict as od;print(":".join(od((p,None) for p in argv[1].split(":") if p.startswith("/")).keys()))' "$PATH")
- rvm use 2.0.0 --fuzzy - rvm install 2.2
- export GEMDIR=$(rvm gemdir) - rvm use 2.2 --fuzzy
- if [ "$TWBS_TEST" = validate-html ]; then echo "ruby=$(basename $GEMDIR) jekyll=$JEKYLL_VERSION rouge=$ROUGE_VERSION" > pseudo_Gemfile.lock; fi
- "export TRAVIS_COMMIT_MSG=\"$(git log --format=%B --no-merges -n 1)\"" - "export TRAVIS_COMMIT_MSG=\"$(git log --format=%B --no-merges -n 1)\""
- echo "$TRAVIS_COMMIT_MSG" | grep '\[skip validator\]'; export TWBS_DO_VALIDATOR=$?; true - echo "$TRAVIS_COMMIT_MSG" | grep '\[skip validator\]'; export TWBS_DO_VALIDATOR=$?; true
- echo "$TRAVIS_COMMIT_MSG" | grep '\[skip sauce\]'; export TWBS_DO_SAUCE=$?; true - echo "$TRAVIS_COMMIT_MSG" | grep '\[skip sauce\]'; export TWBS_DO_SAUCE=$?; true
- if [ "$TRAVIS_REPO_SLUG" = twbs-savage/bootstrap ]; then export TWBS_DO_VALIDATOR=0; fi - if [ "$TRAVIS_REPO_SLUG" = twbs-savage/bootstrap ]; then export TWBS_DO_VALIDATOR=0; fi
install: install:
- bundle install --deployment --jobs=1
- cp grunt/npm-shrinkwrap.json ./
- npm install -g grunt-cli - npm install -g grunt-cli
- ./test-infra/s3_cache.py download npm-modules - npm install
- if [ "$TWBS_TEST" = validate-html ] && [ $TWBS_DO_VALIDATOR -ne 0 ]; then ./test-infra/s3_cache.py download rubygems; fi cache:
after_script: directories:
- if [ "$TRAVIS_REPO_SLUG" != twbs-savage/bootstrap ] && [ "$TWBS_TEST" = core ]; then ./test-infra/s3_cache.py upload npm-modules; fi - node_modules
- if [ "$TRAVIS_REPO_SLUG" != twbs-savage/bootstrap ] && [ "$TWBS_TEST" = validate-html ] && [ $TWBS_DO_VALIDATOR -ne 0 ]; then ./test-infra/s3_cache.py upload rubygems; fi - vendor/bundle
env: env:
global: global:
- JEKYLL_VERSION="3.0.0" - NPM_CONFIG_PROGRESS="false"
- ROUGE_VERSION="1.10.1"
- SAUCE_USERNAME="bootstrap" - SAUCE_USERNAME="bootstrap"
- secure: "pJkBwnuae9dKU5tEcCqccfS1QQw7/meEcfz63fM7ba7QJNjoA6BaXj08L5Z3Vb5vBmVPwBawxo5Hp0jC0r/Z/O0hGnAmz/Cz09L+cy7dSAZ9x4hvZePSja/UAusaB5ogMoO8l2b773MzgQeSmrLbExr9BWLeqEfjC2hFgdgHLaQ=" - secure: "pJkBwnuae9dKU5tEcCqccfS1QQw7/meEcfz63fM7ba7QJNjoA6BaXj08L5Z3Vb5vBmVPwBawxo5Hp0jC0r/Z/O0hGnAmz/Cz09L+cy7dSAZ9x4hvZePSja/UAusaB5ogMoO8l2b773MzgQeSmrLbExr9BWLeqEfjC2hFgdgHLaQ="
- secure: "gqjqISbxBJK6byFbsmr1AyP1qoWH+rap06A2gI7v72+Tn2PU2nYkIMUkCvhZw6K889jv+LhQ/ybcBxDOXHpNCExCnSgB4dcnmYp+9oeNZb37jSP0rQ+Ib4OTLjzc3/FawE/fUq5kukZTC7porzc/k0qJNLAZRx3YLALmK1GIdUY="
- secure: "Gghh/e3Gsbj1+4RR9Lh2aR/xJl35HWiHqlPIeSUqE9D7uDCVTAwNce/dGL3Ew7uJPfJ6Pgr70wD3zgu3stw0Zmzayax0hiDtGwcQCxVIER08wqGANK9C2Q7PYJkNTNtiTo6ehKWbdV4Z+/U+TEYyQfpQTDbAFYk/vVpsdjp0Lmc="
- secure: "RTbRdx4G/2OTLfrZtP1VbRljxEmd6A1F3GqXboeQTldsnAlwpsES65es5CE3ub/rmixLApOY9ot7OPmNixFgC2Y8xOsV7lNCC62QVpmqQEDyGFFQKb3yO6/dmwQxdsCqGfzf9Np6Wh5V22QFvr50ZLKLd7Uhd9oXMDIk/z1MJ3o="
- secure: "RKWpS+P20b4tG9tawzCMJSmQftoonmC7tJzyGYiHuEM1TcpHALLBcnzKlr/+DiPTfzDJWY4kS8pxfhK4uXOe8OHnhpMNub7LEWtFPePlZIervOJcsOydaQocTKqVVWD6OUubMeQmQ+tZmvmpjoJ1uPPEbFs9ciF7+dv3U5tLUZ0=" - secure: "RKWpS+P20b4tG9tawzCMJSmQftoonmC7tJzyGYiHuEM1TcpHALLBcnzKlr/+DiPTfzDJWY4kS8pxfhK4uXOe8OHnhpMNub7LEWtFPePlZIervOJcsOydaQocTKqVVWD6OUubMeQmQ+tZmvmpjoJ1uPPEbFs9ciF7+dv3U5tLUZ0="
- secure: "XswSKBY0HJ/aO9VOBeWlvGpqSFF/DsJmNKz7o5RkJMJX340qe44J929uUNwwOwlv9YrgptzC2W6l8bpmZQV+p6IYs99SoSA8CCaUfIJaqeU9x/UiT5vIHgqaNax+vFJwvzHLpF5v/ggFqFEKCd54gCDasePLTztHeC4oL104iaQ=" - secure: "XswSKBY0HJ/aO9VOBeWlvGpqSFF/DsJmNKz7o5RkJMJX340qe44J929uUNwwOwlv9YrgptzC2W6l8bpmZQV+p6IYs99SoSA8CCaUfIJaqeU9x/UiT5vIHgqaNax+vFJwvzHLpF5v/ggFqFEKCd54gCDasePLTztHeC4oL104iaQ="
- secure: "Dv1HX5dzyTh8gA2YsLI+yWEgh9lnGKPpRDDEYYvm42fjBFziUYfcpvA9g8GXQuU9srY3mhfsZkCDHN0x5n1gliOai5TSjmd5Hh+9UyhvNWE+D8HoUpcFXWoQXvy/if2r25m+ZWi3cqgXkkBOcal3W1ePMtU4ln18NcWyIZ0tEFo="
- secure: "PabpUdG2dE40hHUkMCdxk1e9Ak3BOo0h7Y5/uekosLKOz5N60Xmn/ooyrSkvicLthXO4cfONFhO3/xSVRKQOxlUw4on5i0VuNK+QSqxJk0IDaRSZnTCcC8J7083K0YL+FvMdGQwcYwMY9LiwS8aS014IRkSQjsa+mjo3owP+dOU="
- secure: "G4/f4PVyVi9o6UbZMqw9YFmDu7cHqe9iymiXYd1RcnPXwhWAePX12m0PWMhUj5itJ180PTEddVip8PNOgBdqyrDxEPKkcgAW2EElVAPIKJXVfvDW64UjQ0H7NS7XvF7iLQUJp/XfmR7NJ7tT393AQdh8SGmuQpJhgYbwIWbES/k="
matrix: matrix:
- TWBS_TEST=core - TWBS_TEST=core
- TWBS_TEST=validate-html - TWBS_TEST=validate-html

6
Gemfile Normal file
View File

@ -0,0 +1,6 @@
source 'https://rubygems.org'
group :development, :test do
gem 'jekyll', '~> 3.1.2'
gem 'jekyll-sitemap', '~> 0.10.0'
end

41
Gemfile.lock Normal file
View File

@ -0,0 +1,41 @@
GEM
remote: https://rubygems.org/
specs:
colorator (0.1)
ffi (1.9.10-x64-mingw32)
jekyll (3.1.2)
colorator (~> 0.1)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1)
kramdown (~> 1.3)
liquid (~> 3.0)
mercenary (~> 0.3.3)
rouge (~> 1.7)
safe_yaml (~> 1.0)
jekyll-sass-converter (1.4.0)
sass (~> 3.4)
jekyll-sitemap (0.10.0)
jekyll-watch (1.3.1)
listen (~> 3.0)
kramdown (1.10.0)
liquid (3.0.6)
listen (3.0.6)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9.7)
mercenary (0.3.5)
rb-fsevent (0.9.7)
rb-inotify (0.9.7)
ffi (>= 0.5.0)
rouge (1.10.1)
safe_yaml (1.0.4)
sass (3.4.21)
PLATFORMS
x64-mingw32
DEPENDENCIES
jekyll (~> 3.1.2)
jekyll-sitemap (~> 0.10.0)
BUNDLED WITH
1.11.2

6
Gruntfile.js
View File

@ -301,7 +301,9 @@ module.exports = function (grunt) {
jekyll: { jekyll: {
options: { options: {
config: '_config.yml' bundleExec: true,
config: '_config.yml',
incremental: false
}, },
docs: {}, docs: {},
github: { github: {
@ -501,7 +503,7 @@ module.exports = function (grunt) {
if (err) { if (err) {
grunt.fail.warn(err); grunt.fail.warn(err);
} }
var dest = 'test-infra/npm-shrinkwrap.json'; var dest = 'grunt/npm-shrinkwrap.json';
fs.renameSync('npm-shrinkwrap.json', dest); fs.renameSync('npm-shrinkwrap.json', dest);
grunt.log.writeln('File ' + dest.cyan + ' updated.'); grunt.log.writeln('File ' + dest.cyan + ' updated.');
done(); done();

5
README.md
View File

@ -80,10 +80,9 @@ Bootstrap's documentation, included in this repo in the root directory, is built
### Running documentation locally ### Running documentation locally
1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v3.0.x). 1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) and other Ruby dependencies with `bundle install`.
**Note for Windows users:** Read [this unofficial guide](http://jekyll-windows.juthilo.com/) to get Jekyll up and running without problems. **Note for Windows users:** Read [this unofficial guide](http://jekyll-windows.juthilo.com/) to get Jekyll up and running without problems.
2. Install the Ruby-based syntax highlighter, [Rouge](https://github.com/jneen/rouge), with `gem install rouge`. 2. From the root `/bootstrap` directory, run `bundle exec jekyll serve` in the command line.
3. From the root `/bootstrap` directory, run `jekyll serve` in the command line.
4. Open `http://localhost:9001` in your browser, and voilà. 4. Open `http://localhost:9001` in your browser, and voilà.
Learn more about using Jekyll by reading its [documentation](http://jekyllrb.com/docs/home/). Learn more about using Jekyll by reading its [documentation](http://jekyllrb.com/docs/home/).

3
_config.yml
View File

@ -13,6 +13,9 @@ port: 9001
url: http://getbootstrap.com url: http://getbootstrap.com
encoding: UTF-8 encoding: UTF-8
gems:
- jekyll-sitemap
# Custom vars # Custom vars
current_version: 3.3.6 current_version: 3.3.6
repo: https://github.com/twbs/bootstrap repo: https://github.com/twbs/bootstrap

1
dist/js/bootstrap.js
View File

@ -543,6 +543,7 @@ if (typeof jQuery === 'undefined') {
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */ * ======================================================================== */
/* jshint latedef: false */
+function ($) { +function ($) {
'use strict'; 'use strict';

6
docs/_includes/components/navbar.html
View File

@ -60,7 +60,7 @@
</ul> </ul>
</li> </li>
</ul> </ul>
<form class="navbar-form navbar-left" role="search"> <form class="navbar-form navbar-left">
<div class="form-group"> <div class="form-group">
<input type="text" class="form-control" placeholder="Search"> <input type="text" class="form-control" placeholder="Search">
</div> </div>
@ -115,7 +115,7 @@
</ul> </ul>
</li> </li>
</ul> </ul>
<form class="navbar-form navbar-left" role="search"> <form class="navbar-form navbar-left">
<div class="form-group"> <div class="form-group">
<input type="text" class="form-control" placeholder="Search"> <input type="text" class="form-control" placeholder="Search">
</div> </div>
@ -182,7 +182,7 @@
<a class="navbar-brand" href="#">Brand</a> <a class="navbar-brand" href="#">Brand</a>
</div> </div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-2"> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-2">
<form class="navbar-form navbar-left" role="search"> <form class="navbar-form navbar-left">
<div class="form-group"> <div class="form-group">
<input type="text" class="form-control" placeholder="Search"> <input type="text" class="form-control" placeholder="Search">
</div> </div>

2
docs/_includes/footer.html
View File

@ -1,6 +1,6 @@
<!-- Footer <!-- Footer
================================================== --> ================================================== -->
<footer class="bs-docs-footer" role="contentinfo"> <footer class="bs-docs-footer">
<div class="container"> <div class="container">
<ul class="bs-docs-footer-links"> <ul class="bs-docs-footer-links">

2
docs/_includes/getting-started/grunt.html
View File

@ -25,7 +25,7 @@
<p>Runs <a href="http://jshint.com">JSHint</a> and runs the <a href="http://qunitjs.com">QUnit</a> tests headlessly in <a href="http://phantomjs.org">PhantomJS</a>.</p> <p>Runs <a href="http://jshint.com">JSHint</a> and runs the <a href="http://qunitjs.com">QUnit</a> tests headlessly in <a href="http://phantomjs.org">PhantomJS</a>.</p>
<h3><code>grunt docs</code> (Build &amp; test the docs assets)</h3> <h3><code>grunt docs</code> (Build &amp; test the docs assets)</h3>
<p>Builds and tests CSS, JavaScript, and other assets which are used when running the documentation locally via <code>jekyll serve</code>.</p> <p>Builds and tests CSS, JavaScript, and other assets which are used when running the documentation locally via <code>bundle exec jekyll serve</code>.</p>
<h3><code>grunt</code> (Build absolutely everything and run tests)</h3> <h3><code>grunt</code> (Build absolutely everything and run tests)</h3>
<p>Compiles and minifies CSS and JavaScript, builds the documentation website, runs the HTML5 validator against the docs, regenerates the Customizer assets, and more. Requires <a href="http://jekyllrb.com/docs/installation/">Jekyll</a>. Usually only necessary if you're hacking on Bootstrap itself.</p> <p>Compiles and minifies CSS and JavaScript, builds the documentation website, runs the HTML5 validator against the docs, regenerates the Customizer assets, and more. Requires <a href="http://jekyllrb.com/docs/installation/">Jekyll</a>. Usually only necessary if you're hacking on Bootstrap itself.</p>

2
docs/_includes/nav/main.html
View File

@ -1,4 +1,4 @@
<header class="navbar navbar-static-top bs-docs-nav" id="top" role="banner"> <header class="navbar navbar-static-top bs-docs-nav" id="top">
<div class="container"> <div class="container">
<div class="navbar-header"> <div class="navbar-header">
<button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#bs-navbar" aria-controls="bs-navbar" aria-expanded="false"> <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#bs-navbar" aria-controls="bs-navbar" aria-expanded="false">

12
docs/assets/js/customize.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
docs/assets/js/raw-files.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
docs/assets/js/src/customizer.js
View File

@ -6,8 +6,7 @@
* details, see https://creativecommons.org/licenses/by/3.0/. * details, see https://creativecommons.org/licenses/by/3.0/.
*/ */
/* jshint es3:false */ /* global JSON, JSZip, less, autoprefixer, saveAs, UglifyJS, __configBridge, __js, __less, __fonts */
/* global JSZip, less, autoprefixer, saveAs, UglifyJS, __configBridge, __js, __less, __fonts */
window.onload = function () { // wait for load in a dumb way because B-0 window.onload = function () { // wait for load in a dumb way because B-0
'use strict'; 'use strict';

12
docs/assets/js/vendor/uglify.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
docs/dist/js/bootstrap.js
View File

@ -543,6 +543,7 @@ if (typeof jQuery === 'undefined') {
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */ * ======================================================================== */
/* jshint latedef: false */
+function ($) { +function ($) {
'use strict'; 'use strict';

2
docs/examples/non-responsive/index.html
View File

@ -61,7 +61,7 @@
</ul> </ul>
</li> </li>
</ul> </ul>
<form class="navbar-form navbar-left" role="search"> <form class="navbar-form navbar-left">
<div class="form-group"> <div class="form-group">
<input type="text" class="form-control" placeholder="Search"> <input type="text" class="form-control" placeholder="Search">
</div> </div>

2
docs/examples/theme/index.html
View File

@ -32,7 +32,7 @@
<![endif]--> <![endif]-->
</head> </head>
<body role="document"> <body>
<!-- Fixed navbar --> <!-- Fixed navbar -->
<nav class="navbar navbar-inverse navbar-fixed-top"> <nav class="navbar navbar-inverse navbar-fixed-top">

2
docs/index.html
View File

@ -4,7 +4,7 @@ title: Bootstrap &middot; The world's most popular mobile-first and responsive f
--- ---
<main class="bs-docs-masthead" id="content" role="main" tabindex="-1"> <main class="bs-docs-masthead" id="content" tabindex="-1">
<div class="container"> <div class="container">
<span class="bs-docs-booticon bs-docs-booticon-lg bs-docs-booticon-outline">B</span> <span class="bs-docs-booticon bs-docs-booticon-lg bs-docs-booticon-outline">B</span>
<p class="lead">Bootstrap is the most popular HTML, CSS, and JS framework for developing responsive, mobile first projects on the web.</p> <p class="lead">Bootstrap is the most popular HTML, CSS, and JS framework for developing responsive, mobile first projects on the web.</p>

23
docs/sitemap.xml
View File

@ -1,23 +0,0 @@
---
---
<?xml version="1.0" encoding="UTF-8"?>
<urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url>
<loc>{{ site.url }}/</loc>
<lastmod>{{ site.time | date_to_xmlschema }}</lastmod>
<changefreq>daily</changefreq>
<priority>1.0</priority>
</url>
{% for page in site.html_pages %}
{% if page.layout != "home" %}
<url>
<loc>{{ site.url }}{{ page.url }}</loc>
<lastmod>{{ site.time | date_to_xmlschema }}</lastmod>
<changefreq>weekly</changefreq>
<priority>0.7</priority>
</url>
{% endif %}
{% endfor %}
</urlset>

1445
test-infra/npm-shrinkwrap.json → grunt/npm-shrinkwrap.json generated
View File

@ -2,7 +2,7 @@
"name": "bootstrap", "name": "bootstrap",
"version": "3.3.6", "version": "3.3.6",
"npm-shrinkwrap-version": "200.4.0", "npm-shrinkwrap-version": "200.4.0",
"node-version": "v5.3.0", "node-version": "v5.8.0",
"dependencies": { "dependencies": {
"JSV": { "JSV": {
"version": "4.0.2", "version": "4.0.2",
@ -17,8 +17,8 @@
"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz" "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz"
}, },
"acorn": { "acorn": {
"version": "2.6.4", "version": "2.7.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-2.6.4.tgz" "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz"
}, },
"acorn-globals": { "acorn-globals": {
"version": "1.0.9", "version": "1.0.9",
@ -29,8 +29,8 @@
"resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.4.tgz" "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.4.tgz"
}, },
"align-text": { "align-text": {
"version": "0.1.3", "version": "0.1.4",
"resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz" "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"
}, },
"alter": { "alter": {
"version": "0.2.0", "version": "0.2.0",
@ -45,24 +45,38 @@
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz" "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
}, },
"ansi-styles": { "ansi-styles": {
"version": "2.1.0", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz" "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.0.tgz"
}, },
"ansicolors": { "ansicolors": {
"version": "0.2.1", "version": "0.2.1",
"resolved": "https://registry.npmjs.org/ansicolors/-/ansicolors-0.2.1.tgz" "resolved": "https://registry.npmjs.org/ansicolors/-/ansicolors-0.2.1.tgz"
}, },
"archiver": { "archiver": {
"version": "0.16.0", "version": "0.21.0",
"resolved": "https://registry.npmjs.org/archiver/-/archiver-0.16.0.tgz", "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.21.0.tgz",
"dependencies": { "dependencies": {
"async": { "async": {
"version": "1.4.2", "version": "1.5.2",
"resolved": "https://registry.npmjs.org/async/-/async-1.4.2.tgz" "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
}, },
"glob": { "glob": {
"version": "5.0.15", "version": "6.0.4",
"resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz" "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz"
},
"lodash": {
"version": "3.10.1",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
}
}
},
"archiver-utils": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-0.3.0.tgz",
"dependencies": {
"glob": {
"version": "6.0.4",
"resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz"
}, },
"lodash": { "lodash": {
"version": "3.10.1", "version": "3.10.1",
@ -109,8 +123,8 @@
"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz" "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"
}, },
"assert-plus": { "assert-plus": {
"version": "0.1.5", "version": "0.2.0",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz" "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
}, },
"ast-traverse": { "ast-traverse": {
"version": "0.1.1", "version": "0.1.1",
@ -136,9 +150,19 @@
"version": "0.6.0", "version": "0.6.0",
"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz" "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
}, },
"aws4": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.3.2.tgz",
"dependencies": {
"lru-cache": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.0.tgz"
}
}
},
"babel-core": { "babel-core": {
"version": "5.8.34", "version": "5.8.35",
"resolved": "https://registry.npmjs.org/babel-core/-/babel-core-5.8.34.tgz", "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-5.8.35.tgz",
"dependencies": { "dependencies": {
"lodash": { "lodash": {
"version": "3.10.1", "version": "3.10.1",
@ -148,14 +172,6 @@
"version": "2.0.10", "version": "2.0.10",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz" "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz"
}, },
"path-exists": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-1.0.0.tgz"
},
"repeating": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz"
},
"source-map": { "source-map": {
"version": "0.5.3", "version": "0.5.3",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz" "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz"
@ -233,8 +249,8 @@
"resolved": "https://registry.npmjs.org/babel-plugin-undefined-to-void/-/babel-plugin-undefined-to-void-1.1.6.tgz" "resolved": "https://registry.npmjs.org/babel-plugin-undefined-to-void/-/babel-plugin-undefined-to-void-1.1.6.tgz"
}, },
"babylon": { "babylon": {
"version": "5.8.34", "version": "5.8.35",
"resolved": "https://registry.npmjs.org/babylon/-/babylon-5.8.34.tgz" "resolved": "https://registry.npmjs.org/babylon/-/babylon-5.8.35.tgz"
}, },
"balanced-match": { "balanced-match": {
"version": "0.3.0", "version": "0.3.0",
@ -245,18 +261,12 @@
"resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.3.tgz" "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.3.tgz"
}, },
"batch": { "batch": {
"version": "0.5.2", "version": "0.5.3",
"resolved": "https://registry.npmjs.org/batch/-/batch-0.5.2.tgz" "resolved": "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz"
}, },
"bl": { "bl": {
"version": "1.0.0", "version": "1.1.2",
"resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz", "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz"
"dependencies": {
"readable-stream": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.5.tgz"
}
}
}, },
"bluebird": { "bluebird": {
"version": "2.10.2", "version": "2.10.2",
@ -267,17 +277,13 @@
"resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz" "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.2", "version": "1.1.3",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz" "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.3.tgz"
}, },
"breakable": { "breakable": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/breakable/-/breakable-1.0.0.tgz" "resolved": "https://registry.npmjs.org/breakable/-/breakable-1.0.0.tgz"
}, },
"browserify-zlib": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz"
},
"browserslist": { "browserslist": {
"version": "0.4.0", "version": "0.4.0",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-0.4.0.tgz" "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-0.4.0.tgz"
@ -290,29 +296,21 @@
"version": "0.2.5", "version": "0.2.5",
"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz" "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz"
}, },
"builtin-modules": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
},
"camel-case": { "camel-case": {
"version": "1.2.2", "version": "1.2.2",
"resolved": "https://registry.npmjs.org/camel-case/-/camel-case-1.2.2.tgz" "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-1.2.2.tgz"
}, },
"camelcase": { "camelcase": {
"version": "2.0.1", "version": "1.2.1",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.0.1.tgz" "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
},
"camelcase-keys": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.0.0.tgz"
}, },
"camelize": { "camelize": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz" "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz"
}, },
"caniuse-db": { "caniuse-db": {
"version": "1.0.30000382", "version": "1.0.30000426",
"resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000382.tgz" "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000426.tgz"
}, },
"cardinal": { "cardinal": {
"version": "0.5.0", "version": "0.5.0",
@ -323,8 +321,8 @@
"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz" "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
}, },
"center-align": { "center-align": {
"version": "0.1.2", "version": "0.1.3",
"resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.2.tgz" "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"
}, },
"chalk": { "chalk": {
"version": "1.0.0", "version": "1.0.0",
@ -343,12 +341,12 @@
"resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.1.tgz" "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.1.tgz"
}, },
"clean-css": { "clean-css": {
"version": "3.4.8", "version": "3.4.10",
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.8.tgz" "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.10.tgz"
}, },
"cli": { "cli": {
"version": "0.11.1", "version": "0.11.2",
"resolved": "https://registry.npmjs.org/cli/-/cli-0.11.1.tgz", "resolved": "https://registry.npmjs.org/cli/-/cli-0.11.2.tgz",
"dependencies": { "dependencies": {
"glob": { "glob": {
"version": "5.0.15", "version": "5.0.15",
@ -384,6 +382,10 @@
"version": "1.3.3", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz" "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz"
}, },
"color-convert": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.0.0.tgz"
},
"colors": { "colors": {
"version": "0.6.2", "version": "0.6.2",
"resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz" "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
@ -398,13 +400,7 @@
}, },
"comment-parser": { "comment-parser": {
"version": "0.3.1", "version": "0.3.1",
"resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-0.3.1.tgz", "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-0.3.1.tgz"
"dependencies": {
"readable-stream": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.5.tgz"
}
}
}, },
"commoner": { "commoner": {
"version": "0.10.4", "version": "0.10.4",
@ -415,8 +411,8 @@
"resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz" "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"
}, },
"graceful-fs": { "graceful-fs": {
"version": "4.1.2", "version": "4.1.3",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz" "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.3.tgz"
}, },
"iconv-lite": { "iconv-lite": {
"version": "0.4.13", "version": "0.4.13",
@ -425,8 +421,8 @@
} }
}, },
"compress-commons": { "compress-commons": {
"version": "0.3.0", "version": "0.4.2",
"resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-0.3.0.tgz" "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-0.4.2.tgz"
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
@ -434,21 +430,15 @@
}, },
"concat-stream": { "concat-stream": {
"version": "1.5.1", "version": "1.5.1",
"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.1.tgz", "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.1.tgz"
"dependencies": {
"readable-stream": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.5.tgz"
}
}
}, },
"config-chain": { "config-chain": {
"version": "1.1.9", "version": "1.1.10",
"resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz" "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.10.tgz"
}, },
"connect": { "connect": {
"version": "3.4.0", "version": "3.4.1",
"resolved": "https://registry.npmjs.org/connect/-/connect-3.4.0.tgz" "resolved": "https://registry.npmjs.org/connect/-/connect-3.4.1.tgz"
}, },
"connect-livereload": { "connect-livereload": {
"version": "0.5.4", "version": "0.5.4",
@ -467,8 +457,8 @@
"resolved": "https://registry.npmjs.org/constantinople/-/constantinople-3.0.2.tgz" "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-3.0.2.tgz"
}, },
"convert-source-map": { "convert-source-map": {
"version": "1.1.2", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.2.tgz" "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.2.0.tgz"
}, },
"cookie-jar": { "cookie-jar": {
"version": "0.3.0", "version": "0.3.0",
@ -483,8 +473,8 @@
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
}, },
"crc32-stream": { "crc32-stream": {
"version": "0.3.4", "version": "0.4.0",
"resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-0.3.4.tgz" "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-0.4.0.tgz"
}, },
"crypt": { "crypt": {
"version": "0.0.1", "version": "0.0.1",
@ -543,8 +533,14 @@
"resolved": "https://registry.npmjs.org/d/-/d-0.1.1.tgz" "resolved": "https://registry.npmjs.org/d/-/d-0.1.1.tgz"
}, },
"dashdash": { "dashdash": {
"version": "1.10.1", "version": "1.13.0",
"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.10.1.tgz" "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.13.0.tgz",
"dependencies": {
"assert-plus": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
}
}
}, },
"date-now": { "date-now": {
"version": "0.1.4", "version": "0.1.4",
@ -563,8 +559,8 @@
"resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz" "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
}, },
"decamelize": { "decamelize": {
"version": "1.1.2", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.1.2.tgz" "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"
}, },
"deep-equal": { "deep-equal": {
"version": "1.0.1", "version": "1.0.1",
@ -578,10 +574,6 @@
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/defs/-/defs-1.1.1.tgz", "resolved": "https://registry.npmjs.org/defs/-/defs-1.1.1.tgz",
"dependencies": { "dependencies": {
"camelcase": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
},
"esprima-fb": { "esprima-fb": {
"version": "15001.1001.0-dev-harmony-fb", "version": "15001.1001.0-dev-harmony-fb",
"resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz" "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz"
@ -601,20 +593,20 @@
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz" "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
}, },
"depd": { "depd": {
"version": "1.0.1", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz" "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz"
}, },
"destroy": { "destroy": {
"version": "1.0.3", "version": "1.0.4",
"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz" "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"
}, },
"detect-indent": { "detect-indent": {
"version": "3.0.1", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-3.0.1.tgz", "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-3.0.1.tgz",
"dependencies": { "dependencies": {
"repeating": { "minimist": {
"version": "1.1.3", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz" "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
} }
} }
}, },
@ -670,6 +662,10 @@
"version": "0.6.0", "version": "0.6.0",
"resolved": "https://registry.npmjs.org/dreamopt/-/dreamopt-0.6.0.tgz" "resolved": "https://registry.npmjs.org/dreamopt/-/dreamopt-0.6.0.tgz"
}, },
"duplexer": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
},
"ecc-jsbn": { "ecc-jsbn": {
"version": "0.1.1", "version": "0.1.1",
"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz" "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"
@ -694,10 +690,6 @@
"version": "4.4.0", "version": "4.4.0",
"resolved": "https://registry.npmjs.org/error/-/error-4.4.0.tgz" "resolved": "https://registry.npmjs.org/error/-/error-4.4.0.tgz"
}, },
"error-ex": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz"
},
"es5-ext": { "es5-ext": {
"version": "0.10.11", "version": "0.10.11",
"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.11.tgz" "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.11.tgz"
@ -715,8 +707,8 @@
"resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz" "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz"
}, },
"es6-set": { "es6-set": {
"version": "0.1.3", "version": "0.1.4",
"resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.3.tgz" "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.4.tgz"
}, },
"es6-symbol": { "es6-symbol": {
"version": "3.0.2", "version": "3.0.2",
@ -727,30 +719,24 @@
"resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.1.tgz" "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.1.tgz"
}, },
"escape-html": { "escape-html": {
"version": "1.0.2", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz" "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"
}, },
"escape-string-regexp": { "escape-string-regexp": {
"version": "1.0.4", "version": "1.0.5",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.4.tgz" "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
}, },
"escope": { "escope": {
"version": "3.3.0", "version": "3.5.0",
"resolved": "https://registry.npmjs.org/escope/-/escope-3.3.0.tgz" "resolved": "https://registry.npmjs.org/escope/-/escope-3.5.0.tgz"
}, },
"esprima": { "esprima": {
"version": "1.0.4", "version": "1.0.4",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz" "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"
}, },
"esrecurse": { "esrecurse": {
"version": "3.1.1", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-3.1.1.tgz", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.0.0.tgz"
"dependencies": {
"estraverse": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-3.1.0.tgz"
}
}
}, },
"estraverse": { "estraverse": {
"version": "4.1.1", "version": "4.1.1",
@ -815,12 +801,18 @@
"resolved": "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz" "resolved": "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz"
}, },
"finalhandler": { "finalhandler": {
"version": "0.4.0", "version": "0.4.1",
"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz" "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz"
}, },
"find-up": { "find-up": {
"version": "1.1.0", "version": "1.1.2",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.0.tgz" "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
"dependencies": {
"path-exists": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"
}
}
}, },
"findup-sync": { "findup-sync": {
"version": "0.1.3", "version": "0.1.3",
@ -849,8 +841,8 @@
"resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz", "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz",
"dependencies": { "dependencies": {
"async": { "async": {
"version": "1.5.0", "version": "1.5.2",
"resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz" "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
} }
} }
}, },
@ -863,8 +855,8 @@
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.23.1.tgz", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.23.1.tgz",
"dependencies": { "dependencies": {
"graceful-fs": { "graceful-fs": {
"version": "4.1.2", "version": "4.1.3",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz" "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.3.tgz"
} }
} }
}, },
@ -893,8 +885,8 @@
"resolved": "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz" "resolved": "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz"
}, },
"glob": { "glob": {
"version": "6.0.2", "version": "7.0.3",
"resolved": "https://registry.npmjs.org/glob/-/glob-6.0.2.tgz" "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.3.tgz"
}, },
"globals": { "globals": {
"version": "6.4.1", "version": "6.4.1",
@ -953,64 +945,26 @@
} }
}, },
"grunt-autoprefixer": { "grunt-autoprefixer": {
"version": "3.0.3", "version": "3.0.4",
"resolved": "https://registry.npmjs.org/grunt-autoprefixer/-/grunt-autoprefixer-3.0.3.tgz" "resolved": "https://registry.npmjs.org/grunt-autoprefixer/-/grunt-autoprefixer-3.0.4.tgz"
}, },
"grunt-contrib-clean": { "grunt-contrib-clean": {
"version": "0.7.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/grunt-contrib-clean/-/grunt-contrib-clean-0.7.0.tgz" "resolved": "https://registry.npmjs.org/grunt-contrib-clean/-/grunt-contrib-clean-1.0.0.tgz",
},
"grunt-contrib-compress": {
"version": "0.14.0",
"resolved": "https://registry.npmjs.org/grunt-contrib-compress/-/grunt-contrib-compress-0.14.0.tgz"
},
"grunt-contrib-concat": {
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/grunt-contrib-concat/-/grunt-contrib-concat-0.5.1.tgz",
"dependencies": {
"ansi-regex": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
},
"ansi-styles": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
},
"chalk": {
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz"
},
"has-ansi": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz"
},
"source-map": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz"
},
"strip-ansi": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz"
},
"supports-color": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
}
}
},
"grunt-contrib-connect": {
"version": "0.11.2",
"resolved": "https://registry.npmjs.org/grunt-contrib-connect/-/grunt-contrib-connect-0.11.2.tgz",
"dependencies": { "dependencies": {
"async": { "async": {
"version": "0.9.2", "version": "1.5.2",
"resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz" "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
},
"rimraf": {
"version": "2.5.2",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.2.tgz"
} }
} }
}, },
"grunt-contrib-copy": { "grunt-contrib-compress": {
"version": "0.8.2", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/grunt-contrib-copy/-/grunt-contrib-copy-0.8.2.tgz", "resolved": "https://registry.npmjs.org/grunt-contrib-compress/-/grunt-contrib-compress-1.1.1.tgz",
"dependencies": { "dependencies": {
"ansi-regex": { "ansi-regex": {
"version": "2.0.0", "version": "2.0.0",
@ -1025,8 +979,54 @@
"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz" "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
}, },
"strip-ansi": { "strip-ansi": {
"version": "3.0.0", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz" "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
},
"supports-color": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
}
}
},
"grunt-contrib-concat": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/grunt-contrib-concat/-/grunt-contrib-concat-1.0.0.tgz",
"dependencies": {
"source-map": {
"version": "0.5.3",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz"
}
}
},
"grunt-contrib-connect": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/grunt-contrib-connect/-/grunt-contrib-connect-1.0.0.tgz",
"dependencies": {
"async": {
"version": "1.5.2",
"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
}
}
},
"grunt-contrib-copy": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/grunt-contrib-copy/-/grunt-contrib-copy-1.0.0.tgz",
"dependencies": {
"ansi-regex": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
},
"chalk": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz"
},
"has-ansi": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
},
"strip-ansi": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
}, },
"supports-color": { "supports-color": {
"version": "2.0.0", "version": "2.0.0",
@ -1035,8 +1035,8 @@
} }
}, },
"grunt-contrib-csslint": { "grunt-contrib-csslint": {
"version": "0.5.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/grunt-contrib-csslint/-/grunt-contrib-csslint-0.5.0.tgz", "resolved": "https://registry.npmjs.org/grunt-contrib-csslint/-/grunt-contrib-csslint-1.0.0.tgz",
"dependencies": { "dependencies": {
"lodash": { "lodash": {
"version": "3.10.1", "version": "3.10.1",
@ -1045,24 +1045,46 @@
} }
}, },
"grunt-contrib-cssmin": { "grunt-contrib-cssmin": {
"version": "0.14.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.14.0.tgz" "resolved": "https://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-1.0.0.tgz"
}, },
"grunt-contrib-htmlmin": { "grunt-contrib-htmlmin": {
"version": "0.6.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/grunt-contrib-htmlmin/-/grunt-contrib-htmlmin-0.6.0.tgz" "resolved": "https://registry.npmjs.org/grunt-contrib-htmlmin/-/grunt-contrib-htmlmin-1.0.0.tgz"
}, },
"grunt-contrib-jade": { "grunt-contrib-jade": {
"version": "0.15.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/grunt-contrib-jade/-/grunt-contrib-jade-0.15.0.tgz" "resolved": "https://registry.npmjs.org/grunt-contrib-jade/-/grunt-contrib-jade-1.0.0.tgz"
}, },
"grunt-contrib-jshint": { "grunt-contrib-jshint": {
"version": "0.11.3", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.11.3.tgz" "resolved": "https://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-1.0.0.tgz",
"dependencies": {
"ansi-regex": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
},
"chalk": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz"
},
"has-ansi": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
},
"strip-ansi": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
},
"supports-color": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
}
}
}, },
"grunt-contrib-less": { "grunt-contrib-less": {
"version": "1.1.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-1.1.0.tgz", "resolved": "https://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-1.2.0.tgz",
"dependencies": { "dependencies": {
"async": { "async": {
"version": "0.9.2", "version": "0.9.2",
@ -1079,32 +1101,12 @@
"resolved": "https://registry.npmjs.org/grunt-contrib-qunit/-/grunt-contrib-qunit-0.7.0.tgz" "resolved": "https://registry.npmjs.org/grunt-contrib-qunit/-/grunt-contrib-qunit-0.7.0.tgz"
}, },
"grunt-contrib-uglify": { "grunt-contrib-uglify": {
"version": "0.11.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.11.0.tgz", "resolved": "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-1.0.0.tgz",
"dependencies": { "dependencies": {
"async": {
"version": "0.2.10",
"resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
},
"camelcase": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
},
"lodash": { "lodash": {
"version": "3.10.1", "version": "4.6.1",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz" "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.6.1.tgz"
},
"source-map": {
"version": "0.5.3",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz"
},
"uglify-js": {
"version": "2.6.1",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz"
},
"yargs": {
"version": "3.10.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"
} }
} }
}, },
@ -1131,28 +1133,28 @@
"resolved": "https://registry.npmjs.org/grunt-exec/-/grunt-exec-0.4.6.tgz" "resolved": "https://registry.npmjs.org/grunt-exec/-/grunt-exec-0.4.6.tgz"
}, },
"grunt-html": { "grunt-html": {
"version": "5.0.1", "version": "6.0.0",
"resolved": "https://registry.npmjs.org/grunt-html/-/grunt-html-5.0.1.tgz", "resolved": "https://registry.npmjs.org/grunt-html/-/grunt-html-6.0.0.tgz",
"dependencies": { "dependencies": {
"ansi-regex": { "ansi-regex": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz" "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
}, },
"async": { "async": {
"version": "1.4.0", "version": "1.5.1",
"resolved": "https://registry.npmjs.org/async/-/async-1.4.0.tgz" "resolved": "https://registry.npmjs.org/async/-/async-1.5.1.tgz"
}, },
"chalk": { "chalk": {
"version": "1.1.0", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.0.tgz" "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz"
}, },
"has-ansi": { "has-ansi": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz" "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
}, },
"strip-ansi": { "strip-ansi": {
"version": "3.0.0", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz" "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
}, },
"supports-color": { "supports-color": {
"version": "2.0.0", "version": "2.0.0",
@ -1161,16 +1163,16 @@
} }
}, },
"grunt-jekyll": { "grunt-jekyll": {
"version": "0.4.3", "version": "0.4.4",
"resolved": "https://registry.npmjs.org/grunt-jekyll/-/grunt-jekyll-0.4.3.tgz" "resolved": "https://registry.npmjs.org/grunt-jekyll/-/grunt-jekyll-0.4.4.tgz"
}, },
"grunt-jscs": { "grunt-jscs": {
"version": "2.5.0", "version": "2.8.0",
"resolved": "https://registry.npmjs.org/grunt-jscs/-/grunt-jscs-2.5.0.tgz", "resolved": "https://registry.npmjs.org/grunt-jscs/-/grunt-jscs-2.8.0.tgz",
"dependencies": { "dependencies": {
"lodash": { "lodash": {
"version": "3.10.1", "version": "4.6.1",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz" "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.6.1.tgz"
} }
} }
}, },
@ -1208,13 +1210,7 @@
}, },
"grunt-lib-phantomjs": { "grunt-lib-phantomjs": {
"version": "0.6.0", "version": "0.6.0",
"resolved": "https://registry.npmjs.org/grunt-lib-phantomjs/-/grunt-lib-phantomjs-0.6.0.tgz", "resolved": "https://registry.npmjs.org/grunt-lib-phantomjs/-/grunt-lib-phantomjs-0.6.0.tgz"
"dependencies": {
"semver": {
"version": "1.0.14",
"resolved": "https://registry.npmjs.org/semver/-/semver-1.0.14.tgz"
}
}
}, },
"grunt-saucelabs": { "grunt-saucelabs": {
"version": "8.6.2", "version": "8.6.2",
@ -1235,12 +1231,12 @@
} }
}, },
"gzip-size": { "gzip-size": {
"version": "1.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-1.0.0.tgz" "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-3.0.0.tgz"
}, },
"har-validator": { "har-validator": {
"version": "2.0.3", "version": "2.0.6",
"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.3.tgz", "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
"dependencies": { "dependencies": {
"ansi-regex": { "ansi-regex": {
"version": "2.0.0", "version": "2.0.0",
@ -1259,8 +1255,8 @@
"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz" "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
}, },
"strip-ansi": { "strip-ansi": {
"version": "3.0.0", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz" "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
}, },
"supports-color": { "supports-color": {
"version": "2.0.0", "version": "2.0.0",
@ -1277,8 +1273,8 @@
"resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz" "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz"
}, },
"hawk": { "hawk": {
"version": "3.1.2", "version": "3.1.3",
"resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.2.tgz" "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"
}, },
"heap": { "heap": {
"version": "0.2.6", "version": "0.2.6",
@ -1296,13 +1292,9 @@
"version": "0.2.3", "version": "0.2.3",
"resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz" "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"
}, },
"hosted-git-info": {
"version": "2.1.4",
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
},
"html-minifier": { "html-minifier": {
"version": "1.0.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-1.0.0.tgz" "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-1.2.0.tgz"
}, },
"htmlparser2": { "htmlparser2": {
"version": "3.8.3", "version": "3.8.3",
@ -1319,32 +1311,33 @@
"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz" "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz"
}, },
"http-signature": { "http-signature": {
"version": "1.1.0", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.0.tgz" "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"
},
"http2": {
"version": "3.3.2",
"from": "http2@git://github.com/gruntjs/node-http2.git#f1fc002c1aef9b4e871c808fc5ddacdeb1a5cd94",
"resolved": "git://github.com/gruntjs/node-http2.git#f1fc002c1aef9b4e871c808fc5ddacdeb1a5cd94"
}, },
"i": { "i": {
"version": "0.3.3", "version": "0.3.4",
"resolved": "https://registry.npmjs.org/i/-/i-0.3.3.tgz" "resolved": "https://registry.npmjs.org/i/-/i-0.3.4.tgz"
}, },
"iconv-lite": { "iconv-lite": {
"version": "0.2.11", "version": "0.2.11",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz" "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
}, },
"image-size": { "image-size": {
"version": "0.3.5", "version": "0.4.0",
"resolved": "https://registry.npmjs.org/image-size/-/image-size-0.3.5.tgz" "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.4.0.tgz"
},
"indent-string": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz"
}, },
"inflight": { "inflight": {
"version": "1.0.4", "version": "1.0.4",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz" "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz"
}, },
"inherit": { "inherit": {
"version": "2.2.2", "version": "2.2.3",
"resolved": "https://registry.npmjs.org/inherit/-/inherit-2.2.2.tgz" "resolved": "https://registry.npmjs.org/inherit/-/inherit-2.2.3.tgz"
}, },
"inherits": { "inherits": {
"version": "2.0.1", "version": "2.0.1",
@ -1358,17 +1351,9 @@
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz" "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"
}, },
"is-arrayish": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
},
"is-buffer": { "is-buffer": {
"version": "1.0.2", "version": "1.1.3",
"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.0.2.tgz" "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.3.tgz"
},
"is-builtin-module": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"
}, },
"is-finite": { "is-finite": {
"version": "1.0.1", "version": "1.0.1",
@ -1383,8 +1368,8 @@
"resolved": "https://registry.npmjs.org/is-lower-case/-/is-lower-case-1.1.3.tgz" "resolved": "https://registry.npmjs.org/is-lower-case/-/is-lower-case-1.1.3.tgz"
}, },
"is-my-json-valid": { "is-my-json-valid": {
"version": "2.12.3", "version": "2.13.1",
"resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.3.tgz" "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz"
}, },
"is-promise": { "is-promise": {
"version": "2.1.0", "version": "2.1.0",
@ -1445,16 +1430,16 @@
"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz" "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
}, },
"jscs": { "jscs": {
"version": "2.7.0", "version": "2.11.0",
"resolved": "https://registry.npmjs.org/jscs/-/jscs-2.7.0.tgz", "resolved": "https://registry.npmjs.org/jscs/-/jscs-2.11.0.tgz",
"dependencies": { "dependencies": {
"ansi-regex": { "ansi-regex": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz" "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
}, },
"argparse": { "argparse": {
"version": "1.0.3", "version": "1.0.6",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.3.tgz" "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.6.tgz"
}, },
"chalk": { "chalk": {
"version": "1.1.1", "version": "1.1.1",
@ -1465,8 +1450,8 @@
"resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz" "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"
}, },
"esprima": { "esprima": {
"version": "2.7.1", "version": "2.7.2",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.1.tgz" "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.2.tgz"
}, },
"glob": { "glob": {
"version": "5.0.15", "version": "5.0.15",
@ -1485,16 +1470,16 @@
"resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz" "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
}, },
"strip-ansi": { "strip-ansi": {
"version": "3.0.0", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz" "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
}, },
"supports-color": { "supports-color": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz" "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
}, },
"vow": { "vow": {
"version": "0.4.11", "version": "0.4.12",
"resolved": "https://registry.npmjs.org/vow/-/vow-0.4.11.tgz" "resolved": "https://registry.npmjs.org/vow/-/vow-0.4.12.tgz"
}, },
"vow-fs": { "vow-fs": {
"version": "0.3.4", "version": "0.3.4",
@ -1539,8 +1524,8 @@
"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz" "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"
}, },
"jshint": { "jshint": {
"version": "2.8.0", "version": "2.9.1",
"resolved": "https://registry.npmjs.org/jshint/-/jshint-2.8.0.tgz", "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.9.1.tgz",
"dependencies": { "dependencies": {
"cli": { "cli": {
"version": "0.6.6", "version": "0.6.6",
@ -1611,16 +1596,22 @@
"resolved": "https://registry.npmjs.org/kew/-/kew-0.4.0.tgz" "resolved": "https://registry.npmjs.org/kew/-/kew-0.4.0.tgz"
}, },
"kind-of": { "kind-of": {
"version": "2.0.1", "version": "3.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz" "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.0.2.tgz"
}, },
"lazy-cache": { "lazy-cache": {
"version": "0.2.7", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz" "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.3.tgz"
}, },
"lazystream": { "lazystream": {
"version": "0.1.0", "version": "0.1.0",
"resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz" "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
"dependencies": {
"readable-stream": {
"version": "1.0.33",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz"
}
}
}, },
"lcid": { "lcid": {
"version": "1.0.0", "version": "1.0.0",
@ -1631,12 +1622,24 @@
"resolved": "https://registry.npmjs.org/left-pad/-/left-pad-0.0.3.tgz" "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-0.0.3.tgz"
}, },
"less": { "less": {
"version": "2.5.3", "version": "2.6.1",
"resolved": "https://registry.npmjs.org/less/-/less-2.5.3.tgz", "resolved": "https://registry.npmjs.org/less/-/less-2.6.1.tgz",
"dependencies": { "dependencies": {
"asap": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/asap/-/asap-2.0.3.tgz"
},
"graceful-fs": { "graceful-fs": {
"version": "3.0.8", "version": "4.1.3",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz" "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.3.tgz"
},
"promise": {
"version": "7.1.1",
"resolved": "https://registry.npmjs.org/promise/-/promise-7.1.1.tgz"
},
"source-map": {
"version": "0.5.3",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz"
} }
} }
}, },
@ -1653,18 +1656,8 @@
"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.0.tgz" "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.0.tgz"
}, },
"load-grunt-tasks": { "load-grunt-tasks": {
"version": "3.4.0", "version": "3.4.1",
"resolved": "https://registry.npmjs.org/load-grunt-tasks/-/load-grunt-tasks-3.4.0.tgz" "resolved": "https://registry.npmjs.org/load-grunt-tasks/-/load-grunt-tasks-3.4.1.tgz"
},
"load-json-file": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
"dependencies": {
"graceful-fs": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
}
}
}, },
"lodash": { "lodash": {
"version": "0.9.2", "version": "0.9.2",
@ -1699,8 +1692,8 @@
"resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz" "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz"
}, },
"lodash.isarguments": { "lodash.isarguments": {
"version": "3.0.4", "version": "3.0.8",
"resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.4.tgz" "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.8.tgz"
}, },
"lodash.isarray": { "lodash.isarray": {
"version": "3.0.4", "version": "3.0.4",
@ -1718,10 +1711,6 @@
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz" "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
}, },
"loud-rejection": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.2.0.tgz"
},
"lower-case": { "lower-case": {
"version": "1.1.3", "version": "1.1.3",
"resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.3.tgz" "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.3.tgz"
@ -1734,25 +1723,17 @@
"version": "2.7.3", "version": "2.7.3",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz" "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
}, },
"map-obj": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"
},
"markdown-it": { "markdown-it": {
"version": "5.0.2", "version": "6.0.0",
"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-5.0.2.tgz", "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-6.0.0.tgz",
"dependencies": { "dependencies": {
"argparse": { "argparse": {
"version": "1.0.3", "version": "1.0.6",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.3.tgz" "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.6.tgz"
}, },
"entities": { "entities": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz" "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"
},
"lodash": {
"version": "3.10.1",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
} }
} }
}, },
@ -1761,60 +1742,50 @@
"resolved": "https://registry.npmjs.org/marked/-/marked-0.3.5.tgz" "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.5.tgz"
}, },
"maxmin": { "maxmin": {
"version": "1.1.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/maxmin/-/maxmin-1.1.0.tgz", "resolved": "https://registry.npmjs.org/maxmin/-/maxmin-2.1.0.tgz"
"dependencies": {
"pretty-bytes": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz"
}
}
}, },
"md5": { "md5": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/md5/-/md5-2.0.0.tgz" "resolved": "https://registry.npmjs.org/md5/-/md5-2.0.0.tgz",
"dependencies": {
"is-buffer": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.0.2.tgz"
}
}
}, },
"mdurl": { "mdurl": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz" "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz"
}, },
"meow": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/meow/-/meow-3.6.0.tgz"
},
"mime": { "mime": {
"version": "1.3.4", "version": "1.3.4",
"resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz" "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"
}, },
"mime-db": { "mime-db": {
"version": "1.20.0", "version": "1.22.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.20.0.tgz" "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz"
}, },
"mime-types": { "mime-types": {
"version": "2.1.8", "version": "2.1.10",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.8.tgz" "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz"
}, },
"minimatch": { "minimatch": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz" "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz"
}, },
"minimist": { "minimist": {
"version": "1.2.0", "version": "0.0.8",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz" "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
}, },
"mkdirp": { "mkdirp": {
"version": "0.5.1", "version": "0.5.1",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
"dependencies": {
"minimist": {
"version": "0.0.8",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
}
}
}, },
"morgan": { "morgan": {
"version": "1.6.1", "version": "1.7.0",
"resolved": "https://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz" "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.7.0.tgz"
}, },
"ms": { "ms": {
"version": "0.7.1", "version": "0.7.1",
@ -1851,8 +1822,8 @@
"resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz" "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz"
}, },
"mute-stream": { "mute-stream": {
"version": "0.0.5", "version": "0.0.6",
"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz" "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz"
}, },
"natural-compare": { "natural-compare": {
"version": "1.2.2", "version": "1.2.2",
@ -1910,21 +1881,21 @@
} }
} }
}, },
"normalize-package-data": { "normalize-path": {
"version": "2.3.5", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz" "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.0.1.tgz"
}, },
"npm": { "npm": {
"version": "2.14.15", "version": "2.14.22",
"resolved": "https://registry.npmjs.org/npm/-/npm-2.14.15.tgz", "resolved": "https://registry.npmjs.org/npm/-/npm-2.14.22.tgz",
"dependencies": { "dependencies": {
"abbrev": { "abbrev": {
"version": "1.0.7", "version": "1.0.7",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz" "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
}, },
"ansi": { "ansi": {
"version": "0.3.0", "version": "0.3.1",
"resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz" "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz"
}, },
"ansi-regex": { "ansi-regex": {
"version": "2.0.0", "version": "2.0.0",
@ -1963,30 +1934,24 @@
"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz" "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz"
}, },
"cmd-shim": { "cmd-shim": {
"version": "2.0.1", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.1.tgz", "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.2.tgz"
"dependencies": {
"graceful-fs": {
"version": "3.0.8",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
}
}
}, },
"columnify": { "columnify": {
"version": "1.5.2", "version": "1.5.4",
"resolved": "https://registry.npmjs.org/columnify/-/columnify-1.5.2.tgz", "resolved": "https://registry.npmjs.org/columnify/-/columnify-1.5.4.tgz",
"dependencies": { "dependencies": {
"wcwidth": { "wcwidth": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.0.tgz", "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.0.tgz",
"dependencies": { "dependencies": {
"defaults": { "defaults": {
"version": "1.0.2", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.2.tgz", "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
"dependencies": { "dependencies": {
"clone": { "clone": {
"version": "0.1.19", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz" "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz"
} }
} }
} }
@ -1995,8 +1960,8 @@
} }
}, },
"config-chain": { "config-chain": {
"version": "1.1.9", "version": "1.1.10",
"resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz", "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.10.tgz",
"dependencies": { "dependencies": {
"proto-list": { "proto-list": {
"version": "1.2.4", "version": "1.2.4",
@ -2023,8 +1988,14 @@
"resolved": "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.7.tgz" "resolved": "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.7.tgz"
}, },
"fs-write-stream-atomic": { "fs-write-stream-atomic": {
"version": "1.0.5", "version": "1.0.8",
"resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.5.tgz" "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.8.tgz",
"dependencies": {
"iferr": {
"version": "0.1.5",
"resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz"
}
}
}, },
"fstream": { "fstream": {
"version": "1.0.8", "version": "1.0.8",
@ -2059,8 +2030,8 @@
} }
}, },
"graceful-fs": { "graceful-fs": {
"version": "4.1.2", "version": "4.1.3",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz" "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.3.tgz"
}, },
"hosted-git-info": { "hosted-git-info": {
"version": "2.1.4", "version": "2.1.4",
@ -2083,9 +2054,19 @@
"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz" "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
}, },
"init-package-json": { "init-package-json": {
"version": "1.9.1", "version": "1.9.3",
"resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.1.tgz", "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.3.tgz",
"dependencies": { "dependencies": {
"glob": {
"version": "6.0.4",
"resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
"dependencies": {
"path-is-absolute": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
}
}
},
"promzard": { "promzard": {
"version": "0.3.0", "version": "0.3.0",
"resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz" "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"
@ -2137,8 +2118,8 @@
} }
}, },
"node-gyp": { "node-gyp": {
"version": "3.2.1", "version": "3.3.0",
"resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.2.1.tgz", "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.3.0.tgz",
"dependencies": { "dependencies": {
"glob": { "glob": {
"version": "4.5.3", "version": "4.5.3",
@ -2149,8 +2130,8 @@
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
"dependencies": { "dependencies": {
"brace-expansion": { "brace-expansion": {
"version": "1.1.2", "version": "1.1.3",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.3.tgz",
"dependencies": { "dependencies": {
"balanced-match": { "balanced-match": {
"version": "0.3.0", "version": "0.3.0",
@ -2180,99 +2161,13 @@
} }
} }
}, },
"npmlog": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz",
"dependencies": {
"are-we-there-yet": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.5.tgz",
"dependencies": {
"delegates": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
}
}
},
"gauge": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz",
"dependencies": {
"has-unicode": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
},
"lodash.pad": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
"dependencies": {
"lodash._basetostring": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
},
"lodash._createpadding": {
"version": "3.6.1",
"resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
"dependencies": {
"lodash.repeat": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
}
}
}
}
},
"lodash.padleft": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
"dependencies": {
"lodash._basetostring": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
},
"lodash._createpadding": {
"version": "3.6.1",
"resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
"dependencies": {
"lodash.repeat": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
}
}
}
}
},
"lodash.padright": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
"dependencies": {
"lodash._basetostring": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
},
"lodash._createpadding": {
"version": "3.6.1",
"resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
"dependencies": {
"lodash.repeat": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
}
}
}
}
}
}
}
}
},
"path-array": { "path-array": {
"version": "1.0.0", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/path-array/-/path-array-1.0.0.tgz", "resolved": "https://registry.npmjs.org/path-array/-/path-array-1.0.1.tgz",
"dependencies": { "dependencies": {
"array-index": { "array-index": {
"version": "0.1.1", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/array-index/-/array-index-0.1.1.tgz", "resolved": "https://registry.npmjs.org/array-index/-/array-index-1.0.0.tgz",
"dependencies": { "dependencies": {
"debug": { "debug": {
"version": "2.2.0", "version": "2.2.0",
@ -2283,6 +2178,26 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
} }
} }
},
"es6-symbol": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.0.2.tgz",
"dependencies": {
"d": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/d/-/d-0.1.1.tgz"
},
"es5-ext": {
"version": "0.10.11",
"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.11.tgz",
"dependencies": {
"es6-iterator": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.0.tgz"
}
}
}
}
} }
} }
} }
@ -2319,96 +2234,8 @@
"resolved": "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz" "resolved": "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz"
}, },
"npm-install-checks": { "npm-install-checks": {
"version": "1.0.6", "version": "1.0.7",
"resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.6.tgz", "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.7.tgz"
"dependencies": {
"npmlog": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz",
"dependencies": {
"are-we-there-yet": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
"dependencies": {
"delegates": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
}
}
},
"gauge": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz",
"dependencies": {
"has-unicode": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
},
"lodash.pad": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
"dependencies": {
"lodash._basetostring": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
},
"lodash._createpadding": {
"version": "3.6.1",
"resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
"dependencies": {
"lodash.repeat": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
}
}
}
}
},
"lodash.padleft": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
"dependencies": {
"lodash._basetostring": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
},
"lodash._createpadding": {
"version": "3.6.1",
"resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
"dependencies": {
"lodash.repeat": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
}
}
}
}
},
"lodash.padright": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
"dependencies": {
"lodash._basetostring": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
},
"lodash._createpadding": {
"version": "3.6.1",
"resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
"dependencies": {
"lodash.repeat": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
}
}
}
}
}
}
}
}
}
}
}, },
"npm-package-arg": { "npm-package-arg": {
"version": "4.1.0", "version": "4.1.0",
@ -2453,6 +2280,10 @@
"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz" "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
} }
} }
},
"retry": {
"version": "0.8.0",
"resolved": "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz"
} }
} }
}, },
@ -2461,84 +2292,54 @@
"resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.2.tgz" "resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.2.tgz"
}, },
"npmlog": { "npmlog": {
"version": "2.0.0", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-2.0.0.tgz", "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-2.0.2.tgz",
"dependencies": { "dependencies": {
"are-we-there-yet": { "are-we-there-yet": {
"version": "1.0.4", "version": "1.0.6",
"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz", "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.6.tgz",
"dependencies": { "dependencies": {
"delegates": { "delegates": {
"version": "0.1.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz" "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"
} }
} }
}, },
"gauge": { "gauge": {
"version": "1.2.2", "version": "1.2.5",
"resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz", "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.5.tgz",
"dependencies": { "dependencies": {
"has-unicode": { "has-unicode": {
"version": "1.0.1", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz" "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.0.tgz"
},
"lodash._basetostring": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
},
"lodash._createpadding": {
"version": "3.6.1",
"resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz"
}, },
"lodash.pad": { "lodash.pad": {
"version": "3.1.1", "version": "3.2.2",
"resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz", "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.2.2.tgz"
"dependencies": {
"lodash._basetostring": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
},
"lodash._createpadding": {
"version": "3.6.1",
"resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
"dependencies": {
"lodash.repeat": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
}
}
}
}
}, },
"lodash.padleft": { "lodash.padleft": {
"version": "3.1.1", "version": "3.1.1",
"resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz", "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz"
"dependencies": {
"lodash._basetostring": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
},
"lodash._createpadding": {
"version": "3.6.1",
"resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
"dependencies": {
"lodash.repeat": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
}
}
}
}
}, },
"lodash.padright": { "lodash.padright": {
"version": "3.1.1", "version": "3.1.1",
"resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz", "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz"
},
"lodash.repeat": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.2.0.tgz",
"dependencies": { "dependencies": {
"lodash._basetostring": { "lodash._root": {
"version": "3.0.1", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz" "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz"
},
"lodash._createpadding": {
"version": "3.6.1",
"resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
"dependencies": {
"lodash.repeat": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
}
}
} }
} }
} }
@ -2601,9 +2402,19 @@
} }
}, },
"read-package-json": { "read-package-json": {
"version": "2.0.2", "version": "2.0.3",
"resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.2.tgz", "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.3.tgz",
"dependencies": { "dependencies": {
"glob": {
"version": "6.0.4",
"resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
"dependencies": {
"path-is-absolute": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
}
}
},
"json-parse-helpfulerror": { "json-parse-helpfulerror": {
"version": "1.0.3", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz", "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
@ -2639,20 +2450,30 @@
"resolved": "https://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-3.0.1.tgz" "resolved": "https://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-3.0.1.tgz"
}, },
"request": { "request": {
"version": "2.67.0", "version": "2.69.0",
"resolved": "https://registry.npmjs.org/request/-/request-2.67.0.tgz", "resolved": "https://registry.npmjs.org/request/-/request-2.69.0.tgz",
"dependencies": { "dependencies": {
"aws-sign2": { "aws-sign2": {
"version": "0.6.0", "version": "0.6.0",
"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz" "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
}, },
"aws4": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.2.1.tgz",
"dependencies": {
"lru-cache": {
"version": "2.7.3",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
}
}
},
"bl": { "bl": {
"version": "1.0.0", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz", "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.2.tgz",
"dependencies": { "dependencies": {
"readable-stream": { "readable-stream": {
"version": "2.0.4", "version": "2.0.5",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.5.tgz",
"dependencies": { "dependencies": {
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
@ -2705,14 +2526,14 @@
"resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz", "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz",
"dependencies": { "dependencies": {
"async": { "async": {
"version": "1.5.0", "version": "1.5.2",
"resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz" "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
} }
} }
}, },
"har-validator": { "har-validator": {
"version": "2.0.3", "version": "2.0.6",
"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.3.tgz", "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
"dependencies": { "dependencies": {
"chalk": { "chalk": {
"version": "1.1.1", "version": "1.1.1",
@ -2723,8 +2544,8 @@
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz" "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
}, },
"escape-string-regexp": { "escape-string-regexp": {
"version": "1.0.3", "version": "1.0.4",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz" "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.4.tgz"
}, },
"has-ansi": { "has-ansi": {
"version": "2.0.0", "version": "2.0.0",
@ -2747,8 +2568,8 @@
} }
}, },
"is-my-json-valid": { "is-my-json-valid": {
"version": "2.12.3", "version": "2.12.4",
"resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.3.tgz", "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.4.tgz",
"dependencies": { "dependencies": {
"generate-function": { "generate-function": {
"version": "2.0.0", "version": "2.0.0",
@ -2779,16 +2600,16 @@
"resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz", "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
"dependencies": { "dependencies": {
"pinkie": { "pinkie": {
"version": "2.0.1", "version": "2.0.4",
"resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz" "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"
} }
} }
} }
} }
}, },
"hawk": { "hawk": {
"version": "3.1.2", "version": "3.1.3",
"resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.2.tgz", "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
"dependencies": { "dependencies": {
"boom": { "boom": {
"version": "2.10.1", "version": "2.10.1",
@ -2809,12 +2630,12 @@
} }
}, },
"http-signature": { "http-signature": {
"version": "1.1.0", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.0.tgz", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
"dependencies": { "dependencies": {
"assert-plus": { "assert-plus": {
"version": "0.1.5", "version": "0.2.0",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz" "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
}, },
"jsprim": { "jsprim": {
"version": "1.2.2", "version": "1.2.2",
@ -2835,26 +2656,16 @@
} }
}, },
"sshpk": { "sshpk": {
"version": "1.7.1", "version": "1.7.3",
"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.7.1.tgz", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.7.3.tgz",
"dependencies": { "dependencies": {
"asn1": { "asn1": {
"version": "0.2.3", "version": "0.2.3",
"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz" "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"
}, },
"assert-plus": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
},
"dashdash": { "dashdash": {
"version": "1.10.1", "version": "1.12.2",
"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.10.1.tgz", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.12.2.tgz"
"dependencies": {
"assert-plus": {
"version": "0.1.5",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
}
}
}, },
"ecc-jsbn": { "ecc-jsbn": {
"version": "0.1.1", "version": "0.1.1",
@ -2869,8 +2680,8 @@
"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz" "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
}, },
"tweetnacl": { "tweetnacl": {
"version": "0.13.2", "version": "0.13.3",
"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.2.tgz" "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz"
} }
} }
} }
@ -2889,12 +2700,12 @@
"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz" "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
}, },
"mime-types": { "mime-types": {
"version": "2.1.8", "version": "2.1.9",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.8.tgz", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz",
"dependencies": { "dependencies": {
"mime-db": { "mime-db": {
"version": "1.20.0", "version": "1.21.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.20.0.tgz" "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz"
} }
} }
}, },
@ -2903,12 +2714,12 @@
"resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz" "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
}, },
"oauth-sign": { "oauth-sign": {
"version": "0.8.0", "version": "0.8.1",
"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz" "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.1.tgz"
}, },
"qs": { "qs": {
"version": "5.2.0", "version": "6.0.2",
"resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz" "resolved": "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz"
}, },
"stringstream": { "stringstream": {
"version": "0.0.5", "version": "0.0.5",
@ -2925,12 +2736,24 @@
} }
}, },
"retry": { "retry": {
"version": "0.8.0", "version": "0.9.0",
"resolved": "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz" "resolved": "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz"
}, },
"rimraf": { "rimraf": {
"version": "2.4.4", "version": "2.5.2",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz" "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.2.tgz",
"dependencies": {
"glob": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.0.0.tgz",
"dependencies": {
"path-is-absolute": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
}
}
}
}
}, },
"semver": { "semver": {
"version": "5.1.0", "version": "5.1.0",
@ -2977,8 +2800,8 @@
"resolved": "https://registry.npmjs.org/sorted-object/-/sorted-object-1.0.0.tgz" "resolved": "https://registry.npmjs.org/sorted-object/-/sorted-object-1.0.0.tgz"
}, },
"spdx-license-ids": { "spdx-license-ids": {
"version": "1.1.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz" "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.0.tgz"
}, },
"strip-ansi": { "strip-ansi": {
"version": "3.0.0", "version": "3.0.0",
@ -3031,8 +2854,8 @@
} }
}, },
"which": { "which": {
"version": "1.2.0", "version": "1.2.4",
"resolved": "https://registry.npmjs.org/which/-/which-1.2.0.tgz", "resolved": "https://registry.npmjs.org/which/-/which-1.2.4.tgz",
"dependencies": { "dependencies": {
"is-absolute": { "is-absolute": {
"version": "0.1.7", "version": "0.1.7",
@ -3043,6 +2866,10 @@
"resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz" "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"
} }
} }
},
"isexe": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/isexe/-/isexe-1.1.1.tgz"
} }
} }
}, },
@ -3060,6 +2887,10 @@
"version": "200.4.0", "version": "200.4.0",
"resolved": "https://registry.npmjs.org/npm-shrinkwrap/-/npm-shrinkwrap-200.4.0.tgz", "resolved": "https://registry.npmjs.org/npm-shrinkwrap/-/npm-shrinkwrap-200.4.0.tgz",
"dependencies": { "dependencies": {
"minimist": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
},
"semver": { "semver": {
"version": "4.3.6", "version": "4.3.6",
"resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz" "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
@ -3089,8 +2920,8 @@
"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz" "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
}, },
"oauth-sign": { "oauth-sign": {
"version": "0.8.0", "version": "0.8.1",
"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz" "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.1.tgz"
}, },
"object-assign": { "object-assign": {
"version": "4.0.1", "version": "4.0.1",
@ -3113,8 +2944,8 @@
"resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz" "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz"
}, },
"opn": { "opn": {
"version": "1.0.2", "version": "4.0.1",
"resolved": "https://registry.npmjs.org/opn/-/opn-1.0.2.tgz" "resolved": "https://registry.npmjs.org/opn/-/opn-4.0.1.tgz"
}, },
"optimist": { "optimist": {
"version": "0.3.7", "version": "0.3.7",
@ -3144,29 +2975,21 @@
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/package/-/package-1.0.1.tgz" "resolved": "https://registry.npmjs.org/package/-/package-1.0.1.tgz"
}, },
"pako": {
"version": "0.2.8",
"resolved": "https://registry.npmjs.org/pako/-/pako-0.2.8.tgz"
},
"param-case": { "param-case": {
"version": "1.1.2", "version": "1.1.2",
"resolved": "https://registry.npmjs.org/param-case/-/param-case-1.1.2.tgz" "resolved": "https://registry.npmjs.org/param-case/-/param-case-1.1.2.tgz"
}, },
"parse-json": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"
},
"parse-ms": { "parse-ms": {
"version": "1.0.0", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-1.0.0.tgz" "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-1.0.1.tgz"
}, },
"parserlib": { "parserlib": {
"version": "0.2.5", "version": "0.2.5",
"resolved": "https://registry.npmjs.org/parserlib/-/parserlib-0.2.5.tgz" "resolved": "https://registry.npmjs.org/parserlib/-/parserlib-0.2.5.tgz"
}, },
"parseurl": { "parseurl": {
"version": "1.3.0", "version": "1.3.1",
"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz" "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz"
}, },
"pascal-case": { "pascal-case": {
"version": "1.1.2", "version": "1.1.2",
@ -3177,23 +3000,13 @@
"resolved": "https://registry.npmjs.org/path-case/-/path-case-1.1.2.tgz" "resolved": "https://registry.npmjs.org/path-case/-/path-case-1.1.2.tgz"
}, },
"path-exists": { "path-exists": {
"version": "2.1.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz" "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-1.0.0.tgz"
}, },
"path-is-absolute": { "path-is-absolute": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz" "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
}, },
"path-type": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
"dependencies": {
"graceful-fs": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
}
}
},
"pathval": { "pathval": {
"version": "0.1.1", "version": "0.1.1",
"resolved": "https://registry.npmjs.org/pathval/-/pathval-0.1.1.tgz" "resolved": "https://registry.npmjs.org/pathval/-/pathval-0.1.1.tgz"
@ -3206,6 +3019,10 @@
"version": "0.1.11", "version": "0.1.11",
"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz" "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
}, },
"assert-plus": {
"version": "0.1.5",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
},
"async": { "async": {
"version": "0.9.2", "version": "0.9.2",
"resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz" "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
@ -3215,8 +3032,8 @@
"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz" "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
}, },
"bl": { "bl": {
"version": "0.9.4", "version": "0.9.5",
"resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz" "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz"
}, },
"boom": { "boom": {
"version": "0.4.2", "version": "0.4.2",
@ -3274,6 +3091,10 @@
"version": "1.2.2", "version": "1.2.2",
"resolved": "https://registry.npmjs.org/qs/-/qs-1.2.2.tgz" "resolved": "https://registry.npmjs.org/qs/-/qs-1.2.2.tgz"
}, },
"readable-stream": {
"version": "1.0.33",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz"
},
"request": { "request": {
"version": "2.42.0", "version": "2.42.0",
"resolved": "https://registry.npmjs.org/request/-/request-2.42.0.tgz" "resolved": "https://registry.npmjs.org/request/-/request-2.42.0.tgz"
@ -3284,13 +3105,9 @@
} }
} }
}, },
"pify": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
},
"pinkie": { "pinkie": {
"version": "2.0.1", "version": "2.0.4",
"resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz" "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"
}, },
"pinkie-promise": { "pinkie-promise": {
"version": "2.0.0", "version": "2.0.0",
@ -3301,8 +3118,8 @@
"resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-1.0.0.tgz" "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-1.0.0.tgz"
}, },
"pkginfo": { "pkginfo": {
"version": "0.3.1", "version": "0.4.0",
"resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz" "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.0.tgz"
}, },
"plur": { "plur": {
"version": "1.0.0", "version": "1.0.0",
@ -3323,8 +3140,8 @@
"resolved": "https://registry.npmjs.org/postcss/-/postcss-4.1.16.tgz" "resolved": "https://registry.npmjs.org/postcss/-/postcss-4.1.16.tgz"
}, },
"pretty-bytes": { "pretty-bytes": {
"version": "2.0.1", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-2.0.1.tgz" "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-3.0.1.tgz"
}, },
"pretty-ms": { "pretty-ms": {
"version": "2.1.0", "version": "2.1.0",
@ -3358,13 +3175,17 @@
"version": "0.0.0", "version": "0.0.0",
"resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz" "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz"
}, },
"pseudomap": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"
},
"q": { "q": {
"version": "1.4.1", "version": "1.4.1",
"resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz" "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz"
}, },
"qs": { "qs": {
"version": "5.2.0", "version": "6.0.2",
"resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz" "resolved": "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz"
}, },
"range-parser": { "range-parser": {
"version": "1.0.3", "version": "1.0.3",
@ -3378,17 +3199,9 @@
"version": "0.1.0", "version": "0.1.0",
"resolved": "https://registry.npmjs.org/read-json/-/read-json-0.1.0.tgz" "resolved": "https://registry.npmjs.org/read-json/-/read-json-0.1.0.tgz"
}, },
"read-pkg": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"
},
"read-pkg-up": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"
},
"readable-stream": { "readable-stream": {
"version": "1.0.33", "version": "2.0.5",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz" "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.5.tgz"
}, },
"recast": { "recast": {
"version": "0.10.33", "version": "0.10.33",
@ -3404,10 +3217,6 @@
} }
} }
}, },
"redent": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz"
},
"redeyed": { "redeyed": {
"version": "0.5.0", "version": "0.5.0",
"resolved": "https://registry.npmjs.org/redeyed/-/redeyed-0.5.0.tgz", "resolved": "https://registry.npmjs.org/redeyed/-/redeyed-0.5.0.tgz",
@ -3437,8 +3246,8 @@
"resolved": "https://registry.npmjs.org/regexpu/-/regexpu-1.3.0.tgz", "resolved": "https://registry.npmjs.org/regexpu/-/regexpu-1.3.0.tgz",
"dependencies": { "dependencies": {
"esprima": { "esprima": {
"version": "2.7.1", "version": "2.7.2",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.1.tgz" "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.2.tgz"
} }
} }
}, },
@ -3455,16 +3264,22 @@
"resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.6.tgz" "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.6.tgz"
}, },
"repeat-string": { "repeat-string": {
"version": "1.5.2", "version": "1.5.4",
"resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz" "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.4.tgz"
}, },
"repeating": { "repeating": {
"version": "2.0.0", "version": "1.1.3",
"resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz" "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz"
}, },
"request": { "request": {
"version": "2.67.0", "version": "2.69.0",
"resolved": "https://registry.npmjs.org/request/-/request-2.67.0.tgz" "resolved": "https://registry.npmjs.org/request/-/request-2.69.0.tgz",
"dependencies": {
"bl": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz"
}
}
}, },
"request-progress": { "request-progress": {
"version": "0.3.1", "version": "0.3.1",
@ -3478,6 +3293,10 @@
"version": "0.1.11", "version": "0.1.11",
"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz" "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
}, },
"assert-plus": {
"version": "0.1.5",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
},
"async": { "async": {
"version": "0.9.2", "version": "0.9.2",
"resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz" "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
@ -3487,8 +3306,8 @@
"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz" "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
}, },
"bl": { "bl": {
"version": "0.9.4", "version": "0.9.5",
"resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz" "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz"
}, },
"boom": { "boom": {
"version": "0.4.2", "version": "0.4.2",
@ -3552,6 +3371,10 @@
"version": "2.3.3", "version": "2.3.3",
"resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz" "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
}, },
"readable-stream": {
"version": "1.0.33",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz"
},
"request": { "request": {
"version": "2.51.0", "version": "2.51.0",
"resolved": "https://registry.npmjs.org/request/-/request-2.51.0.tgz" "resolved": "https://registry.npmjs.org/request/-/request-2.51.0.tgz"
@ -3567,8 +3390,8 @@
"resolved": "https://registry.npmjs.org/reserved-words/-/reserved-words-0.1.1.tgz" "resolved": "https://registry.npmjs.org/reserved-words/-/reserved-words-0.1.1.tgz"
}, },
"resolve": { "resolve": {
"version": "1.1.6", "version": "1.1.7",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.6.tgz" "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"
}, },
"resolve-from": { "resolve-from": {
"version": "2.0.0", "version": "2.0.0",
@ -3705,41 +3528,37 @@
"resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-0.1.1.tgz" "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-0.1.1.tgz"
}, },
"semver": { "semver": {
"version": "5.1.0", "version": "1.0.14",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz" "resolved": "https://registry.npmjs.org/semver/-/semver-1.0.14.tgz"
}, },
"send": { "send": {
"version": "0.13.0", "version": "0.13.1",
"resolved": "https://registry.npmjs.org/send/-/send-0.13.0.tgz" "resolved": "https://registry.npmjs.org/send/-/send-0.13.1.tgz"
}, },
"sentence-case": { "sentence-case": {
"version": "1.1.3", "version": "1.1.3",
"resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-1.1.3.tgz" "resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-1.1.3.tgz"
}, },
"serve-index": { "serve-index": {
"version": "1.7.2", "version": "1.7.3",
"resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.7.2.tgz" "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.7.3.tgz"
}, },
"serve-static": { "serve-static": {
"version": "1.10.0", "version": "1.10.2",
"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.10.0.tgz" "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.10.2.tgz"
}, },
"shebang-regex": { "shebang-regex": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz" "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"
}, },
"shelljs": { "shelljs": {
"version": "0.5.3", "version": "0.6.0",
"resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz" "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.6.0.tgz"
}, },
"sigmund": { "sigmund": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz" "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
}, },
"signal-exit": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-2.1.2.tgz"
},
"simple-fmt": { "simple-fmt": {
"version": "0.1.0", "version": "0.1.0",
"resolved": "https://registry.npmjs.org/simple-fmt/-/simple-fmt-0.1.0.tgz" "resolved": "https://registry.npmjs.org/simple-fmt/-/simple-fmt-0.1.0.tgz"
@ -3778,22 +3597,6 @@
} }
} }
}, },
"spdx-correct": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"
},
"spdx-exceptions": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
},
"spdx-expression-parse": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz"
},
"spdx-license-ids": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
},
"split": { "split": {
"version": "0.3.3", "version": "0.3.3",
"resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz" "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz"
@ -3803,14 +3606,8 @@
"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz" "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
}, },
"sshpk": { "sshpk": {
"version": "1.7.1", "version": "1.7.4",
"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.7.1.tgz", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.7.4.tgz"
"dependencies": {
"assert-plus": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
}
}
}, },
"stable": { "stable": {
"version": "0.1.5", "version": "0.1.5",
@ -3824,6 +3621,10 @@
"version": "1.2.1", "version": "1.2.1",
"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz" "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz"
}, },
"stream-buffers": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz"
},
"string-template": { "string-template": {
"version": "0.2.1", "version": "0.2.1",
"resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz" "resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz"
@ -3852,10 +3653,6 @@
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz" "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"
}, },
"strip-indent": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"
},
"strip-json-comments": { "strip-json-comments": {
"version": "1.0.4", "version": "1.0.4",
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz" "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz"
@ -3869,14 +3666,8 @@
"resolved": "https://registry.npmjs.org/swap-case/-/swap-case-1.1.2.tgz" "resolved": "https://registry.npmjs.org/swap-case/-/swap-case-1.1.2.tgz"
}, },
"tar-stream": { "tar-stream": {
"version": "1.2.2", "version": "1.3.2",
"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.2.2.tgz", "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.3.2.tgz"
"dependencies": {
"readable-stream": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.5.tgz"
}
}
}, },
"temporary": { "temporary": {
"version": "0.0.8", "version": "0.0.8",
@ -3933,8 +3724,8 @@
"resolved": "https://registry.npmjs.org/to-single-quotes/-/to-single-quotes-2.0.0.tgz" "resolved": "https://registry.npmjs.org/to-single-quotes/-/to-single-quotes-2.0.0.tgz"
}, },
"tough-cookie": { "tough-cookie": {
"version": "2.2.1", "version": "2.2.2",
"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz" "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz"
}, },
"transformers": { "transformers": {
"version": "2.1.0", "version": "2.1.0",
@ -3958,10 +3749,6 @@
} }
} }
}, },
"trim-newlines": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"
},
"trim-right": { "trim-right": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz" "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz"
@ -3979,8 +3766,8 @@
"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz" "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz"
}, },
"tweetnacl": { "tweetnacl": {
"version": "0.13.2", "version": "0.14.1",
"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.2.tgz" "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.1.tgz"
}, },
"typedarray": { "typedarray": {
"version": "0.0.6", "version": "0.0.6",
@ -3991,8 +3778,8 @@
"resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.0.tgz" "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.0.tgz"
}, },
"uglify-js": { "uglify-js": {
"version": "2.5.0", "version": "2.6.2",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.5.0.tgz", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.2.tgz",
"dependencies": { "dependencies": {
"async": { "async": {
"version": "0.2.10", "version": "0.2.10",
@ -4058,10 +3845,6 @@
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz" "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
}, },
"validate-npm-package-license": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"
},
"verror": { "verror": {
"version": "1.3.6", "version": "1.3.6",
"resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz" "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
@ -4111,6 +3894,10 @@
"async": { "async": {
"version": "0.2.10", "version": "0.2.10",
"resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz" "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
},
"pkginfo": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"
} }
} }
}, },
@ -4150,19 +3937,17 @@
"version": "3.2.0", "version": "3.2.0",
"resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.0.tgz" "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.0.tgz"
}, },
"yallist": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz"
},
"yargs": { "yargs": {
"version": "3.5.4", "version": "3.10.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz", "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"
"dependencies": {
"camelcase": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
}
}
}, },
"zip-stream": { "zip-stream": {
"version": "0.6.0", "version": "0.8.0",
"resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.6.0.tgz", "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.8.0.tgz",
"dependencies": { "dependencies": {
"lodash": { "lodash": {
"version": "3.10.1", "version": "3.10.1",

1
js/collapse.js
View File

@ -6,6 +6,7 @@
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */ * ======================================================================== */
/* jshint latedef: false */
+function ($) { +function ($) {
'use strict'; 'use strict';

41
js/tests/vendor/qunit.css vendored
View File

@ -1,27 +1,27 @@
/*! /*!
* QUnit 1.17.1 * QUnit 1.22.0
* http://qunitjs.com/ * https://qunitjs.com/
* *
* Copyright jQuery Foundation and other contributors * Copyright jQuery Foundation and other contributors
* Released under the MIT license * Released under the MIT license
* http://jquery.org/license * https://jquery.org/license
* *
* Date: 2015-01-20T19:39Z * Date: 2016-02-23T15:57Z
*/ */
/** Font Family and Sizes */ /** Font Family and Sizes */
#qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult { #qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-filteredTest, #qunit-userAgent, #qunit-testresult {
font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif; font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif;
} }
#qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; } #qunit-testrunner-toolbar, #qunit-filteredTest, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; }
#qunit-tests { font-size: smaller; } #qunit-tests { font-size: smaller; }
/** Resets */ /** Resets */
#qunit-tests, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult, #qunit-modulefilter { #qunit-tests, #qunit-header, #qunit-banner, #qunit-filteredTest, #qunit-userAgent, #qunit-testresult, #qunit-modulefilter {
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
@ -68,6 +68,12 @@
overflow: hidden; overflow: hidden;
} }
#qunit-filteredTest {
padding: 0.5em 1em 0.5em 1em;
background-color: #F4FF77;
color: #366097;
}
#qunit-userAgent { #qunit-userAgent {
padding: 0.5em 1em 0.5em 1em; padding: 0.5em 1em 0.5em 1em;
background-color: #2B81AF; background-color: #2B81AF;
@ -114,9 +120,19 @@
display: list-item; display: list-item;
} }
#qunit-tests.hidepass {
position: relative;
}
#qunit-tests.hidepass li.running, #qunit-tests.hidepass li.running,
#qunit-tests.hidepass li.pass { #qunit-tests.hidepass li.pass {
display: none; visibility: hidden;
position: absolute;
width: 0;
height: 0;
padding: 0;
border: 0;
margin: 0;
} }
#qunit-tests li strong { #qunit-tests li strong {
@ -132,6 +148,11 @@
color: #C2CCD1; color: #C2CCD1;
text-decoration: none; text-decoration: none;
} }
#qunit-tests li p a {
padding: 0.25em;
color: #6B6464;
}
#qunit-tests li a:hover, #qunit-tests li a:hover,
#qunit-tests li a:focus { #qunit-tests li a:focus {
color: #000; color: #000;
@ -151,6 +172,10 @@
border-radius: 5px; border-radius: 5px;
} }
.qunit-source {
margin: 0.6em 0 0.3em;
}
.qunit-collapsed { .qunit-collapsed {
display: none; display: none;
} }

3333
js/tests/vendor/qunit.js vendored
View File

@ -1,102 +1,249 @@
/*! /*!
* QUnit 1.17.1 * QUnit 1.22.0
* http://qunitjs.com/ * https://qunitjs.com/
* *
* Copyright jQuery Foundation and other contributors * Copyright jQuery Foundation and other contributors
* Released under the MIT license * Released under the MIT license
* http://jquery.org/license * https://jquery.org/license
* *
* Date: 2015-01-20T19:39Z * Date: 2016-02-23T15:57Z
*/ */
(function( window ) { (function( global ) {
var QUnit, var QUnit = {};
config,
onErrorFnPrev, var Date = global.Date;
loggingCallbacks = {}, var now = Date.now || function() {
fileName = ( sourceFromStacktrace( 0 ) || "" ).replace( /(:\d+)+\)?/, "" ).replace( /.+\//, "" ), return new Date().getTime();
toString = Object.prototype.toString, };
hasOwn = Object.prototype.hasOwnProperty,
// Keep a local reference to Date (GH-283) var setTimeout = global.setTimeout;
Date = window.Date, var clearTimeout = global.clearTimeout;
now = Date.now || function() {
return new Date().getTime(); // Store a local window from the global to allow direct references.
}, var window = global.window;
globalStartCalled = false,
runStarted = false, var defined = {
setTimeout = window.setTimeout, document: window && window.document !== undefined,
clearTimeout = window.clearTimeout, setTimeout: setTimeout !== undefined,
defined = { sessionStorage: (function() {
document: window.document !== undefined, var x = "qunit-test-string";
setTimeout: window.setTimeout !== undefined, try {
sessionStorage: (function() { sessionStorage.setItem( x, x );
var x = "qunit-test-string"; sessionStorage.removeItem( x );
try { return true;
sessionStorage.setItem( x, x ); } catch ( e ) {
sessionStorage.removeItem( x ); return false;
return true; }
} catch ( e ) { }() )
return false; };
var fileName = ( sourceFromStacktrace( 0 ) || "" ).replace( /(:\d+)+\)?/, "" ).replace( /.+\//, "" );
var globalStartCalled = false;
var runStarted = false;
var toString = Object.prototype.toString,
hasOwn = Object.prototype.hasOwnProperty;
// returns a new Array with the elements that are in a but not in b
function diff( a, b ) {
var i, j,
result = a.slice();
for ( i = 0; i < result.length; i++ ) {
for ( j = 0; j < b.length; j++ ) {
if ( result[ i ] === b[ j ] ) {
result.splice( i, 1 );
i--;
break;
} }
}()) }
}, }
/** return result;
* Provides a normalized error string, correcting an issue }
* with IE 7 (and prior) where Error.prototype.toString is
* not properly implemented // from jquery.js
* function inArray( elem, array ) {
* Based on http://es5.github.com/#x15.11.4.4 if ( array.indexOf ) {
* return array.indexOf( elem );
* @param {String|Error} error }
* @return {String} error message
*/ for ( var i = 0, length = array.length; i < length; i++ ) {
errorString = function( error ) { if ( array[ i ] === elem ) {
var name, message, return i;
errorString = error.toString(); }
if ( errorString.substring( 0, 7 ) === "[object" ) { }
name = error.name ? error.name.toString() : "Error";
message = error.message ? error.message.toString() : ""; return -1;
if ( name && message ) { }
return name + ": " + message;
} else if ( name ) { /**
return name; * Makes a clone of an object using only Array or Object as base,
} else if ( message ) { * and copies over the own enumerable properties.
return message; *
* @param {Object} obj
* @return {Object} New object with only the own properties (recursively).
*/
function objectValues ( obj ) {
var key, val,
vals = QUnit.is( "array", obj ) ? [] : {};
for ( key in obj ) {
if ( hasOwn.call( obj, key ) ) {
val = obj[ key ];
vals[ key ] = val === Object( val ) ? objectValues( val ) : val;
}
}
return vals;
}
function extend( a, b, undefOnly ) {
for ( var prop in b ) {
if ( hasOwn.call( b, prop ) ) {
// Avoid "Member not found" error in IE8 caused by messing with window.constructor
// This block runs on every environment, so `global` is being used instead of `window`
// to avoid errors on node.
if ( prop !== "constructor" || a !== global ) {
if ( b[ prop ] === undefined ) {
delete a[ prop ];
} else if ( !( undefOnly && typeof a[ prop ] !== "undefined" ) ) {
a[ prop ] = b[ prop ];
}
}
}
}
return a;
}
function objectType( obj ) {
if ( typeof obj === "undefined" ) {
return "undefined";
}
// Consider: typeof null === object
if ( obj === null ) {
return "null";
}
var match = toString.call( obj ).match( /^\[object\s(.*)\]$/ ),
type = match && match[ 1 ];
switch ( type ) {
case "Number":
if ( isNaN( obj ) ) {
return "nan";
}
return "number";
case "String":
case "Boolean":
case "Array":
case "Set":
case "Map":
case "Date":
case "RegExp":
case "Function":
case "Symbol":
return type.toLowerCase();
}
if ( typeof obj === "object" ) {
return "object";
}
}
// Safe object type checking
function is( type, obj ) {
return QUnit.objectType( obj ) === type;
}
var getUrlParams = function() {
var i, param, name, value;
var urlParams = {};
var location = window.location;
var params = location.search.slice( 1 ).split( "&" );
var length = params.length;
for ( i = 0; i < length; i++ ) {
if ( params[ i ] ) {
param = params[ i ].split( "=" );
name = decodeURIComponent( param[ 0 ] );
// allow just a key to turn on a flag, e.g., test.html?noglobals
value = param.length === 1 ||
decodeURIComponent( param.slice( 1 ).join( "=" ) ) ;
if ( urlParams[ name ] ) {
urlParams[ name ] = [].concat( urlParams[ name ], value );
} else { } else {
return "Error"; urlParams[ name ] = value;
}
} else {
return errorString;
}
},
/**
* Makes a clone of an object using only Array or Object as base,
* and copies over the own enumerable properties.
*
* @param {Object} obj
* @return {Object} New object with only the own properties (recursively).
*/
objectValues = function( obj ) {
var key, val,
vals = QUnit.is( "array", obj ) ? [] : {};
for ( key in obj ) {
if ( hasOwn.call( obj, key ) ) {
val = obj[ key ];
vals[ key ] = val === Object( val ) ? objectValues( val ) : val;
} }
} }
return vals; }
};
QUnit = {}; return urlParams;
};
// Doesn't support IE6 to IE9, it will return undefined on these browsers
// See also https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error/Stack
function extractStacktrace( e, offset ) {
offset = offset === undefined ? 4 : offset;
var stack, include, i;
if ( e.stack ) {
stack = e.stack.split( "\n" );
if ( /^error$/i.test( stack[ 0 ] ) ) {
stack.shift();
}
if ( fileName ) {
include = [];
for ( i = offset; i < stack.length; i++ ) {
if ( stack[ i ].indexOf( fileName ) !== -1 ) {
break;
}
include.push( stack[ i ] );
}
if ( include.length ) {
return include.join( "\n" );
}
}
return stack[ offset ];
// Support: Safari <=6 only
} else if ( e.sourceURL ) {
// exclude useless self-reference for generated Error objects
if ( /qunit.js$/.test( e.sourceURL ) ) {
return;
}
// for actual exceptions, this is useful
return e.sourceURL + ":" + e.line;
}
}
function sourceFromStacktrace( offset ) {
var error = new Error();
// Support: Safari <=7 only, IE <=10 - 11 only
// Not all browsers generate the `stack` property for `new Error()`, see also #636
if ( !error.stack ) {
try {
throw error;
} catch ( err ) {
error = err;
}
}
return extractStacktrace( error, offset );
}
/** /**
* Config object: Maintain internal state * Config object: Maintain internal state
* Later exposed as QUnit.config * Later exposed as QUnit.config
* `config` initialized at top of scope * `config` initialized at top of scope
*/ */
config = { var config = {
// The queue of tests to run // The queue of tests to run
queue: [], queue: [],
@ -110,9 +257,16 @@ config = {
// by default, modify document.title when suite is done // by default, modify document.title when suite is done
altertitle: true, altertitle: true,
// HTML Reporter: collapse every test except the first failing test
// If false, all failing tests will be expanded
collapse: true,
// by default, scroll to top of the page when suite is done // by default, scroll to top of the page when suite is done
scrolltop: true, scrolltop: true,
// depth up-to which object will be dumped
maxDepth: 5,
// when enabled, all tests must call expect() // when enabled, all tests must call expect()
requireExpects: false, requireExpects: false,
@ -128,7 +282,7 @@ config = {
id: "noglobals", id: "noglobals",
label: "Check for Globals", label: "Check for Globals",
tooltip: "Enabling this will test if any test introduces new properties on the " + tooltip: "Enabling this will test if any test introduces new properties on the " +
"`window` object. Stored as query-strings." "global object (`window` in Browsers). Stored as query-strings."
}, },
{ {
id: "notrycatch", id: "notrycatch",
@ -141,6 +295,9 @@ config = {
// Set of all modules. // Set of all modules.
modules: [], modules: [],
// Stack of nested modules
moduleStack: [],
// The first unnamed module // The first unnamed module
currentModule: { currentModule: {
name: "", name: "",
@ -150,66 +307,162 @@ config = {
callbacks: {} callbacks: {}
}; };
var urlParams = defined.document ? getUrlParams() : {};
// Push a loose unnamed module to the modules collection // Push a loose unnamed module to the modules collection
config.modules.push( config.currentModule ); config.modules.push( config.currentModule );
// Initialize more QUnit.config and QUnit.urlParams if ( urlParams.filter === true ) {
(function() { delete urlParams.filter;
var i, current, }
location = window.location || { search: "", protocol: "file:" },
params = location.search.slice( 1 ).split( "&" ),
length = params.length,
urlParams = {};
if ( params[ 0 ] ) { // String search anywhere in moduleName+testName
for ( i = 0; i < length; i++ ) { config.filter = urlParams.filter;
current = params[ i ].split( "=" );
current[ 0 ] = decodeURIComponent( current[ 0 ] );
// allow just a key to turn on a flag, e.g., test.html?noglobals config.testId = [];
current[ 1 ] = current[ 1 ] ? decodeURIComponent( current[ 1 ] ) : true; if ( urlParams.testId ) {
if ( urlParams[ current[ 0 ] ] ) { // Ensure that urlParams.testId is an array
urlParams[ current[ 0 ] ] = [].concat( urlParams[ current[ 0 ] ], current[ 1 ] ); urlParams.testId = decodeURIComponent( urlParams.testId ).split( "," );
} else { for (var i = 0; i < urlParams.testId.length; i++ ) {
urlParams[ current[ 0 ] ] = current[ 1 ]; config.testId.push( urlParams.testId[ i ] );
}
}
var loggingCallbacks = {};
// Register logging callbacks
function registerLoggingCallbacks( obj ) {
var i, l, key,
callbackNames = [ "begin", "done", "log", "testStart", "testDone",
"moduleStart", "moduleDone" ];
function registerLoggingCallback( key ) {
var loggingCallback = function( callback ) {
if ( objectType( callback ) !== "function" ) {
throw new Error(
"QUnit logging methods require a callback function as their first parameters."
);
}
config.callbacks[ key ].push( callback );
};
// DEPRECATED: This will be removed on QUnit 2.0.0+
// Stores the registered functions allowing restoring
// at verifyLoggingCallbacks() if modified
loggingCallbacks[ key ] = loggingCallback;
return loggingCallback;
}
for ( i = 0, l = callbackNames.length; i < l; i++ ) {
key = callbackNames[ i ];
// Initialize key collection of logging callback
if ( objectType( config.callbacks[ key ] ) === "undefined" ) {
config.callbacks[ key ] = [];
}
obj[ key ] = registerLoggingCallback( key );
}
}
function runLoggingCallbacks( key, args ) {
var i, l, callbacks;
callbacks = config.callbacks[ key ];
for ( i = 0, l = callbacks.length; i < l; i++ ) {
callbacks[ i ]( args );
}
}
// DEPRECATED: This will be removed on 2.0.0+
// This function verifies if the loggingCallbacks were modified by the user
// If so, it will restore it, assign the given callback and print a console warning
function verifyLoggingCallbacks() {
var loggingCallback, userCallback;
for ( loggingCallback in loggingCallbacks ) {
if ( QUnit[ loggingCallback ] !== loggingCallbacks[ loggingCallback ] ) {
userCallback = QUnit[ loggingCallback ];
// Restore the callback function
QUnit[ loggingCallback ] = loggingCallbacks[ loggingCallback ];
// Assign the deprecated given callback
QUnit[ loggingCallback ]( userCallback );
if ( global.console && global.console.warn ) {
global.console.warn(
"QUnit." + loggingCallback + " was replaced with a new value.\n" +
"Please, check out the documentation on how to apply logging callbacks.\n" +
"Reference: https://api.qunitjs.com/category/callbacks/"
);
} }
} }
} }
}
if ( urlParams.filter === true ) { ( function() {
delete urlParams.filter; if ( !defined.document ) {
return;
} }
QUnit.urlParams = urlParams; // `onErrorFnPrev` initialized at top of scope
// Preserve other handlers
var onErrorFnPrev = window.onerror;
// String search anywhere in moduleName+testName // Cover uncaught exceptions
config.filter = urlParams.filter; // Returning true will suppress the default browser handler,
// returning false will let it run.
config.testId = []; window.onerror = function( error, filePath, linerNr ) {
if ( urlParams.testId ) { var ret = false;
if ( onErrorFnPrev ) {
// Ensure that urlParams.testId is an array ret = onErrorFnPrev( error, filePath, linerNr );
urlParams.testId = [].concat( urlParams.testId );
for ( i = 0; i < urlParams.testId.length; i++ ) {
config.testId.push( urlParams.testId[ i ] );
} }
}
// Figure out if we're running the tests from a server or not // Treat return value as window.onerror itself does,
QUnit.isLocal = location.protocol === "file:"; // Only do our handling if not suppressed.
}()); if ( ret !== true ) {
if ( QUnit.config.current ) {
if ( QUnit.config.current.ignoreGlobalErrors ) {
return true;
}
QUnit.pushFailure( error, filePath + ":" + linerNr );
} else {
QUnit.test( "global failure", extend(function() {
QUnit.pushFailure( error, filePath + ":" + linerNr );
}, { validTest: true } ) );
}
return false;
}
return ret;
};
} )();
QUnit.urlParams = urlParams;
// Figure out if we're running the tests from a server or not
QUnit.isLocal = !( defined.document && window.location.protocol !== "file:" );
// Expose the current QUnit version
QUnit.version = "1.22.0";
// Root QUnit object.
// `QUnit` initialized at top of scope
extend( QUnit, { extend( QUnit, {
// call on start of module test to prepend name to all tests // call on start of module test to prepend name to all tests
module: function( name, testEnvironment ) { module: function( name, testEnvironment, executeNow ) {
var currentModule = { var module, moduleFns;
name: name, var currentModule = config.currentModule;
testEnvironment: testEnvironment,
tests: [] if ( arguments.length === 2 ) {
}; if ( testEnvironment instanceof Function ) {
executeNow = testEnvironment;
testEnvironment = undefined;
}
}
// DEPRECATED: handles setup/teardown functions, // DEPRECATED: handles setup/teardown functions,
// beforeEach and afterEach should be used instead // beforeEach and afterEach should be used instead
@ -222,46 +475,61 @@ extend( QUnit, {
delete testEnvironment.teardown; delete testEnvironment.teardown;
} }
config.modules.push( currentModule ); module = createModule();
config.currentModule = currentModule;
moduleFns = {
beforeEach: setHook( module, "beforeEach" ),
afterEach: setHook( module, "afterEach" )
};
if ( executeNow instanceof Function ) {
config.moduleStack.push( module );
setCurrentModule( module );
executeNow.call( module.testEnvironment, moduleFns );
config.moduleStack.pop();
module = module.parentModule || currentModule;
}
setCurrentModule( module );
function createModule() {
var parentModule = config.moduleStack.length ?
config.moduleStack.slice( -1 )[ 0 ] : null;
var moduleName = parentModule !== null ?
[ parentModule.name, name ].join( " > " ) : name;
var module = {
name: moduleName,
parentModule: parentModule,
tests: []
};
var env = {};
if ( parentModule ) {
extend( env, parentModule.testEnvironment );
delete env.beforeEach;
delete env.afterEach;
}
extend( env, testEnvironment );
module.testEnvironment = env;
config.modules.push( module );
return module;
}
function setCurrentModule( module ) {
config.currentModule = module;
}
}, },
// DEPRECATED: QUnit.asyncTest() will be removed in QUnit 2.0. // DEPRECATED: QUnit.asyncTest() will be removed in QUnit 2.0.
asyncTest: function( testName, expected, callback ) { asyncTest: asyncTest,
if ( arguments.length === 2 ) {
callback = expected;
expected = null;
}
QUnit.test( testName, expected, callback, true ); test: test,
},
test: function( testName, expected, callback, async ) { skip: skip,
var test;
if ( arguments.length === 2 ) { only: only,
callback = expected;
expected = null;
}
test = new Test({
testName: testName,
expected: expected,
async: async,
callback: callback
});
test.queue();
},
skip: function( testName ) {
var test = new Test({
testName: testName,
skip: true
});
test.queue();
},
// DEPRECATED: The functionality of QUnit.start() will be altered in QUnit 2.0. // DEPRECATED: The functionality of QUnit.start() will be altered in QUnit 2.0.
// In QUnit 2.0, invoking it will ONLY affect the `QUnit.config.autostart` blocking behavior. // In QUnit 2.0, invoking it will ONLY affect the `QUnit.config.autostart` blocking behavior.
@ -289,6 +557,17 @@ extend( QUnit, {
// If a test is running, adjust its semaphore // If a test is running, adjust its semaphore
config.current.semaphore -= count || 1; config.current.semaphore -= count || 1;
// If semaphore is non-numeric, throw error
if ( isNaN( config.current.semaphore ) ) {
config.current.semaphore = 0;
QUnit.pushFailure(
"Called start() with a non-numeric decrement.",
sourceFromStacktrace( 2 )
);
return;
}
// Don't start until equal number of stop-calls // Don't start until equal number of stop-calls
if ( config.current.semaphore > 0 ) { if ( config.current.semaphore > 0 ) {
return; return;
@ -325,43 +604,9 @@ extend( QUnit, {
config: config, config: config,
// Safe object type checking is: is,
is: function( type, obj ) {
return QUnit.objectType( obj ) === type;
},
objectType: function( obj ) { objectType: objectType,
if ( typeof obj === "undefined" ) {
return "undefined";
}
// Consider: typeof null === object
if ( obj === null ) {
return "null";
}
var match = toString.call( obj ).match( /^\[object\s(.*)\]$/ ),
type = match && match[ 1 ] || "";
switch ( type ) {
case "Number":
if ( isNaN( obj ) ) {
return "nan";
}
return "number";
case "String":
case "Boolean":
case "Array":
case "Date":
case "RegExp":
case "Function":
return type.toLowerCase();
}
if ( typeof obj === "object" ) {
return "object";
}
return undefined;
},
extend: extend, extend: extend,
@ -383,204 +628,15 @@ extend( QUnit, {
if ( config.autostart ) { if ( config.autostart ) {
resumeProcessing(); resumeProcessing();
} }
},
stack: function( offset ) {
offset = ( offset || 0 ) + 2;
return sourceFromStacktrace( offset );
} }
}); });
// Register logging callbacks registerLoggingCallbacks( QUnit );
(function() {
var i, l, key,
callbacks = [ "begin", "done", "log", "testStart", "testDone",
"moduleStart", "moduleDone" ];
function registerLoggingCallback( key ) {
var loggingCallback = function( callback ) {
if ( QUnit.objectType( callback ) !== "function" ) {
throw new Error(
"QUnit logging methods require a callback function as their first parameters."
);
}
config.callbacks[ key ].push( callback );
};
// DEPRECATED: This will be removed on QUnit 2.0.0+
// Stores the registered functions allowing restoring
// at verifyLoggingCallbacks() if modified
loggingCallbacks[ key ] = loggingCallback;
return loggingCallback;
}
for ( i = 0, l = callbacks.length; i < l; i++ ) {
key = callbacks[ i ];
// Initialize key collection of logging callback
if ( QUnit.objectType( config.callbacks[ key ] ) === "undefined" ) {
config.callbacks[ key ] = [];
}
QUnit[ key ] = registerLoggingCallback( key );
}
})();
// `onErrorFnPrev` initialized at top of scope
// Preserve other handlers
onErrorFnPrev = window.onerror;
// Cover uncaught exceptions
// Returning true will suppress the default browser handler,
// returning false will let it run.
window.onerror = function( error, filePath, linerNr ) {
var ret = false;
if ( onErrorFnPrev ) {
ret = onErrorFnPrev( error, filePath, linerNr );
}
// Treat return value as window.onerror itself does,
// Only do our handling if not suppressed.
if ( ret !== true ) {
if ( QUnit.config.current ) {
if ( QUnit.config.current.ignoreGlobalErrors ) {
return true;
}
QUnit.pushFailure( error, filePath + ":" + linerNr );
} else {
QUnit.test( "global failure", extend(function() {
QUnit.pushFailure( error, filePath + ":" + linerNr );
}, { validTest: true } ) );
}
return false;
}
return ret;
};
function done() {
var runtime, passed;
config.autorun = true;
// Log the last module results
if ( config.previousModule ) {
runLoggingCallbacks( "moduleDone", {
name: config.previousModule.name,
tests: config.previousModule.tests,
failed: config.moduleStats.bad,
passed: config.moduleStats.all - config.moduleStats.bad,
total: config.moduleStats.all,
runtime: now() - config.moduleStats.started
});
}
delete config.previousModule;
runtime = now() - config.started;
passed = config.stats.all - config.stats.bad;
runLoggingCallbacks( "done", {
failed: config.stats.bad,
passed: passed,
total: config.stats.all,
runtime: runtime
});
}
// Doesn't support IE6 to IE9
// See also https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error/Stack
function extractStacktrace( e, offset ) {
offset = offset === undefined ? 4 : offset;
var stack, include, i;
if ( e.stacktrace ) {
// Opera 12.x
return e.stacktrace.split( "\n" )[ offset + 3 ];
} else if ( e.stack ) {
// Firefox, Chrome, Safari 6+, IE10+, PhantomJS and Node
stack = e.stack.split( "\n" );
if ( /^error$/i.test( stack[ 0 ] ) ) {
stack.shift();
}
if ( fileName ) {
include = [];
for ( i = offset; i < stack.length; i++ ) {
if ( stack[ i ].indexOf( fileName ) !== -1 ) {
break;
}
include.push( stack[ i ] );
}
if ( include.length ) {
return include.join( "\n" );
}
}
return stack[ offset ];
} else if ( e.sourceURL ) {
// Safari < 6
// exclude useless self-reference for generated Error objects
if ( /qunit.js$/.test( e.sourceURL ) ) {
return;
}
// for actual exceptions, this is useful
return e.sourceURL + ":" + e.line;
}
}
function sourceFromStacktrace( offset ) {
var e = new Error();
if ( !e.stack ) {
try {
throw e;
} catch ( err ) {
// This should already be true in most browsers
e = err;
}
}
return extractStacktrace( e, offset );
}
function synchronize( callback, last ) {
if ( QUnit.objectType( callback ) === "array" ) {
while ( callback.length ) {
synchronize( callback.shift() );
}
return;
}
config.queue.push( callback );
if ( config.autorun && !config.blocking ) {
process( last );
}
}
function process( last ) {
function next() {
process( last );
}
var start = now();
config.depth = ( config.depth || 0 ) + 1;
while ( config.queue.length && !config.blocking ) {
if ( !defined.setTimeout || config.updateRate <= 0 ||
( ( now() - start ) < config.updateRate ) ) {
if ( config.current ) {
// Reset async tracking for each phase of the Test lifecycle
config.current.usedAsync = false;
}
config.queue.shift()();
} else {
setTimeout( next, 13 );
break;
}
}
config.depth--;
if ( last && !config.blocking && !config.queue.length && config.depth === 0 ) {
done();
}
}
function begin() { function begin() {
var i, l, var i, l,
@ -618,23 +674,30 @@ function begin() {
process( true ); process( true );
} }
function resumeProcessing() { function process( last ) {
runStarted = true; function next() {
process( last );
}
var start = now();
config.depth = ( config.depth || 0 ) + 1;
// A slight delay to allow this iteration of the event loop to finish (more assertions, etc.) while ( config.queue.length && !config.blocking ) {
if ( defined.setTimeout ) { if ( !defined.setTimeout || config.updateRate <= 0 ||
setTimeout(function() { ( ( now() - start ) < config.updateRate ) ) {
if ( config.current && config.current.semaphore > 0 ) { if ( config.current ) {
return;
}
if ( config.timeout ) {
clearTimeout( config.timeout );
}
begin(); // Reset async tracking for each phase of the Test lifecycle
}, 13 ); config.current.usedAsync = false;
} else { }
begin(); config.queue.shift()();
} else {
setTimeout( next, 13 );
break;
}
}
config.depth--;
if ( last && !config.blocking && !config.queue.length && config.depth === 0 ) {
done();
} }
} }
@ -655,127 +718,68 @@ function pauseProcessing() {
} }
} }
function saveGlobal() { function resumeProcessing() {
config.pollution = []; runStarted = true;
if ( config.noglobals ) { // A slight delay to allow this iteration of the event loop to finish (more assertions, etc.)
for ( var key in window ) { if ( defined.setTimeout ) {
if ( hasOwn.call( window, key ) ) { setTimeout(function() {
// in Opera sometimes DOM element ids show up here, ignore them if ( config.current && config.current.semaphore > 0 ) {
if ( /^qunit-test-output/.test( key ) ) { return;
continue;
}
config.pollution.push( key );
} }
} if ( config.timeout ) {
} clearTimeout( config.timeout );
}
function checkPollution() {
var newGlobals,
deletedGlobals,
old = config.pollution;
saveGlobal();
newGlobals = diff( config.pollution, old );
if ( newGlobals.length > 0 ) {
QUnit.pushFailure( "Introduced global variable(s): " + newGlobals.join( ", " ) );
}
deletedGlobals = diff( old, config.pollution );
if ( deletedGlobals.length > 0 ) {
QUnit.pushFailure( "Deleted global variable(s): " + deletedGlobals.join( ", " ) );
}
}
// returns a new Array with the elements that are in a but not in b
function diff( a, b ) {
var i, j,
result = a.slice();
for ( i = 0; i < result.length; i++ ) {
for ( j = 0; j < b.length; j++ ) {
if ( result[ i ] === b[ j ] ) {
result.splice( i, 1 );
i--;
break;
} }
}
}
return result;
}
function extend( a, b, undefOnly ) { begin();
for ( var prop in b ) { }, 13 );
if ( hasOwn.call( b, prop ) ) { } else {
begin();
// Avoid "Member not found" error in IE8 caused by messing with window.constructor
if ( !( prop === "constructor" && a === window ) ) {
if ( b[ prop ] === undefined ) {
delete a[ prop ];
} else if ( !( undefOnly && typeof a[ prop ] !== "undefined" ) ) {
a[ prop ] = b[ prop ];
}
}
}
}
return a;
}
function runLoggingCallbacks( key, args ) {
var i, l, callbacks;
callbacks = config.callbacks[ key ];
for ( i = 0, l = callbacks.length; i < l; i++ ) {
callbacks[ i ]( args );
} }
} }
// DEPRECATED: This will be removed on 2.0.0+ function done() {
// This function verifies if the loggingCallbacks were modified by the user var runtime, passed;
// If so, it will restore it, assign the given callback and print a console warning
function verifyLoggingCallbacks() {
var loggingCallback, userCallback;
for ( loggingCallback in loggingCallbacks ) { config.autorun = true;
if ( QUnit[ loggingCallback ] !== loggingCallbacks[ loggingCallback ] ) {
userCallback = QUnit[ loggingCallback ]; // Log the last module results
if ( config.previousModule ) {
// Restore the callback function runLoggingCallbacks( "moduleDone", {
QUnit[ loggingCallback ] = loggingCallbacks[ loggingCallback ]; name: config.previousModule.name,
tests: config.previousModule.tests,
// Assign the deprecated given callback failed: config.moduleStats.bad,
QUnit[ loggingCallback ]( userCallback ); passed: config.moduleStats.all - config.moduleStats.bad,
total: config.moduleStats.all,
if ( window.console && window.console.warn ) { runtime: now() - config.moduleStats.started
window.console.warn( });
"QUnit." + loggingCallback + " was replaced with a new value.\n" +
"Please, check out the documentation on how to apply logging callbacks.\n" +
"Reference: http://api.qunitjs.com/category/callbacks/"
);
}
}
} }
delete config.previousModule;
runtime = now() - config.started;
passed = config.stats.all - config.stats.bad;
runLoggingCallbacks( "done", {
failed: config.stats.bad,
passed: passed,
total: config.stats.all,
runtime: runtime
});
} }
// from jquery.js function setHook( module, hookName ) {
function inArray( elem, array ) { if ( module.testEnvironment === undefined ) {
if ( array.indexOf ) { module.testEnvironment = {};
return array.indexOf( elem );
} }
for ( var i = 0, length = array.length; i < length; i++ ) { return function( callback ) {
if ( array[ i ] === elem ) { module.testEnvironment[ hookName ] = callback;
return i; };
}
}
return -1;
} }
var focused = false;
var priorityCount = 0;
function Test( settings ) { function Test( settings ) {
var i, l; var i, l;
@ -848,9 +852,11 @@ Test.prototype = {
config.current = this; config.current = this;
if ( this.module.testEnvironment ) {
delete this.module.testEnvironment.beforeEach;
delete this.module.testEnvironment.afterEach;
}
this.testEnvironment = extend( {}, this.module.testEnvironment ); this.testEnvironment = extend( {}, this.module.testEnvironment );
delete this.testEnvironment.beforeEach;
delete this.testEnvironment.afterEach;
this.started = now(); this.started = now();
runLoggingCallbacks( "testStart", { runLoggingCallbacks( "testStart", {
@ -876,14 +882,12 @@ Test.prototype = {
this.callbackStarted = now(); this.callbackStarted = now();
if ( config.notrycatch ) { if ( config.notrycatch ) {
promise = this.callback.call( this.testEnvironment, this.assert ); runTest( this );
this.resolvePromise( promise );
return; return;
} }
try { try {
promise = this.callback.call( this.testEnvironment, this.assert ); runTest( this );
this.resolvePromise( promise );
} catch ( e ) { } catch ( e ) {
this.pushFailure( "Died on test #" + ( this.assertions.length + 1 ) + " " + this.pushFailure( "Died on test #" + ( this.assertions.length + 1 ) + " " +
this.stack + ": " + ( e.message || e ), extractStacktrace( e, 0 ) ); this.stack + ": " + ( e.message || e ), extractStacktrace( e, 0 ) );
@ -896,6 +900,11 @@ Test.prototype = {
QUnit.start(); QUnit.start();
} }
} }
function runTest( test ) {
promise = test.callback.call( test.testEnvironment, test.assert );
test.resolvePromise( promise );
}
}, },
after: function() { after: function() {
@ -908,16 +917,19 @@ Test.prototype = {
return function runHook() { return function runHook() {
config.current = test; config.current = test;
if ( config.notrycatch ) { if ( config.notrycatch ) {
promise = hook.call( test.testEnvironment, test.assert ); callHook();
test.resolvePromise( promise, hookName );
return; return;
} }
try { try {
promise = hook.call( test.testEnvironment, test.assert ); callHook();
test.resolvePromise( promise, hookName );
} catch ( error ) { } catch ( error ) {
test.pushFailure( hookName + " failed on " + test.testName + ": " + test.pushFailure( hookName + " failed on " + test.testName + ": " +
( error.message || error ), extractStacktrace( error, 0 ) ); ( error.message || error ), extractStacktrace( error, 0 ) );
}
function callHook() {
promise = hook.call( test.testEnvironment, test.assert );
test.resolvePromise( promise, hookName );
} }
}; };
}, },
@ -926,16 +938,20 @@ Test.prototype = {
hooks: function( handler ) { hooks: function( handler ) {
var hooks = []; var hooks = [];
function processHooks( test, module ) {
if ( module.parentModule ) {
processHooks( test, module.parentModule );
}
if ( module.testEnvironment &&
QUnit.objectType( module.testEnvironment[ handler ] ) === "function" ) {
hooks.push( test.queueHook( module.testEnvironment[ handler ], handler ) );
}
}
// Hooks are ignored on skipped tests // Hooks are ignored on skipped tests
if ( this.skip ) { if ( !this.skip ) {
return hooks; processHooks( this, this.module );
} }
if ( this.module.testEnvironment &&
QUnit.objectType( this.module.testEnvironment[ handler ] ) === "function" ) {
hooks.push( this.queueHook( this.module.testEnvironment[ handler ], handler ) );
}
return hooks; return hooks;
}, },
@ -980,6 +996,9 @@ Test.prototype = {
assertions: this.assertions, assertions: this.assertions,
testId: this.testId, testId: this.testId,
// Source of Test
source: this.stack,
// DEPRECATED: this property will be removed in 2.0.0, use runtime instead // DEPRECATED: this property will be removed in 2.0.0, use runtime instead
duration: this.runtime duration: this.runtime
}); });
@ -993,7 +1012,7 @@ Test.prototype = {
}, },
queue: function() { queue: function() {
var bad, var priority,
test = this; test = this;
if ( !this.valid() ) { if ( !this.valid() ) {
@ -1009,7 +1028,6 @@ Test.prototype = {
}, },
test.hooks( "beforeEach" ), test.hooks( "beforeEach" ),
function() { function() {
test.run(); test.run();
}, },
@ -1025,32 +1043,30 @@ Test.prototype = {
]); ]);
} }
// `bad` initialized at top of scope // Prioritize previously failed tests, detected from sessionStorage
// defer when previous test run passed, if storage is available priority = QUnit.config.reorder && defined.sessionStorage &&
bad = QUnit.config.reorder && defined.sessionStorage &&
+sessionStorage.getItem( "qunit-test-" + this.module.name + "-" + this.testName ); +sessionStorage.getItem( "qunit-test-" + this.module.name + "-" + this.testName );
if ( bad ) { return synchronize( run, priority );
run();
} else {
synchronize( run, true );
}
}, },
push: function( result, actual, expected, message ) { pushResult: function( resultInfo ) {
// resultInfo = { result, actual, expected, message, negative }
var source, var source,
details = { details = {
module: this.module.name, module: this.module.name,
name: this.testName, name: this.testName,
result: result, result: resultInfo.result,
message: message, message: resultInfo.message,
actual: actual, actual: resultInfo.actual,
expected: expected, expected: resultInfo.expected,
testId: this.testId, testId: this.testId,
negative: resultInfo.negative || false,
runtime: now() - this.started runtime: now() - this.started
}; };
if ( !result ) { if ( !resultInfo.result ) {
source = sourceFromStacktrace(); source = sourceFromStacktrace();
if ( source ) { if ( source ) {
@ -1061,13 +1077,13 @@ Test.prototype = {
runLoggingCallbacks( "log", details ); runLoggingCallbacks( "log", details );
this.assertions.push({ this.assertions.push({
result: !!result, result: !!resultInfo.result,
message: message message: resultInfo.message
}); });
}, },
pushFailure: function( message, source, actual ) { pushFailure: function( message, source, actual ) {
if ( !this instanceof Test ) { if ( !( this instanceof Test ) ) {
throw new Error( "pushFailure() assertion outside test context, was " + throw new Error( "pushFailure() assertion outside test context, was " +
sourceFromStacktrace( 2 ) ); sourceFromStacktrace( 2 ) );
} }
@ -1103,7 +1119,7 @@ Test.prototype = {
QUnit.stop(); QUnit.stop();
then.call( then.call(
promise, promise,
QUnit.start, function() { QUnit.start(); },
function( error ) { function( error ) {
message = "Promise rejected " + message = "Promise rejected " +
( !phase ? "during" : phase.replace( /Each$/, "" ) ) + ( !phase ? "during" : phase.replace( /Each$/, "" ) ) +
@ -1122,10 +1138,21 @@ Test.prototype = {
}, },
valid: function() { valid: function() {
var include, var filter = config.filter,
filter = config.filter, regexFilter = /^(!?)\/([\w\W]*)\/(i?$)/.exec( filter ),
module = QUnit.urlParams.module && QUnit.urlParams.module.toLowerCase(), module = QUnit.urlParams.module && QUnit.urlParams.module.toLowerCase(),
fullName = ( this.module.name + ": " + this.testName ).toLowerCase(); fullName = ( this.module.name + ": " + this.testName );
function testInModuleChain( testModule ) {
var testModuleName = testModule.name ? testModule.name.toLowerCase() : null;
if ( testModuleName === module ) {
return true;
} else if ( testModule.parentModule ) {
return testInModuleChain( testModule.parentModule );
} else {
return false;
}
}
// Internally-generated tests are always valid // Internally-generated tests are always valid
if ( this.callback && this.callback.validTest ) { if ( this.callback && this.callback.validTest ) {
@ -1136,7 +1163,7 @@ Test.prototype = {
return false; return false;
} }
if ( module && ( !this.module.name || this.module.name.toLowerCase() !== module ) ) { if ( module && !testInModuleChain( this.module ) ) {
return false; return false;
} }
@ -1144,9 +1171,25 @@ Test.prototype = {
return true; return true;
} }
include = filter.charAt( 0 ) !== "!"; return regexFilter ?
this.regexFilter( !!regexFilter[1], regexFilter[2], regexFilter[3], fullName ) :
this.stringFilter( filter, fullName );
},
regexFilter: function( exclude, pattern, flags, fullName ) {
var regex = new RegExp( pattern, flags );
var match = regex.test( fullName );
return match !== exclude;
},
stringFilter: function( filter, fullName ) {
filter = filter.toLowerCase();
fullName = fullName.toLowerCase();
var include = filter.charAt( 0 ) !== "!";
if ( !include ) { if ( !include ) {
filter = filter.toLowerCase().slice( 1 ); filter = filter.slice( 1 );
} }
// If the filter matches, we need to honour include // If the filter matches, we need to honour include
@ -1157,7 +1200,6 @@ Test.prototype = {
// Otherwise, do the opposite // Otherwise, do the opposite
return !include; return !include;
} }
}; };
// Resets the test setup. Useful for tests that modify the DOM. // Resets the test setup. Useful for tests that modify the DOM.
@ -1170,7 +1212,7 @@ QUnit.reset = function() {
// Return on non-browser environments // Return on non-browser environments
// This is necessary to not break on node tests // This is necessary to not break on node tests
if ( typeof window === "undefined" ) { if ( !defined.document ) {
return; return;
} }
@ -1218,6 +1260,129 @@ function generateHash( module, testName ) {
return hex.slice( -8 ); return hex.slice( -8 );
} }
function synchronize( callback, priority ) {
var last = !priority;
if ( QUnit.objectType( callback ) === "array" ) {
while ( callback.length ) {
synchronize( callback.shift() );
}
return;
}
if ( priority ) {
config.queue.splice( priorityCount++, 0, callback );
} else {
config.queue.push( callback );
}
if ( config.autorun && !config.blocking ) {
process( last );
}
}
function saveGlobal() {
config.pollution = [];
if ( config.noglobals ) {
for ( var key in global ) {
if ( hasOwn.call( global, key ) ) {
// in Opera sometimes DOM element ids show up here, ignore them
if ( /^qunit-test-output/.test( key ) ) {
continue;
}
config.pollution.push( key );
}
}
}
}
function checkPollution() {
var newGlobals,
deletedGlobals,
old = config.pollution;
saveGlobal();
newGlobals = diff( config.pollution, old );
if ( newGlobals.length > 0 ) {
QUnit.pushFailure( "Introduced global variable(s): " + newGlobals.join( ", " ) );
}
deletedGlobals = diff( old, config.pollution );
if ( deletedGlobals.length > 0 ) {
QUnit.pushFailure( "Deleted global variable(s): " + deletedGlobals.join( ", " ) );
}
}
// Will be exposed as QUnit.asyncTest
function asyncTest( testName, expected, callback ) {
if ( arguments.length === 2 ) {
callback = expected;
expected = null;
}
QUnit.test( testName, expected, callback, true );
}
// Will be exposed as QUnit.test
function test( testName, expected, callback, async ) {
if ( focused ) { return; }
var newTest;
if ( arguments.length === 2 ) {
callback = expected;
expected = null;
}
newTest = new Test({
testName: testName,
expected: expected,
async: async,
callback: callback
});
newTest.queue();
}
// Will be exposed as QUnit.skip
function skip( testName ) {
if ( focused ) { return; }
var test = new Test({
testName: testName,
skip: true
});
test.queue();
}
// Will be exposed as QUnit.only
function only( testName, expected, callback, async ) {
var newTest;
if ( focused ) { return; }
QUnit.config.queue.length = 0;
focused = true;
if ( arguments.length === 2 ) {
callback = expected;
expected = null;
}
newTest = new Test({
testName: testName,
expected: expected,
async: async,
callback: callback
});
newTest.queue();
}
function Assert( testContext ) { function Assert( testContext ) {
this.test = testContext; this.test = testContext;
} }
@ -1235,30 +1400,55 @@ QUnit.assert = Assert.prototype = {
} }
}, },
// Increment this Test's semaphore counter, then return a single-use function that // Increment this Test's semaphore counter, then return a function that
// decrements that counter a maximum of once. // decrements that counter a maximum of once.
async: function() { async: function( count ) {
var test = this.test, var test = this.test,
popped = false; popped = false,
acceptCallCount = count;
if ( typeof acceptCallCount === "undefined" ) {
acceptCallCount = 1;
}
test.semaphore += 1; test.semaphore += 1;
test.usedAsync = true; test.usedAsync = true;
pauseProcessing(); pauseProcessing();
return function done() { return function done() {
if ( !popped ) {
test.semaphore -= 1; if ( popped ) {
popped = true; test.pushFailure( "Too many calls to the `assert.async` callback",
resumeProcessing();
} else {
test.pushFailure( "Called the callback returned from `assert.async` more than once",
sourceFromStacktrace( 2 ) ); sourceFromStacktrace( 2 ) );
return;
} }
acceptCallCount -= 1;
if ( acceptCallCount > 0 ) {
return;
}
test.semaphore -= 1;
popped = true;
resumeProcessing();
}; };
}, },
// Exports test.push() to the user API // Exports test.push() to the user API
push: function( /* result, actual, expected, message */ ) { // Alias of pushResult.
push: function( result, actual, expected, message, negative ) {
var currentAssert = this instanceof Assert ? this : QUnit.config.current.assert;
return currentAssert.pushResult( {
result: result,
actual: actual,
expected: expected,
message: message,
negative: negative
} );
},
pushResult: function( resultInfo ) {
// resultInfo = { result, actual, expected, message, negative }
var assert = this, var assert = this,
currentTest = ( assert instanceof Assert && assert.test ) || QUnit.config.current; currentTest = ( assert instanceof Assert && assert.test ) || QUnit.config.current;
@ -1281,98 +1471,119 @@ QUnit.assert = Assert.prototype = {
if ( !( assert instanceof Assert ) ) { if ( !( assert instanceof Assert ) ) {
assert = currentTest.assert; assert = currentTest.assert;
} }
return assert.test.push.apply( assert.test, arguments );
return assert.test.pushResult( resultInfo );
}, },
/**
* Asserts rough true-ish result.
* @name ok
* @function
* @example ok( "asdfasdf".length > 5, "There must be at least 5 chars" );
*/
ok: function( result, message ) { ok: function( result, message ) {
message = message || ( result ? "okay" : "failed, expected argument to be truthy, was: " + message = message || ( result ? "okay" : "failed, expected argument to be truthy, was: " +
QUnit.dump.parse( result ) ); QUnit.dump.parse( result ) );
this.push( !!result, result, true, message ); this.pushResult( {
result: !!result,
actual: result,
expected: true,
message: message
} );
},
notOk: function( result, message ) {
message = message || ( !result ? "okay" : "failed, expected argument to be falsy, was: " +
QUnit.dump.parse( result ) );
this.pushResult( {
result: !result,
actual: result,
expected: false,
message: message
} );
}, },
/**
* Assert that the first two arguments are equal, with an optional message.
* Prints out both actual and expected values.
* @name equal
* @function
* @example equal( format( "{0} bytes.", 2), "2 bytes.", "replaces {0} with next argument" );
*/
equal: function( actual, expected, message ) { equal: function( actual, expected, message ) {
/*jshint eqeqeq:false */ /*jshint eqeqeq:false */
this.push( expected == actual, actual, expected, message ); this.pushResult( {
result: expected == actual,
actual: actual,
expected: expected,
message: message
} );
}, },
/**
* @name notEqual
* @function
*/
notEqual: function( actual, expected, message ) { notEqual: function( actual, expected, message ) {
/*jshint eqeqeq:false */ /*jshint eqeqeq:false */
this.push( expected != actual, actual, expected, message ); this.pushResult( {
result: expected != actual,
actual: actual,
expected: expected,
message: message,
negative: true
} );
}, },
/**
* @name propEqual
* @function
*/
propEqual: function( actual, expected, message ) { propEqual: function( actual, expected, message ) {
actual = objectValues( actual ); actual = objectValues( actual );
expected = objectValues( expected ); expected = objectValues( expected );
this.push( QUnit.equiv( actual, expected ), actual, expected, message ); this.pushResult( {
result: QUnit.equiv( actual, expected ),
actual: actual,
expected: expected,
message: message
} );
}, },
/**
* @name notPropEqual
* @function
*/
notPropEqual: function( actual, expected, message ) { notPropEqual: function( actual, expected, message ) {
actual = objectValues( actual ); actual = objectValues( actual );
expected = objectValues( expected ); expected = objectValues( expected );
this.push( !QUnit.equiv( actual, expected ), actual, expected, message ); this.pushResult( {
result: !QUnit.equiv( actual, expected ),
actual: actual,
expected: expected,
message: message,
negative: true
} );
}, },
/**
* @name deepEqual
* @function
*/
deepEqual: function( actual, expected, message ) { deepEqual: function( actual, expected, message ) {
this.push( QUnit.equiv( actual, expected ), actual, expected, message ); this.pushResult( {
result: QUnit.equiv( actual, expected ),
actual: actual,
expected: expected,
message: message
} );
}, },
/**
* @name notDeepEqual
* @function
*/
notDeepEqual: function( actual, expected, message ) { notDeepEqual: function( actual, expected, message ) {
this.push( !QUnit.equiv( actual, expected ), actual, expected, message ); this.pushResult( {
result: !QUnit.equiv( actual, expected ),
actual: actual,
expected: expected,
message: message,
negative: true
} );
}, },
/**
* @name strictEqual
* @function
*/
strictEqual: function( actual, expected, message ) { strictEqual: function( actual, expected, message ) {
this.push( expected === actual, actual, expected, message ); this.pushResult( {
result: expected === actual,
actual: actual,
expected: expected,
message: message
} );
}, },
/**
* @name notStrictEqual
* @function
*/
notStrictEqual: function( actual, expected, message ) { notStrictEqual: function( actual, expected, message ) {
this.push( expected !== actual, actual, expected, message ); this.pushResult( {
result: expected !== actual,
actual: actual,
expected: expected,
message: message,
negative: true
} );
}, },
"throws": function( block, expected, message ) { "throws": function( block, expected, message ) {
var actual, expectedType, var actual, expectedType,
expectedOutput = expected, expectedOutput = expected,
ok = false; ok = false,
currentTest = ( this instanceof Assert && this.test ) || QUnit.config.current;
// 'expected' is optional unless doing string comparison // 'expected' is optional unless doing string comparison
if ( message == null && typeof expected === "string" ) { if ( message == null && typeof expected === "string" ) {
@ -1380,13 +1591,13 @@ QUnit.assert = Assert.prototype = {
expected = null; expected = null;
} }
this.test.ignoreGlobalErrors = true; currentTest.ignoreGlobalErrors = true;
try { try {
block.call( this.test.testEnvironment ); block.call( currentTest.testEnvironment );
} catch (e) { } catch (e) {
actual = e; actual = e;
} }
this.test.ignoreGlobalErrors = false; currentTest.ignoreGlobalErrors = false;
if ( actual ) { if ( actual ) {
expectedType = QUnit.objectType( expected ); expectedType = QUnit.objectType( expected );
@ -1419,238 +1630,283 @@ QUnit.assert = Assert.prototype = {
expectedOutput = null; expectedOutput = null;
ok = true; ok = true;
} }
this.push( ok, actual, expectedOutput, message );
} else {
this.test.pushFailure( message, null, "No exception was thrown." );
} }
currentTest.assert.pushResult( {
result: ok,
actual: actual,
expected: expectedOutput,
message: message
} );
} }
}; };
// Provide an alternative to assert.throws(), for enviroments that consider throws a reserved word // Provide an alternative to assert.throws(), for environments that consider throws a reserved word
// Known to us are: Closure Compiler, Narwhal // Known to us are: Closure Compiler, Narwhal
(function() { (function() {
/*jshint sub:true */ /*jshint sub:true */
Assert.prototype.raises = Assert.prototype[ "throws" ]; Assert.prototype.raises = Assert.prototype[ "throws" ];
}()); }());
function errorString( error ) {
var name, message,
resultErrorString = error.toString();
if ( resultErrorString.substring( 0, 7 ) === "[object" ) {
name = error.name ? error.name.toString() : "Error";
message = error.message ? error.message.toString() : "";
if ( name && message ) {
return name + ": " + message;
} else if ( name ) {
return name;
} else if ( message ) {
return message;
} else {
return "Error";
}
} else {
return resultErrorString;
}
}
// Test for equality any JavaScript type. // Test for equality any JavaScript type.
// Author: Philippe Rathé <prathe@gmail.com> // Author: Philippe Rathé <prathe@gmail.com>
QUnit.equiv = (function() { QUnit.equiv = (function() {
// Call the o related callback with the given arguments. // Stack to decide between skip/abort functions
function bindCallbacks( o, callbacks, args ) { var callers = [];
var prop = QUnit.objectType( o );
if ( prop ) { // Stack to avoiding loops from circular referencing
if ( QUnit.objectType( callbacks[ prop ] ) === "function" ) { var parents = [];
return callbacks[ prop ].apply( callbacks, args ); var parentsB = [];
} else {
return callbacks[ prop ]; // or undefined var getProto = Object.getPrototypeOf || function( obj ) {
}
/*jshint proto: true */
return obj.__proto__;
};
function useStrictEquality( b, a ) {
// To catch short annotation VS 'new' annotation of a declaration. e.g.:
// `var i = 1;`
// `var j = new Number(1);`
if ( typeof a === "object" ) {
a = a.valueOf();
} }
if ( typeof b === "object" ) {
b = b.valueOf();
}
return a === b;
} }
// the real equiv function function compareConstructors( a, b ) {
var innerEquiv, var protoA = getProto( a );
var protoB = getProto( b );
// stack to decide between skip/abort functions // Comparing constructors is more strict than using `instanceof`
callers = [], if ( a.constructor === b.constructor ) {
return true;
}
// stack to avoiding loops from circular referencing // Ref #851
parents = [], // If the obj prototype descends from a null constructor, treat it
parentsB = [], // as a null prototype.
if ( protoA && protoA.constructor === null ) {
protoA = null;
}
if ( protoB && protoB.constructor === null ) {
protoB = null;
}
getProto = Object.getPrototypeOf || function( obj ) { // Allow objects with no prototype to be equivalent to
/* jshint camelcase: false, proto: true */ // objects with Object as their constructor.
return obj.__proto__; if ( ( protoA === null && protoB === Object.prototype ) ||
( protoB === null && protoA === Object.prototype ) ) {
return true;
}
return false;
}
function getRegExpFlags( regexp ) {
return "flags" in regexp ? regexp.flags : regexp.toString().match( /[gimuy]*$/ )[ 0 ];
}
var callbacks = {
"string": useStrictEquality,
"boolean": useStrictEquality,
"number": useStrictEquality,
"null": useStrictEquality,
"undefined": useStrictEquality,
"symbol": useStrictEquality,
"date": useStrictEquality,
"nan": function() {
return true;
}, },
callbacks = (function() {
// for string, boolean, number and null "regexp": function( b, a ) {
function useStrictEquality( b, a ) { return a.source === b.source &&
/*jshint eqeqeq:false */ // Include flags in the comparison
if ( b instanceof a.constructor || a instanceof b.constructor ) { getRegExpFlags( a ) === getRegExpFlags( b );
},
// to catch short annotation VS 'new' annotation of a // - skip when the property is a method of an instance (OOP)
// declaration // - abort otherwise,
// e.g. var i = 1; // initial === would have catch identical references anyway
// var j = new Number(1); "function": function() {
return a == b; var caller = callers[ callers.length - 1 ];
} else { return caller !== Object && typeof caller !== "undefined";
return a === b; },
}
"array": function( b, a ) {
var i, j, len, loop, aCircular, bCircular;
len = a.length;
if ( len !== b.length ) {
// safe and faster
return false;
} }
return { // Track reference to avoid circular references
"string": useStrictEquality, parents.push( a );
"boolean": useStrictEquality, parentsB.push( b );
"number": useStrictEquality, for ( i = 0; i < len; i++ ) {
"null": useStrictEquality, loop = false;
"undefined": useStrictEquality, for ( j = 0; j < parents.length; j++ ) {
aCircular = parents[ j ] === a[ i ];
"nan": function( b ) { bCircular = parentsB[ j ] === b[ i ];
return isNaN( b ); if ( aCircular || bCircular ) {
}, if ( a[ i ] === b[ i ] || aCircular && bCircular ) {
loop = true;
"date": function( b, a ) { } else {
return QUnit.objectType( b ) === "date" && a.valueOf() === b.valueOf();
},
"regexp": function( b, a ) {
return QUnit.objectType( b ) === "regexp" &&
// the regex itself
a.source === b.source &&
// and its modifiers
a.global === b.global &&
// (gmi) ...
a.ignoreCase === b.ignoreCase &&
a.multiline === b.multiline &&
a.sticky === b.sticky;
},
// - skip when the property is a method of an instance (OOP)
// - abort otherwise,
// initial === would have catch identical references anyway
"function": function() {
var caller = callers[ callers.length - 1 ];
return caller !== Object && typeof caller !== "undefined";
},
"array": function( b, a ) {
var i, j, len, loop, aCircular, bCircular;
// b could be an object literal here
if ( QUnit.objectType( b ) !== "array" ) {
return false;
}
len = a.length;
if ( len !== b.length ) {
// safe and faster
return false;
}
// track reference to avoid circular references
parents.push( a );
parentsB.push( b );
for ( i = 0; i < len; i++ ) {
loop = false;
for ( j = 0; j < parents.length; j++ ) {
aCircular = parents[ j ] === a[ i ];
bCircular = parentsB[ j ] === b[ i ];
if ( aCircular || bCircular ) {
if ( a[ i ] === b[ i ] || aCircular && bCircular ) {
loop = true;
} else {
parents.pop();
parentsB.pop();
return false;
}
}
}
if ( !loop && !innerEquiv( a[ i ], b[ i ] ) ) {
parents.pop(); parents.pop();
parentsB.pop(); parentsB.pop();
return false; return false;
} }
} }
}
if ( !loop && !innerEquiv( a[ i ], b[ i ] ) ) {
parents.pop(); parents.pop();
parentsB.pop(); parentsB.pop();
return true; return false;
}, }
}
parents.pop();
parentsB.pop();
return true;
},
"object": function( b, a ) { "set": function( b, a ) {
var aArray, bArray;
/*jshint forin:false */ aArray = [];
var i, j, loop, aCircular, bCircular, a.forEach( function( v ) {
// Default to true aArray.push( v );
eq = true, });
aProperties = [], bArray = [];
bProperties = []; b.forEach( function( v ) {
bArray.push( v );
});
// comparing constructors is more strict than using return innerEquiv( bArray, aArray );
// instanceof },
if ( a.constructor !== b.constructor ) {
// Allow objects with no prototype to be equivalent to "map": function( b, a ) {
// objects with Object as their constructor. var aArray, bArray;
if ( !( ( getProto( a ) === null && getProto( b ) === Object.prototype ) ||
( getProto( b ) === null && getProto( a ) === Object.prototype ) ) ) {
return false;
}
}
// stack constructor before traversing properties aArray = [];
callers.push( a.constructor ); a.forEach( function( v, k ) {
aArray.push( [ k, v ] );
});
bArray = [];
b.forEach( function( v, k ) {
bArray.push( [ k, v ] );
});
// track reference to avoid circular references return innerEquiv( bArray, aArray );
parents.push( a ); },
parentsB.push( b );
// be strict: don't ensure hasOwnProperty and go deep "object": function( b, a ) {
for ( i in a ) { var i, j, loop, aCircular, bCircular;
loop = false;
for ( j = 0; j < parents.length; j++ ) { // Default to true
aCircular = parents[ j ] === a[ i ]; var eq = true;
bCircular = parentsB[ j ] === b[ i ]; var aProperties = [];
if ( aCircular || bCircular ) { var bProperties = [];
if ( a[ i ] === b[ i ] || aCircular && bCircular ) {
loop = true; if ( compareConstructors( a, b ) === false ) {
} else { return false;
eq = false; }
break;
} // Stack constructor before traversing properties
} callers.push( a.constructor );
}
aProperties.push( i ); // Track reference to avoid circular references
if ( !loop && !innerEquiv( a[ i ], b[ i ] ) ) { parents.push( a );
parentsB.push( b );
// Be strict: don't ensure hasOwnProperty and go deep
for ( i in a ) {
loop = false;
for ( j = 0; j < parents.length; j++ ) {
aCircular = parents[ j ] === a[ i ];
bCircular = parentsB[ j ] === b[ i ];
if ( aCircular || bCircular ) {
if ( a[ i ] === b[ i ] || aCircular && bCircular ) {
loop = true;
} else {
eq = false; eq = false;
break; break;
} }
} }
parents.pop();
parentsB.pop();
callers.pop(); // unstack, we are done
for ( i in b ) {
bProperties.push( i ); // collect b's properties
}
// Ensures identical properties name
return eq && innerEquiv( aProperties.sort(), bProperties.sort() );
} }
}; aProperties.push( i );
}()); if ( !loop && !innerEquiv( a[ i ], b[ i ] ) ) {
eq = false;
innerEquiv = function() { // can take multiple arguments break;
var args = [].slice.apply( arguments ); }
if ( args.length < 2 ) {
return true; // end transition
}
return ( (function( a, b ) {
if ( a === b ) {
return true; // catch the most you can
} else if ( a === null || b === null || typeof a === "undefined" ||
typeof b === "undefined" ||
QUnit.objectType( a ) !== QUnit.objectType( b ) ) {
// don't lose time with error prone cases
return false;
} else {
return bindCallbacks( a, callbacks, [ b, a ] );
} }
// apply transition with (1..n) arguments parents.pop();
}( args[ 0 ], args[ 1 ] ) ) && parentsB.pop();
innerEquiv.apply( this, args.splice( 1, args.length - 1 ) ) );
// Unstack, we are done
callers.pop();
for ( i in b ) {
// Collect b's properties
bProperties.push( i );
}
// Ensures identical properties name
return eq && innerEquiv( aProperties.sort(), bProperties.sort() );
}
}; };
function typeEquiv( a, b ) {
var type = QUnit.objectType( a );
return QUnit.objectType( b ) === type && callbacks[ type ]( b, a );
}
// The real equiv function
function innerEquiv( a, b ) {
// We're done when there's nothing more to compare
if ( arguments.length < 2 ) {
return true;
}
// Require type-specific equality
return ( a === b || typeEquiv( a, b ) ) &&
// ...across all consecutive argument pairs
( arguments.length === 2 || innerEquiv.apply( this, [].slice.call( arguments, 1 ) ) );
}
return innerEquiv; return innerEquiv;
}()); }());
@ -1658,7 +1914,7 @@ QUnit.equiv = (function() {
// http://flesler.blogspot.com/2008/05/jsdump-pretty-dump-of-any-javascript.html // http://flesler.blogspot.com/2008/05/jsdump-pretty-dump-of-any-javascript.html
QUnit.dump = (function() { QUnit.dump = (function() {
function quote( str ) { function quote( str ) {
return "\"" + str.toString().replace( /"/g, "\\\"" ) + "\""; return "\"" + str.toString().replace( /\\/g, "\\\\" ).replace( /"/g, "\\\"" ) + "\"";
} }
function literal( o ) { function literal( o ) {
return o + ""; return o + "";
@ -1783,7 +2039,7 @@ QUnit.dump = (function() {
join: join, join: join,
// //
depth: 1, depth: 1,
maxDepth: 5, maxDepth: QUnit.config.maxDepth,
// This is the list of parsers, to modify them, use dump.setParser // This is the list of parsers, to modify them, use dump.setParser
parsers: { parsers: {
@ -1830,7 +2086,7 @@ QUnit.dump = (function() {
nonEnumerableProperties = [ "message", "name" ]; nonEnumerableProperties = [ "message", "name" ];
for ( i in nonEnumerableProperties ) { for ( i in nonEnumerableProperties ) {
key = nonEnumerableProperties[ i ]; key = nonEnumerableProperties[ i ];
if ( key in map && !( key in keys ) ) { if ( key in map && inArray( key, keys ) < 0 ) {
keys.push( key ); keys.push( key );
} }
} }
@ -1896,7 +2152,7 @@ QUnit.dump = (function() {
key: quote, key: quote,
// function calls it internally, it's the content of the function // function calls it internally, it's the content of the function
functionCode: "[code]", functionCode: "[code]",
// node calls it internally, it's an html attribute value // node calls it internally, it's a html attribute value
attribute: quote, attribute: quote,
string: quote, string: quote,
date: quote, date: quote,
@ -1918,26 +2174,26 @@ QUnit.dump = (function() {
// back compat // back compat
QUnit.jsDump = QUnit.dump; QUnit.jsDump = QUnit.dump;
// Deprecated
// Extend assert methods to QUnit for Backwards compatibility
(function() {
var i,
assertions = Assert.prototype;
function applyCurrent( current ) {
return function() {
var assert = new Assert( QUnit.config.current );
current.apply( assert, arguments );
};
}
for ( i in assertions ) {
QUnit[ i ] = applyCurrent( assertions[ i ] );
}
})();
// For browser, export only select globals // For browser, export only select globals
if ( typeof window !== "undefined" ) { if ( defined.document ) {
// Deprecated
// Extend assert methods to QUnit and Global scope through Backwards compatibility
(function() {
var i,
assertions = Assert.prototype;
function applyCurrent( current ) {
return function() {
var assert = new Assert( QUnit.config.current );
current.apply( assert, arguments );
};
}
for ( i in assertions ) {
QUnit[ i ] = applyCurrent( assertions[ i ] );
}
})();
(function() { (function() {
var i, l, var i, l,
@ -1949,6 +2205,7 @@ if ( typeof window !== "undefined" ) {
"start", "start",
"stop", "stop",
"ok", "ok",
"notOk",
"equal", "equal",
"notEqual", "notEqual",
"propEqual", "propEqual",
@ -1957,7 +2214,8 @@ if ( typeof window !== "undefined" ) {
"notDeepEqual", "notDeepEqual",
"strictEqual", "strictEqual",
"notStrictEqual", "notStrictEqual",
"throws" "throws",
"raises"
]; ];
for ( i = 0, l = keys.length; i < l; i++ ) { for ( i = 0, l = keys.length; i < l; i++ ) {
@ -1981,163 +2239,1137 @@ if ( typeof exports !== "undefined" && exports ) {
exports.QUnit = QUnit; exports.QUnit = QUnit;
} }
if ( typeof define === "function" && define.amd ) {
define( function() {
return QUnit;
} );
QUnit.config.autostart = false;
}
/*
* This file is a modified version of google-diff-match-patch's JavaScript implementation
* (https://code.google.com/p/google-diff-match-patch/source/browse/trunk/javascript/diff_match_patch_uncompressed.js),
* modifications are licensed as more fully set forth in LICENSE.txt.
*
* The original source of google-diff-match-patch is attributable and licensed as follows:
*
* Copyright 2006 Google Inc.
* https://code.google.com/p/google-diff-match-patch/
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* More Info:
* https://code.google.com/p/google-diff-match-patch/
*
* Usage: QUnit.diff(expected, actual)
*
*/
QUnit.diff = ( function() {
function DiffMatchPatch() {
}
// DIFF FUNCTIONS
/**
* The data structure representing a diff is an array of tuples:
* [[DIFF_DELETE, 'Hello'], [DIFF_INSERT, 'Goodbye'], [DIFF_EQUAL, ' world.']]
* which means: delete 'Hello', add 'Goodbye' and keep ' world.'
*/
var DIFF_DELETE = -1,
DIFF_INSERT = 1,
DIFF_EQUAL = 0;
/**
* Find the differences between two texts. Simplifies the problem by stripping
* any common prefix or suffix off the texts before diffing.
* @param {string} text1 Old string to be diffed.
* @param {string} text2 New string to be diffed.
* @param {boolean=} optChecklines Optional speedup flag. If present and false,
* then don't run a line-level diff first to identify the changed areas.
* Defaults to true, which does a faster, slightly less optimal diff.
* @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
*/
DiffMatchPatch.prototype.DiffMain = function( text1, text2, optChecklines ) {
var deadline, checklines, commonlength,
commonprefix, commonsuffix, diffs;
// The diff must be complete in up to 1 second.
deadline = ( new Date() ).getTime() + 1000;
// Check for null inputs.
if ( text1 === null || text2 === null ) {
throw new Error( "Null input. (DiffMain)" );
}
// Check for equality (speedup).
if ( text1 === text2 ) {
if ( text1 ) {
return [
[ DIFF_EQUAL, text1 ]
];
}
return [];
}
if ( typeof optChecklines === "undefined" ) {
optChecklines = true;
}
checklines = optChecklines;
// Trim off common prefix (speedup).
commonlength = this.diffCommonPrefix( text1, text2 );
commonprefix = text1.substring( 0, commonlength );
text1 = text1.substring( commonlength );
text2 = text2.substring( commonlength );
// Trim off common suffix (speedup).
commonlength = this.diffCommonSuffix( text1, text2 );
commonsuffix = text1.substring( text1.length - commonlength );
text1 = text1.substring( 0, text1.length - commonlength );
text2 = text2.substring( 0, text2.length - commonlength );
// Compute the diff on the middle block.
diffs = this.diffCompute( text1, text2, checklines, deadline );
// Restore the prefix and suffix.
if ( commonprefix ) {
diffs.unshift( [ DIFF_EQUAL, commonprefix ] );
}
if ( commonsuffix ) {
diffs.push( [ DIFF_EQUAL, commonsuffix ] );
}
this.diffCleanupMerge( diffs );
return diffs;
};
/**
* Reduce the number of edits by eliminating operationally trivial equalities.
* @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples.
*/
DiffMatchPatch.prototype.diffCleanupEfficiency = function( diffs ) {
var changes, equalities, equalitiesLength, lastequality,
pointer, preIns, preDel, postIns, postDel;
changes = false;
equalities = []; // Stack of indices where equalities are found.
equalitiesLength = 0; // Keeping our own length var is faster in JS.
/** @type {?string} */
lastequality = null;
// Always equal to diffs[equalities[equalitiesLength - 1]][1]
pointer = 0; // Index of current position.
// Is there an insertion operation before the last equality.
preIns = false;
// Is there a deletion operation before the last equality.
preDel = false;
// Is there an insertion operation after the last equality.
postIns = false;
// Is there a deletion operation after the last equality.
postDel = false;
while ( pointer < diffs.length ) {
// Equality found.
if ( diffs[ pointer ][ 0 ] === DIFF_EQUAL ) {
if ( diffs[ pointer ][ 1 ].length < 4 && ( postIns || postDel ) ) {
// Candidate found.
equalities[ equalitiesLength++ ] = pointer;
preIns = postIns;
preDel = postDel;
lastequality = diffs[ pointer ][ 1 ];
} else {
// Not a candidate, and can never become one.
equalitiesLength = 0;
lastequality = null;
}
postIns = postDel = false;
// An insertion or deletion.
} else {
if ( diffs[ pointer ][ 0 ] === DIFF_DELETE ) {
postDel = true;
} else {
postIns = true;
}
/*
* Five types to be split:
* <ins>A</ins><del>B</del>XY<ins>C</ins><del>D</del>
* <ins>A</ins>X<ins>C</ins><del>D</del>
* <ins>A</ins><del>B</del>X<ins>C</ins>
* <ins>A</del>X<ins>C</ins><del>D</del>
* <ins>A</ins><del>B</del>X<del>C</del>
*/
if ( lastequality && ( ( preIns && preDel && postIns && postDel ) ||
( ( lastequality.length < 2 ) &&
( preIns + preDel + postIns + postDel ) === 3 ) ) ) {
// Duplicate record.
diffs.splice(
equalities[ equalitiesLength - 1 ],
0,
[ DIFF_DELETE, lastequality ]
);
// Change second copy to insert.
diffs[ equalities[ equalitiesLength - 1 ] + 1 ][ 0 ] = DIFF_INSERT;
equalitiesLength--; // Throw away the equality we just deleted;
lastequality = null;
if ( preIns && preDel ) {
// No changes made which could affect previous entry, keep going.
postIns = postDel = true;
equalitiesLength = 0;
} else {
equalitiesLength--; // Throw away the previous equality.
pointer = equalitiesLength > 0 ? equalities[ equalitiesLength - 1 ] : -1;
postIns = postDel = false;
}
changes = true;
}
}
pointer++;
}
if ( changes ) {
this.diffCleanupMerge( diffs );
}
};
/**
* Convert a diff array into a pretty HTML report.
* @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples.
* @param {integer} string to be beautified.
* @return {string} HTML representation.
*/
DiffMatchPatch.prototype.diffPrettyHtml = function( diffs ) {
var op, data, x,
html = [];
for ( x = 0; x < diffs.length; x++ ) {
op = diffs[ x ][ 0 ]; // Operation (insert, delete, equal)
data = diffs[ x ][ 1 ]; // Text of change.
switch ( op ) {
case DIFF_INSERT:
html[ x ] = "<ins>" + data + "</ins>";
break;
case DIFF_DELETE:
html[ x ] = "<del>" + data + "</del>";
break;
case DIFF_EQUAL:
html[ x ] = "<span>" + data + "</span>";
break;
}
}
return html.join( "" );
};
/**
* Determine the common prefix of two strings.
* @param {string} text1 First string.
* @param {string} text2 Second string.
* @return {number} The number of characters common to the start of each
* string.
*/
DiffMatchPatch.prototype.diffCommonPrefix = function( text1, text2 ) {
var pointermid, pointermax, pointermin, pointerstart;
// Quick check for common null cases.
if ( !text1 || !text2 || text1.charAt( 0 ) !== text2.charAt( 0 ) ) {
return 0;
}
// Binary search.
// Performance analysis: https://neil.fraser.name/news/2007/10/09/
pointermin = 0;
pointermax = Math.min( text1.length, text2.length );
pointermid = pointermax;
pointerstart = 0;
while ( pointermin < pointermid ) {
if ( text1.substring( pointerstart, pointermid ) ===
text2.substring( pointerstart, pointermid ) ) {
pointermin = pointermid;
pointerstart = pointermin;
} else {
pointermax = pointermid;
}
pointermid = Math.floor( ( pointermax - pointermin ) / 2 + pointermin );
}
return pointermid;
};
/**
* Determine the common suffix of two strings.
* @param {string} text1 First string.
* @param {string} text2 Second string.
* @return {number} The number of characters common to the end of each string.
*/
DiffMatchPatch.prototype.diffCommonSuffix = function( text1, text2 ) {
var pointermid, pointermax, pointermin, pointerend;
// Quick check for common null cases.
if ( !text1 ||
!text2 ||
text1.charAt( text1.length - 1 ) !== text2.charAt( text2.length - 1 ) ) {
return 0;
}
// Binary search.
// Performance analysis: https://neil.fraser.name/news/2007/10/09/
pointermin = 0;
pointermax = Math.min( text1.length, text2.length );
pointermid = pointermax;
pointerend = 0;
while ( pointermin < pointermid ) {
if ( text1.substring( text1.length - pointermid, text1.length - pointerend ) ===
text2.substring( text2.length - pointermid, text2.length - pointerend ) ) {
pointermin = pointermid;
pointerend = pointermin;
} else {
pointermax = pointermid;
}
pointermid = Math.floor( ( pointermax - pointermin ) / 2 + pointermin );
}
return pointermid;
};
/**
* Find the differences between two texts. Assumes that the texts do not
* have any common prefix or suffix.
* @param {string} text1 Old string to be diffed.
* @param {string} text2 New string to be diffed.
* @param {boolean} checklines Speedup flag. If false, then don't run a
* line-level diff first to identify the changed areas.
* If true, then run a faster, slightly less optimal diff.
* @param {number} deadline Time when the diff should be complete by.
* @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
* @private
*/
DiffMatchPatch.prototype.diffCompute = function( text1, text2, checklines, deadline ) {
var diffs, longtext, shorttext, i, hm,
text1A, text2A, text1B, text2B,
midCommon, diffsA, diffsB;
if ( !text1 ) {
// Just add some text (speedup).
return [
[ DIFF_INSERT, text2 ]
];
}
if ( !text2 ) {
// Just delete some text (speedup).
return [
[ DIFF_DELETE, text1 ]
];
}
longtext = text1.length > text2.length ? text1 : text2;
shorttext = text1.length > text2.length ? text2 : text1;
i = longtext.indexOf( shorttext );
if ( i !== -1 ) {
// Shorter text is inside the longer text (speedup).
diffs = [
[ DIFF_INSERT, longtext.substring( 0, i ) ],
[ DIFF_EQUAL, shorttext ],
[ DIFF_INSERT, longtext.substring( i + shorttext.length ) ]
];
// Swap insertions for deletions if diff is reversed.
if ( text1.length > text2.length ) {
diffs[ 0 ][ 0 ] = diffs[ 2 ][ 0 ] = DIFF_DELETE;
}
return diffs;
}
if ( shorttext.length === 1 ) {
// Single character string.
// After the previous speedup, the character can't be an equality.
return [
[ DIFF_DELETE, text1 ],
[ DIFF_INSERT, text2 ]
];
}
// Check to see if the problem can be split in two.
hm = this.diffHalfMatch( text1, text2 );
if ( hm ) {
// A half-match was found, sort out the return data.
text1A = hm[ 0 ];
text1B = hm[ 1 ];
text2A = hm[ 2 ];
text2B = hm[ 3 ];
midCommon = hm[ 4 ];
// Send both pairs off for separate processing.
diffsA = this.DiffMain( text1A, text2A, checklines, deadline );
diffsB = this.DiffMain( text1B, text2B, checklines, deadline );
// Merge the results.
return diffsA.concat( [
[ DIFF_EQUAL, midCommon ]
], diffsB );
}
if ( checklines && text1.length > 100 && text2.length > 100 ) {
return this.diffLineMode( text1, text2, deadline );
}
return this.diffBisect( text1, text2, deadline );
};
/**
* Do the two texts share a substring which is at least half the length of the
* longer text?
* This speedup can produce non-minimal diffs.
* @param {string} text1 First string.
* @param {string} text2 Second string.
* @return {Array.<string>} Five element Array, containing the prefix of
* text1, the suffix of text1, the prefix of text2, the suffix of
* text2 and the common middle. Or null if there was no match.
* @private
*/
DiffMatchPatch.prototype.diffHalfMatch = function( text1, text2 ) {
var longtext, shorttext, dmp,
text1A, text2B, text2A, text1B, midCommon,
hm1, hm2, hm;
longtext = text1.length > text2.length ? text1 : text2;
shorttext = text1.length > text2.length ? text2 : text1;
if ( longtext.length < 4 || shorttext.length * 2 < longtext.length ) {
return null; // Pointless.
}
dmp = this; // 'this' becomes 'window' in a closure.
/**
* Does a substring of shorttext exist within longtext such that the substring
* is at least half the length of longtext?
* Closure, but does not reference any external variables.
* @param {string} longtext Longer string.
* @param {string} shorttext Shorter string.
* @param {number} i Start index of quarter length substring within longtext.
* @return {Array.<string>} Five element Array, containing the prefix of
* longtext, the suffix of longtext, the prefix of shorttext, the suffix
* of shorttext and the common middle. Or null if there was no match.
* @private
*/
function diffHalfMatchI( longtext, shorttext, i ) {
var seed, j, bestCommon, prefixLength, suffixLength,
bestLongtextA, bestLongtextB, bestShorttextA, bestShorttextB;
// Start with a 1/4 length substring at position i as a seed.
seed = longtext.substring( i, i + Math.floor( longtext.length / 4 ) );
j = -1;
bestCommon = "";
while ( ( j = shorttext.indexOf( seed, j + 1 ) ) !== -1 ) {
prefixLength = dmp.diffCommonPrefix( longtext.substring( i ),
shorttext.substring( j ) );
suffixLength = dmp.diffCommonSuffix( longtext.substring( 0, i ),
shorttext.substring( 0, j ) );
if ( bestCommon.length < suffixLength + prefixLength ) {
bestCommon = shorttext.substring( j - suffixLength, j ) +
shorttext.substring( j, j + prefixLength );
bestLongtextA = longtext.substring( 0, i - suffixLength );
bestLongtextB = longtext.substring( i + prefixLength );
bestShorttextA = shorttext.substring( 0, j - suffixLength );
bestShorttextB = shorttext.substring( j + prefixLength );
}
}
if ( bestCommon.length * 2 >= longtext.length ) {
return [ bestLongtextA, bestLongtextB,
bestShorttextA, bestShorttextB, bestCommon
];
} else {
return null;
}
}
// First check if the second quarter is the seed for a half-match.
hm1 = diffHalfMatchI( longtext, shorttext,
Math.ceil( longtext.length / 4 ) );
// Check again based on the third quarter.
hm2 = diffHalfMatchI( longtext, shorttext,
Math.ceil( longtext.length / 2 ) );
if ( !hm1 && !hm2 ) {
return null;
} else if ( !hm2 ) {
hm = hm1;
} else if ( !hm1 ) {
hm = hm2;
} else {
// Both matched. Select the longest.
hm = hm1[ 4 ].length > hm2[ 4 ].length ? hm1 : hm2;
}
// A half-match was found, sort out the return data.
text1A, text1B, text2A, text2B;
if ( text1.length > text2.length ) {
text1A = hm[ 0 ];
text1B = hm[ 1 ];
text2A = hm[ 2 ];
text2B = hm[ 3 ];
} else {
text2A = hm[ 0 ];
text2B = hm[ 1 ];
text1A = hm[ 2 ];
text1B = hm[ 3 ];
}
midCommon = hm[ 4 ];
return [ text1A, text1B, text2A, text2B, midCommon ];
};
/**
* Do a quick line-level diff on both strings, then rediff the parts for
* greater accuracy.
* This speedup can produce non-minimal diffs.
* @param {string} text1 Old string to be diffed.
* @param {string} text2 New string to be diffed.
* @param {number} deadline Time when the diff should be complete by.
* @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
* @private
*/
DiffMatchPatch.prototype.diffLineMode = function( text1, text2, deadline ) {
var a, diffs, linearray, pointer, countInsert,
countDelete, textInsert, textDelete, j;
// Scan the text on a line-by-line basis first.
a = this.diffLinesToChars( text1, text2 );
text1 = a.chars1;
text2 = a.chars2;
linearray = a.lineArray;
diffs = this.DiffMain( text1, text2, false, deadline );
// Convert the diff back to original text.
this.diffCharsToLines( diffs, linearray );
// Eliminate freak matches (e.g. blank lines)
this.diffCleanupSemantic( diffs );
// Rediff any replacement blocks, this time character-by-character.
// Add a dummy entry at the end.
diffs.push( [ DIFF_EQUAL, "" ] );
pointer = 0;
countDelete = 0;
countInsert = 0;
textDelete = "";
textInsert = "";
while ( pointer < diffs.length ) {
switch ( diffs[ pointer ][ 0 ] ) {
case DIFF_INSERT:
countInsert++;
textInsert += diffs[ pointer ][ 1 ];
break;
case DIFF_DELETE:
countDelete++;
textDelete += diffs[ pointer ][ 1 ];
break;
case DIFF_EQUAL:
// Upon reaching an equality, check for prior redundancies.
if ( countDelete >= 1 && countInsert >= 1 ) {
// Delete the offending records and add the merged ones.
diffs.splice( pointer - countDelete - countInsert,
countDelete + countInsert );
pointer = pointer - countDelete - countInsert;
a = this.DiffMain( textDelete, textInsert, false, deadline );
for ( j = a.length - 1; j >= 0; j-- ) {
diffs.splice( pointer, 0, a[ j ] );
}
pointer = pointer + a.length;
}
countInsert = 0;
countDelete = 0;
textDelete = "";
textInsert = "";
break;
}
pointer++;
}
diffs.pop(); // Remove the dummy entry at the end.
return diffs;
};
/**
* Find the 'middle snake' of a diff, split the problem in two
* and return the recursively constructed diff.
* See Myers 1986 paper: An O(ND) Difference Algorithm and Its Variations.
* @param {string} text1 Old string to be diffed.
* @param {string} text2 New string to be diffed.
* @param {number} deadline Time at which to bail if not yet complete.
* @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
* @private
*/
DiffMatchPatch.prototype.diffBisect = function( text1, text2, deadline ) {
var text1Length, text2Length, maxD, vOffset, vLength,
v1, v2, x, delta, front, k1start, k1end, k2start,
k2end, k2Offset, k1Offset, x1, x2, y1, y2, d, k1, k2;
// Cache the text lengths to prevent multiple calls.
text1Length = text1.length;
text2Length = text2.length;
maxD = Math.ceil( ( text1Length + text2Length ) / 2 );
vOffset = maxD;
vLength = 2 * maxD;
v1 = new Array( vLength );
v2 = new Array( vLength );
// Setting all elements to -1 is faster in Chrome & Firefox than mixing
// integers and undefined.
for ( x = 0; x < vLength; x++ ) {
v1[ x ] = -1;
v2[ x ] = -1;
}
v1[ vOffset + 1 ] = 0;
v2[ vOffset + 1 ] = 0;
delta = text1Length - text2Length;
// If the total number of characters is odd, then the front path will collide
// with the reverse path.
front = ( delta % 2 !== 0 );
// Offsets for start and end of k loop.
// Prevents mapping of space beyond the grid.
k1start = 0;
k1end = 0;
k2start = 0;
k2end = 0;
for ( d = 0; d < maxD; d++ ) {
// Bail out if deadline is reached.
if ( ( new Date() ).getTime() > deadline ) {
break;
}
// Walk the front path one step.
for ( k1 = -d + k1start; k1 <= d - k1end; k1 += 2 ) {
k1Offset = vOffset + k1;
if ( k1 === -d || ( k1 !== d && v1[ k1Offset - 1 ] < v1[ k1Offset + 1 ] ) ) {
x1 = v1[ k1Offset + 1 ];
} else {
x1 = v1[ k1Offset - 1 ] + 1;
}
y1 = x1 - k1;
while ( x1 < text1Length && y1 < text2Length &&
text1.charAt( x1 ) === text2.charAt( y1 ) ) {
x1++;
y1++;
}
v1[ k1Offset ] = x1;
if ( x1 > text1Length ) {
// Ran off the right of the graph.
k1end += 2;
} else if ( y1 > text2Length ) {
// Ran off the bottom of the graph.
k1start += 2;
} else if ( front ) {
k2Offset = vOffset + delta - k1;
if ( k2Offset >= 0 && k2Offset < vLength && v2[ k2Offset ] !== -1 ) {
// Mirror x2 onto top-left coordinate system.
x2 = text1Length - v2[ k2Offset ];
if ( x1 >= x2 ) {
// Overlap detected.
return this.diffBisectSplit( text1, text2, x1, y1, deadline );
}
}
}
}
// Walk the reverse path one step.
for ( k2 = -d + k2start; k2 <= d - k2end; k2 += 2 ) {
k2Offset = vOffset + k2;
if ( k2 === -d || ( k2 !== d && v2[ k2Offset - 1 ] < v2[ k2Offset + 1 ] ) ) {
x2 = v2[ k2Offset + 1 ];
} else {
x2 = v2[ k2Offset - 1 ] + 1;
}
y2 = x2 - k2;
while ( x2 < text1Length && y2 < text2Length &&
text1.charAt( text1Length - x2 - 1 ) ===
text2.charAt( text2Length - y2 - 1 ) ) {
x2++;
y2++;
}
v2[ k2Offset ] = x2;
if ( x2 > text1Length ) {
// Ran off the left of the graph.
k2end += 2;
} else if ( y2 > text2Length ) {
// Ran off the top of the graph.
k2start += 2;
} else if ( !front ) {
k1Offset = vOffset + delta - k2;
if ( k1Offset >= 0 && k1Offset < vLength && v1[ k1Offset ] !== -1 ) {
x1 = v1[ k1Offset ];
y1 = vOffset + x1 - k1Offset;
// Mirror x2 onto top-left coordinate system.
x2 = text1Length - x2;
if ( x1 >= x2 ) {
// Overlap detected.
return this.diffBisectSplit( text1, text2, x1, y1, deadline );
}
}
}
}
}
// Diff took too long and hit the deadline or
// number of diffs equals number of characters, no commonality at all.
return [
[ DIFF_DELETE, text1 ],
[ DIFF_INSERT, text2 ]
];
};
/**
* Given the location of the 'middle snake', split the diff in two parts
* and recurse.
* @param {string} text1 Old string to be diffed.
* @param {string} text2 New string to be diffed.
* @param {number} x Index of split point in text1.
* @param {number} y Index of split point in text2.
* @param {number} deadline Time at which to bail if not yet complete.
* @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
* @private
*/
DiffMatchPatch.prototype.diffBisectSplit = function( text1, text2, x, y, deadline ) {
var text1a, text1b, text2a, text2b, diffs, diffsb;
text1a = text1.substring( 0, x );
text2a = text2.substring( 0, y );
text1b = text1.substring( x );
text2b = text2.substring( y );
// Compute both diffs serially.
diffs = this.DiffMain( text1a, text2a, false, deadline );
diffsb = this.DiffMain( text1b, text2b, false, deadline );
return diffs.concat( diffsb );
};
/**
* Reduce the number of edits by eliminating semantically trivial equalities.
* @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples.
*/
DiffMatchPatch.prototype.diffCleanupSemantic = function( diffs ) {
var changes, equalities, equalitiesLength, lastequality,
pointer, lengthInsertions2, lengthDeletions2, lengthInsertions1,
lengthDeletions1, deletion, insertion, overlapLength1, overlapLength2;
changes = false;
equalities = []; // Stack of indices where equalities are found.
equalitiesLength = 0; // Keeping our own length var is faster in JS.
/** @type {?string} */
lastequality = null;
// Always equal to diffs[equalities[equalitiesLength - 1]][1]
pointer = 0; // Index of current position.
// Number of characters that changed prior to the equality.
lengthInsertions1 = 0;
lengthDeletions1 = 0;
// Number of characters that changed after the equality.
lengthInsertions2 = 0;
lengthDeletions2 = 0;
while ( pointer < diffs.length ) {
if ( diffs[ pointer ][ 0 ] === DIFF_EQUAL ) { // Equality found.
equalities[ equalitiesLength++ ] = pointer;
lengthInsertions1 = lengthInsertions2;
lengthDeletions1 = lengthDeletions2;
lengthInsertions2 = 0;
lengthDeletions2 = 0;
lastequality = diffs[ pointer ][ 1 ];
} else { // An insertion or deletion.
if ( diffs[ pointer ][ 0 ] === DIFF_INSERT ) {
lengthInsertions2 += diffs[ pointer ][ 1 ].length;
} else {
lengthDeletions2 += diffs[ pointer ][ 1 ].length;
}
// Eliminate an equality that is smaller or equal to the edits on both
// sides of it.
if ( lastequality && ( lastequality.length <=
Math.max( lengthInsertions1, lengthDeletions1 ) ) &&
( lastequality.length <= Math.max( lengthInsertions2,
lengthDeletions2 ) ) ) {
// Duplicate record.
diffs.splice(
equalities[ equalitiesLength - 1 ],
0,
[ DIFF_DELETE, lastequality ]
);
// Change second copy to insert.
diffs[ equalities[ equalitiesLength - 1 ] + 1 ][ 0 ] = DIFF_INSERT;
// Throw away the equality we just deleted.
equalitiesLength--;
// Throw away the previous equality (it needs to be reevaluated).
equalitiesLength--;
pointer = equalitiesLength > 0 ? equalities[ equalitiesLength - 1 ] : -1;
// Reset the counters.
lengthInsertions1 = 0;
lengthDeletions1 = 0;
lengthInsertions2 = 0;
lengthDeletions2 = 0;
lastequality = null;
changes = true;
}
}
pointer++;
}
// Normalize the diff.
if ( changes ) {
this.diffCleanupMerge( diffs );
}
// Find any overlaps between deletions and insertions.
// e.g: <del>abcxxx</del><ins>xxxdef</ins>
// -> <del>abc</del>xxx<ins>def</ins>
// e.g: <del>xxxabc</del><ins>defxxx</ins>
// -> <ins>def</ins>xxx<del>abc</del>
// Only extract an overlap if it is as big as the edit ahead or behind it.
pointer = 1;
while ( pointer < diffs.length ) {
if ( diffs[ pointer - 1 ][ 0 ] === DIFF_DELETE &&
diffs[ pointer ][ 0 ] === DIFF_INSERT ) {
deletion = diffs[ pointer - 1 ][ 1 ];
insertion = diffs[ pointer ][ 1 ];
overlapLength1 = this.diffCommonOverlap( deletion, insertion );
overlapLength2 = this.diffCommonOverlap( insertion, deletion );
if ( overlapLength1 >= overlapLength2 ) {
if ( overlapLength1 >= deletion.length / 2 ||
overlapLength1 >= insertion.length / 2 ) {
// Overlap found. Insert an equality and trim the surrounding edits.
diffs.splice(
pointer,
0,
[ DIFF_EQUAL, insertion.substring( 0, overlapLength1 ) ]
);
diffs[ pointer - 1 ][ 1 ] =
deletion.substring( 0, deletion.length - overlapLength1 );
diffs[ pointer + 1 ][ 1 ] = insertion.substring( overlapLength1 );
pointer++;
}
} else {
if ( overlapLength2 >= deletion.length / 2 ||
overlapLength2 >= insertion.length / 2 ) {
// Reverse overlap found.
// Insert an equality and swap and trim the surrounding edits.
diffs.splice(
pointer,
0,
[ DIFF_EQUAL, deletion.substring( 0, overlapLength2 ) ]
);
diffs[ pointer - 1 ][ 0 ] = DIFF_INSERT;
diffs[ pointer - 1 ][ 1 ] =
insertion.substring( 0, insertion.length - overlapLength2 );
diffs[ pointer + 1 ][ 0 ] = DIFF_DELETE;
diffs[ pointer + 1 ][ 1 ] =
deletion.substring( overlapLength2 );
pointer++;
}
}
pointer++;
}
pointer++;
}
};
/**
* Determine if the suffix of one string is the prefix of another.
* @param {string} text1 First string.
* @param {string} text2 Second string.
* @return {number} The number of characters common to the end of the first
* string and the start of the second string.
* @private
*/
DiffMatchPatch.prototype.diffCommonOverlap = function( text1, text2 ) {
var text1Length, text2Length, textLength,
best, length, pattern, found;
// Cache the text lengths to prevent multiple calls.
text1Length = text1.length;
text2Length = text2.length;
// Eliminate the null case.
if ( text1Length === 0 || text2Length === 0 ) {
return 0;
}
// Truncate the longer string.
if ( text1Length > text2Length ) {
text1 = text1.substring( text1Length - text2Length );
} else if ( text1Length < text2Length ) {
text2 = text2.substring( 0, text1Length );
}
textLength = Math.min( text1Length, text2Length );
// Quick check for the worst case.
if ( text1 === text2 ) {
return textLength;
}
// Start by looking for a single character match
// and increase length until no match is found.
// Performance analysis: https://neil.fraser.name/news/2010/11/04/
best = 0;
length = 1;
while ( true ) {
pattern = text1.substring( textLength - length );
found = text2.indexOf( pattern );
if ( found === -1 ) {
return best;
}
length += found;
if ( found === 0 || text1.substring( textLength - length ) ===
text2.substring( 0, length ) ) {
best = length;
length++;
}
}
};
/**
* Split two texts into an array of strings. Reduce the texts to a string of
* hashes where each Unicode character represents one line.
* @param {string} text1 First string.
* @param {string} text2 Second string.
* @return {{chars1: string, chars2: string, lineArray: !Array.<string>}}
* An object containing the encoded text1, the encoded text2 and
* the array of unique strings.
* The zeroth element of the array of unique strings is intentionally blank.
* @private
*/
DiffMatchPatch.prototype.diffLinesToChars = function( text1, text2 ) {
var lineArray, lineHash, chars1, chars2;
lineArray = []; // e.g. lineArray[4] === 'Hello\n'
lineHash = {}; // e.g. lineHash['Hello\n'] === 4
// '\x00' is a valid character, but various debuggers don't like it.
// So we'll insert a junk entry to avoid generating a null character.
lineArray[ 0 ] = "";
/**
* Split a text into an array of strings. Reduce the texts to a string of
* hashes where each Unicode character represents one line.
* Modifies linearray and linehash through being a closure.
* @param {string} text String to encode.
* @return {string} Encoded string.
* @private
*/
function diffLinesToCharsMunge( text ) {
var chars, lineStart, lineEnd, lineArrayLength, line;
chars = "";
// Walk the text, pulling out a substring for each line.
// text.split('\n') would would temporarily double our memory footprint.
// Modifying text would create many large strings to garbage collect.
lineStart = 0;
lineEnd = -1;
// Keeping our own length variable is faster than looking it up.
lineArrayLength = lineArray.length;
while ( lineEnd < text.length - 1 ) {
lineEnd = text.indexOf( "\n", lineStart );
if ( lineEnd === -1 ) {
lineEnd = text.length - 1;
}
line = text.substring( lineStart, lineEnd + 1 );
lineStart = lineEnd + 1;
if ( lineHash.hasOwnProperty ? lineHash.hasOwnProperty( line ) :
( lineHash[ line ] !== undefined ) ) {
chars += String.fromCharCode( lineHash[ line ] );
} else {
chars += String.fromCharCode( lineArrayLength );
lineHash[ line ] = lineArrayLength;
lineArray[ lineArrayLength++ ] = line;
}
}
return chars;
}
chars1 = diffLinesToCharsMunge( text1 );
chars2 = diffLinesToCharsMunge( text2 );
return {
chars1: chars1,
chars2: chars2,
lineArray: lineArray
};
};
/**
* Rehydrate the text in a diff from a string of line hashes to real lines of
* text.
* @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples.
* @param {!Array.<string>} lineArray Array of unique strings.
* @private
*/
DiffMatchPatch.prototype.diffCharsToLines = function( diffs, lineArray ) {
var x, chars, text, y;
for ( x = 0; x < diffs.length; x++ ) {
chars = diffs[ x ][ 1 ];
text = [];
for ( y = 0; y < chars.length; y++ ) {
text[ y ] = lineArray[ chars.charCodeAt( y ) ];
}
diffs[ x ][ 1 ] = text.join( "" );
}
};
/**
* Reorder and merge like edit sections. Merge equalities.
* Any edit section can move as long as it doesn't cross an equality.
* @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples.
*/
DiffMatchPatch.prototype.diffCleanupMerge = function( diffs ) {
var pointer, countDelete, countInsert, textInsert, textDelete,
commonlength, changes, diffPointer, position;
diffs.push( [ DIFF_EQUAL, "" ] ); // Add a dummy entry at the end.
pointer = 0;
countDelete = 0;
countInsert = 0;
textDelete = "";
textInsert = "";
commonlength;
while ( pointer < diffs.length ) {
switch ( diffs[ pointer ][ 0 ] ) {
case DIFF_INSERT:
countInsert++;
textInsert += diffs[ pointer ][ 1 ];
pointer++;
break;
case DIFF_DELETE:
countDelete++;
textDelete += diffs[ pointer ][ 1 ];
pointer++;
break;
case DIFF_EQUAL:
// Upon reaching an equality, check for prior redundancies.
if ( countDelete + countInsert > 1 ) {
if ( countDelete !== 0 && countInsert !== 0 ) {
// Factor out any common prefixes.
commonlength = this.diffCommonPrefix( textInsert, textDelete );
if ( commonlength !== 0 ) {
if ( ( pointer - countDelete - countInsert ) > 0 &&
diffs[ pointer - countDelete - countInsert - 1 ][ 0 ] ===
DIFF_EQUAL ) {
diffs[ pointer - countDelete - countInsert - 1 ][ 1 ] +=
textInsert.substring( 0, commonlength );
} else {
diffs.splice( 0, 0, [ DIFF_EQUAL,
textInsert.substring( 0, commonlength )
] );
pointer++;
}
textInsert = textInsert.substring( commonlength );
textDelete = textDelete.substring( commonlength );
}
// Factor out any common suffixies.
commonlength = this.diffCommonSuffix( textInsert, textDelete );
if ( commonlength !== 0 ) {
diffs[ pointer ][ 1 ] = textInsert.substring( textInsert.length -
commonlength ) + diffs[ pointer ][ 1 ];
textInsert = textInsert.substring( 0, textInsert.length -
commonlength );
textDelete = textDelete.substring( 0, textDelete.length -
commonlength );
}
}
// Delete the offending records and add the merged ones.
if ( countDelete === 0 ) {
diffs.splice( pointer - countInsert,
countDelete + countInsert, [ DIFF_INSERT, textInsert ] );
} else if ( countInsert === 0 ) {
diffs.splice( pointer - countDelete,
countDelete + countInsert, [ DIFF_DELETE, textDelete ] );
} else {
diffs.splice(
pointer - countDelete - countInsert,
countDelete + countInsert,
[ DIFF_DELETE, textDelete ], [ DIFF_INSERT, textInsert ]
);
}
pointer = pointer - countDelete - countInsert +
( countDelete ? 1 : 0 ) + ( countInsert ? 1 : 0 ) + 1;
} else if ( pointer !== 0 && diffs[ pointer - 1 ][ 0 ] === DIFF_EQUAL ) {
// Merge this equality with the previous one.
diffs[ pointer - 1 ][ 1 ] += diffs[ pointer ][ 1 ];
diffs.splice( pointer, 1 );
} else {
pointer++;
}
countInsert = 0;
countDelete = 0;
textDelete = "";
textInsert = "";
break;
}
}
if ( diffs[ diffs.length - 1 ][ 1 ] === "" ) {
diffs.pop(); // Remove the dummy entry at the end.
}
// Second pass: look for single edits surrounded on both sides by equalities
// which can be shifted sideways to eliminate an equality.
// e.g: A<ins>BA</ins>C -> <ins>AB</ins>AC
changes = false;
pointer = 1;
// Intentionally ignore the first and last element (don't need checking).
while ( pointer < diffs.length - 1 ) {
if ( diffs[ pointer - 1 ][ 0 ] === DIFF_EQUAL &&
diffs[ pointer + 1 ][ 0 ] === DIFF_EQUAL ) {
diffPointer = diffs[ pointer ][ 1 ];
position = diffPointer.substring(
diffPointer.length - diffs[ pointer - 1 ][ 1 ].length
);
// This is a single edit surrounded by equalities.
if ( position === diffs[ pointer - 1 ][ 1 ] ) {
// Shift the edit over the previous equality.
diffs[ pointer ][ 1 ] = diffs[ pointer - 1 ][ 1 ] +
diffs[ pointer ][ 1 ].substring( 0, diffs[ pointer ][ 1 ].length -
diffs[ pointer - 1 ][ 1 ].length );
diffs[ pointer + 1 ][ 1 ] =
diffs[ pointer - 1 ][ 1 ] + diffs[ pointer + 1 ][ 1 ];
diffs.splice( pointer - 1, 1 );
changes = true;
} else if ( diffPointer.substring( 0, diffs[ pointer + 1 ][ 1 ].length ) ===
diffs[ pointer + 1 ][ 1 ] ) {
// Shift the edit over the next equality.
diffs[ pointer - 1 ][ 1 ] += diffs[ pointer + 1 ][ 1 ];
diffs[ pointer ][ 1 ] =
diffs[ pointer ][ 1 ].substring( diffs[ pointer + 1 ][ 1 ].length ) +
diffs[ pointer + 1 ][ 1 ];
diffs.splice( pointer + 1, 1 );
changes = true;
}
}
pointer++;
}
// If shifts were made, the diff needs reordering and another shift sweep.
if ( changes ) {
this.diffCleanupMerge( diffs );
}
};
return function( o, n ) {
var diff, output, text;
diff = new DiffMatchPatch();
output = diff.DiffMain( o, n );
diff.diffCleanupEfficiency( output );
text = diff.diffPrettyHtml( output );
return text;
};
}() );
// Get a reference to the global object, like window in browsers // Get a reference to the global object, like window in browsers
}( (function() { }( (function() {
return this; return this;
})() )); })() ));
/*istanbul ignore next */
// jscs:disable maximumLineLength
/*
* Javascript Diff Algorithm
* By John Resig (http://ejohn.org/)
* Modified by Chu Alan "sprite"
*
* Released under the MIT license.
*
* More Info:
* http://ejohn.org/projects/javascript-diff-algorithm/
*
* Usage: QUnit.diff(expected, actual)
*
* QUnit.diff( "the quick brown fox jumped over", "the quick fox jumps over" ) == "the quick <del>brown </del> fox <del>jumped </del><ins>jumps </ins> over"
*/
QUnit.diff = (function() {
var hasOwn = Object.prototype.hasOwnProperty;
/*jshint eqeqeq:false, eqnull:true */
function diff( o, n ) {
var i,
ns = {},
os = {};
for ( i = 0; i < n.length; i++ ) {
if ( !hasOwn.call( ns, n[ i ] ) ) {
ns[ n[ i ] ] = {
rows: [],
o: null
};
}
ns[ n[ i ] ].rows.push( i );
}
for ( i = 0; i < o.length; i++ ) {
if ( !hasOwn.call( os, o[ i ] ) ) {
os[ o[ i ] ] = {
rows: [],
n: null
};
}
os[ o[ i ] ].rows.push( i );
}
for ( i in ns ) {
if ( hasOwn.call( ns, i ) ) {
if ( ns[ i ].rows.length === 1 && hasOwn.call( os, i ) && os[ i ].rows.length === 1 ) {
n[ ns[ i ].rows[ 0 ] ] = {
text: n[ ns[ i ].rows[ 0 ] ],
row: os[ i ].rows[ 0 ]
};
o[ os[ i ].rows[ 0 ] ] = {
text: o[ os[ i ].rows[ 0 ] ],
row: ns[ i ].rows[ 0 ]
};
}
}
}
for ( i = 0; i < n.length - 1; i++ ) {
if ( n[ i ].text != null && n[ i + 1 ].text == null && n[ i ].row + 1 < o.length && o[ n[ i ].row + 1 ].text == null &&
n[ i + 1 ] == o[ n[ i ].row + 1 ] ) {
n[ i + 1 ] = {
text: n[ i + 1 ],
row: n[ i ].row + 1
};
o[ n[ i ].row + 1 ] = {
text: o[ n[ i ].row + 1 ],
row: i + 1
};
}
}
for ( i = n.length - 1; i > 0; i-- ) {
if ( n[ i ].text != null && n[ i - 1 ].text == null && n[ i ].row > 0 && o[ n[ i ].row - 1 ].text == null &&
n[ i - 1 ] == o[ n[ i ].row - 1 ] ) {
n[ i - 1 ] = {
text: n[ i - 1 ],
row: n[ i ].row - 1
};
o[ n[ i ].row - 1 ] = {
text: o[ n[ i ].row - 1 ],
row: i - 1
};
}
}
return {
o: o,
n: n
};
}
return function( o, n ) {
o = o.replace( /\s+$/, "" );
n = n.replace( /\s+$/, "" );
var i, pre,
str = "",
out = diff( o === "" ? [] : o.split( /\s+/ ), n === "" ? [] : n.split( /\s+/ ) ),
oSpace = o.match( /\s+/g ),
nSpace = n.match( /\s+/g );
if ( oSpace == null ) {
oSpace = [ " " ];
} else {
oSpace.push( " " );
}
if ( nSpace == null ) {
nSpace = [ " " ];
} else {
nSpace.push( " " );
}
if ( out.n.length === 0 ) {
for ( i = 0; i < out.o.length; i++ ) {
str += "<del>" + out.o[ i ] + oSpace[ i ] + "</del>";
}
} else {
if ( out.n[ 0 ].text == null ) {
for ( n = 0; n < out.o.length && out.o[ n ].text == null; n++ ) {
str += "<del>" + out.o[ n ] + oSpace[ n ] + "</del>";
}
}
for ( i = 0; i < out.n.length; i++ ) {
if ( out.n[ i ].text == null ) {
str += "<ins>" + out.n[ i ] + nSpace[ i ] + "</ins>";
} else {
// `pre` initialized at top of scope
pre = "";
for ( n = out.n[ i ].row + 1; n < out.o.length && out.o[ n ].text == null; n++ ) {
pre += "<del>" + out.o[ n ] + oSpace[ n ] + "</del>";
}
str += " " + out.n[ i ].text + nSpace[ i ] + pre;
}
}
}
return str;
};
}());
// jscs:enable
(function() { (function() {
// Don't load the HTML Reporter on non-Browser environments
if ( typeof window === "undefined" || !window.document ) {
return;
}
// Deprecated QUnit.init - Ref #530 // Deprecated QUnit.init - Ref #530
// Re-initialize the configuration options // Re-initialize the configuration options
QUnit.init = function() { QUnit.init = function() {
@ -2195,12 +3427,8 @@ QUnit.init = function() {
} }
}; };
// Don't load the HTML Reporter on non-Browser environments
if ( typeof window === "undefined" ) {
return;
}
var config = QUnit.config, var config = QUnit.config,
collapseNext = false,
hasOwn = Object.prototype.hasOwnProperty, hasOwn = Object.prototype.hasOwnProperty,
defined = { defined = {
document: window.document !== undefined, document: window.document !== undefined,
@ -2256,7 +3484,14 @@ function addEvent( elem, type, fn ) {
} else if ( elem.attachEvent ) { } else if ( elem.attachEvent ) {
// support: IE <9 // support: IE <9
elem.attachEvent( "on" + type, fn ); elem.attachEvent( "on" + type, function() {
var event = window.event;
if ( !event.target ) {
event.target = event.srcElement || document;
}
fn.call( elem, event );
});
} }
} }
@ -2427,12 +3662,16 @@ function setUrl( params ) {
} }
function applyUrlParams() { function applyUrlParams() {
var selectBox = id( "qunit-modulefilter" ), var selectedModule,
selection = decodeURIComponent( selectBox.options[ selectBox.selectedIndex ].value ), modulesList = id( "qunit-modulefilter" ),
filter = id( "qunit-filter-input" ).value; filter = id( "qunit-filter-input" ).value;
selectedModule = modulesList ?
decodeURIComponent( modulesList.options[ modulesList.selectedIndex ].value ) :
undefined;
window.location = setUrl({ window.location = setUrl({
module: ( selection === "" ) ? undefined : selection, module: ( selectedModule === "" ) ? undefined : selectedModule,
filter: ( filter === "" ) ? undefined : filter, filter: ( filter === "" ) ? undefined : filter,
// Remove testId filter // Remove testId filter
@ -2548,7 +3787,7 @@ function appendHeader() {
if ( header ) { if ( header ) {
header.innerHTML = "<a href='" + header.innerHTML = "<a href='" +
setUrl({ filter: undefined, module: undefined, testId: undefined }) + escapeText( setUrl( { filter: undefined, module: undefined, testId: undefined } ) ) +
"'>" + header.innerHTML + "</a> "; "'>" + header.innerHTML + "</a> ";
} }
} }
@ -2586,11 +3825,28 @@ function storeFixture() {
} }
} }
function appendFilteredTest() {
var testId = QUnit.config.testId;
if ( !testId || testId.length <= 0 ) {
return "";
}
return "<div id='qunit-filteredTest'>Rerunning selected tests: " +
escapeText( testId.join(", ") ) +
" <a id='qunit-clearFilter' href='" +
escapeText( setUrl( { filter: undefined, module: undefined, testId: undefined } ) ) +
"'>" + "Run all tests" + "</a></div>";
}
function appendUserAgent() { function appendUserAgent() {
var userAgent = id( "qunit-userAgent" ); var userAgent = id( "qunit-userAgent" );
if ( userAgent ) { if ( userAgent ) {
userAgent.innerHTML = ""; userAgent.innerHTML = "";
userAgent.appendChild( document.createTextNode( navigator.userAgent ) ); userAgent.appendChild(
document.createTextNode(
"QUnit " + QUnit.version + "; " + navigator.userAgent
)
);
} }
} }
@ -2652,6 +3908,7 @@ QUnit.begin(function( details ) {
"<h1 id='qunit-header'>" + escapeText( document.title ) + "</h1>" + "<h1 id='qunit-header'>" + escapeText( document.title ) + "</h1>" +
"<h2 id='qunit-banner'></h2>" + "<h2 id='qunit-banner'></h2>" +
"<div id='qunit-testrunner-toolbar'></div>" + "<div id='qunit-testrunner-toolbar'></div>" +
appendFilteredTest() +
"<h2 id='qunit-userAgent'></h2>" + "<h2 id='qunit-userAgent'></h2>" +
"<ol id='qunit-tests'></ol>"; "<ol id='qunit-tests'></ol>";
} }
@ -2733,7 +3990,7 @@ function getNameHtml( name, module ) {
} }
QUnit.testStart(function( details ) { QUnit.testStart(function( details ) {
var running, testBlock; var running, testBlock, bad;
testBlock = id( "qunit-test-output-" + details.testId ); testBlock = id( "qunit-test-output-" + details.testId );
if ( testBlock ) { if ( testBlock ) {
@ -2746,14 +4003,26 @@ QUnit.testStart(function( details ) {
running = id( "qunit-testresult" ); running = id( "qunit-testresult" );
if ( running ) { if ( running ) {
running.innerHTML = "Running: <br />" + getNameHtml( details.name, details.module ); bad = QUnit.config.reorder && defined.sessionStorage &&
+sessionStorage.getItem( "qunit-test-" + details.module + "-" + details.name );
running.innerHTML = ( bad ?
"Rerunning previously failed test: <br />" :
"Running: <br />" ) +
getNameHtml( details.name, details.module );
} }
}); });
function stripHtml( string ) {
// strip tags, html entity and whitespaces
return string.replace(/<\/?[^>]+(>|$)/g, "").replace(/\&quot;/g, "").replace(/\s+/g, "");
}
QUnit.log(function( details ) { QUnit.log(function( details ) {
var assertList, assertLi, var assertList, assertLi,
message, expected, actual, message, expected, actual, diff,
showDiff = false,
testItem = id( "qunit-test-output-" + details.testId ); testItem = id( "qunit-test-output-" + details.testId );
if ( !testItem ) { if ( !testItem ) {
@ -2768,17 +4037,44 @@ QUnit.log(function( details ) {
// when it calls, it's implicit to also not show expected and diff stuff // when it calls, it's implicit to also not show expected and diff stuff
// Also, we need to check details.expected existence, as it can exist and be undefined // Also, we need to check details.expected existence, as it can exist and be undefined
if ( !details.result && hasOwn.call( details, "expected" ) ) { if ( !details.result && hasOwn.call( details, "expected" ) ) {
expected = escapeText( QUnit.dump.parse( details.expected ) ); if ( details.negative ) {
expected = escapeText( "NOT " + QUnit.dump.parse( details.expected ) );
} else {
expected = escapeText( QUnit.dump.parse( details.expected ) );
}
actual = escapeText( QUnit.dump.parse( details.actual ) ); actual = escapeText( QUnit.dump.parse( details.actual ) );
message += "<table><tr class='test-expected'><th>Expected: </th><td><pre>" + message += "<table><tr class='test-expected'><th>Expected: </th><td><pre>" +
expected + expected +
"</pre></td></tr>"; "</pre></td></tr>";
if ( actual !== expected ) { if ( actual !== expected ) {
message += "<tr class='test-actual'><th>Result: </th><td><pre>" + message += "<tr class='test-actual'><th>Result: </th><td><pre>" +
actual + "</pre></td></tr>" + actual + "</pre></td></tr>";
"<tr class='test-diff'><th>Diff: </th><td><pre>" +
QUnit.diff( expected, actual ) + "</pre></td></tr>"; // Don't show diff if actual or expected are booleans
if ( !( /^(true|false)$/.test( actual ) ) &&
!( /^(true|false)$/.test( expected ) ) ) {
diff = QUnit.diff( expected, actual );
showDiff = stripHtml( diff ).length !==
stripHtml( expected ).length +
stripHtml( actual ).length;
}
// Don't show diff if expected and actual are totally different
if ( showDiff ) {
message += "<tr class='test-diff'><th>Diff: </th><td><pre>" +
diff + "</pre></td></tr>";
}
} else if ( expected.indexOf( "[object Array]" ) !== -1 ||
expected.indexOf( "[object Object]" ) !== -1 ) {
message += "<tr class='test-message'><th>Message: </th><td>" +
"Diff suppressed as the depth of object is more than current max depth (" +
QUnit.config.maxDepth + ").<p>Hint: Use <code>QUnit.dump.maxDepth</code> to " +
" run with a higher max depth or <a href='" +
escapeText( setUrl( { maxDepth: -1 } ) ) + "'>" +
"Rerun</a> without max depth.</p></td></tr>";
} }
if ( details.source ) { if ( details.source ) {
@ -2788,7 +4084,7 @@ QUnit.log(function( details ) {
message += "</table>"; message += "</table>";
// this occours when pushFailure is set and we have an extracted stack trace // this occurs when pushFailure is set and we have an extracted stack trace
} else if ( !details.result && details.source ) { } else if ( !details.result && details.source ) {
message += "<table>" + message += "<table>" +
"<tr class='test-source'><th>Source: </th><td><pre>" + "<tr class='test-source'><th>Source: </th><td><pre>" +
@ -2806,7 +4102,7 @@ QUnit.log(function( details ) {
QUnit.testDone(function( details ) { QUnit.testDone(function( details ) {
var testTitle, time, testItem, assertList, var testTitle, time, testItem, assertList,
good, bad, testCounts, skipped, good, bad, testCounts, skipped, sourceName,
tests = id( "qunit-tests" ); tests = id( "qunit-tests" );
if ( !tests ) { if ( !tests ) {
@ -2830,6 +4126,16 @@ QUnit.testDone(function( details ) {
} }
if ( bad === 0 ) { if ( bad === 0 ) {
// Collapse the passing tests
addClass( assertList, "qunit-collapsed" );
} else if ( bad && config.collapse && !collapseNext ) {
// Skip collapsing the first failing test
collapseNext = true;
} else {
// Collapse remaining tests
addClass( assertList, "qunit-collapsed" ); addClass( assertList, "qunit-collapsed" );
} }
@ -2861,15 +4167,38 @@ QUnit.testDone(function( details ) {
time.innerHTML = details.runtime + " ms"; time.innerHTML = details.runtime + " ms";
testItem.insertBefore( time, assertList ); testItem.insertBefore( time, assertList );
} }
// Show the source of the test when showing assertions
if ( details.source ) {
sourceName = document.createElement( "p" );
sourceName.innerHTML = "<strong>Source: </strong>" + details.source;
addClass( sourceName, "qunit-source" );
if ( bad === 0 ) {
addClass( sourceName, "qunit-collapsed" );
}
addEvent( testTitle, "click", function() {
toggleClass( sourceName, "qunit-collapsed" );
});
testItem.appendChild( sourceName );
}
}); });
if ( !defined.document || document.readyState === "complete" ) { if ( defined.document ) {
// Avoid readyState issue with phantomjs
// Ref: #818
var notPhantom = ( function( p ) {
return !( p && p.version && p.version.major > 0 );
} )( window.phantom );
if ( notPhantom && document.readyState === "complete" ) {
QUnit.load();
} else {
addEvent( window, "load", QUnit.load );
}
} else {
config.pageLoaded = true; config.pageLoaded = true;
config.autorun = true; config.autorun = true;
} }
if ( defined.document ) {
addEvent( window, "load", QUnit.load );
}
})(); })();

44
package.json
View File

@ -30,34 +30,34 @@
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {
"btoa": "~1.1.2", "btoa": "~1.1.2",
"glob": "~6.0.1", "glob": "~7.0.3",
"grunt": "~0.4.5", "grunt": "~0.4.5",
"grunt-autoprefixer": "~3.0.3", "grunt-autoprefixer": "~3.0.4",
"grunt-contrib-clean": "~0.7.0", "grunt-contrib-clean": "~1.0.0",
"grunt-contrib-compress": "~0.14.0", "grunt-contrib-compress": "~1.1.1",
"grunt-contrib-concat": "~0.5.1", "grunt-contrib-concat": "~1.0.0",
"grunt-contrib-connect": "~0.11.2", "grunt-contrib-connect": "~1.0.0",
"grunt-contrib-copy": "~0.8.0", "grunt-contrib-copy": "~1.0.0",
"grunt-contrib-csslint": "~0.5.0", "grunt-contrib-csslint": "~1.0.0",
"grunt-contrib-cssmin": "~0.14.0", "grunt-contrib-cssmin": "~1.0.0",
"grunt-contrib-htmlmin": "~0.6.0", "grunt-contrib-htmlmin": "~1.0.0",
"grunt-contrib-jade": "~0.15.0", "grunt-contrib-jade": "~1.0.0",
"grunt-contrib-jshint": "~0.11.2", "grunt-contrib-jshint": "~1.0.0",
"grunt-contrib-less": "~1.1.0", "grunt-contrib-less": "~1.2.0",
"grunt-contrib-qunit": "~0.7.0", "grunt-contrib-qunit": "~0.7.0",
"grunt-contrib-uglify": "~0.11.0", "grunt-contrib-uglify": "~1.0.0",
"grunt-contrib-watch": "~0.6.1", "grunt-contrib-watch": "~0.6.1",
"grunt-csscomb": "~3.1.0", "grunt-csscomb": "~3.1.0",
"grunt-exec": "~0.4.6", "grunt-exec": "~0.4.6",
"grunt-html": "~5.0.1", "grunt-html": "~6.0.0",
"grunt-jekyll": "~0.4.2", "grunt-jekyll": "~0.4.4",
"grunt-jscs": "~2.5.0", "grunt-jscs": "~2.8.0",
"grunt-saucelabs": "~8.6.1", "grunt-saucelabs": "~8.6.2",
"load-grunt-tasks": "~3.4.0", "load-grunt-tasks": "~3.4.1",
"markdown-it": "^5.0.0", "markdown-it": "^6.0.0",
"npm-shrinkwrap": "^200.4.0", "npm-shrinkwrap": "^200.4.0",
"shelljs": "^0.5.3", "shelljs": "^0.6.0",
"time-grunt": "^1.2.1" "time-grunt": "^1.3.0"
}, },
"engines": { "engines": {
"node": ">=0.10.1" "node": ">=0.10.1"

118
test-infra/README.md
View File

@ -1,118 +0,0 @@
## What does `s3_cache.py` do?
### In general
`s3_cache.py` maintains a cache, stored in an Amazon S3 (Simple Storage Service) bucket, of a given directory whose contents are considered non-critical and are completely & solely determined by (and should be able to be regenerated from) a single given file.
The SHA-256 hash of the single file is used as the key for the cache. The directory is stored as a gzipped tarball.
All the tarballs are stored in S3's Reduced Redundancy Storage (RRS) storage class, since this is cheaper and the data is non-critical.
`s3_cache.py` itself never deletes cache entries; deletion should either be done manually or using automatic S3 life cycle rules on the bucket.
Similar to git, `s3_cache.py` makes the assumption that [SHA-256 will effectively never have a collision](https://stackoverflow.com/questions/4014090/is-it-safe-to-ignore-the-possibility-of-sha-collisions-in-practice).
### For Bootstrap specifically
`s3_cache.py` is used to cache the npm packages that our Grunt tasks depend on and the RubyGems that Jekyll depends on. (Jekyll is needed to compile our docs to HTML so that we can run them thru an HTML5 validator.)
For npm, the `node_modules` directory is cached based on our `npm-shrinkwrap.json` file.
For RubyGems, the `gemdir` of the current RVM-selected Ruby is cached based on the `pseudo_Gemfile.lock` file generated by our Travis build script.
`pseudo_Gemfile.lock` contains the versions of Ruby and Jekyll that we're using (read our `.travis.yml` for details).
## Why is `s3_cache.py` necessary?
`s3_cache.py` is used to speed up Bootstrap's Travis builds. Installing npm packages and RubyGems used to take up a significant fraction of our total build times. Also, at the time that `s3_cache.py` was written, npm was occasionally unreliable.
Travis does offer built-in caching on their paid plans, but this do-it-ourselves S3 solution is significantly cheaper since we only need caching and not Travis' other paid features.
## Configuration
`s3_cache.py` is configured via `S3Cachefile.json`, which has the following format:
```json
{
"cache-name-here": {
"key": "path/to/file/to/SHA-256/hash/and/use/that/as/the/cache.key",
"cache": "path/to/directory/to/be/cached",
"generate": "shell-command --to run --to regenerate --the-cache $from scratch"
},
...
}
```
`s3_cache.py` will SHA-256 hash the contents of the `key` file and try to fetch a tarball from S3 using the hash as the filename.
If it's unable to fetch the tarball (either because it doesn't exist or there was a network error), it will run the `generate` command. If it was able to fetch the tarball, it will extract it to the `cache` directory.
If it had to `generate` the cache, it will later create a tarball of the `cache` directory and try to upload the tarball to S3 using the SHA-256 hash of the `key` file as the tarball's filename.
## AWS Setup
### Overview
1. Create an Amazon Web Services (AWS) account.
2. Create an Identity & Access Management (IAM) user, and note their credentials.
3. Create an S3 bucket.
4. Set permissions on the bucket to grant the user read + write access.
5. Set the user credentials as secure Travis environment variables.
### In detail
1. Create an AWS account.
2. Login to the [AWS Management Console](https://console.aws.amazon.com).
3. Go to the IAM Management Console.
4. Create a new user (named e.g. `travis-ci`) and generate an access key for them. Note both the Access Key ID and the Secret Access Key.
5. Note the user's ARN (Amazon Resource Name), which can be found in the "Summary" tab of the user browser. This will be of the form: `arn:aws:iam::XXXXXXXXXXXXXX:user/the-username-goes-here`
6. Note the user's access key, which can be found in the "Security Credentials" tab of the user browser.
7. Go to the S3 Management Console.
8. Create a new bucket. For a non-publicly-accessible bucket (like Bootstrap uses), it's recommended that the bucket name be random to increase security. On most *nix machines, you can easily generate a random UUID to use as the bucket name using Python:
```bash
python -c "import uuid; print(uuid.uuid4())"
```
9. Determine and note what your bucket's ARN is. The ARN for an S3 bucket is of the form: `arn:aws:s3:::the-bucket-name-goes-here`
10. In the bucket's Properties pane, in the "Permissions" section, click the "Edit bucket policy" button.
11. Input and submit an IAM Policy that grants the user at least read + write rights to the bucket. AWS has a policy generator and some examples to help with crafting the policy. Here's the policy that Bootstrap uses, with the sensitive bits censored:
```json
{
"Version": "2012-10-17",
"Id": "PolicyTravisReadWriteNoAdmin",
"Statement": [
{
"Sid": "StmtXXXXXXXXXXXXXX",
"Effect": "Allow",
"Principal": {
"AWS": "arn:aws:iam::XXXXXXXXXXXXXX:user/travis-ci"
},
"Action": [
"s3:AbortMultipartUpload",
"s3:GetObjectVersion",
"s3:ListBucket",
"s3:DeleteObject",
"s3:DeleteObjectVersion",
"s3:GetObject",
"s3:PutObject"
],
"Resource": [
"arn:aws:s3:::XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX",
"arn:aws:s3:::XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX/*"
]
}
]
}
```
12. If you want deletion from the cache to be done automatically based on age (like Bootstrap does): In the bucket's Properties pane, in the "Lifecycle" section, add a rule to expire/delete files based on creation date.
13. Install the [`travis` RubyGem](https://github.com/travis-ci/travis): `gem install travis`
14. Encrypt the environment variables:
```bash
travis encrypt --repo twbs/bootstrap "AWS_ACCESS_KEY_ID=XXX"
travis encrypt --repo twbs/bootstrap "AWS_SECRET_ACCESS_KEY=XXX"
travis encrypt --repo twbs/bootstrap "TWBS_S3_BUCKET=XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"
```
14. Add the resulting secure environment variables to `.travis.yml`.
## Usage
Read `s3_cache.py`'s source code and Bootstrap's `.travis.yml` for how to invoke and make use of `s3_cache.py`.

12
test-infra/S3Cachefile.json
View File

@ -1,12 +0,0 @@
{
"npm-modules": {
"key": "./npm-shrinkwrap.json",
"cache": "../node_modules",
"generate": "./uncached-npm-install.sh"
},
"rubygems": {
"key": "../pseudo_Gemfile.lock",
"cache": "$GEMDIR",
"generate": "gem install -N jekyll -v $JEKYLL_VERSION && gem install -N rouge -v $ROUGE_VERSION"
}
}

1
test-infra/requirements.txt
View File

@ -1 +0,0 @@
boto==2.25.0

184
test-infra/s3_cache.py
View File

@ -1,184 +0,0 @@
#!/usr/bin/env python2.7
# pylint: disable=C0301
from __future__ import absolute_import, unicode_literals, print_function, division
from sys import argv
from os import environ, stat, chdir, remove as _delete_file
from os.path import dirname, basename, abspath, realpath, expandvars
from hashlib import sha256
from subprocess import check_call as run
from json import load, dump as save
from contextlib import contextmanager
from datetime import datetime
from boto.s3.connection import S3Connection
from boto.s3.key import Key
from boto.exception import S3ResponseError
CONFIG_FILE = './S3Cachefile.json'
UPLOAD_TODO_FILE = './S3CacheTodo.json'
BYTES_PER_MB = 1024 * 1024
@contextmanager
def timer():
start = datetime.utcnow()
yield
end = datetime.utcnow()
elapsed = end - start
print("\tDone. Took", int(elapsed.total_seconds()), "second(s).")
@contextmanager
def todo_file(writeback=True):
try:
with open(UPLOAD_TODO_FILE, 'rt') as json_file:
todo = load(json_file)
except (IOError, OSError, ValueError):
todo = {}
yield todo
if writeback:
try:
with open(UPLOAD_TODO_FILE, 'wt') as json_file:
save(todo, json_file)
except (OSError, IOError) as save_err:
print("Error saving {}:".format(UPLOAD_TODO_FILE), save_err)
def _sha256_of_file(filename):
hasher = sha256()
with open(filename, 'rb') as input_file:
hasher.update(input_file.read())
file_hash = hasher.hexdigest()
print('sha256({}) = {}'.format(filename, file_hash))
return file_hash
def _delete_file_quietly(filename):
try:
_delete_file(filename)
except (OSError, IOError):
pass
def mark_needs_uploading(cache_name):
with todo_file() as todo:
todo[cache_name] = True
def mark_uploaded(cache_name):
with todo_file() as todo:
todo.pop(cache_name, None)
def need_to_upload(cache_name):
with todo_file(writeback=False) as todo:
return todo.get(cache_name, False)
def _tarball_size(directory):
kib = stat(_tarball_filename_for(directory)).st_size // BYTES_PER_MB
return "{} MiB".format(kib)
def _tarball_filename_for(directory):
return abspath('./{}.tar.gz'.format(basename(directory)))
def _create_tarball(directory):
print("Creating tarball of {}...".format(directory))
with timer():
run(['tar', '-czf', _tarball_filename_for(directory), '-C', dirname(directory), basename(directory)])
def _extract_tarball(directory):
print("Extracting tarball of {}...".format(directory))
with timer():
run(['tar', '-xzf', _tarball_filename_for(directory), '-C', dirname(directory)])
def download(directory):
mark_uploaded(cache_name) # reset
try:
print("Downloading {} tarball from S3...".format(cache_name))
with timer():
key.get_contents_to_filename(_tarball_filename_for(directory))
except S3ResponseError as err:
mark_needs_uploading(cache_name)
raise SystemExit("Cached {} download failed!".format(cache_name))
print("Downloaded {}.".format(_tarball_size(directory)))
_extract_tarball(directory)
print("{} successfully installed from cache.".format(cache_name))
def upload(directory):
_create_tarball(directory)
print("Uploading {} tarball to S3... ({})".format(cache_name, _tarball_size(directory)))
with timer():
key.set_contents_from_filename(_tarball_filename_for(directory))
print("{} cache successfully updated.".format(cache_name))
mark_uploaded(cache_name)
if __name__ == '__main__':
# Uses environment variables:
# AWS_ACCESS_KEY_ID -- AWS Access Key ID
# AWS_SECRET_ACCESS_KEY -- AWS Secret Access Key
argv.pop(0)
if len(argv) != 2:
raise SystemExit("USAGE: s3_cache.py <download | upload> <cache name>")
mode, cache_name = argv
script_dir = dirname(realpath(__file__))
chdir(script_dir)
try:
with open(CONFIG_FILE, 'rt') as config_file:
config = load(config_file)
except (IOError, OSError, ValueError) as config_err:
print(config_err)
raise SystemExit("Error when trying to load config from JSON file!")
try:
cache_info = config[cache_name]
key_file = expandvars(cache_info["key"])
fallback_cmd = cache_info["generate"]
directory = expandvars(cache_info["cache"])
except (TypeError, KeyError) as load_err:
print(load_err)
raise SystemExit("Config for cache named {!r} is missing or malformed!".format(cache_name))
try:
try:
BUCKET_NAME = environ['TWBS_S3_BUCKET']
except KeyError:
raise SystemExit("TWBS_S3_BUCKET environment variable not set!")
conn = S3Connection()
bucket = conn.lookup(BUCKET_NAME)
if bucket is None:
raise SystemExit("Could not access bucket!")
key_file_hash = _sha256_of_file(key_file)
key = Key(bucket, key_file_hash)
key.storage_class = 'REDUCED_REDUNDANCY'
if mode == 'download':
download(directory)
elif mode == 'upload':
if need_to_upload(cache_name):
upload(directory)
else:
print("No need to upload anything.")
else:
raise SystemExit("Unrecognized mode {!r}".format(mode))
except BaseException as exc:
if mode != 'download':
raise
print("Error!:", exc)
print("Unable to download from cache.")
print("Running fallback command to generate cache directory {!r}: {}".format(directory, fallback_cmd))
with timer():
run(fallback_cmd, shell=True)

15
test-infra/uncached-npm-install.sh
View File

@ -1,15 +0,0 @@
#!/bin/bash
set -e
cd .. # /bootstrap/
cp test-infra/npm-shrinkwrap.json npm-shrinkwrap.json
# npm is flaky, so try multiple times
MAXTRIES=3
TRIES=1
while ! npm install; do
if [ $TRIES -ge $MAXTRIES ]; then
exit 1
fi
TRIES=$(($TRIES + 1))
echo "Retrying npm install (Try $TRIES of $MAXTRIES)..."
done
rm npm-shrinkwrap.json