mime-types@2.1.6 & mime-db@1.18.0

3 files changed, 51 insertions, 17 deletions

diff --git a/node_modules/mime-db/HISTORY.md b/node_modules/mime-db/HISTORY.md
index b8c7fae31..87ab92955 100644
--- a/node_modules/mime-db/HISTORY.md
+++ b/node_modules/mime-db/HISTORY.md
@@ -1,3 +1,15 @@
+1.18.0 / 2015-09-03
+===================
+
+  * Add `application/pkcs12`
+  * Add `application/vnd.3gpp-prose+xml`
+  * Add `application/vnd.3gpp.mid-call+xml`
+  * Add `application/vnd.3gpp.state-and-event-info+xml`
+  * Add `application/vnd.anki`
+  * Add `application/vnd.firemonkeys.cloudcell`
+  * Add `application/vnd.openblox.game+xml`
+  * Add `application/vnd.openblox.game-binary`
+
 1.17.0 / 2015-08-13
 ===================
 
diff --git a/node_modules/mime-db/db.json b/node_modules/mime-db/db.json
index f91d6fd5e..96aae4500 100644
--- a/node_modules/mime-db/db.json
+++ b/node_modules/mime-db/db.json
@@ -768,6 +768,9 @@
     "source": "iana",
     "extensions": ["p10"]
   },
