diff --git a/bundle/.env.js b/bundle/.env.js new file mode 100644 index 00000000..ae73fc96 --- /dev/null +++ b/bundle/.env.js @@ -0,0 +1,8 @@ +'use strict'; + +const { homedir } = require('os'); +const { join } = require('path'); + +const { SDC_KEY_PATH } = process.env; + +process.env.SDC_KEY_PATH = SDC_KEY_PATH || join(homedir(), './.ssh/id_rsa'); diff --git a/bundle/.yarnclean b/bundle/.yarnclean deleted file mode 100644 index e69de29b..00000000 diff --git a/bundle/data/categories.js b/bundle/data/categories.js new file mode 100644 index 00000000..ecbc677a --- /dev/null +++ b/bundle/data/categories.js @@ -0,0 +1,89 @@ +module.exports = [ + { + name: 'Compute', + services: [ + { + name: 'VMs & Containers', + slug: 'instances', + description: 'Run VMs and bare metal containers' + } + ] + }, + { + name: 'Network', + services: [ + { + name: 'VLANs', + slug: 'vlans', + description: 'Wire your application your way' + }, + { + name: 'Subnets', + slug: 'subnets', + description: 'A network for everything' + }, + { + name: 'Firewall Rules', + slug: 'firewall', + description: 'Control the bits coming and going' + } + ] + }, + { + name: 'Storage', + services: [ + { + name: 'Triton Object Storage', + slug: 'object-storage', + description: 'Modern cloud object storage', + tags: ["'note'='was Manta'"] + }, + { + name: 'S3 Compatibility Bridge', + slug: 's3-bridge', + description: 'Modern storage, legacy compability' + }, + { + name: 'Triton Volumes', + slug: 'volumes', + description: 'Network filesystems for your apps', + tags: ["'is-new'='true'"] + } + ] + }, + { + name: 'Access', + services: [ + { + name: 'Role Based Access Control', + slug: 'rbac', + description: 'Manage users within your account' + } + ] + }, + { + name: 'Help & Support', + services: [ + { + name: 'Service Status', + slug: 'status', + description: 'Find out about the status of our services' + }, + { + name: 'Contact Support', + slug: 'contact-support', + description: 'Chat to us via phone or email' + }, + { + name: 'Support Plans', + slug: 'support-plans', + description: 'Write here about Support Plans' + }, + { + name: 'Getting Started', + slug: 'getting-started', + description: 'Write here about Getting Started' + } + ] + } +]; diff --git a/bundle/data/regions.js b/bundle/data/regions.js new file mode 100644 index 00000000..2a5ab2ff --- /dev/null +++ b/bundle/data/regions.js @@ -0,0 +1,86 @@ +module.exports = [ + { + name: 'Ashburn, Virginia, USA', + continent: 'NORTH_AMERICA', + datacenters: [ + { + name: 'us-east-1', + url: 'http://localhost' + }, + { + name: 'us-east-2', + url: 'http://localhost' + }, + { + name: 'us-east-3', + url: 'http://localhost' + } + ] + }, + { + name: 'Las Vegas, Nevada, USA', + continent: 'NORTH_AMERICA', + datacenters: [ + { + name: 'us-sw-1', + url: 'http://localhost' + } + ] + }, + { + name: 'Emeryville, California, USA', + continent: 'NORTH_AMERICA', + datacenters: [ + { + name: 'us-west-1', + url: 'http://localhost' + } + ] + }, + { + name: 'Amsterdam, Netherlands', + continent: 'EUROPE', + datacenters: [ + { + name: 'us-ams-1', + url: 'http://localhost' + } + ] + }, + { + name: 'Singapore', + continent: 'ASIA', + datacenters: [ + { + name: 'ap-sg-1', + url: 'http://localhost' + }, + { + name: 'ap-sg-2', + url: 'http://localhost' + }, + { + name: 'ap-sg-3', + url: 'http://localhost' + } + ] + }, + { + name: 'Seoul, South Korea', + continent: 'ASIA', + datacenters: [ + { + name: 'ap-kr-1', + url: 'http://localhost' + }, + { + name: 'ap-kr-2', + url: 'http://localhost' + }, + { + name: 'ap-kr-3', + url: 'http://localhost' + } + ] + } +]; diff --git a/bundle/index.js b/bundle/index.js new file mode 100644 index 00000000..9a99aa39 --- /dev/null +++ b/bundle/index.js @@ -0,0 +1,72 @@ +// Requires .env.js file with the following exports: +// SDC_URL, SDC_KEY_ID, SDC_KEY_PATH +require('./.env.js'); + +const Main = require('apr-main'); +const Hapi = require('hapi'); +const H2O2 = require('h2o2'); +const Execa = require('execa'); +const Path = require('path'); +const Fs = require('fs'); + +const { PORT = 4000 } = process.env; +const ROOT = Path.join(__dirname, 'src'); + +const calcPort = (i) => Number(PORT) + Number(i) + 1; + +const namespaces = Fs.readdirSync(ROOT) + .filter(filename => /.js$/.test(filename)) + .map(filename => filename.replace(/.js$/, '')) + .filter(filename => !['index', 'server'].includes(filename)); + +const routes = namespaces.map((namespace, i) => ({ + method: '*', + path: `/${namespace}/{params*}`, + handler: { + proxy: { + uri: `{protocol}://0.0.0.0:${calcPort(i)}/${namespace}/{params}` + } + } +})); + +namespaces.forEach((namespace, i) => { + const child = Execa('node', [namespace], { + cwd: ROOT, + cleanup: true, + env: Object.assign({}, process.env, { + PORT: calcPort(i), + PREFIX: namespace + }) + }); + + child.stdout.pipe(process.stdout); + child.stderr.pipe(process.stderr); +}); + +Main(async () => { + const server = Hapi.server({ + port: PORT, + routes: { + cors: { + origin: ['*'], + credentials: true, + additionalHeaders: ['Cookie', 'X-CSRF-Token'] + } + }, + debug: { + log: ['error'], + request: ['error'] + } + }); + + await server.register({ + plugin: H2O2 + }); + + routes.map(route => server.route(route)); + + await server.start(); + + // eslint-disable-next-line no-console + console.log(`server started at http://0.0.0.0:${server.info.port}`); +}); diff --git a/bundle/package.json b/bundle/package.json index 22f4d251..39e6591d 100644 --- a/bundle/package.json +++ b/bundle/package.json @@ -4,8 +4,7 @@ "private": true, "license": "MPL-2.0", "scripts": { - "start": "UMD=1 NODE_ENV=development PORT=3069 REACT_APP_GQL_PORT=3069 REACT_APP_GQL_HOSTNAME=localhost REACT_APP_GQL_PROTOCOL=http node src/index.js", - "dev": "echo 0", + "dev": "NODE_ENV=development PORT=4000 node index.js", "build:test": "echo 0", "build:lib": "echo 0", "build:bundle": "echo 0", @@ -16,14 +15,18 @@ "test:ci": "echo 0" }, "dependencies": { + "apr-main": "^4.0.3", "brule": "^3.1.0", - "cloudapi-gql": "^7.1.3", - "hapi": "^17.2.0", - "hapi-triton-auth": "^2.0.0", + "cloudapi-gql": "^7.1.4", + "execa": "^0.10.0", + "h2o2": "^8.0.1", + "hapi": "^17.3.1", + "hapi-triton-auth": "^2.0.1", + "hapi-webconsole-nav": "^1.1.1", "inert": "^5.1.0", - "my-joy-navigation": "*", "my-joy-images": "*", "my-joy-instances": "*", + "my-joy-navigation": "*", "rollover": "^1.0.0" } } diff --git a/bundle/src/images.js b/bundle/src/images.js new file mode 100644 index 00000000..2b81a297 --- /dev/null +++ b/bundle/src/images.js @@ -0,0 +1,43 @@ +const Main = require('apr-main'); +const CloudApiGql = require('cloudapi-gql'); +const Url = require('url'); +const Server = require('./server'); + +const { + PORT = 4003, + BASE_URL = `http://0.0.0.0:${PORT}`, + PREFIX = 'images', + DC_NAME, + SDC_URL, + SDC_KEY_PATH, + SDC_ACCOUNT, + SDC_KEY_ID +} = process.env; + +const dcName = DC_NAME || Url.parse(SDC_URL).host.split('.')[0]; +const keyPath = SDC_KEY_PATH; +const keyId = `/${SDC_ACCOUNT}/keys/${SDC_KEY_ID}`; +const apiBaseUrl = SDC_URL; + +Main(async () => { + const server = await Server({ + PORT, + BASE_URL + }); + + await server.register({ + plugin: CloudApiGql, + options: { + authStrategy: 'sso', + keyPath, + keyId, + apiBaseUrl, + dcName + }, + routes: { + prefix: `/${PREFIX}` + } + }); + + await server.start(); +}); diff --git a/bundle/src/index.js b/bundle/src/index.js deleted file mode 100644 index db4ca7e8..00000000 --- a/bundle/src/index.js +++ /dev/null @@ -1,101 +0,0 @@ -'use strict'; - -const Brule = require('brule'); -const Hapi = require('hapi'); -const Rollover = require('rollover'); -const { homedir } = require('os'); -const { join } = require('path'); - -const Sso = require('hapi-triton-auth'); -const Nav = require('my-joy-navigation'); -const Api = require('cloudapi-gql'); - -const { - PORT = 3069, - COOKIE_PASSWORD, - COOKIE_DOMAIN, - SDC_KEY_PATH, - SDC_ACCOUNT, - SDC_KEY_ID, - SDC_URL, - BASE_URL = `http://0.0.0.0:${PORT}`, - ROLLBAR_SERVER_TOKEN, - NODE_ENV = 'development' - // CONSOLE = 'my-joy-instances' -} = process.env; - -const Ui = require('my-joy-instances'); -// const Instances = require('my-joy-instances'); -// const Images = require('my-joy-images'); - -const server = Hapi.server({ - debug: { - request: ['error'] - }, - port: PORT, - host: '127.0.0.1' -}); - -async function main() { - await server.register([ - { - plugin: Rollover, - options: { - rollbar: { - accessToken: ROLLBAR_SERVER_TOKEN, - reportLevel: 'error' - } - } - }, - { - plugin: Brule, - options: { - auth: false - } - }, - { - plugin: Sso, - options: { - ssoUrl: 'https://sso.joyent.com', - baseUrl: BASE_URL, - apiBaseUrl: SDC_URL, - keyId: '/' + SDC_ACCOUNT + '/keys/' + SDC_KEY_ID, - keyPath: SDC_KEY_PATH || join(homedir(), '.ssh/id_rsa'), - permissions: { cloudapi: ['/my/*'] }, - isDev: NODE_ENV === 'development', - cookie: { - isHttpOnly: true, - isSecure: false, - password: COOKIE_PASSWORD, - ttl: 1000 * 60 * 60, // 1 hour - domain: COOKIE_DOMAIN - } - } - }, - { - plugin: Nav - }, - { - plugin: Ui - }, - { - plugin: Api, - options: { - keyId: '/' + SDC_ACCOUNT + '/keys/' + SDC_KEY_ID, - keyPath: SDC_KEY_PATH || join(homedir(), '.ssh/id_rsa'), - apiBaseUrl: SDC_URL - } - } - ]); - - server.auth.default('sso'); - - process.on('unhandledRejection', err => { - server.log(['error'], err); - }); - - await server.start(); - console.log(`server started at http://localhost:${server.info.port}`); -} - -main(); diff --git a/bundle/src/instances.js b/bundle/src/instances.js new file mode 100644 index 00000000..7b237131 --- /dev/null +++ b/bundle/src/instances.js @@ -0,0 +1,43 @@ +const Main = require('apr-main'); +const CloudApiGql = require('cloudapi-gql'); +const Url = require('url'); +const Server = require('./server'); + +const { + PORT = 4002, + BASE_URL = `http://0.0.0.0:${PORT}`, + PREFIX = 'instances', + DC_NAME, + SDC_URL, + SDC_KEY_PATH, + SDC_ACCOUNT, + SDC_KEY_ID +} = process.env; + +const dcName = DC_NAME || Url.parse(SDC_URL).host.split('.')[0]; +const keyPath = SDC_KEY_PATH; +const keyId = `/${SDC_ACCOUNT}/keys/${SDC_KEY_ID}`; +const apiBaseUrl = SDC_URL; + +Main(async () => { + const server = await Server({ + PORT, + BASE_URL + }); + + await server.register({ + plugin: CloudApiGql, + options: { + authStrategy: 'sso', + keyPath, + keyId, + apiBaseUrl, + dcName + }, + routes: { + prefix: `/${PREFIX}` + } + }); + + await server.start(); +}); diff --git a/bundle/src/navigation.js b/bundle/src/navigation.js new file mode 100644 index 00000000..c3405719 --- /dev/null +++ b/bundle/src/navigation.js @@ -0,0 +1,49 @@ +const Main = require('apr-main'); +const Nav = require('hapi-webconsole-nav'); +const Url = require('url'); +const Server = require('./server'); + +const Regions = require('../data/regions'); +const Categories = require('../data/categories'); + +const { + PORT = 4001, + BASE_URL = `http://0.0.0.0:${PORT}`, + PREFIX = 'navigation', + DC_NAME, + SDC_URL, + SDC_KEY_PATH, + SDC_ACCOUNT, + SDC_KEY_ID +} = process.env; + +const dcName = DC_NAME || Url.parse(SDC_URL).host.split('.')[0]; +const keyPath = SDC_KEY_PATH; +const keyId = `/${SDC_ACCOUNT}/keys/${SDC_KEY_ID}`; +const apiBaseUrl = SDC_URL; +const baseUrl = BASE_URL; + +Main(async () => { + const server = await Server({ + PORT, + BASE_URL + }); + + await server.register({ + plugin: Nav, + options: { + keyPath, + keyId, + apiBaseUrl, + dcName, + baseUrl, + regions: Regions, + categories: Categories + }, + routes: { + prefix: `/${PREFIX}` + } + }); + + await server.start(); +}); diff --git a/bundle/src/server.js b/bundle/src/server.js new file mode 100644 index 00000000..6378cae1 --- /dev/null +++ b/bundle/src/server.js @@ -0,0 +1,83 @@ +const Hapi = require('hapi'); +const Sso = require('hapi-triton-auth'); +const Url = require('url'); + +const { + COOKIE_PASSWORD, + COOKIE_DOMAIN, + SDC_KEY_PATH, + SDC_ACCOUNT, + SDC_KEY_ID, + SDC_URL, + DC_NAME +} = process.env; + +module.exports = async ({ PORT, BASE_URL }) => { + const dcName = DC_NAME || Url.parse(SDC_URL).host.split('.')[0]; + const keyPath = SDC_KEY_PATH; + const keyId = `/${SDC_ACCOUNT}/keys/${SDC_KEY_ID}`; + const apiBaseUrl = SDC_URL; + const ssoUrl = 'https://sso.joyent.com/login'; + const baseUrl = BASE_URL; + const isDev = true; + + const permissions = { + cloudapi: ['/my/*'] + }; + + const cookie = { + password: COOKIE_PASSWORD, + domain: COOKIE_DOMAIN, + isSecure: false, + isHttpOnly: true, + ttl: 1000 * 60 * 60 // 1 hour + }; + + const server = Hapi.server({ + port: PORT, + routes: { + cors: { + origin: ['*'], + credentials: true, + additionalHeaders: ['Cookie', 'X-CSRF-Token'] + } + }, + debug: { + log: ['error'], + request: ['error'] + } + }); + + server.events.on('log', (event, tags) => { + if (tags.error) { + console.log(event); + } + }); + + server.events.on('request', (request, event) => { + const { tags } = event; + if (tags.includes('error') && event.data && event.data.errors) { + event.data.errors.forEach(error => { + console.log(error); + }); + } + }); + + await server.register({ + plugin: Sso, + options: { + keyPath, + keyId, + apiBaseUrl, + ssoUrl, + permissions, + baseUrl, + isDev, + cookie + } + }); + + server.auth.default('sso'); + + return server; +}; diff --git a/package.json b/package.json index 022a49ce..befd0b56 100644 --- a/package.json +++ b/package.json @@ -45,16 +45,31 @@ }, "resolutions": { "axios": "0.16.2", - "core-js": "2.5.3", + "follow-redirects": "1.4.1", + "debug": "3.1.0", + "chalk": "2.1.0", + "minimist": "1.2.0", + "node-fetch": "2.1.1", + "ansi-styles": "3.2.1", + "strip-ansi": "4.0.0", + "supports-color": "4.5.0", + "ansi-regex": "3.0.0", + "core-js": "2.5.4", "regenerator-runtime": "0.11.1", "pify": "3.0.0", - "parse-json": "3.0.0", - "graphql": "0.13.0", - "hoist-non-react-statics": "2.5.0", - "stylis-rule-sheet": "0.0.10", - "react": "16.2.0", + "has-flag": "2.0.0", + "parse-json": "4.0.0", + "whatwg-fetch": "2.0.4", + "react": "16.3.1", "breeze-nexttick": "0.2.1", - "isarray": "1.0.0" + "isarray": "1.0.0", + "boom": "7.2.0", + "lru-cache": "4.1.2", + "uuid": "3.0.1", + "extsprintf": "1.0.1" }, - "workspaces": ["packages/*", "bundle"] + "workspaces": [ + "packages/*", + "bundle" + ] } diff --git a/packages/icons/package.json b/packages/icons/package.json index 3b9e4433..9fe5ac59 100644 --- a/packages/icons/package.json +++ b/packages/icons/package.json @@ -24,7 +24,7 @@ "dependencies": { "remcalc": "^1.0.10", "rnd-id": "^2.0.2", - "styled-components": "^3.2.1" + "styled-components": "^3.2.5" }, "devDependencies": { "babel-cli": "^6.26.0", @@ -32,10 +32,10 @@ "eslint": "^4.19.1", "eslint-config-joyent-portal": "^3.3.1", "joyent-react-scripts": "^8.0.3", - "react": "^16.2.0", - "redrun": "^6.0.1" + "react": "^16.3.1", + "redrun": "^6.0.2" }, "peerDependencies": { - "react": "^16.2.0" + "react": "^16.3.1" } } diff --git a/packages/logos/package.json b/packages/logos/package.json index f58485f6..d1a72ca4 100644 --- a/packages/logos/package.json +++ b/packages/logos/package.json @@ -28,16 +28,15 @@ "babel-preset-joyent-portal": "^7.0.1", "eslint": "^4.19.1", "eslint-config-joyent-portal": "^3.3.1", - "execa": "^0.9.0", + "execa": "^0.10.0", "globby": "^8.0.1", "htmltojsx": "^0.3.0", "joyent-react-scripts": "^8.0.3", "mz": "^2.7.0", - "prettier": "^1.11.0", - "react": "^16.2.0", - "redrun": "^6.0.1" + "react": "^16.3.1", + "redrun": "^6.0.2" }, "peerDependencies": { - "react": "^16.2.0" + "react": "^16.3.1" } } diff --git a/packages/my-joy-images/package.json b/packages/my-joy-images/package.json index bae1c0f6..a8e52604 100644 --- a/packages/my-joy-images/package.json +++ b/packages/my-joy-images/package.json @@ -32,7 +32,7 @@ "exenv": "^1.2.2", "force-array": "^3.1.0", "fuse.js": "^3.2.0", - "hapi-render-react": "^2.2.0", + "hapi-render-react": "^2.5.2", "hapi-render-react-joyent-document": "^5.0.0", "inert": "^5.1.0", "joyent-logo-assets": "^1.1.0", @@ -49,19 +49,19 @@ "lunr": "^2.1.6", "mz": "^2.7.0", "param-case": "^2.1.1", - "react": "^16.2.0", - "react-apollo": "^2.1.1", - "react-dom": "^16.2.0", + "react": "^16.3.1", + "react-apollo": "^2.1.2", + "react-dom": "^16.3.1", "react-redux": "^5.0.7", "react-redux-values": "^1.1.2", "react-router": "^4.2.0", "react-router-dom": "^4.2.2", "redux": "^3.7.2", - "redux-form": "^7.2.3", + "redux-form": "^7.3.0", "remcalc": "^1.0.10", - "styled-components": "^3.2.1", + "styled-components": "^3.2.5", "styled-components-spacing": "^2.1.3", - "styled-flex-component": "^2.2.1", + "styled-flex-component": "^2.2.2", "styled-is": "^1.1.2", "title-case": "^2.1.1", "yup": "^0.24.1" @@ -71,11 +71,11 @@ "babel-preset-joyent-portal": "^7.0.1", "eslint": "^4.19.1", "eslint-config-joyent-portal": "^3.3.1", - "jest-image-snapshot": "^2.3.0", - "jest-styled-components": "^5.0.0", + "jest-image-snapshot": "^2.4.0", + "jest-styled-components": "^5.0.1", "joyent-react-scripts": "^8.0.3", "react-screenshot-renderer": "^1.1.2", - "react-test-renderer": "^16.2.0", - "redrun": "^6.0.1" + "react-test-renderer": "^16.3.1", + "redrun": "^6.0.2" } } diff --git a/packages/my-joy-instances/package.json b/packages/my-joy-instances/package.json index e7d030a5..69175377 100644 --- a/packages/my-joy-instances/package.json +++ b/packages/my-joy-instances/package.json @@ -23,14 +23,14 @@ "apr-intercept": "^3.0.3", "apr-reduce": "^3.0.3", "bytes": "^3.0.0", - "clipboard-copy": "^1.4.2", + "clipboard-copy": "^2.0.0", "constant-case": "^2.0.0", - "cross-fetch": "^1.1.1", + "cross-fetch": "^2.1.0", "date-fns": "^1.29.0", "declarative-redux-form": "^2.0.8", "exenv": "^1.2.2", "fuse.js": "^3.2.0", - "hapi-render-react": "^2.2.0", + "hapi-render-react": "^2.5.2", "hapi-render-react-joyent-document": "^5.0.0", "inert": "^5.1.0", "joyent-logo-assets": "^1.1.0", @@ -56,22 +56,21 @@ "lodash.sortby": "^4.7.0", "lodash.uniqby": "^4.7.0", "lodash.values": "^4.3.0", - "my-joy-images": "1.1.5", "param-case": "^2.1.1", - "query-string": "^5.1.0", - "react": "^16.2.0", - "react-apollo": "^2.1.1", - "react-dom": "^16.2.0", + "query-string": "^6.0.0", + "react": "^16.3.1", + "react-apollo": "^2.1.2", + "react-dom": "^16.3.1", "react-redux": "^5.0.7", "react-redux-values": "^1.1.2", "react-router": "^4.2.0", "react-router-dom": "^4.2.2", "redux": "^3.7.2", - "redux-form": "^7.2.3", + "redux-form": "^7.3.0", "remcalc": "^1.0.10", - "styled-components": "^3.2.1", + "styled-components": "^3.2.5", "styled-components-spacing": "^2.1.3", - "styled-flex-component": "^2.2.1", + "styled-flex-component": "^2.2.2", "title-case": "^2.1.1", "yup": "^0.24.1" }, @@ -80,11 +79,11 @@ "babel-preset-joyent-portal": "^7.0.1", "eslint": "^4.19.1", "eslint-config-joyent-portal": "^3.3.1", - "jest-image-snapshot": "^2.3.0", - "jest-styled-components": "^5.0.0", + "jest-image-snapshot": "^2.4.0", + "jest-styled-components": "^5.0.1", "joyent-react-scripts": "^8.0.3", "react-screenshot-renderer": "^1.1.2", - "react-test-renderer": "^16.2.0", - "redrun": "^6.0.1" + "react-test-renderer": "^16.3.1", + "redrun": "^6.0.2" } } diff --git a/packages/my-joy-navigation/package.json b/packages/my-joy-navigation/package.json index cd3e1651..1df5de22 100644 --- a/packages/my-joy-navigation/package.json +++ b/packages/my-joy-navigation/package.json @@ -5,7 +5,7 @@ "license": "MPL-2.0", "main": "lib/index.js", "scripts": { - "dev": "NAMESPACE=navigation NODE_ENV=development PREACT=1 REACT_APP_GQL_PORT=3068 PORT=3000 joyent-react-scripts start", + "dev": "NAMESPACE=navigation NODE_ENV=development PREACT=1 REACT_APP_GQL_PORT=4000 PORT=3000 joyent-react-scripts start", "build:test": "echo 0", "build:lib": "echo 0", "build:bundle": "NAMESPACE=navigation NODE_ENV=production redrun build", @@ -23,7 +23,7 @@ "apollo-link-http": "^1.5.3", "apollo-link-state": "^0.4.1", "apr-intercept": "^3.0.3", - "emotion": "^9.1.0", + "emotion": "^9.1.1", "emotion-theming": "^9.0.0", "graphql-tag": "^2.8.0", "inert": "^5.1.0", @@ -37,9 +37,9 @@ "pascal-case": "^2.0.1", "preact": "^8.2.7", "preact-compat": "^3.18.0", - "preact-emotion": "^9.1.0", + "preact-emotion": "^9.1.1", "preact-emotion-flexboxgrid": "^2.0.1", - "react-apollo": "^2.1.1", + "react-apollo": "^2.1.2", "remcalc": "^1.0.10", "stickybits": "^3.2.0" }, @@ -49,6 +49,6 @@ "eslint": "^4.19.1", "eslint-config-joyent-portal": "^3.3.1", "joyent-react-scripts": "^8.0.3", - "redrun": "^6.0.1" + "redrun": "^6.0.2" } } diff --git a/packages/ui-toolkit/package.json b/packages/ui-toolkit/package.json index 909d9277..697a193d 100644 --- a/packages/ui-toolkit/package.json +++ b/packages/ui-toolkit/package.json @@ -25,7 +25,7 @@ }, "dependencies": { "camel-case": "^3.0.0", - "clipboard-copy": "^1.4.2", + "clipboard-copy": "^2.0.0", "exenv": "^1.2.2", "joy-react-broadcast": "^0.6.9", "joyent-icons": "^5.1.0", @@ -40,14 +40,14 @@ "pascal-case": "^2.0.1", "prop-types": "^15.6.1", "react-bundle": "^1.1.0", - "react-popper": "^0.8.2", - "react-responsive": "^4.0.4", + "react-popper": "^0.9.5", + "react-responsive": "^4.1.0", "react-scroll-parallax": "^1.3.3", "remcalc": "^1.0.10", "rnd-id": "^2.0.2", - "styled-components": "^3.2.1", + "styled-components": "^3.2.5", "styled-components-spacing": "^2.1.3", - "styled-flex-component": "^2.2.1", + "styled-flex-component": "^2.2.2", "styled-is": "^1.1.2", "unitcalc": "^1.2.3" }, @@ -57,19 +57,19 @@ "classnames": "^2.2.5", "eslint": "^4.19.1", "eslint-config-joyent-portal": "^3.3.1", - "jest-styled-components": "^5.0.0", + "jest-styled-components": "^5.0.1", "joyent-react-scripts": "^8.0.3", - "react": "^16.2.0", + "react": "^16.3.1", "react-docgen": "^3.0.0-beta8", "react-docgen-displayname-handler": "^1.0.1", - "react-dom": "^16.2.0", - "react-styleguidist": "^6.2.5", - "react-test-renderer": "^16.2.0", - "redrun": "^6.0.1" + "react-dom": "^16.3.1", + "react-styleguidist": "^7.0.4", + "react-test-renderer": "^16.3.1", + "redrun": "^6.0.2" }, "peerDependencies": { "joyent-manifest-editor": "^1.4.0", - "react": "^16.2.0", - "react-dom": "^16.2.0" + "react": "^16.3.1", + "react-dom": "^16.3.1" } } diff --git a/prototypes/cra-boilerplate/package.json b/prototypes/cra-boilerplate/package.json index 56098af4..81fcf08e 100644 --- a/prototypes/cra-boilerplate/package.json +++ b/prototypes/cra-boilerplate/package.json @@ -8,7 +8,6 @@ "scripts": { "dev": "NODE_ENV=development joyent-react-scripts start", "build": "NODE_ENV=production joyent-react-scripts build", - "fmt": "prettier --write --single-quote *.js src/*.js src/**/*.js", "lint-ci": "eslint . --fix --ext .js --ext .md && echo 0 `# stylelint './src/**/*.js'`", "lint": "eslint . --fix --ext .js --ext .md && echo 0 `# stylelint './src/**/*.js'`", "prepublish": "echo 0" @@ -33,7 +32,6 @@ "eslint": "^4.11.0", "eslint-config-joyent-portal": "^3.2.0", "joyent-react-scripts": "^8.0.2", - "prettier": "^1.8.2", "stylelint": "^8.4.0", "stylelint-config-joyent-portal": "^2.0.1" } diff --git a/yarn.lock b/yarn.lock index 8d01c229..a5b78a06 100644 --- a/yarn.lock +++ b/yarn.lock @@ -311,6 +311,12 @@ version "0.5.3" resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.5.3.tgz#91b728599544efbb7386d8b6633693a3c2e7ade5" +"@vxna/mini-html-webpack-template@^0.1.6": + version "0.1.6" + resolved "https://registry.yarnpkg.com/@vxna/mini-html-webpack-template/-/mini-html-webpack-template-0.1.6.tgz#64225d564da5fe610b6445523c245572923c00b8" + dependencies: + common-tags "^1.7.2" + JSONStream@^1.0.4: version "1.3.2" resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.2.tgz#c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea" @@ -378,7 +384,7 @@ acorn@^4.0.3, acorn@^4.0.4: version "4.0.13" resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" -acorn@^5.0.0, acorn@^5.0.3, acorn@^5.1.1, acorn@^5.4.1, acorn@^5.5.0: +acorn@^5.0.0, acorn@^5.0.3, acorn@^5.1.1, acorn@^5.4.1, acorn@^5.5.0, acorn@^5.5.3: version "5.5.3" resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9" @@ -474,19 +480,11 @@ ansi-html@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" -ansi-regex@^2.0.0, ansi-regex@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - -ansi-regex@^3.0.0: +ansi-regex@3.0.0, ansi-regex@^2.0.0, ansi-regex@^2.1.1, ansi-regex@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - -ansi-styles@^3.0.0, ansi-styles@^3.1.0, ansi-styles@^3.2.0, ansi-styles@^3.2.1: +ansi-styles@3.2.1, ansi-styles@^3.0.0, ansi-styles@^3.1.0, ansi-styles@^3.2.0: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" dependencies: @@ -514,7 +512,7 @@ apart@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/apart/-/apart-1.0.1.tgz#97ae56938c71c113ae09c0feafb5f5af84eba063" -apollo-cache-inmemory@^1.1.12, apollo-cache-inmemory@^1.1.9: +apollo-cache-inmemory@^1.1.12: version "1.1.12" resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.1.12.tgz#ab489bf046b3e026556ab28bdebb6e010cac9531" dependencies: @@ -528,7 +526,7 @@ apollo-cache@^1.1.7: dependencies: apollo-utilities "^1.0.11" -apollo-client@^2.2.5, apollo-client@^2.2.8: +apollo-client@^2.2.8: version "2.2.8" resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.2.8.tgz#b604d31ab2d2dd00db3105d8793b93ee02ce567e" dependencies: @@ -554,7 +552,7 @@ apollo-link-http-common@^0.2.3: dependencies: apollo-link "^1.2.1" -apollo-link-http@^1.5.2, apollo-link-http@^1.5.3: +apollo-link-http@^1.5.3: version "1.5.3" resolved "https://registry.yarnpkg.com/apollo-link-http/-/apollo-link-http-1.5.3.tgz#3aa0d3ecfe5666ef0c360f359c425ff6ea1d285b" dependencies: @@ -1965,37 +1963,7 @@ boolbase@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" -boom@2.x.x: - version "2.10.1" - resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f" - dependencies: - hoek "2.x.x" - -boom@4.x.x: - version "4.3.1" - resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31" - dependencies: - hoek "4.x.x" - -boom@5.x.x: - version "5.2.0" - resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02" - dependencies: - hoek "4.x.x" - -boom@6.x.x: - version "6.0.0" - resolved "https://registry.yarnpkg.com/boom/-/boom-6.0.0.tgz#9b36c52a12afab3f0e55536131b7fd5021aad0cc" - dependencies: - hoek "5.x.x" - -boom@7.1.x: - version "7.1.1" - resolved "https://registry.yarnpkg.com/boom/-/boom-7.1.1.tgz#50392a4e3417e971f1ad28622c20e832275260bb" - dependencies: - hoek "5.x.x" - -boom@7.x.x: +boom@2.x.x, boom@4.x.x, boom@5.x.x, boom@6.x.x, boom@7.1.x, boom@7.2.0, boom@7.x.x: version "7.2.0" resolved "https://registry.yarnpkg.com/boom/-/boom-7.2.0.tgz#2bff24a55565767fde869ec808317eb10c48e966" dependencies: @@ -2407,17 +2375,7 @@ center-align@^0.1.1: align-text "^0.1.3" lazy-cache "^1.0.3" -chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" - -chalk@2.1.0: +chalk@1.1.3, chalk@2.1.0, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.3.2: version "2.1.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e" dependencies: @@ -2425,14 +2383,6 @@ chalk@2.1.0: escape-string-regexp "^1.0.5" supports-color "^4.0.0" -chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65" - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - character-entities-html4@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.1.tgz#359a2a4a0f7e29d3dc2ac99bdbe21ee39438ea50" @@ -2579,10 +2529,6 @@ cli-width@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" -clipboard-copy@^1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/clipboard-copy/-/clipboard-copy-1.4.2.tgz#620cb6a9347d4f92447649db5a9b00edfcbb2cae" - clipboard-copy@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/clipboard-copy/-/clipboard-copy-2.0.0.tgz#663abcd8be9c641de6e92a2eb9afef6e0afa727e" @@ -2607,7 +2553,7 @@ clone@^1.0.2: version "1.0.4" resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" -cloudapi-gql@^7.1.3: +cloudapi-gql@^7.1.4: version "7.1.4" resolved "https://registry.yarnpkg.com/cloudapi-gql/-/cloudapi-gql-7.1.4.tgz#4baed087d980d86b44e6bf1c8fac2a486901e3fa" dependencies: @@ -2745,6 +2691,12 @@ common-shake@^2.0.2: debug "^2.6.8" escope "^3.6.0" +common-tags@^1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.7.2.tgz#24d9768c63d253a56ecff93845b44b4df1d52771" + dependencies: + babel-runtime "^6.26.0" + commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" @@ -3055,9 +3007,9 @@ copy-webpack-plugin@^4.5.1: p-limit "^1.0.0" serialize-javascript "^1.4.0" -core-js@2.5.3, core-js@^1.0.0, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0: - version "2.5.3" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e" +core-js@2.5.4, core-js@^1.0.0, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0: + version "2.5.4" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.4.tgz#f2c8bf181f2a80b92f360121429ce63a2f0aeae0" core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -3149,13 +3101,6 @@ create-react-class@^15.5.1: loose-envify "^1.3.1" object-assign "^4.1.1" -cross-fetch@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-1.1.1.tgz#dede6865ae30f37eae62ac90ebb7bdac002b05a0" - dependencies: - node-fetch "1.7.3" - whatwg-fetch "2.0.3" - cross-fetch@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-2.1.0.tgz#7d4ea7e10a4f3bb73d5c2f0a3791ec3752d39b50" @@ -3421,13 +3366,7 @@ dateformat@^3.0.0: version "3.0.3" resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" -debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - dependencies: - ms "2.0.0" - -debug@^3.0.0, debug@^3.0.1, debug@^3.1.0: +debug@2.6.9, debug@3.1.0, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9, debug@^3.0.0, debug@^3.0.1, debug@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" dependencies: @@ -3807,7 +3746,7 @@ emotion-utils@^9.1.0: version "9.1.0" resolved "https://registry.yarnpkg.com/emotion-utils/-/emotion-utils-9.1.0.tgz#7484dbf18f3b1dc1de68559d1ff35a74caa998dc" -emotion@^9.1.0: +emotion@^9.1.0, emotion@^9.1.1: version "9.1.1" resolved "https://registry.yarnpkg.com/emotion/-/emotion-9.1.1.tgz#ee9dd8d5553954ceea9cd0e62402e0afd6802890" dependencies: @@ -3818,12 +3757,6 @@ encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" -encoding@^0.1.11: - version "0.1.12" - resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb" - dependencies: - iconv-lite "~0.4.13" - end-of-stream@^1.0.0, end-of-stream@^1.1.0: version "1.4.1" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43" @@ -3961,7 +3894,7 @@ escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" -escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: +escape-string-regexp@1.0.5, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" @@ -4341,18 +4274,6 @@ execa@^0.8.0: signal-exit "^3.0.0" strip-eof "^1.0.0" -execa@^0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.9.0.tgz#adb7ce62cf985071f60580deb4a88b9e34712d01" - dependencies: - cross-spawn "^5.0.1" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - exenv@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/exenv/-/exenv-1.2.2.tgz#2ae78e85d9894158670b03d47bec1f03bd91bb9d" @@ -4492,22 +4413,10 @@ extract-zip@^1.6.5: mkdirp "0.5.0" yauzl "2.4.1" -extsprintf@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.0.tgz#4d58b815ace5bebfc4ebf03cf98b0a7604a99b86" - -extsprintf@1.0.1: +extsprintf@1.0.0, extsprintf@1.0.1, extsprintf@1.3.0, extsprintf@^1.2.0: version "1.0.1" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.1.tgz#590e147d5c59e2180b3366f7bc21acabaf69a185" -extsprintf@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - -extsprintf@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" - facet@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/facet/-/facet-0.3.0.tgz#1bf949d8a112e2045dda84259407def3deb62c1b" @@ -4734,12 +4643,16 @@ fn-name@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-1.0.1.tgz#de8d8a15388b33cbf2145782171f73770c6030f0" -follow-redirects@^1.2.3: +follow-redirects@1.4.1, follow-redirects@^1.2.3: version "1.4.1" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.4.1.tgz#d8120f4518190f55aac65bb6fc7b85fcd666d6aa" dependencies: debug "^3.1.0" +for-each-key@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/for-each-key/-/for-each-key-1.0.0.tgz#d3d00fa6bf479ebb11dfd256a4b03cd1862c3cd0" + for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -5147,7 +5060,7 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.4, version "4.1.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" -graphi@5.x.x: +graphi@5.5.x, graphi@5.x.x: version "5.5.0" resolved "https://registry.yarnpkg.com/graphi/-/graphi-5.5.0.tgz#6e656b942037121b80e8639afd01230cbcbd67cd" dependencies: @@ -5172,11 +5085,11 @@ graphql-tag@^2.8.0: version "2.8.0" resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.8.0.tgz#52cdea07a842154ec11a2e840c11b977f9b835ce" -graphql@0.13.0, graphql@0.13.x, graphql@^0.13.1: - version "0.13.0" - resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.13.0.tgz#d1b44a282279a9ce0a6ec1037329332f4c1079b6" +graphql@0.13.x, graphql@^0.13.1: + version "0.13.2" + resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.13.2.tgz#4c740ae3c222823e7004096f832e7b93b2108270" dependencies: - iterall "1.1.x" + iterall "^1.2.1" growly@^1.3.0: version "1.3.0" @@ -5195,6 +5108,15 @@ gzip-size@^4.0.0: duplexer "^0.1.1" pify "^3.0.0" +h2o2@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/h2o2/-/h2o2-8.0.1.tgz#665b0ff811fc71f3228fbaa81f51a2b0733ec965" + dependencies: + boom "7.x.x" + hoek "5.x.x" + joi "13.x.x" + wreck "14.x.x" + handle-thing@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4" @@ -5209,19 +5131,13 @@ handlebars@^4.0.2, handlebars@^4.0.3: optionalDependencies: uglify-js "^2.6" -hapi-render-react-joyent-document@^4.3.0: - version "4.4.1" - resolved "https://registry.yarnpkg.com/hapi-render-react-joyent-document/-/hapi-render-react-joyent-document-4.4.1.tgz#41a6956b8647ba4d22ca86ae41e8f1735e0dadde" - dependencies: - through2 "^2.0.3" - hapi-render-react-joyent-document@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/hapi-render-react-joyent-document/-/hapi-render-react-joyent-document-5.0.0.tgz#3e182a1afdae8e1874d322caed3d883bfd85efde" dependencies: through2 "^2.0.3" -hapi-render-react@^2.2.0: +hapi-render-react@^2.5.2: version "2.5.2" resolved "https://registry.yarnpkg.com/hapi-render-react/-/hapi-render-react-2.5.2.tgz#d94c6000865d977404facc317e34bae84b2f4176" dependencies: @@ -5232,7 +5148,7 @@ hapi-render-react@^2.2.0: mz "^2.7.0" p-is-promise "^1.1.0" -hapi-triton-auth@^2.0.0: +hapi-triton-auth@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/hapi-triton-auth/-/hapi-triton-auth-2.0.1.tgz#157d29adeafb2a17219c3c4b9ab151f0ebffbac3" dependencies: @@ -5242,7 +5158,16 @@ hapi-triton-auth@^2.0.0: hoek "5.0.x" wreck "14.0.x" -hapi@^17.2.0: +hapi-webconsole-nav@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/hapi-webconsole-nav/-/hapi-webconsole-nav-1.1.1.tgz#d84b16b3e2f0ec746e4071987327ac773b0a9e31" + dependencies: + boom "7.x.x" + bounce "1.x.x" + graphi "5.5.x" + wreck "14.x.x" + +hapi@^17.3.1: version "17.3.1" resolved "https://registry.yarnpkg.com/hapi/-/hapi-17.3.1.tgz#d99679d208389e12a13a91f55932b32ab7dceff1" dependencies: @@ -5286,24 +5211,10 @@ har-validator@~5.0.3: ajv "^5.1.0" har-schema "^2.0.0" -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - dependencies: - ansi-regex "^2.0.0" - -has-flag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa" - -has-flag@^2.0.0: +has-flag@2.0.0, has-flag@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51" -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - has-unicode@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" @@ -5431,7 +5342,7 @@ hoek@5.0.x, hoek@5.x.x: version "5.0.3" resolved "https://registry.yarnpkg.com/hoek/-/hoek-5.0.3.tgz#b71d40d943d0a95da01956b547f83c4a5b4a34ac" -hoist-non-react-statics@2.5.0, hoist-non-react-statics@^2.3.0, hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0: +hoist-non-react-statics@^2.3.0, hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.0.tgz#d2ca2dfc19c5a91c5a6615ce8e564ef0347e2a40" @@ -5498,17 +5409,6 @@ html-webpack-plugin@2.29.0: pretty-error "^2.0.2" toposort "^1.0.0" -html-webpack-plugin@^2.30.1: - version "2.30.1" - resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-2.30.1.tgz#7f9c421b7ea91ec460f56527d78df484ee7537d5" - dependencies: - bluebird "^3.4.7" - html-minifier "^3.2.3" - loader-utils "^0.2.16" - lodash "^4.17.3" - pretty-error "^2.0.2" - toposort "^1.0.0" - "htmlparser2@>= 3.7.3 < 4.0.0": version "3.9.2" resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338" @@ -5619,7 +5519,7 @@ hyphenate-style-name@^1.0.0, hyphenate-style-name@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.2.tgz#31160a36930adaf1fc04c6074f7eb41465d4ec4b" -iconv-lite@0.4.19, iconv-lite@^0.4.17, iconv-lite@~0.4.13: +iconv-lite@0.4.19, iconv-lite@^0.4.17: version "0.4.19" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b" @@ -6274,9 +6174,9 @@ istanbul-reports@^1.3.0: dependencies: handlebars "^4.0.3" -iterall@1.1.x: - version "1.1.4" - resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.1.4.tgz#0db40d38fdcf53ae14dc8ec674e62ab190d52cfc" +iterall@^1.2.1: + version "1.2.2" + resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.2.2.tgz#92d70deb8028e0c39ff3164fdbf4d8b088130cd7" javascript-stringify@^1.6.0: version "1.6.0" @@ -6383,7 +6283,7 @@ jest-haste-map@^20.0.4: sane "~1.6.0" worker-farm "^1.3.1" -jest-image-snapshot@^2.3.0: +jest-image-snapshot@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/jest-image-snapshot/-/jest-image-snapshot-2.4.0.tgz#72bf8f0815bb0d6d1d7f210f0a470e6e87c8c640" dependencies: @@ -6486,7 +6386,7 @@ jest-snapshot@^20.0.3: natural-compare "^1.4.0" pretty-format "^20.0.3" -jest-styled-components@^5.0.0: +jest-styled-components@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/jest-styled-components/-/jest-styled-components-5.0.1.tgz#386c5a161a0f5e783444d624bfc18c6d228d1277" dependencies: @@ -6575,36 +6475,6 @@ joyent-react-styled-flexboxgrid@^2.2.3: lodash.isinteger "^4.0.4" prop-types "^15.6.0" -joyent-ui-toolkit@^5.0.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/joyent-ui-toolkit/-/joyent-ui-toolkit-5.2.0.tgz#f8668483c73b16442e34e6960416db5a59e868e1" - dependencies: - camel-case "^3.0.0" - clipboard-copy "^1.4.2" - exenv "^1.2.2" - joy-react-broadcast "^0.6.9" - joyent-icons "^5.1.0" - joyent-react-styled-flexboxgrid "^2.2.3" - lodash.assign "^4.2.0" - lodash.isboolean "^3.0.3" - lodash.isnan "^3.0.2" - lodash.isundefined "^3.0.1" - lodash.values "^4.3.0" - normalized-styled-components "^1.0.18" - outy "^0.1.2" - pascal-case "^2.0.1" - prop-types "^15.6.1" - react-bundle "^1.1.0" - react-popper "^0.8.2" - react-responsive "^4.0.4" - remcalc "^1.0.10" - rnd-id "^2.0.2" - styled-components "^3.2.1" - styled-components-spacing "^2.1.3" - styled-flex-component "^2.2.1" - styled-is "^1.1.2" - unitcalc "^1.2.3" - js-base64@^2.1.9: version "2.4.3" resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582" @@ -6685,6 +6555,10 @@ json-loader@^0.5.4: version "0.5.7" resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d" +json-parse-better-errors@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" + json-schema-traverse@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340" @@ -7181,21 +7055,17 @@ lower-case@^1.1.1: version "1.1.4" resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" -lowercase-keys@^1.0.0: +lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" -lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.1: +lru-cache@4.1.2, lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@~2.2.1: version "4.1.2" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.2.tgz#45234b2e6e2f2b33da125624c4664929a0224c3f" dependencies: pseudomap "^1.0.2" yallist "^2.1.2" -lru-cache@~2.2.1: - version "2.2.4" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d" - lunr@^2.1.6: version "2.1.6" resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.1.6.tgz#671d2321c4c5bc4c522914953d1c54d612f60aa7" @@ -7252,7 +7122,7 @@ markdown-table@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.1.tgz#4b3dd3a133d1518b8ef0dbc709bf2a1b4824bc8c" -markdown-to-jsx@^6.5.2: +markdown-to-jsx@^6.6.0: version "6.6.1" resolved "https://registry.yarnpkg.com/markdown-to-jsx/-/markdown-to-jsx-6.6.1.tgz#858b37f8a92526b1f3407593ff77c95927720bef" dependencies: @@ -7430,6 +7300,12 @@ mimos@4.x.x: hoek "5.x.x" mime-db "1.x.x" +mini-html-webpack-plugin@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/mini-html-webpack-plugin/-/mini-html-webpack-plugin-0.2.3.tgz#2dfbdc3f35f6ae03864a608808381f8137311ea0" + dependencies: + webpack-sources "^1.1.0" + minimalistic-assert@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3" @@ -7457,22 +7333,10 @@ minimist-options@^3.0.1: arrify "^1.0.1" is-plain-obj "^1.1.0" -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - -minimist@1.2.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0: +minimist@0.0.8, minimist@1.2.0, minimist@^0.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@~0.0.1: version "1.2.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" -minimist@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de" - -minimist@~0.0.1: - version "0.0.10" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" - mississippi@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f" @@ -7553,50 +7417,6 @@ mute-stream@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" -my-joy-images@1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/my-joy-images/-/my-joy-images-1.1.5.tgz#f25af4e454aa95135c35e8795a7c6a2a125c8777" - dependencies: - "@manaflair/redux-batch" "^0.1.0" - apollo "^0.2.2" - apollo-cache-inmemory "^1.1.9" - apollo-client "^2.2.5" - apollo-link-http "^1.5.2" - apr-intercept "^3.0.3" - date-fns "^1.29.0" - declarative-redux-form "^2.0.8" - force-array "^3.1.0" - fuse.js "^3.2.0" - hapi-render-react "^2.2.0" - hapi-render-react-joyent-document "^4.3.0" - joyent-logo-assets "^1.0.0" - joyent-react-styled-flexboxgrid "^2.2.3" - joyent-ui-toolkit "^5.0.0" - lodash.find "^4.6.0" - lodash.get "^4.4.2" - lodash.isfinite "^3.3.2" - lodash.isfunction "^3.0.9" - lodash.omit "^4.5.0" - lodash.uniqby "^4.7.0" - lunr "^2.1.6" - param-case "^2.1.1" - react "^16.2.0" - react-apollo "^2.0.4" - react-dom "^16.2.0" - react-redux "^5.0.7" - react-redux-values "^1.1.2" - react-router "^4.2.0" - react-router-dom "^4.2.2" - redux "^3.7.2" - redux-form "^7.2.3" - remcalc "^1.0.10" - styled-components "^3.1.6" - styled-components-spacing "^2.1.3" - styled-flex-component "^2.2.1" - styled-is "^1.1.2" - title-case "^2.1.1" - yup "^0.24.1" - mz@^2.7.0: version "2.7.0" resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" @@ -7665,21 +7485,7 @@ node-dir@^0.1.10: dependencies: minimatch "^3.0.2" -node-fetch@1.6.3: - version "1.6.3" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.6.3.tgz#dc234edd6489982d58e8f0db4f695029abcd8c04" - dependencies: - encoding "^0.1.11" - is-stream "^1.0.1" - -node-fetch@1.7.3, node-fetch@^1.0.1: - version "1.7.3" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef" - dependencies: - encoding "^0.1.11" - is-stream "^1.0.1" - -node-fetch@2.1.1: +node-fetch@1.6.3, node-fetch@2.1.1, node-fetch@^1.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.1.1.tgz#369ca70b82f50c86496104a6c776d274f4e4a2d4" @@ -8108,11 +7914,12 @@ parse-glob@^3.0.4: is-extglob "^1.0.0" is-glob "^2.0.0" -parse-json@3.0.0, parse-json@^2.2.0, parse-json@^3.0.0, parse-json@^4.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-3.0.0.tgz#fa6f47b18e23826ead32f263e744d0e1e847fb13" +parse-json@4.0.0, parse-json@^2.2.0, parse-json@^3.0.0, parse-json@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" dependencies: error-ex "^1.3.1" + json-parse-better-errors "^1.0.1" parse-passwd@^1.0.0: version "1.0.0" @@ -8295,7 +8102,7 @@ podium@3.x.x: hoek "5.x.x" joi "13.x.x" -popper.js@^1.12.9: +popper.js@^1.14.1: version "1.14.3" resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.3.tgz#1438f98d046acf7b4d78cd502bf418ac64d4f095" @@ -8619,7 +8426,7 @@ preact-emotion-flexboxgrid@^2.0.1: lodash.isinteger "^4.0.4" preact-emotion "^9.1.0" -preact-emotion@^9.1.0: +preact-emotion@^9.1.0, preact-emotion@^9.1.1: version "9.1.1" resolved "https://registry.yarnpkg.com/preact-emotion/-/preact-emotion-9.1.1.tgz#e6b4de65a6c14162a85c856f00bf56bbbf99bd93" dependencies: @@ -8656,7 +8463,7 @@ prettier@1.11.0: version "1.11.0" resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.11.0.tgz#c024f70cab158c993f50fc0c25ffe738cb8b0f85" -prettier@^1.11.0, prettier@^1.7.4: +prettier@^1.7.4: version "1.11.1" resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.11.1.tgz#61e43fc4cd44e68f2b0dfc2c38cd4bb0fccdcc75" @@ -8838,13 +8645,12 @@ query-string@^4.1.0: object-assign "^4.1.0" strict-uri-encode "^1.0.0" -query-string@^5.1.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb" +query-string@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.0.0.tgz#8b8f39447b73e8290d6f5e3581779218e9171142" dependencies: decode-uri-component "^0.2.0" - object-assign "^4.1.0" - strict-uri-encode "^1.0.0" + strict-uri-encode "^2.0.0" querystring-es3@^0.2.0: version "0.2.1" @@ -8929,7 +8735,7 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.1.7: minimist "^1.2.0" strip-json-comments "~2.0.1" -react-apollo@^2.0.4, react-apollo@^2.1.1: +react-apollo@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/react-apollo/-/react-apollo-2.1.2.tgz#fc355a3975b3f5d7de59db283380a38807e8bf3f" dependencies: @@ -9001,7 +8807,7 @@ react-docgen-displayname-handler@^1.0.1: dependencies: recast "0.12.6" -react-docgen@^3.0.0-beta8, react-docgen@^3.0.0-beta9: +react-docgen@^3.0.0-beta11, react-docgen@^3.0.0-beta8: version "3.0.0-beta9" resolved "https://registry.yarnpkg.com/react-docgen/-/react-docgen-3.0.0-beta9.tgz#6be987e640786ecb10ce2dd22157a022c8285e95" dependencies: @@ -9017,7 +8823,7 @@ react-dom@^0.14.0: version "0.14.9" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-0.14.9.tgz#05064a3dcf0fb1880a3b2bfc9d58c55d8d9f6293" -react-dom@^16.2.0: +react-dom@^16.3.1: version "16.3.1" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.3.1.tgz#6a3c90a4fb62f915bdbcf6204422d93a7d4ca573" dependencies: @@ -9058,12 +8864,12 @@ react-is@^16.3.1: version "16.3.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.3.1.tgz#ee66e6d8283224a83b3030e110056798488359ba" -react-popper@^0.8.2: - version "0.8.3" - resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-0.8.3.tgz#0f73333137c9fb0af6ec4074d2d0585a0a0461e1" +react-popper@^0.9.5: + version "0.9.5" + resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-0.9.5.tgz#02a24ef3eec33af9e54e8358ab70eb0e331edd05" dependencies: - popper.js "^1.12.9" - prop-types "^15.6.0" + popper.js "^1.14.1" + prop-types "^15.6.1" react-redux-values@^1.1.2: version "1.1.2" @@ -9084,7 +8890,7 @@ react-redux@^5.0.7: loose-envify "^1.1.0" prop-types "^15.6.0" -react-responsive@^4.0.4: +react-responsive@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/react-responsive/-/react-responsive-4.1.0.tgz#01d129a35729c8f0373e79871cc8d5ecf6e22765" dependencies: @@ -9173,11 +8979,12 @@ react-scroll-parallax@^1.3.3: dependencies: prop-types "^15.5.10" -react-styleguidist@^6.2.5: - version "6.5.3" - resolved "https://registry.yarnpkg.com/react-styleguidist/-/react-styleguidist-6.5.3.tgz#17abbfd14cfc4e0eb8921bb03d7cbd74836b0b5b" +react-styleguidist@^7.0.4: + version "7.0.4" + resolved "https://registry.yarnpkg.com/react-styleguidist/-/react-styleguidist-7.0.4.tgz#b4bc99d561b3ed8a075c37bca690c0f3e439aeb1" dependencies: - acorn "^5.4.1" + "@vxna/mini-html-webpack-template" "^0.1.6" + acorn "^5.5.3" ast-types "^0.11.3" buble "^0.19.3" chalk "^2.3.2" @@ -9198,7 +9005,6 @@ react-styleguidist@^6.2.5: glob "^7.1.2" glogg "^1.0.1" highlight.js "^9.12.0" - html-webpack-plugin "^2.30.1" is-directory "^0.3.1" javascript-stringify "^1.6.0" jss "^9.8.1" @@ -9212,30 +9018,30 @@ react-styleguidist@^6.2.5: listify "^1.0.0" loader-utils "^1.1.0" lodash "^4.17.5" - lowercase-keys "^1.0.0" - markdown-to-jsx "^6.5.2" + lowercase-keys "^1.0.1" + markdown-to-jsx "^6.6.0" + mini-html-webpack-plugin "^0.2.3" minimist "^1.2.0" ora "^2.0.0" prop-types "^15.6.1" q-i "^2.0.1" react-codemirror2 "^4.2.1" react-dev-utils "^5.0.0" - react-docgen "^3.0.0-beta9" + react-docgen "^3.0.0-beta11" react-docgen-annotation-resolver "^1.0.0" react-docgen-displayname-handler "^1.0.1" react-group "^1.0.5" react-icons "^2.2.7" remark "^9.0.0" - semver-utils "^1.1.1" style-loader "^0.20.3" to-ast "^1.0.0" type-detect "^4.0.8" uglifyjs-webpack-plugin "1.2.4" unist-util-visit "^1.3.0" - webpack-dev-server "^2.9.7" + webpack-dev-server "^2.11.2" webpack-merge "^4.1.2" -react-test-renderer@^16.2.0: +react-test-renderer@^16.3.1: version "16.3.1" resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.3.1.tgz#d9257936d8535bd40f57f3d5a84e7b0452fb17f2" dependencies: @@ -9244,9 +9050,9 @@ react-test-renderer@^16.2.0: prop-types "^15.6.0" react-is "^16.3.1" -react@16.2.0, react@^0.14.0, react@^15.5.4, react@^16.2.0, react@~15.4.1: - version "16.2.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba" +react@16.3.1, react@^0.14.0, react@^15.5.4, react@^16.3.1, react@~15.4.1: + version "16.3.1" + resolved "https://registry.yarnpkg.com/react/-/react-16.3.1.tgz#4a2da433d471251c69b6033ada30e2ed1202cfd8" dependencies: fbjs "^0.8.16" loose-envify "^1.1.0" @@ -9388,14 +9194,15 @@ redent@^2.0.0: indent-string "^3.0.0" strip-indent "^2.0.0" -redrun@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/redrun/-/redrun-6.0.1.tgz#38039c377b08b8e7d9049a960e5d37761721468f" +redrun@^6.0.1, redrun@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/redrun/-/redrun-6.0.2.tgz#83c0db1d94c0c5d7098b3e5e552c01c839b65ce1" dependencies: all-object-keys "^1.0.0" currify "^2.0.0" debug "^3.0.0" envir "^1.0.0" + for-each-key "^1.0.0" fullstore "^1.0.0" jessy "^2.0.0" mapsome "^1.0.0" @@ -9404,7 +9211,7 @@ redrun@^6.0.1: somefilter "^2.0.0" squad "^2.0.0" try-catch "^2.0.0" - yargs-parser "^9.0.2" + yargs-parser "^10.0.0" reduce-css-calc@^1.2.6: version "1.3.0" @@ -9433,7 +9240,7 @@ redux-actions@^2.2.1: lodash-es "^4.17.4" reduce-reducers "^0.1.0" -redux-form@^7.2.3: +redux-form@^7.3.0: version "7.3.0" resolved "https://registry.yarnpkg.com/redux-form/-/redux-form-7.3.0.tgz#b92ef1639c86a6009b0821aacfc80ad8b5ac8c05" dependencies: @@ -9928,10 +9735,6 @@ semver-diff@^2.0.0: dependencies: semver "^5.0.3" -semver-utils@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/semver-utils/-/semver-utils-1.1.2.tgz#197d758a0a28c3d3a009338cfbcc1211bccd76d4" - "semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" @@ -10396,6 +10199,10 @@ strict-uri-encode@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" +strict-uri-encode@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546" + string-length@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/string-length/-/string-length-1.0.1.tgz#56970fb1c38558e9e70b728bf3de269ac45adfac" @@ -10448,13 +10255,7 @@ stringstream@~0.0.4, stringstream@~0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" -strip-ansi@3.0.1, strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - dependencies: - ansi-regex "^2.0.0" - -strip-ansi@^4.0.0: +strip-ansi@3.0.1, strip-ansi@4.0.0, strip-ansi@^3.0.0, strip-ansi@^3.0.1, strip-ansi@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" dependencies: @@ -10524,7 +10325,7 @@ styled-components-spacing@^2.1.3: react-create-component-from-tag-prop "^1.2.1" styled-components-breakpoint "^1.0.0-preview.3" -styled-components@^3.1.6, styled-components@^3.2.1: +styled-components@^3.2.5: version "3.2.5" resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-3.2.5.tgz#b5d5d7d618ab240ff10602b5ca5886b8db3d0a0d" dependencies: @@ -10538,7 +10339,7 @@ styled-components@^3.1.6, styled-components@^3.2.1: stylis-rule-sheet "^0.0.10" supports-color "^3.2.3" -styled-flex-component@^2.2.1: +styled-flex-component@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/styled-flex-component/-/styled-flex-component-2.2.2.tgz#6d5225228bb48ee4b7fe451a3492236381d991d1" dependencies: @@ -10548,7 +10349,7 @@ styled-is@1.1.2, styled-is@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/styled-is/-/styled-is-1.1.2.tgz#f23a43249ba52ac9136c166aac1da30a5711593e" -stylis-rule-sheet@0.0.10, stylis-rule-sheet@^0.0.10: +stylis-rule-sheet@^0.0.10: version "0.0.10" resolved "https://registry.yarnpkg.com/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz#44e64a2b076643f4b52e5ff71efc04d8c3c4a430" @@ -10566,28 +10367,12 @@ subtext@6.x.x: pez "4.x.x" wreck "14.x.x" -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - -supports-color@^3.1.2, supports-color@^3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" - dependencies: - has-flag "^1.0.0" - -supports-color@^4.0.0, supports-color@^4.2.1: +supports-color@4.5.0, supports-color@^3.1.2, supports-color@^3.2.3, supports-color@^4.0.0, supports-color@^4.2.1, supports-color@^5.1.0, supports-color@^5.3.0: version "4.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b" dependencies: has-flag "^2.0.0" -supports-color@^5.1.0, supports-color@^5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0" - dependencies: - has-flag "^3.0.0" - svgo@^0.7.0: version "0.7.2" resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5" @@ -11283,22 +11068,10 @@ utils-merge@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" -uuid@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.0.tgz#6728fc0459c450d796a99c31837569bdf672d728" - -uuid@3.0.x: +uuid@3.0.0, uuid@3.0.1, uuid@3.0.x, uuid@^2.0.1, uuid@^2.0.2, uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0: version "3.0.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" -uuid@^2.0.1, uuid@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a" - -uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" - v8flags@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4" @@ -11487,7 +11260,7 @@ webpack-dev-server@2.9.4: webpack-dev-middleware "^1.11.0" yargs "^6.6.0" -webpack-dev-server@^2.9.7: +webpack-dev-server@^2.11.2: version "2.11.2" resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.11.2.tgz#1f4f4c78bf1895378f376815910812daf79a216f" dependencies: @@ -11619,11 +11392,7 @@ whatwg-encoding@^1.0.1: dependencies: iconv-lite "0.4.19" -whatwg-fetch@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84" - -whatwg-fetch@>=0.10.0: +whatwg-fetch@2.0.3, whatwg-fetch@2.0.4, whatwg-fetch@>=0.10.0: version "2.0.4" resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f" @@ -11788,6 +11557,12 @@ yallist@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" +yargs-parser@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.0.0.tgz#c737c93de2567657750cb1f2c00be639fd19c994" + dependencies: + camelcase "^4.1.0" + yargs-parser@^2.4.0: version "2.4.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-2.4.1.tgz#85568de3cf150ff49fa51825f03a8c880ddcc5c4" @@ -11813,12 +11588,6 @@ yargs-parser@^7.0.0: dependencies: camelcase "^4.1.0" -yargs-parser@^9.0.2: - version "9.0.2" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077" - dependencies: - camelcase "^4.1.0" - yargs@6.6.0, yargs@^6.6.0: version "6.6.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"