Skip to content

Commit 47ab400

Browse files
Merge pull request #262 from conveyal/dev
v5.0.0
2 parents 9a18124 + bf525af commit 47ab400

File tree

4 files changed

+3875
-2761
lines changed

4 files changed

+3875
-2761
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ cache:
66
notifications:
77
email: false
88
node_js:
9-
- '8'
9+
- '10'
1010
before_install:
1111
- npm i -g codecov yarn
1212
install:

lib/flyle.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const fs = require('fs')
22
const http = require('http')
33
const https = require('https')
44
const path = require('path')
5-
const parse = require('url').parse
5+
const URL = require('url').URL
66

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

1515
module.exports = function (req, res) {
16-
const url = parse(req.url, true).query.url
16+
const url = new URL(req.url).searchParams.get('url')
1717
const isHttps = url.indexOf('https') !== -1
1818
const get = isHttps ? https.get : http.get
1919
const filePath = isHttps ? url.split('https://')[1] : url.split('http://')[1]

package.json

+45-45
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Conveyal JavaScript development toolbelt.",
44
"main": "bin/mastarm",
55
"engines": {
6-
"node": ">=8",
6+
"node": ">=10",
77
"npm": ">=5"
88
},
99
"bin": {
@@ -43,80 +43,80 @@
4343
},
4444
"homepage": "https://github.com/conveyal/mastarm",
4545
"dependencies": {
46-
"@babel/core": "^7.0.0",
47-
"@babel/plugin-proposal-class-properties": "^7.0.0",
48-
"@babel/plugin-proposal-export-namespace-from": "^7.0.0",
49-
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
50-
"@babel/plugin-transform-react-display-name": "^7.0.0",
51-
"@babel/polyfill": "^7.0.0",
52-
"@babel/preset-env": "^7.0.0",
46+
"@babel/core": "^7.3.4",
47+
"@babel/plugin-proposal-class-properties": "^7.3.4",
48+
"@babel/plugin-proposal-export-namespace-from": "^7.2.0",
49+
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
50+
"@babel/plugin-transform-react-display-name": "^7.2.0",
51+
"@babel/polyfill": "^7.2.5",
52+
"@babel/preset-env": "^7.3.4",
5353
"@babel/preset-flow": "^7.0.0",
5454
"@babel/preset-react": "^7.0.0",
55-
"@babel/runtime": "^7.0.0",
56-
"aws-sdk": "^2.311.0",
55+
"@babel/runtime": "^7.3.4",
56+
"aws-sdk": "^2.414.0",
5757
"babel-core": "^7.0.0-bridge.0",
58-
"babel-eslint": "^9.0.0",
59-
"babel-jest": "^23.4.2",
60-
"babel-plugin-add-module-exports": "^0.2.1",
58+
"babel-eslint": "^10.0.1",
59+
"babel-jest": "^24.1.0",
60+
"babel-plugin-add-module-exports": "^1.0.0",
6161
"babel-plugin-istanbul": "^5.1.0",
6262
"babel-plugin-lodash": "^3.3.4",
63-
"babel-plugin-react-require": "^3.0.0",
63+
"babel-plugin-react-require": "^3.1.1",
6464
"babelify": "^10.0.0",
65-
"browserify": "^16.2.2",
65+
"browserify": "^16.2.3",
6666
"browserify-markdown": "2.0.1",
67-
"budo": "^11.3.2",
68-
"caniuse-lite": "^1.0.30000885",
69-
"chokidar": "^2.0.4",
70-
"commander": "^2.18.0",
71-
"commitizen": "^2.10.1",
72-
"concat-stream": "^1.6.2",
73-
"cssnano": "^4.1.0",
67+
"budo": "^11.6.1",
68+
"caniuse-lite": "^1.0.30000941",
69+
"chokidar": "^2.1.2",
70+
"commander": "^2.19.0",
71+
"commitizen": "^3.0.7",
72+
"concat-stream": "^2.0.0",
73+
"cssnano": "^4.1.10",
7474
"cz-conventional-changelog": "^2.1.0",
7575
"envify": "^4.1.0",
7676
"errorify": "^0.3.1",
77-
"eslint": "^5.5.0",
77+
"eslint": "^5.15.1",
7878
"eslint-config-standard": "^12.0.0",
7979
"eslint-config-standard-jsx": "^6.0.2",
80-
"eslint-plugin-flowtype": "^2.50.0",
81-
"eslint-plugin-import": "^2.14.0",
82-
"eslint-plugin-jest": "^21.22.0",
83-
"eslint-plugin-jsx-a11y": "^6.1.1",
84-
"eslint-plugin-node": "^7.0.1",
80+
"eslint-plugin-flowtype": "^3.4.2",
81+
"eslint-plugin-import": "^2.16.0",
82+
"eslint-plugin-jest": "^22.3.0",
83+
"eslint-plugin-jsx-a11y": "^6.2.1",
84+
"eslint-plugin-node": "^8.0.1",
8585
"eslint-plugin-promise": "^4.0.1",
86-
"eslint-plugin-react": "^7.11.1",
86+
"eslint-plugin-react": "^7.12.4",
8787
"eslint-plugin-standard": "^4.0.0",
8888
"exorcist": "^1.0.1",
89-
"flow-bin": "^0.80.0",
89+
"flow-bin": "^0.94.0",
9090
"flow-runtime": "^0.17.0",
9191
"glob": "^7.1.3",
9292
"isomorphic-fetch": "^2.2.1",
93-
"jest": "^23.5.0",
93+
"jest": "^24.1.0",
9494
"jest-yaml-transform": "^0.2.0",
9595
"lodash.uniq": "^4.5.0",
96-
"middleware-proxy": "^2.0.2",
97-
"mime": "^2.3.1",
96+
"middleware-proxy": "^2.0.5",
97+
"mime": "^2.4.0",
9898
"mkdirp": "^0.5.1",
99-
"node-emoji": "^1.8.1",
100-
"postcss": "^7.0.2",
101-
"postcss-import": "^12.0.0",
102-
"postcss-preset-env": "^5.3.0",
103-
"postcss-reporter": "^6.0.0",
99+
"node-emoji": "^1.10.0",
100+
"postcss": "^7.0.14",
101+
"postcss-import": "^12.0.1",
102+
"postcss-preset-env": "^6.6.0",
103+
"postcss-reporter": "^6.0.1",
104104
"postcss-safe-parser": "^4.0.1",
105105
"prettier-eslint-cli": "^4.7.1",
106-
"rimraf": "^2.6.2",
106+
"rimraf": "^2.6.3",
107107
"slack-node": "^0.1.8",
108108
"this-commit": "^1.0.0",
109-
"through2": "^2.0.3",
109+
"through2": "^3.0.1",
110110
"uglifyify": "^5.0.1",
111-
"username": "^4.0.0",
111+
"username": "^4.1.0",
112112
"uuid": "^3.3.2",
113-
"watchify": "^3.11.0",
113+
"watchify": "^3.11.1",
114114
"yamljs": "^0.3.0"
115115
},
116116
"devDependencies": {
117-
"bootstrap": "^4.1.3",
118-
"react": "^16.5.0",
119-
"semantic-release": "^15.9.14"
117+
"bootstrap": "^4.3.1",
118+
"react": "^16.8.3",
119+
"semantic-release": "^15.13.3"
120120
},
121121
"standard": {
122122
"parser": "babel-eslint"

0 commit comments

Comments
 (0)