+  "application/pkcs12": {
+    "source": "iana"
+  },
   "application/pkcs7-mime": {
     "source": "iana",
     "extensions": ["p7m","p7c"]
@@ -1148,9 +1151,15 @@
   "application/vividence.scriptfile": {
     "source": "apache"
   },
+  "application/vnd.3gpp-prose+xml": {
+    "source": "iana"
+  },
   "application/vnd.3gpp.bsf+xml": {
     "source": "iana"
   },
+  "application/vnd.3gpp.mid-call+xml": {
+    "source": "iana"
+  },
   "application/vnd.3gpp.pic-bw-large": {
     "source": "iana",
     "extensions": ["plb"]
@@ -1166,6 +1175,9 @@
   "application/vnd.3gpp.sms": {
     "source": "iana"
   },
+  "application/vnd.3gpp.state-and-event-info+xml": {
+    "source": "iana"
+  },
   "application/vnd.3gpp.ussd+xml": {
     "source": "iana"
   },
@@ -1263,6 +1275,9 @@
     "compressible": false,
     "extensions": ["apk"]
   },
+  "application/vnd.anki": {
+    "source": "iana"
+  },
   "application/vnd.anser-web-certificate-issue-initiation": {
     "source": "iana",
     "extensions": ["cii"]
@@ -1816,6 +1831,9 @@
   "application/vnd.fints": {
     "source": "iana"
   },
+  "application/vnd.firemonkeys.cloudcell": {
+    "source": "iana"
+  },
   "application/vnd.flographit": {
     "source": "iana",
     "extensions": ["gph"]
@@ -3028,6 +3046,12 @@
   "application/vnd.omaloc-supl-init": {
     "source": "iana"
   },
+  "application/vnd.openblox.game+xml": {
+    "source": "iana"
+  },
+  "application/vnd.openblox.game-binary": {
+    "source": "iana"
+  },
   "application/vnd.openeye.oeb": {
     "source": "iana"
   },
diff --git a/node_modules/mime-db/package.json b/node_modules/mime-db/package.json
index ef81d9e7f..72448dd87 100644
--- a/node_modules/mime-db/package.json
+++ b/node_modules/mime-db/package.json
@@ -1,12 +1,12 @@
 {
   "_args": [
     [
-      "mime-db@~1.17.0",
+      "mime-db@~1.18.0",
       "/Users/rebecca/code/npm/node_modules/mime-types"
     ]
   ],
-  "_from": "mime-db@>=1.17.0 <1.18.0",
-  "_id": "mime-db@1.17.0",
+  "_from": "mime-db@>=1.18.0 <1.19.0",
+  "_id": "mime-db@1.18.0",
   "_inCache": true,
   "_location": "/mime-db",
   "_npmUser": {
@@ -17,19 +17,19 @@
   "_phantomChildren": {},
   "_requested": {
     "name": "mime-db",
-    "raw": "mime-db@~1.17.0",
-    "rawSpec": "~1.17.0",
+    "raw": "mime-db@~1.18.0",
+    "rawSpec": "~1.18.0",
     "scope": null,
-    "spec": ">=1.17.0 <1.18.0",
+    "spec": ">=1.18.0 <1.19.0",
     "type": "range"
   },
   "_requiredBy": [
     "/mime-types"
   ],
-  "_resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.17.0.tgz",
-  "_shasum": "95bdc044092d2bcc3189dd19fbed6ed3a3f3df2a",
+  "_resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.18.0.tgz",
+  "_shasum": "5317e28224c08af1d484f60973dd386ba8f389e0",
   "_shrinkwrap": null,
-  "_spec": "mime-db@~1.17.0",
+  "_spec": "mime-db@~1.18.0",
   "_where": "/Users/rebecca/code/npm/node_modules/mime-types",
   "bugs": {
     "url": "https://github.com/jshttp/mime-db/issues"
@@ -58,15 +58,15 @@
     "cogent": "1.0.1",
     "csv-parse": "1.0.0",
     "gnode": "0.1.1",
-    "istanbul": "0.3.17",
+    "istanbul": "0.3.19",
     "mocha": "1.21.5",
     "raw-body": "2.1.2",
     "stream-to-array": "2"
   },
   "directories": {},
   "dist": {
-    "shasum": "95bdc044092d2bcc3189dd19fbed6ed3a3f3df2a",
-    "tarball": "http://registry.npmjs.org/mime-db/-/mime-db-1.17.0.tgz"
+    "shasum": "5317e28224c08af1d484f60973dd386ba8f389e0",
+    "tarball": "http://registry.npmjs.org/mime-db/-/mime-db-1.18.0.tgz"
   },
   "engines": {
     "node": ">= 0.6"
@@ -78,7 +78,7 @@
     "db.json",
     "index.js"
   ],
-  "gitHead": "6525b89bd6d8f901d3c5b072741f0fbc4a4d60c3",
+  "gitHead": "c48209a8786e61f20499ba14167252ad67638c5f",
   "homepage": "https://github.com/jshttp/mime-db",
   "installable": true,
   "keywords": [
@@ -103,11 +103,9 @@
   ],
   "name": "mime-db",
   "optionalDependencies": {},
-  "readme": "# mime-db\n\n[![NPM Version][npm-version-image]][npm-url]\n[![NPM Downloads][npm-downloads-image]][npm-url]\n[![Node.js Version][node-image]][node-url]\n[![Build Status][travis-image]][travis-url]\n[![Coverage Status][coveralls-image]][coveralls-url]\n\nThis is a database of all mime types.\nIt consists of a single, public JSON file and does not include any logic,\nallowing it to remain as un-opinionated as possible with an API.\nIt aggregates data from the following sources:\n\n- http://www.iana.org/assignments/media-types/media-types.xhtml\n- http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types\n- http://hg.nginx.org/nginx/raw-file/default/conf/mime.types\n\n## Installation\n\n```bash\nnpm install mime-db\n```\n\n### Database Download\n\nIf you're crazy enough to use this in the browser, you can just grab the\nJSON file using [RawGit](https://rawgit.com/). It is recommended to replace\n`master` with [a release tag](https://github.com/jshttp/mime-db/tags) as the\nJSON format may change in the future.\n\n```\nhttps://cdn.rawgit.com/jshttp/mime-db/master/db.json\n```\n\n## Usage\n\n```js\nvar db = require('mime-db');\n\n// grab data on .js files\nvar data = db['application/javascript'];\n```\n\n## Data Structure\n\nThe JSON file is a map lookup for lowercased mime types.\nEach mime type has the following properties:\n\n- `.source` - where the mime type is defined.\n    If not set, it's probably a custom media type.\n    - `apache` - [Apache common media types](http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types)\n    - `iana` - [IANA-defined media types](http://www.iana.org/assignments/media-types/media-types.xhtml)\n    - `nginx` - [nginx media types](http://hg.nginx.org/nginx/raw-file/default/conf/mime.types)\n- `.extensions[]` - known extensions associated with this mime type.\n- `.compressible` - whether a file of this type is can be gzipped.\n- `.charset` - the default charset associated with this type, if any.\n\nIf unknown, every property could be `undefined`.\n\n## Contributing\n\nTo edit the database, only make PRs against `src/custom.json` or\n`src/custom-suffix.json`.\n\nTo update the build, run `npm run build`.\n\n## Adding Custom Media Types\n\nThe best way to get new media types included in this library is to register\nthem with the IANA. The community registration procedure is outlined in\n[RFC 6838 section 5](http://tools.ietf.org/html/rfc6838#section-5). Types\nregistered with the IANA are automatically pulled into this library.\n\n[npm-version-image]: https://img.shields.io/npm/v/mime-db.svg\n[npm-downloads-image]: https://img.shields.io/npm/dm/mime-db.svg\n[npm-url]: https://npmjs.org/package/mime-db\n[travis-image]: https://img.shields.io/travis/jshttp/mime-db/master.svg\n[travis-url]: https://travis-ci.org/jshttp/mime-db\n[coveralls-image]: https://img.shields.io/coveralls/jshttp/mime-db/master.svg\n[coveralls-url]: https://coveralls.io/r/jshttp/mime-db?branch=master\n[node-image]: https://img.shields.io/node/v/mime-db.svg\n[node-url]: http://nodejs.org/download/\n",
-  "readmeFilename": "README.md",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/jshttp/mime-db.git"
+    "url": "https://github.com/jshttp/mime-db"
   },
   "scripts": {
     "build": "node scripts/build",
@@ -117,5 +115,5 @@
     "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/",
     "update": "npm run fetch && npm run build"
   },
-  "version": "1.17.0"
+  "version": "1.18.0"
 }