diff --git a/package.json b/package.json index ae635b1..94a731b 100644 --- a/package.json +++ b/package.json @@ -11,16 +11,21 @@ "dependencies": { "cors": "^2.8.1", "countries-list": "^1.3.2", + "csso": "^3.1.1", "date-fns": "^1.28.1", + "debug": "^2.6.8", + "etag": "^1.8.0", "express": "^4.15.2", - "express-unpkg": "^2.0.1", - "firebase-admin": "^4.2.1", "gunzip-maybe": "^1.4.0", "http-client": "^4.3.1", "invariant": "^2.2.2", "isomorphic-fetch": "^2.2.1", + "lru-cache": "^4.0.2", + "mime": "^1.3.6", + "mkdirp": "^0.5.1", "morgan": "^1.8.1", "ndjson": "^1.5.0", + "os-tmpdir": "^1.0.2", "pretty-bytes": "^3", "prop-types": "^15.5.8", "raven": "^1.2.1", @@ -29,6 +34,8 @@ "react-motion": "^0.4.7", "react-router-dom": "^4.0.0", "redis": "^2.7.1", + "semver": "^5.3.0", + "tar-fs": "^1.15.2", "throng": "^4.0.0" }, "devDependencies": { diff --git a/server/index.js b/server/index.js index 0824ac8..4c9701d 100644 --- a/server/index.js +++ b/server/index.js @@ -3,7 +3,7 @@ const http = require('http') const express = require('express') const cors = require('cors') const morgan = require('morgan') -const unpkg = require('express-unpkg') +const middleware = require('./middleware') const { fetchStats } = require('./cloudflare') const fs = require('fs') @@ -69,7 +69,7 @@ const createServer = (config) => { maxAge: config.maxAge })) - app.use(unpkg.createRequestHandler(config)) + app.use(middleware.createRequestHandler(config)) const server = http.createServer(app) diff --git a/server/middleware/FileUtils.js b/server/middleware/FileUtils.js new file mode 100644 index 0000000..bc0db12 --- /dev/null +++ b/server/middleware/FileUtils.js @@ -0,0 +1,35 @@ +const fs = require('fs') +const mime = require('mime') + +const TextFiles = /\/?(LICENSE|README|CHANGES|AUTHORS|Makefile|\.[a-z]*rc|\.git[a-z]*|\.[a-z]*ignore)$/i + +const getContentType = (file) => + TextFiles.test(file) ? 'text/plain' : mime.lookup(file) + +const getStats = (file) => + new Promise((resolve, reject) => { + fs.lstat(file, (error, stats) => { + if (error) { + reject(error) + } else { + resolve(stats) + } + }) + }) + +const getFileType = (stats) => { + if (stats.isFile()) return 'file' + if (stats.isDirectory()) return 'directory' + if (stats.isBlockDevice()) return 'blockDevice' + if (stats.isCharacterDevice()) return 'characterDevice' + if (stats.isSymbolicLink()) return 'symlink' + if (stats.isSocket()) return 'socket' + if (stats.isFIFO()) return 'fifo' + return 'unknown' +} + +module.exports = { + getContentType, + getStats, + getFileType +} diff --git a/server/middleware/IndexUtils.js b/server/middleware/IndexUtils.js new file mode 100644 index 0000000..5f78430 --- /dev/null +++ b/server/middleware/IndexUtils.js @@ -0,0 +1,41 @@ +const fs = require('fs') +const path = require('path') +const React = require('react') +const ReactDOMServer = require('react-dom/server') +const IndexPage = require('./components/IndexPage') +const { getStats } = require('./FileUtils') + +const e = React.createElement + +const getEntries = (dir) => + new Promise((resolve, reject) => { + fs.readdir(dir, (error, files) => { + if (error) { + reject(error) + } else { + resolve( + Promise.all( + files.map(file => getStats(path.join(dir, file))) + ).then( + statsArray => statsArray.map( + (stats, index) => ({ file: files[index], stats }) + ) + ) + ) + } + }) + }) + +const DOCTYPE = '' + +const generateIndexPage = (props) => + DOCTYPE + ReactDOMServer.renderToStaticMarkup(e(IndexPage, props)) + +const generateDirectoryIndexHTML = (packageInfo, version, baseDir, dir, callback) => + getEntries(path.join(baseDir, dir)) + .then(entries => generateIndexPage({ packageInfo, version, dir, entries })) + .then(html => callback(null, html), callback) + +module.exports = { + generateDirectoryIndexHTML +} diff --git a/server/middleware/MetadataUtils.js b/server/middleware/MetadataUtils.js new file mode 100644 index 0000000..6fbe7ed --- /dev/null +++ b/server/middleware/MetadataUtils.js @@ -0,0 +1,51 @@ +const fs = require('fs') +const { join: joinPaths } = require('path') +const { getContentType, getStats, getFileType } = require('./FileUtils') + +const getEntries = (baseDir, path, maximumDepth) => + new Promise((resolve, reject) => { + fs.readdir(joinPaths(baseDir, path), (error, files) => { + if (error) { + reject(error) + } else { + resolve( + Promise.all( + files.map(f => getStats(joinPaths(baseDir, path, f))) + ).then( + statsArray => Promise.all(statsArray.map( + (stats, index) => getMetadata(baseDir, joinPaths(path, files[index]), stats, maximumDepth - 1) + )) + ) + ) + } + }) + }) + +const formatTime = (time) => + new Date(time).toISOString() + +const getMetadata = (baseDir, path, stats, maximumDepth) => { + const metadata = { + path, + lastModified: formatTime(stats.mtime), + contentType: getContentType(path), + size: stats.size, + type: getFileType(stats) + } + + if (!stats.isDirectory() || maximumDepth === 0) + return Promise.resolve(metadata) + + return getEntries(baseDir, path, maximumDepth).then(files => { + metadata.files = files + return metadata + }) +} + +const generateMetadata = (baseDir, path, stats, maximumDepth, callback) => + getMetadata(baseDir, path, stats, maximumDepth) + .then(metadata => callback(null, metadata), callback) + +module.exports = { + generateMetadata +} diff --git a/server/middleware/PackageUtils.js b/server/middleware/PackageUtils.js new file mode 100644 index 0000000..7d58f72 --- /dev/null +++ b/server/middleware/PackageUtils.js @@ -0,0 +1,59 @@ +const { parse: parseURL } = require('url') + +const URLFormat = /^\/((?:@[^\/@]+\/)?[^\/@]+)(?:@([^\/]+))?(\/.*)?$/ + +const decodeParam = (param) => + param && decodeURIComponent(param) + +const ValidQueryKeys = { + main: true, + json: true +} + +const queryIsValid = (query) => + Object.keys(query).every(key => ValidQueryKeys[key]) + +const parsePackageURL = (url) => { + const { pathname, search, query } = parseURL(url, true) + + if (!queryIsValid(query)) + return null + + const match = URLFormat.exec(pathname) + + if (match == null) + return null + + const packageName = match[1] + const version = decodeParam(match[2]) || 'latest' + const filename = decodeParam(match[3]) + + return { // If the URL is /@scope/name@version/path.js?main=browser: + pathname, // /@scope/name@version/path.js + search, // ?main=browser + query, // { main: 'browser' } + packageName, // @scope/name + version, // version + filename // /path.js + } +} + +const createPackageURL = (packageName, version, filename, search) => { + let pathname = `/${packageName}` + + if (version != null) + pathname += `@${version}` + + if (filename != null) + pathname += filename + + if (search) + pathname += search + + return pathname +} + +module.exports = { + parsePackageURL, + createPackageURL +} diff --git a/server/middleware/RegistryCache.js b/server/middleware/RegistryCache.js new file mode 100644 index 0000000..3e957e2 --- /dev/null +++ b/server/middleware/RegistryCache.js @@ -0,0 +1,49 @@ +const redis = require('redis') +const createLRUCache = require('lru-cache') + +const createRedisCache = (redisURL) => { + const client = redis.createClient(redisURL) + + const createKey = (key) => 'registry:' + key + + const set = (key, value, expiry) => { + client.set(createKey(key), JSON.stringify(value)) + client.pexpire(createKey(key), expiry) + } + + const get = (key, callback) => { + client.get(createKey(key), (error, value) => { + callback(error, value && JSON.parse(value)) + }) + } + + const del = (key) => { + client.del(createKey(key)) + } + + return { set, get, del } +} + +const createMemoryCache = (options) => { + const cache = createLRUCache(options) + + const set = (key, value, expiry) => { + cache.set(key, value, expiry) + } + + const get = (key, callback) => { + callback(null, cache.get(key)) + } + + const del = (key) => { + cache.del(key) + } + + return { set, get, del } +} + +const RegistryCache = process.env.REDIS_URL + ? createRedisCache(process.env.REDIS_URL) + : createMemoryCache({ max: 1000 }) + +module.exports = RegistryCache diff --git a/server/middleware/RegistryUtils.js b/server/middleware/RegistryUtils.js new file mode 100644 index 0000000..b22c053 --- /dev/null +++ b/server/middleware/RegistryUtils.js @@ -0,0 +1,104 @@ +require('isomorphic-fetch') +const debug = require('debug') +const gunzip = require('gunzip-maybe') +const mkdirp = require('mkdirp') +const tar = require('tar-fs') +const RegistryCache = require('./RegistryCache') + +const log = debug('express-unpkg') + +const getPackageInfoFromRegistry = (registryURL, packageName) => { + let encodedPackageName + if (packageName.charAt(0) === '@') { + encodedPackageName = `@${encodeURIComponent(packageName.substring(1))}` + } else { + encodedPackageName = encodeURIComponent(packageName) + } + + const url = `${registryURL}/${encodedPackageName}` + + return fetch(url, { + headers: { 'Accept': 'application/json' } + }).then(response => ( + response.status === 404 ? null : response.json() + )) +} + +const OneMinute = 60 * 1000 +const PackageNotFound = 'PackageNotFound' + +const getPackageInfo = (registryURL, packageName, callback) => { + const cacheKey = registryURL + packageName + + RegistryCache.get(cacheKey, (error, value) => { + if (error) { + callback(error) + } else if (value) { + callback(null, value === PackageNotFound ? null : value) + } else { + log('Registry cache miss for package %s', packageName) + + getPackageInfoFromRegistry(registryURL, packageName).then(value => { + if (value == null) { + // Keep 404s in the cache for 5 minutes. This prevents us + // from making unnecessary requests to the registry for + // bad package names. In the worst case, a brand new + // package's info will be available within 5 minutes. + RegistryCache.set(cacheKey, PackageNotFound, OneMinute * 5) + } else { + RegistryCache.set(cacheKey, value, OneMinute) + } + + callback(null, value) + }, error => { + // Do not cache errors. + RegistryCache.del(cacheKey) + callback(error) + }) + } + }) +} + +const normalizeTarHeader = (header) => { + // Most packages have header names that look like "package/index.js" + // so we shorten that to just "index.js" here. A few packages use a + // prefix other than "package/". e.g. the firebase package uses the + // "firebase_npm/" prefix. So we just strip the first dir name. + header.name = header.name.replace(/^[^\/]+\//, '') + return header +} + +const getPackage = (tarballURL, outputDir, callback) => { + mkdirp(outputDir, (error) => { + if (error) { + callback(error) + } else { + let callbackWasCalled = false + + fetch(tarballURL).then(response => { + response.body + .pipe(gunzip()) + .pipe( + tar.extract(outputDir, { + dmode: 0o666, // All dirs should be writable + fmode: 0o444, // All files should be readable + map: normalizeTarHeader + }) + ) + .on('finish', callback) + .on('error', (error) => { + if (callbackWasCalled) // LOL node streams + return + + callbackWasCalled = true + callback(error) + }) + }) + } + }) +} + +module.exports = { + getPackageInfo, + getPackage +} diff --git a/server/middleware/ResponseUtils.js b/server/middleware/ResponseUtils.js new file mode 100644 index 0000000..ac37936 --- /dev/null +++ b/server/middleware/ResponseUtils.js @@ -0,0 +1,91 @@ +const fs = require('fs') +const etag = require('etag') +const { getContentType } = require('./FileUtils') + +const sendText = (res, statusCode, text) => { + res.writeHead(statusCode, { + 'Content-Type': 'text/plain', + 'Content-Length': text.length + }) + + res.end(text) +} + +const sendJSON = (res, json, maxAge = 0, statusCode = 200) => { + const text = JSON.stringify(json) + + res.writeHead(statusCode, { + 'Content-Type': 'application/json', + 'Content-Length': text.length, + 'Cache-Control': `public, max-age=${maxAge}` + }) + + res.end(text) +} + +const sendInvalidURLError = (res, url) => + sendText(res, 403, `Invalid URL: ${url}`) + +const sendNotFoundError = (res, what) => + sendText(res, 404, `Not found: ${what}`) + +const sendServerError = (res, error) => + sendText(res, 500, `Server error: ${error.message || error}`) + +const sendHTML = (res, html, maxAge = 0, statusCode = 200) => { + res.writeHead(statusCode, { + 'Content-Type': 'text/html', + 'Content-Length': html.length, + 'Cache-Control': `public, max-age=${maxAge}` + }) + + res.end(html) +} + +const sendRedirect = (res, relativeLocation, maxAge = 0, statusCode = 302) => { + const location = res.req && res.req.baseUrl ? res.req.baseUrl + relativeLocation : relativeLocation + + const html = `

You are being redirected to ${location}` + + res.writeHead(statusCode, { + 'Content-Type': 'text/html', + 'Content-Length': html.length, + 'Cache-Control': `public, max-age=${maxAge}`, + 'Location': location + }) + + res.end(html) +} + +const sendFile = (res, file, stats, maxAge = 0) => { + let contentType = getContentType(file) + + if (contentType === 'text/html') + contentType = 'text/plain' // We can't serve HTML because bad people :( + + res.writeHead(200, { + 'Content-Type': contentType, + 'Content-Length': stats.size, + 'Cache-Control': `public, max-age=${maxAge}`, + 'ETag': etag(stats) + }) + + const stream = fs.createReadStream(file) + + stream.on('error', (error) => { + sendServerError(res, error) + }) + + stream.pipe(res) +} + +module.exports = { + sendText, + sendJSON, + sendInvalidURLError, + sendNotFoundError, + sendServerError, + sendHTML, + sendRedirect, + sendFile +} diff --git a/server/middleware/StyleUtils.js b/server/middleware/StyleUtils.js new file mode 100644 index 0000000..362e01f --- /dev/null +++ b/server/middleware/StyleUtils.js @@ -0,0 +1,14 @@ +const fs = require('fs') +const path = require('path') +const csso = require('csso') + +const minifyCSS = (css) => + csso.minify(css).css + +const readCSS = (...args) => + minifyCSS(fs.readFileSync(path.resolve(...args), 'utf8')) + +module.exports = { + minifyCSS, + readCSS +} diff --git a/server/middleware/components/DirectoryListing.js b/server/middleware/components/DirectoryListing.js new file mode 100644 index 0000000..949ae22 --- /dev/null +++ b/server/middleware/components/DirectoryListing.js @@ -0,0 +1,50 @@ +const React = require('react') +const prettyBytes = require('pretty-bytes') +const { getContentType } = require('../FileUtils') + +const e = React.createElement + +const formatTime = (time) => + new Date(time).toISOString() + +const DirectoryListing = ({ dir, entries }) => { + const rows = entries.map(({ file, stats }, index) => { + const isDir = stats.isDirectory() + const href = file + (isDir ? '/' : '') + + return ( + e('tr', { key: file, className: index % 2 ? 'odd' : 'even' }, + e('td', null, e('a', { title: file, href }, file)), + e('td', null, isDir ? '-' : getContentType(file)), + e('td', null, isDir ? '-' : prettyBytes(stats.size)), + e('td', null, isDir ? '-' : formatTime(stats.mtime)) + ) + ) + }) + + if (dir !== '/') + rows.unshift( + e('tr', { key: '..', className: 'odd' }, + e('td', null, e('a', { title: 'Parent directory', href: '../' }, '..')), + e('td', null, '-'), + e('td', null, '-'), + e('td', null, '-') + ) + ) + + return ( + e('table', null, + e('thead', null, + e('tr', null, + e('th', null, 'Name'), + e('th', null, 'Type'), + e('th', null, 'Size'), + e('th', null, 'Last Modified') + ) + ), + e('tbody', null, rows) + ) + ) +} + +module.exports = DirectoryListing diff --git a/server/middleware/components/IndexPage.css b/server/middleware/components/IndexPage.css new file mode 100644 index 0000000..b093a52 --- /dev/null +++ b/server/middleware/components/IndexPage.css @@ -0,0 +1,39 @@ +body { + font-size: 16px; + font-family: -apple-system, + BlinkMacSystemFont, + "Segoe UI", + Roboto, + Helvetica, + Arial, + sans-serif; + line-height: 1.5; + padding: 0px 10px 5px; +} + +table { + width: 100%; + border-collapse: collapse; + font: 0.85em Monaco, monospace; +} +tr.even { + background-color: #eee; +} +th { + text-align: left; +} +th, td { + padding: 0.1em 0.25em; +} + +.version-wrapper { + line-height: 2.25em; + float: right; +} +#version { + font-size: 1em; +} + +address { + text-align: right; +} diff --git a/server/middleware/components/IndexPage.js b/server/middleware/components/IndexPage.js new file mode 100644 index 0000000..9be5a72 --- /dev/null +++ b/server/middleware/components/IndexPage.js @@ -0,0 +1,48 @@ +const semver = require('semver') +const React = require('react') +const PropTypes = require('prop-types') +const DirectoryListing = require('./DirectoryListing') +const { readCSS } = require('../StyleUtils') + +const e = React.createElement + +const IndexPageStyle = readCSS(__dirname, 'IndexPage.css') +const IndexPageScript = ` +var s = document.getElementById('version'), v = s.value +s.onchange = function () { + window.location.href = window.location.href.replace('@' + v, '@' + s.value) +} +` + +const byVersion = (a, b) => + semver.lt(a, b) ? -1 : (semver.gt(a, b) ? 1 : 0) + +const IndexPage = ({ packageInfo, version, dir, entries }) => { + const versions = Object.keys(packageInfo.versions).sort(byVersion) + const options = versions.map(v => ( + e('option', { key: v, value: v }, `${packageInfo.name}@${v}`) + )) + + return ( + e('html', null, + e('head', null, + e('meta', { charSet: 'utf-8' }), + e('title', null, `Index of ${dir}`), + e('style', { dangerouslySetInnerHTML: { __html: IndexPageStyle } }) + ), + e('body', null, + e('div', { className: 'version-wrapper' }, + e('select', { id: 'version', defaultValue: version }, options) + ), + e('h1', null, `Index of ${dir}`), + e('script', { dangerouslySetInnerHTML: { __html: IndexPageScript } }), + e('hr'), + e(DirectoryListing, { dir, entries }), + e('hr'), + e('address', null, `${packageInfo.name}@${version}`) + ) + ) + ) +} + +module.exports = IndexPage diff --git a/server/middleware/index.js b/server/middleware/index.js new file mode 100644 index 0000000..142e79a --- /dev/null +++ b/server/middleware/index.js @@ -0,0 +1,286 @@ +const http = require('http') +const tmpdir = require('os-tmpdir') +const { join: joinPaths } = require('path') +const { stat: statFile, readFile } = require('fs') +const { maxSatisfying: maxSatisfyingVersion } = require('semver') +const { parsePackageURL, createPackageURL } = require('./PackageUtils') +const { getPackageInfo, getPackage } = require('./RegistryUtils') +const { generateDirectoryIndexHTML } = require('./IndexUtils') +const { generateMetadata } = require('./MetadataUtils') +const { getFileType } = require('./FileUtils') +const { + sendNotFoundError, + sendInvalidURLError, + sendServerError, + sendRedirect, + sendFile, + sendText, + sendJSON, + sendHTML +} = require('./ResponseUtils') + +const OneMinute = 60 +const OneDay = OneMinute * 60 * 24 +const OneYear = OneDay * 365 + +const checkLocalCache = (dir, callback) => + statFile(joinPaths(dir, 'package.json'), (error, stats) => { + callback(stats && stats.isFile()) + }) + +const ResolveExtensions = [ '', '.js', '.json' ] + +const createTempPath = (name) => + joinPaths(tmpdir(), `express-unpkg-${name}`) + +/** + * Resolves a path like "lib/file" into "lib/file.js" or + * "lib/file.json" depending on which one is available, similar + * to how require('lib/file') does. + */ +const resolveFile = (path, useIndex, callback) => { + ResolveExtensions.reduceRight((next, ext) => { + const file = path + ext + + return () => { + statFile(file, (error, stats) => { + if (error) { + if (error.code === 'ENOENT' || error.code === 'ENOTDIR') { + next() + } else { + callback(error) + } + } else if (useIndex && stats.isDirectory()) { + resolveFile(joinPaths(file, 'index'), false, (error, indexFile, indexStats) => { + if (error) { + callback(error) + } else if (indexFile) { + callback(null, indexFile, indexStats) + } else { + next() + } + }) + } else { + callback(null, file, stats) + } + }) + } + }, callback)() +} + +/** + * Creates and returns a function that can be used in the "request" + * event of a standard node HTTP server. Options are: + * + * - registryURL The URL of the npm registry (defaults to https://registry.npmjs.org) + * - redirectTTL The TTL (in seconds) for redirects (defaults to 0) + * - autoIndex Automatically generate index HTML pages for directories (defaults to true) + * + * Supported URL schemes are: + * + * /history@1.12.5/umd/History.min.js (recommended) + * /history@1.12.5 (package.json's main is implied) + * + * Additionally, the following URLs are supported but will return a + * temporary (302) redirect: + * + * /history (redirects to version, latest is implied) + * /history/umd/History.min.js (redirects to version, latest is implied) + * /history@latest/umd/History.min.js (redirects to version) + * /history@^1/umd/History.min.js (redirects to max satisfying version) + */ +const createRequestHandler = (options = {}) => { + const registryURL = options.registryURL || 'https://registry.npmjs.org' + const redirectTTL = options.redirectTTL || 0 + const autoIndex = options.autoIndex !== false + const maximumDepth = options.maximumDepth || Number.MAX_VALUE + const blacklist = options.blacklist || [] + + const handleRequest = (req, res) => { + let url + try { + url = parsePackageURL(req.url) + } catch (error) { + return sendInvalidURLError(res, req.url) + } + + if (url == null) + return sendInvalidURLError(res, req.url) + + const { pathname, search, query, packageName, version, filename } = url + const displayName = `${packageName}@${version}` + + const isBlacklisted = blacklist.indexOf(packageName) !== -1 + + if (isBlacklisted) + return sendText(res, 403, `Package ${packageName} is blacklisted`) + + // Step 1: Fetch the package from the registry and store a local copy. + // Redirect if the URL does not specify an exact version number. + const fetchPackage = (next) => { + const packageDir = createTempPath(displayName) + + checkLocalCache(packageDir, (isCached) => { + if (isCached) + return next(packageDir) // Best case: we already have this package on disk. + + // Fetch package info from NPM registry. + getPackageInfo(registryURL, packageName, (error, packageInfo) => { + if (error) + return sendServerError(res, error) + + if (packageInfo == null) + return sendNotFoundError(res, `package "${packageName}"`) + + if (packageInfo.versions == null) + return sendServerError(res, new Error(`Unable to retrieve info for package ${packageName}`)) + + const { versions, 'dist-tags': tags } = packageInfo + + if (version in versions) { + // A valid request for a package we haven't downloaded yet. + const packageConfig = versions[version] + const tarballURL = packageConfig.dist.tarball + + getPackage(tarballURL, packageDir, (error) => { + if (error) { + sendServerError(res, error) + } else { + next(packageDir) + } + }) + } else if (version in tags) { + sendRedirect(res, createPackageURL(packageName, tags[version], filename, search), redirectTTL) + } else { + const maxVersion = maxSatisfyingVersion(Object.keys(versions), version) + + if (maxVersion) { + sendRedirect(res, createPackageURL(packageName, maxVersion, filename, search), redirectTTL) + } else { + sendNotFoundError(res, `package ${displayName}`) + } + } + }) + }) + } + + // Step 2: Determine which file we're going to serve and get its stats. + // Redirect if the request targets a directory with no trailing slash. + const findFile = (packageDir, next) => { + if (filename) { + const path = joinPaths(packageDir, filename) + + // Based on the URL, figure out which file they want. + resolveFile(path, false, (error, file, stats) => { + if (error) { + sendServerError(res, error) + } else if (file == null) { + sendNotFoundError(res, `file "${filename}" in package ${displayName}`) + } else if (stats.isDirectory() && pathname[pathname.length - 1] !== '/') { + // Append `/` to directory URLs + sendRedirect(res, pathname + '/' + search, OneYear) + } else { + next(file.replace(packageDir, ''), stats) + } + }) + } else { + // No filename in the URL. Try to serve the package's "main" file. + readFile(joinPaths(packageDir, 'package.json'), 'utf8', (error, data) => { + if (error) + return sendServerError(res, error) + + let packageConfig + try { + packageConfig = JSON.parse(data) + } catch (error) { + return sendText(res, 500, `Error parsing ${displayName}/package.json: ${error.message}`) + } + + let mainFilename + const queryMain = query && query.main + + if (queryMain) { + if (!(queryMain in packageConfig)) + return sendNotFoundError(res, `field "${queryMain}" in ${displayName}/package.json`) + + mainFilename = packageConfig[queryMain] + } else { + if (typeof packageConfig.unpkg === 'string') { + // The "unpkg" field allows packages to explicitly declare the + // file to serve at the bare URL (see #59). + mainFilename = packageConfig.unpkg + } else if (typeof packageConfig.browser === 'string') { + // Fall back to the "browser" field if declared (only support strings). + mainFilename = packageConfig.browser + } else { + // If there is no main, use "index" (same as npm). + mainFilename = packageConfig.main || 'index' + } + } + + resolveFile(joinPaths(packageDir, mainFilename), true, (error, file, stats) => { + if (error) { + sendServerError(res, error) + } else if (file == null) { + sendNotFoundError(res, `main file "${mainFilename}" in package ${displayName}`) + } else { + next(file.replace(packageDir, ''), stats) + } + }) + }) + } + } + + // Step 3: Send the file, JSON metadata, or HTML directory listing. + const serveFile = (baseDir, path, stats) => { + if (query.json != null) { + generateMetadata(baseDir, path, stats, maximumDepth, (error, metadata) => { + if (metadata) { + sendJSON(res, metadata, OneYear) + } else { + sendServerError(res, `unable to generate JSON metadata for ${displayName}${filename}`) + } + }) + } else if (stats.isFile()) { + sendFile(res, joinPaths(baseDir, path), stats, OneYear) + } else if (autoIndex && stats.isDirectory()) { + getPackageInfo(registryURL, packageName, (error, packageInfo) => { + if (error) { + sendServerError(res, `unable to generate index page for ${displayName}${filename}`) + } else { + generateDirectoryIndexHTML(packageInfo, version, baseDir, path, (error, html) => { + if (html) { + sendHTML(res, html, OneYear) + } else { + sendServerError(res, `unable to generate index page for ${displayName}${filename}`) + } + }) + } + }) + } else { + sendInvalidURLError(res, `${displayName}${filename} is a ${getFileType(stats)}`) + } + } + + fetchPackage(packageDir => { + findFile(packageDir, (file, stats) => { + serveFile(packageDir, file, stats) + }) + }) + } + + return handleRequest +} + +/** + * Creates and returns an HTTP server that serves files from NPM packages. + */ +const createServer = (options) => + http.createServer( + createRequestHandler(options) + ) + +module.exports = { + createRequestHandler, + createServer +} diff --git a/yarn.lock b/yarn.lock index 7fa6bad..572817d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,16 +2,6 @@ # yarn lockfile v1 -"@types/jsonwebtoken@^7.1.33": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-7.2.0.tgz#0fed32c8501da80ac9839d2d403a65c83d776ffd" - dependencies: - "@types/node" "*" - -"@types/node@*": - version "7.0.18" - resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.18.tgz#cd67f27d3dc0cfb746f0bdd5e086c4c5d55be173" - abab@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d" @@ -44,8 +34,8 @@ acorn@^3.0.0, acorn@^3.0.4: resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" acorn@^4.0.4: - version "4.0.11" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0" + version "4.0.13" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" acorn@^5.0.1: version "5.0.3" @@ -213,8 +203,8 @@ async@^1.3.0, async@^1.4.0, async@^1.5.0: resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" async@^2.1.4: - version "2.4.0" - resolved "https://registry.yarnpkg.com/async/-/async-2.4.0.tgz#4990200f18ea5b837c2cc4f8c031a6985c385611" + version "2.4.1" + resolved "https://registry.yarnpkg.com/async/-/async-2.4.1.tgz#62a56b279c98a11d0987096a01cc3eeb8eb7bbd7" dependencies: lodash "^4.14.0" @@ -903,10 +893,6 @@ base64-js@^1.0.2: version "1.2.0" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1" -base64url@2.0.0, base64url@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/base64url/-/base64url-2.0.0.tgz#eac16e03ea1438eff9423d69baa36262ed1f70bb" - basic-auth@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-1.1.0.tgz#45221ee429f7ee1e5035be3f51533f1cdfd29884" @@ -1001,10 +987,6 @@ bser@1.0.2: dependencies: node-int64 "^0.4.0" -buffer-equal-constant-time@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819" - buffer-shims@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51" @@ -1072,8 +1054,8 @@ caniuse-api@^1.5.2: lodash.uniq "^4.5.0" caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000618, caniuse-db@^1.0.30000639: - version "1.0.30000670" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000670.tgz#90d33b79e3090e25829c311113c56d6b1788bf43" + version "1.0.30000671" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000671.tgz#9f071bbc7b96994638ccbaf47829d58a1577a8ed" cardinal@^1.0.0: version "1.0.0" @@ -1194,8 +1176,8 @@ co@^4.6.0: resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" coa@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.1.tgz#7f959346cfc8719e3f7233cd6852854a7c67d8a3" + version "1.0.2" + resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.2.tgz#2ba9fec3b4aa43d7a49d7e6c3561e92061b6bcec" dependencies: q "^1.1.2" @@ -1429,14 +1411,6 @@ css-select@^1.1.0: domutils "1.5.1" nth-check "~1.0.1" -css-selector-tokenizer@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.6.0.tgz#6445f582c7930d241dcc5007a43d6fcb8f073152" - dependencies: - cssesc "^0.1.0" - fastparse "^1.1.1" - regexpu-core "^1.0.0" - css-selector-tokenizer@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86" @@ -1445,6 +1419,12 @@ css-selector-tokenizer@^0.7.0: fastparse "^1.1.1" regexpu-core "^1.0.0" +css-tree@1.0.0-alpha19: + version "1.0.0-alpha19" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha19.tgz#949aa846c2c15b3979792e8fce05f6b6e3ebcad4" + dependencies: + source-map "^0.5.3" + css-what@2.1: version "2.1.0" resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd" @@ -1490,7 +1470,13 @@ cssesc@^0.1.0: postcss-value-parser "^3.2.3" postcss-zindex "^2.0.1" -csso@^2.0.0, csso@~2.3.1: +csso@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/csso/-/csso-3.1.1.tgz#ab427584486c2e02e180327511b0b02a9179c272" + dependencies: + css-tree "1.0.0-alpha19" + +csso@~2.3.1: version "2.3.2" resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85" dependencies: @@ -1537,19 +1523,13 @@ debug@2.2.0, debug@~2.2.0: dependencies: ms "0.7.1" -debug@2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.1.tgz#79855090ba2c4e3115cc7d8769491d58f0491351" - dependencies: - ms "0.7.2" - debug@2.6.7: version "2.6.7" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.7.tgz#92bad1f6d05bbb6bba22cca88bcd0ec894c2861e" dependencies: ms "2.0.0" -debug@^2.1.0, debug@^2.1.1, debug@^2.2.0, debug@^2.6.0, debug@^2.6.3, debug@^2.6.6: +debug@2.6.8, debug@^2.1.0, debug@^2.1.1, debug@^2.2.0, debug@^2.6.0, debug@^2.6.3, debug@^2.6.6, debug@^2.6.8: version "2.6.8" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc" dependencies: @@ -1699,13 +1679,6 @@ ecc-jsbn@~0.1.1: dependencies: jsbn "~0.1.0" -ecdsa-sig-formatter@1.0.9: - version "1.0.9" - resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz#4bc926274ec3b5abb5016e7e1d60921ac262b2a1" - dependencies: - base64url "^2.0.0" - safe-buffer "^5.0.1" - ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" @@ -1769,8 +1742,8 @@ error-ex@^1.2.0: is-arrayish "^0.2.1" es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14: - version "0.10.20" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.20.tgz#72a9b4fd5832797ba1bb65dceb2e25c04241c492" + version "0.10.21" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.21.tgz#19a725f9e51d0300bbc1e8e821109fd9daf55925" dependencies: es6-iterator "2" es6-symbol "~3.1" @@ -2002,7 +1975,7 @@ esutils@^2.0.0, esutils@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" -etag@^1.7.0, etag@~1.8.0: +etag@^1.8.0, etag@~1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.0.tgz#6f631aef336d6c46362b51764044ce216be3c051" @@ -2049,27 +2022,6 @@ expand-range@^1.8.1: dependencies: fill-range "^2.1.0" -express-unpkg@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/express-unpkg/-/express-unpkg-2.0.1.tgz#85e6a0cfbfbecd946de1b0eba4180809df7c5f47" - dependencies: - csso "^2.0.0" - debug "^2.2.0" - etag "^1.7.0" - gunzip-maybe "^1.2.1" - isomorphic-fetch "^2.2.1" - lru-cache "^4.0.1" - mime "^1.3.4" - mkdirp "^0.5.1" - os-tmpdir "^1.0.1" - pretty-bytes "^4.0.2" - prop-types "^15.5.8" - react "^15.5.4" - react-dom "^15.5.4" - redis "^2.6.2" - semver "^5.0.3" - tar-fs "^1.8.1" - express@^4.13.3, express@^4.15.2: version "4.15.3" resolved "https://registry.yarnpkg.com/express/-/express-4.15.3.tgz#bab65d0f03aa80c358408972fc700f916944b662" @@ -2133,12 +2085,6 @@ fastparse@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8" -faye-websocket@0.9.3: - version "0.9.3" - resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.9.3.tgz#482a505b0df0ae626b969866d3bd740cdb962e83" - dependencies: - websocket-driver ">=0.5.1" - faye-websocket@^0.10.0: version "0.10.0" resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4" @@ -2247,14 +2193,6 @@ find-up@^1.0.0, find-up@^1.1.2: path-exists "^2.0.0" pinkie-promise "^2.0.0" -firebase-admin@^4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/firebase-admin/-/firebase-admin-4.2.1.tgz#91794bfc214ee21decc765d308411166a05c0b20" - dependencies: - "@types/jsonwebtoken" "^7.1.33" - faye-websocket "0.9.3" - jsonwebtoken "7.1.9" - flat-cache@^1.2.1: version "1.2.2" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.2.2.tgz#fa86714e72c21db88601761ecf2f555d1abc6b96" @@ -2387,13 +2325,13 @@ glob-parent@^2.0.0: is-glob "^2.0.0" glob@^7.0.0, glob@^7.0.3, glob@^7.0.5: - version "7.1.1" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8" + version "7.1.2" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" inherits "2" - minimatch "^3.0.2" + minimatch "^3.0.4" once "^1.3.0" path-is-absolute "^1.0.0" @@ -2424,7 +2362,7 @@ growly@^1.2.0: version "1.3.0" resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" -gunzip-maybe@^1.2.1, gunzip-maybe@^1.4.0: +gunzip-maybe@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/gunzip-maybe/-/gunzip-maybe-1.4.0.tgz#7d8316c8d0571e1d08a5a79e46fff0afe8172b19" dependencies: @@ -2442,8 +2380,8 @@ gzip-size@3.0.0: duplexer "^0.1.1" handlebars@^4.0.3: - version "4.0.8" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.8.tgz#22b875cd3f0e6cbea30314f144e82bc7a72ff420" + version "4.0.10" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.10.tgz#3d30c718b09a3d96f23ea4cc1f403c4d3ba9ff4f" dependencies: async "^1.4.0" optimist "^0.6.1" @@ -2549,8 +2487,8 @@ html-loader@^0.4.5: object-assign "^4.1.0" html-minifier@^3.0.1, html-minifier@^3.1.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.0.tgz#98be1b18f87443592722f654e67a1541f22018cb" + version "3.5.2" + resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.2.tgz#d73bc3ff448942408818ce609bf3fb0ea7ef4eb7" dependencies: camel-case "3.0.x" clean-css "4.1.x" @@ -2641,9 +2579,9 @@ iconv-lite@~0.4.13: version "0.4.17" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.17.tgz#4fdaa3b38acbc2c031b045d0edcdfe1ecab18c8d" -icss-replace-symbols@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.0.2.tgz#cb0b6054eb3af6edc9ab1d62d01933e2d4c8bfa5" +icss-replace-symbols@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded" ieee754@^1.1.4: version "1.1.8" @@ -2895,10 +2833,6 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" -isemail@1.x.x: - version "1.2.0" - resolved "https://registry.yarnpkg.com/isemail/-/isemail-1.2.0.tgz#be03df8cc3e29de4d2c5df6501263f1fa4595e9a" - isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -3171,15 +3105,6 @@ jodid25519@^1.0.0: dependencies: jsbn "~0.1.0" -joi@^6.10.1: - version "6.10.1" - resolved "https://registry.yarnpkg.com/joi/-/joi-6.10.1.tgz#4d50c318079122000fe5f16af1ff8e1917b77e06" - dependencies: - hoek "2.x.x" - isemail "1.x.x" - moment "2.x.x" - topo "1.x.x" - js-base64@^2.1.9: version "2.1.9" resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce" @@ -3278,16 +3203,6 @@ jsonpointer@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9" -jsonwebtoken@7.1.9: - version "7.1.9" - resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-7.1.9.tgz#847804e5258bec5a9499a8dc4a5e7a3bae08d58a" - dependencies: - joi "^6.10.1" - jws "^3.1.3" - lodash.once "^4.0.0" - ms "^0.7.1" - xtend "^4.0.1" - jsprim@^1.2.2: version "1.4.0" resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918" @@ -3301,23 +3216,6 @@ jsx-ast-utils@^1.0.0, jsx-ast-utils@^1.3.1: version "1.4.1" resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz#3867213e8dd79bf1e8f2300c0cfc1efb182c0df1" -jwa@^1.1.4: - version "1.1.5" - resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.1.5.tgz#a0552ce0220742cd52e153774a32905c30e756e5" - dependencies: - base64url "2.0.0" - buffer-equal-constant-time "1.0.1" - ecdsa-sig-formatter "1.0.9" - safe-buffer "^5.0.1" - -jws@^3.1.3: - version "3.1.4" - resolved "https://registry.yarnpkg.com/jws/-/jws-3.1.4.tgz#f9e8b9338e8a847277d6444b1464f61880e050a2" - dependencies: - base64url "^2.0.0" - jwa "^1.1.4" - safe-buffer "^5.0.1" - kind-of@^3.0.2: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" @@ -3459,10 +3357,6 @@ lodash.memoize@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" -lodash.once@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" - lodash.pickby@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.pickby/-/lodash.pickby-4.6.0.tgz#7dea21d8c18d7703a27c704c15d3b84a67e33aff" @@ -3489,7 +3383,7 @@ lower-case@^1.1.1: version "1.1.4" resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" -lru-cache@^4.0.1: +lru-cache@^4.0.1, lru-cache@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e" dependencies: @@ -3605,7 +3499,7 @@ mime@1.3.4: version "1.3.4" resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53" -mime@^1.3.4: +mime@^1.3.4, mime@^1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0" @@ -3615,7 +3509,7 @@ minimatch@3.0.3: dependencies: brace-expansion "^1.0.0" -minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3: +minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" dependencies: @@ -3635,16 +3529,12 @@ minimist@^1.1.1, minimist@^1.2.0: dependencies: minimist "0.0.8" -moment@2.x.x: - version "2.18.1" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f" - morgan@^1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.8.1.tgz#f93023d3887bd27b78dfd6023cea7892ee27a4b1" + version "1.8.2" + resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.8.2.tgz#784ac7734e4a453a9c6e6e8680a9329275c8b687" dependencies: basic-auth "~1.1.0" - debug "2.6.1" + debug "2.6.8" depd "~1.1.0" on-finished "~2.3.0" on-headers "~1.0.1" @@ -3653,10 +3543,6 @@ ms@0.7.1: version "0.7.1" resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098" -ms@0.7.2, ms@^0.7.1: - version "0.7.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765" - ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" @@ -3705,8 +3591,8 @@ node-emoji@^1.4.1: string.prototype.codepointat "^0.2.0" node-fetch@^1.0.1: - version "1.6.3" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.6.3.tgz#dc234edd6489982d58e8f0db4f695029abcd8c04" + version "1.7.0" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.0.tgz#3ff6c56544f9b7fb00682338bb55ee6f54a8a0ef" dependencies: encoding "^0.1.11" is-stream "^1.0.1" @@ -3828,8 +3714,8 @@ number-is-nan@^1.0.0: resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" "nwmatcher@>= 1.3.9 < 2.0.0": - version "1.3.9" - resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.3.9.tgz#8bab486ff7fa3dfd086656bbe8b17116d3692d2a" + version "1.4.0" + resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.0.tgz#b4389362170e7ef9798c3c7716d80ebc0106fccf" oauth-sign@~0.8.1: version "0.8.2" @@ -3921,7 +3807,7 @@ os-locale@^1.4.0: dependencies: lcid "^1.0.0" -os-tmpdir@^1.0.0, os-tmpdir@^1.0.1: +os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" @@ -4209,31 +4095,31 @@ postcss-minify-selectors@^2.0.4: postcss-selector-parser "^2.0.0" postcss-modules-extract-imports@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.0.1.tgz#8fb3fef9a6dd0420d3f6d4353cf1ff73f2b2a341" + version "1.2.0" + resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85" dependencies: - postcss "^5.0.4" + postcss "^6.0.1" postcss-modules-local-by-default@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.1.1.tgz#29a10673fa37d19251265ca2ba3150d9040eb4ce" + version "1.2.0" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069" dependencies: - css-selector-tokenizer "^0.6.0" - postcss "^5.0.4" + css-selector-tokenizer "^0.7.0" + postcss "^6.0.1" postcss-modules-scope@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.0.2.tgz#ff977395e5e06202d7362290b88b1e8cd049de29" + version "1.1.0" + resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90" dependencies: - css-selector-tokenizer "^0.6.0" - postcss "^5.0.4" + css-selector-tokenizer "^0.7.0" + postcss "^6.0.1" postcss-modules-values@^1.1.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.2.2.tgz#f0e7d476fe1ed88c5e4c7f97533a3e772ad94ca1" + version "1.3.0" + resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20" dependencies: - icss-replace-symbols "^1.0.2" - postcss "^5.0.14" + icss-replace-symbols "^1.1.0" + postcss "^6.0.1" postcss-normalize-charset@^1.1.0: version "1.1.1" @@ -4324,6 +4210,14 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0 source-map "^0.5.6" supports-color "^3.2.3" +postcss@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.1.tgz#000dbd1f8eef217aa368b9a212c5fc40b2a8f3f2" + dependencies: + chalk "^1.1.3" + source-map "^0.5.6" + supports-color "^3.2.3" + prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -4342,10 +4236,6 @@ pretty-bytes@^3: dependencies: number-is-nan "^1.0.0" -pretty-bytes@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-4.0.2.tgz#b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9" - pretty-error@^2.0.2: version "2.1.0" resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.0.tgz#87f4e9d706a24c87d6cbee9fabec001fcf8c75d8" @@ -4644,7 +4534,7 @@ redis-parser@^2.5.0: version "2.6.0" resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-2.6.0.tgz#52ed09dacac108f1a631c07e9b69941e7a19504b" -redis@^2.6.2, redis@^2.7.1: +redis@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/redis/-/redis-2.7.1.tgz#7d56f7875b98b20410b71539f1d878ed58ebf46a" dependencies: @@ -4867,7 +4757,7 @@ sax@^1.2.1, sax@~1.2.1: version "1.2.2" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828" -"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0: +"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" @@ -5201,7 +5091,7 @@ tapable@^0.1.8, tapable@~0.1.8: version "0.1.10" resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.1.10.tgz#29c35707c2b70e50d07482b5d202e8ed446dafd4" -tar-fs@^1.8.1: +tar-fs@^1.15.2: version "1.15.2" resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.15.2.tgz#761f5b32932c7b39461a60d537faea0d8084830c" dependencies: @@ -5293,12 +5183,6 @@ to-fast-properties@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" -topo@1.x.x: - version "1.1.0" - resolved "https://registry.yarnpkg.com/topo/-/topo-1.1.0.tgz#e9d751615d1bb87dc865db182fa1ca0a5ef536d5" - dependencies: - hoek "2.x.x" - toposort@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.3.tgz#f02cd8a74bd8be2fc0e98611c3bacb95a171869c" @@ -5357,8 +5241,8 @@ ua-parser-js@^0.7.9: resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb" uglify-js@3.0.x: - version "3.0.9" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.9.tgz#974c5e638f5e2348f8509f0233667caedd52d813" + version "3.0.11" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.11.tgz#81f594b9a24dad76e39da92f8f06e5b3bc8c2e11" dependencies: commander "~2.9.0" source-map "~0.5.1" @@ -5692,7 +5576,7 @@ xml-name-validator@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635" -"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1: +"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"