Skip to content

Commit

Permalink
Merge pull request #262 from conveyal/dev
Browse files Browse the repository at this point in the history
v5.0.0
  • Loading branch information
trevorgerhardt authored Mar 6, 2019
2 parents 9a18124 + bf525af commit 47ab400
Show file tree
Hide file tree
Showing 4 changed files with 3,875 additions and 2,761 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cache:
notifications:
email: false
node_js:
- '8'
- '10'
before_install:
- npm i -g codecov yarn
install:
Expand Down
4 changes: 2 additions & 2 deletions lib/flyle.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const fs = require('fs')
const http = require('http')
const https = require('https')
const path = require('path')
const parse = require('url').parse
const URL = require('url').URL

const concat = require('concat-stream')
const mkdirp = require('mkdirp')
Expand All @@ -13,7 +13,7 @@ const DEFAULT_CACHE_DIRECTORY = `${process.env.HOME}/.flyle`
const DEFAULT_PNG = path.resolve(__dirname, '../mastarm.png')

module.exports = function (req, res) {
const url = parse(req.url, true).query.url
const url = new URL(req.url).searchParams.get('url')
const isHttps = url.indexOf('https') !== -1
const get = isHttps ? https.get : http.get
const filePath = isHttps ? url.split('https://')[1] : url.split('http://')[1]
Expand Down
90 changes: 45 additions & 45 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Conveyal JavaScript development toolbelt.",
"main": "bin/mastarm",
"engines": {
"node": ">=8",
"node": ">=10",
"npm": ">=5"
},
"bin": {
Expand Down Expand Up @@ -43,80 +43,80 @@
},
"homepage": "https://github.com/conveyal/mastarm",
"dependencies": {
"@babel/core": "^7.0.0",
"@babel/plugin-proposal-class-properties": "^7.0.0",
"@babel/plugin-proposal-export-namespace-from": "^7.0.0",
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
"@babel/plugin-transform-react-display-name": "^7.0.0",
"@babel/polyfill": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/core": "^7.3.4",
"@babel/plugin-proposal-class-properties": "^7.3.4",
"@babel/plugin-proposal-export-namespace-from": "^7.2.0",
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
"@babel/plugin-transform-react-display-name": "^7.2.0",
"@babel/polyfill": "^7.2.5",
"@babel/preset-env": "^7.3.4",
"@babel/preset-flow": "^7.0.0",
"@babel/preset-react": "^7.0.0",
"@babel/runtime": "^7.0.0",
"aws-sdk": "^2.311.0",
"@babel/runtime": "^7.3.4",
"aws-sdk": "^2.414.0",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "^9.0.0",
"babel-jest": "^23.4.2",
"babel-plugin-add-module-exports": "^0.2.1",
"babel-eslint": "^10.0.1",
"babel-jest": "^24.1.0",
"babel-plugin-add-module-exports": "^1.0.0",
"babel-plugin-istanbul": "^5.1.0",
"babel-plugin-lodash": "^3.3.4",
"babel-plugin-react-require": "^3.0.0",
"babel-plugin-react-require": "^3.1.1",
"babelify": "^10.0.0",
"browserify": "^16.2.2",
"browserify": "^16.2.3",
"browserify-markdown": "2.0.1",
"budo": "^11.3.2",
"caniuse-lite": "^1.0.30000885",
"chokidar": "^2.0.4",
"commander": "^2.18.0",
"commitizen": "^2.10.1",
"concat-stream": "^1.6.2",
"cssnano": "^4.1.0",
"budo": "^11.6.1",
"caniuse-lite": "^1.0.30000941",
"chokidar": "^2.1.2",
"commander": "^2.19.0",
"commitizen": "^3.0.7",
"concat-stream": "^2.0.0",
"cssnano": "^4.1.10",
"cz-conventional-changelog": "^2.1.0",
"envify": "^4.1.0",
"errorify": "^0.3.1",
"eslint": "^5.5.0",
"eslint": "^5.15.1",
"eslint-config-standard": "^12.0.0",
"eslint-config-standard-jsx": "^6.0.2",
"eslint-plugin-flowtype": "^2.50.0",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-jest": "^21.22.0",
"eslint-plugin-jsx-a11y": "^6.1.1",
"eslint-plugin-node": "^7.0.1",
"eslint-plugin-flowtype": "^3.4.2",
"eslint-plugin-import": "^2.16.0",
"eslint-plugin-jest": "^22.3.0",
"eslint-plugin-jsx-a11y": "^6.2.1",
"eslint-plugin-node": "^8.0.1",
"eslint-plugin-promise": "^4.0.1",
"eslint-plugin-react": "^7.11.1",
"eslint-plugin-react": "^7.12.4",
"eslint-plugin-standard": "^4.0.0",
"exorcist": "^1.0.1",
"flow-bin": "^0.80.0",
"flow-bin": "^0.94.0",
"flow-runtime": "^0.17.0",
"glob": "^7.1.3",
"isomorphic-fetch": "^2.2.1",
"jest": "^23.5.0",
"jest": "^24.1.0",
"jest-yaml-transform": "^0.2.0",
"lodash.uniq": "^4.5.0",
"middleware-proxy": "^2.0.2",
"mime": "^2.3.1",
"middleware-proxy": "^2.0.5",
"mime": "^2.4.0",
"mkdirp": "^0.5.1",
"node-emoji": "^1.8.1",
"postcss": "^7.0.2",
"postcss-import": "^12.0.0",
"postcss-preset-env": "^5.3.0",
"postcss-reporter": "^6.0.0",
"node-emoji": "^1.10.0",
"postcss": "^7.0.14",
"postcss-import": "^12.0.1",
"postcss-preset-env": "^6.6.0",
"postcss-reporter": "^6.0.1",
"postcss-safe-parser": "^4.0.1",
"prettier-eslint-cli": "^4.7.1",
"rimraf": "^2.6.2",
"rimraf": "^2.6.3",
"slack-node": "^0.1.8",
"this-commit": "^1.0.0",
"through2": "^2.0.3",
"through2": "^3.0.1",
"uglifyify": "^5.0.1",
"username": "^4.0.0",
"username": "^4.1.0",
"uuid": "^3.3.2",
"watchify": "^3.11.0",
"watchify": "^3.11.1",
"yamljs": "^0.3.0"
},
"devDependencies": {
"bootstrap": "^4.1.3",
"react": "^16.5.0",
"semantic-release": "^15.9.14"
"bootstrap": "^4.3.1",
"react": "^16.8.3",
"semantic-release": "^15.13.3"
},
"standard": {
"parser": "babel-eslint"
Expand Down
Loading

0 comments on commit 47ab400

Please sign in to comment.