From f0a64cf8aff2baa8cae89241810851196d0e15e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=CC=81rgio=20Ramos?= Date: Thu, 23 Nov 2017 12:18:38 +0000 Subject: [PATCH] feat(ui-toolkit): detach icons into its own package --- commitlint.config.js | 2 +- lerna.json | 10 +- package.json | 7 +- packages/icons/.babelrc | 3 + packages/icons/.dockerignore | 9 + packages/icons/.eslintignore | 4 + packages/icons/.eslintrc | 8 + packages/icons/.tern-project | 12 + packages/icons/.yarnclean | 0 packages/icons/README.md | 29 + packages/icons/package.json | 38 + .../__snapshots__/icons.spec.js.snap | 675 ++++++++++++++++++ packages/icons/src/__tests__/icons.spec.js | 378 ++++++++++ packages/icons/src/actions.js | 16 + packages/icons/src/affinity.js | 22 + packages/icons/src/arrow.js | 22 + packages/icons/src/bin.js | 13 + packages/icons/src/checkcircle.js | 115 +++ packages/icons/src/chevron.js | 23 + packages/icons/src/close.js | 22 + packages/icons/src/colors.js | 22 + packages/icons/src/data-center.js | 22 + .../src/icons => icons/src}/dot.js | 6 +- packages/icons/src/health.js | 24 + packages/icons/src/import.js | 50 ++ packages/icons/src/index.js | 18 + packages/icons/src/instances.js | 22 + packages/icons/src/loading.js | 34 + packages/icons/src/minus.js | 22 + packages/icons/src/package.js | 22 + packages/icons/src/plus.js | 22 + packages/icons/src/triton.js | 62 ++ packages/icons/src/user.js | 12 + .../src/components/instances/list.js | 4 +- .../src/components/navigation/header.js | 14 +- packages/ui-toolkit/README.md | 3 - packages/ui-toolkit/package.json | 24 +- packages/ui-toolkit/src/breadcrumb/item.js | 2 +- packages/ui-toolkit/src/card/demo.md | 67 +- packages/ui-toolkit/src/close-button/index.js | 4 +- packages/ui-toolkit/src/form/number-input.js | 6 +- packages/ui-toolkit/src/header/brand.js | 1 - packages/ui-toolkit/src/header/nav.js | 19 +- packages/ui-toolkit/src/header/usage.md | 24 +- .../ui-toolkit/src/icons/actions-light.js | 6 - packages/ui-toolkit/src/icons/actions.js | 6 - packages/ui-toolkit/src/icons/affinity.js | 6 - packages/ui-toolkit/src/icons/arrow-light.js | 6 - packages/ui-toolkit/src/icons/arrow.js | 6 - packages/ui-toolkit/src/icons/bin.js | 6 - packages/ui-toolkit/src/icons/chevron.js | 7 - packages/ui-toolkit/src/icons/close.js | 6 - packages/ui-toolkit/src/icons/completed.js | 6 - .../ui-toolkit/src/icons/data-center-light.js | 7 - packages/ui-toolkit/src/icons/data-center.js | 7 - packages/ui-toolkit/src/icons/healthy.js | 14 - packages/ui-toolkit/src/icons/icons.js | 110 ++- packages/ui-toolkit/src/icons/import.js | 6 - packages/ui-toolkit/src/icons/incomplete.js | 6 - packages/ui-toolkit/src/icons/index.js | 69 +- .../ui-toolkit/src/icons/instances-light.js | 6 - packages/ui-toolkit/src/icons/instances.js | 6 - packages/ui-toolkit/src/icons/loading.js | 6 - packages/ui-toolkit/src/icons/minus.js | 7 - packages/ui-toolkit/src/icons/package.js | 6 - .../ui-toolkit/src/icons/part-complete.js | 6 - packages/ui-toolkit/src/icons/plus.js | 7 - .../ui-toolkit/src/icons/svg/affinity.svg | 3 - .../ui-toolkit/src/icons/svg/icon_actions.svg | 1 - .../src/icons/svg/icon_actions_light.svg | 1 - .../ui-toolkit/src/icons/svg/icon_alert.svg | 1 - .../ui-toolkit/src/icons/svg/icon_arrow.svg | 1 - .../src/icons/svg/icon_arrow_light.svg | 1 - .../ui-toolkit/src/icons/svg/icon_bin.svg | 1 - .../src/icons/svg/icon_calendar.svg | 1 - .../ui-toolkit/src/icons/svg/icon_chevron.svg | 1 - .../src/icons/svg/icon_close_cross.svg | 1 - .../src/icons/svg/icon_completed.svg | 1 - .../ui-toolkit/src/icons/svg/icon_cpu.svg | 1 - .../src/icons/svg/icon_data_center.svg | 1 - .../src/icons/svg/icon_data_center_light.svg | 1 - .../ui-toolkit/src/icons/svg/icon_disk.svg | 1 - .../src/icons/svg/icon_error_failure.svg | 1 - .../ui-toolkit/src/icons/svg/icon_healthy.svg | 1 - .../src/icons/svg/icon_incomplete.svg | 1 - .../src/icons/svg/icon_instances.svg | 1 - .../src/icons/svg/icon_instances_light.svg | 1 - .../ui-toolkit/src/icons/svg/icon_loading.svg | 1 - .../ui-toolkit/src/icons/svg/icon_minus.svg | 1 - .../src/icons/svg/icon_part_completed.svg | 1 - .../ui-toolkit/src/icons/svg/icon_plus.svg | 1 - .../ui-toolkit/src/icons/svg/icon_ran.svg | 1 - .../ui-toolkit/src/icons/svg/icon_tick.svg | 1 - .../src/icons/svg/icon_upload_manifest.svg | 1 - .../ui-toolkit/src/icons/svg/icon_user.svg | 1 - .../src/icons/svg/icon_user_light.svg | 1 - packages/ui-toolkit/src/icons/svg/import.svg | 26 - packages/ui-toolkit/src/icons/svg/package.svg | 3 - .../ui-toolkit/src/icons/svg/triton_beta.svg | 18 - .../ui-toolkit/src/icons/svg/triton_logo.svg | 1 - packages/ui-toolkit/src/icons/tick.js | 6 - packages/ui-toolkit/src/icons/triton-beta.js | 6 - packages/ui-toolkit/src/icons/triton.js | 7 - packages/ui-toolkit/src/icons/unhealthy.js | 6 - packages/ui-toolkit/src/icons/user-light.js | 6 - packages/ui-toolkit/src/icons/user.js | 6 - packages/ui-toolkit/src/index.js | 46 +- packages/ui-toolkit/src/message/Readme.md | 20 +- .../ui-toolkit/src/progress-bar/indicator.js | 6 +- packages/ui-toolkit/src/text/headings.js | 1 - packages/ui-toolkit/styleguide.config.js | 7 +- prototypes/create-instance-icons/README.md | 1 - .../src/components/navigation/header.js | 12 +- prototypes/create-instance/README.md | 1 - yarn.lock | 313 ++++---- 115 files changed, 2106 insertions(+), 649 deletions(-) create mode 100644 packages/icons/.babelrc create mode 100644 packages/icons/.dockerignore create mode 100644 packages/icons/.eslintignore create mode 100644 packages/icons/.eslintrc create mode 100644 packages/icons/.tern-project create mode 100644 packages/icons/.yarnclean create mode 100644 packages/icons/README.md create mode 100644 packages/icons/package.json create mode 100644 packages/icons/src/__tests__/__snapshots__/icons.spec.js.snap create mode 100644 packages/icons/src/__tests__/icons.spec.js create mode 100644 packages/icons/src/actions.js create mode 100644 packages/icons/src/affinity.js create mode 100644 packages/icons/src/arrow.js create mode 100644 packages/icons/src/bin.js create mode 100644 packages/icons/src/checkcircle.js create mode 100644 packages/icons/src/chevron.js create mode 100644 packages/icons/src/close.js create mode 100644 packages/icons/src/colors.js create mode 100644 packages/icons/src/data-center.js rename packages/{ui-toolkit/src/icons => icons/src}/dot.js (75%) create mode 100644 packages/icons/src/health.js create mode 100644 packages/icons/src/import.js create mode 100644 packages/icons/src/index.js create mode 100644 packages/icons/src/instances.js create mode 100644 packages/icons/src/loading.js create mode 100644 packages/icons/src/minus.js create mode 100644 packages/icons/src/package.js create mode 100644 packages/icons/src/plus.js create mode 100644 packages/icons/src/triton.js create mode 100644 packages/icons/src/user.js delete mode 100644 packages/ui-toolkit/src/icons/actions-light.js delete mode 100644 packages/ui-toolkit/src/icons/actions.js delete mode 100644 packages/ui-toolkit/src/icons/affinity.js delete mode 100644 packages/ui-toolkit/src/icons/arrow-light.js delete mode 100644 packages/ui-toolkit/src/icons/arrow.js delete mode 100644 packages/ui-toolkit/src/icons/bin.js delete mode 100644 packages/ui-toolkit/src/icons/chevron.js delete mode 100644 packages/ui-toolkit/src/icons/close.js delete mode 100644 packages/ui-toolkit/src/icons/completed.js delete mode 100644 packages/ui-toolkit/src/icons/data-center-light.js delete mode 100644 packages/ui-toolkit/src/icons/data-center.js delete mode 100644 packages/ui-toolkit/src/icons/healthy.js delete mode 100644 packages/ui-toolkit/src/icons/import.js delete mode 100644 packages/ui-toolkit/src/icons/incomplete.js delete mode 100644 packages/ui-toolkit/src/icons/instances-light.js delete mode 100644 packages/ui-toolkit/src/icons/instances.js delete mode 100644 packages/ui-toolkit/src/icons/loading.js delete mode 100644 packages/ui-toolkit/src/icons/minus.js delete mode 100644 packages/ui-toolkit/src/icons/package.js delete mode 100644 packages/ui-toolkit/src/icons/part-complete.js delete mode 100644 packages/ui-toolkit/src/icons/plus.js delete mode 100644 packages/ui-toolkit/src/icons/svg/affinity.svg delete mode 100644 packages/ui-toolkit/src/icons/svg/icon_actions.svg delete mode 100644 packages/ui-toolkit/src/icons/svg/icon_actions_light.svg delete mode 100755 packages/ui-toolkit/src/icons/svg/icon_alert.svg delete mode 100755 packages/ui-toolkit/src/icons/svg/icon_arrow.svg delete mode 100755 packages/ui-toolkit/src/icons/svg/icon_arrow_light.svg delete mode 100644 packages/ui-toolkit/src/icons/svg/icon_bin.svg delete mode 100755 packages/ui-toolkit/src/icons/svg/icon_calendar.svg delete mode 100644 packages/ui-toolkit/src/icons/svg/icon_chevron.svg delete mode 100755 packages/ui-toolkit/src/icons/svg/icon_close_cross.svg delete mode 100644 packages/ui-toolkit/src/icons/svg/icon_completed.svg delete mode 100755 packages/ui-toolkit/src/icons/svg/icon_cpu.svg delete mode 100755 packages/ui-toolkit/src/icons/svg/icon_data_center.svg delete mode 100755 packages/ui-toolkit/src/icons/svg/icon_data_center_light.svg delete mode 100755 packages/ui-toolkit/src/icons/svg/icon_disk.svg delete mode 100755 packages/ui-toolkit/src/icons/svg/icon_error_failure.svg delete mode 100755 packages/ui-toolkit/src/icons/svg/icon_healthy.svg delete mode 100644 packages/ui-toolkit/src/icons/svg/icon_incomplete.svg delete mode 100755 packages/ui-toolkit/src/icons/svg/icon_instances.svg delete mode 100755 packages/ui-toolkit/src/icons/svg/icon_instances_light.svg delete mode 100644 packages/ui-toolkit/src/icons/svg/icon_loading.svg delete mode 100644 packages/ui-toolkit/src/icons/svg/icon_minus.svg delete mode 100644 packages/ui-toolkit/src/icons/svg/icon_part_completed.svg delete mode 100644 packages/ui-toolkit/src/icons/svg/icon_plus.svg delete mode 100755 packages/ui-toolkit/src/icons/svg/icon_ran.svg delete mode 100755 packages/ui-toolkit/src/icons/svg/icon_tick.svg delete mode 100755 packages/ui-toolkit/src/icons/svg/icon_upload_manifest.svg delete mode 100755 packages/ui-toolkit/src/icons/svg/icon_user.svg delete mode 100755 packages/ui-toolkit/src/icons/svg/icon_user_light.svg delete mode 100644 packages/ui-toolkit/src/icons/svg/import.svg delete mode 100644 packages/ui-toolkit/src/icons/svg/package.svg delete mode 100644 packages/ui-toolkit/src/icons/svg/triton_beta.svg delete mode 100644 packages/ui-toolkit/src/icons/svg/triton_logo.svg delete mode 100644 packages/ui-toolkit/src/icons/tick.js delete mode 100644 packages/ui-toolkit/src/icons/triton-beta.js delete mode 100644 packages/ui-toolkit/src/icons/triton.js delete mode 100644 packages/ui-toolkit/src/icons/unhealthy.js delete mode 100644 packages/ui-toolkit/src/icons/user-light.js delete mode 100644 packages/ui-toolkit/src/icons/user.js diff --git a/commitlint.config.js b/commitlint.config.js index 0667ed75..f4eeefb8 100644 --- a/commitlint.config.js +++ b/commitlint.config.js @@ -4,7 +4,7 @@ module.exports = { 'scope-enum': [ 2, 'always', - ['ui-toolkit', 'my-joy-beta', 'boilerplate', 'create-instance'] + ['ui-toolkit', 'icons', 'my-joy-beta', 'boilerplate', 'create-instance'] ] } }; diff --git a/lerna.json b/lerna.json index dee1c355..80981fac 100644 --- a/lerna.json +++ b/lerna.json @@ -3,13 +3,5 @@ "version": "independent", "npmClient": "yarn", "useWorkspaces": true, - "hoist": true, - "nohoist": [ - "graphi", - "eslint", - "jest", - "jest-cli", - "react-scripts", - "react-styleguidist" - ] + "hoist": true } diff --git a/package.json b/package.json index ff7fb2b1..0fcc4d9e 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "test": "lerna run test", "clean": "lerna clean --yes", "dev": "redrun -p dev:*", - "dev:ui": "lerna run watch --scope joyent-ui-toolkit --stream", + "dev:ui": "lerna run dev --scope joyent-ui-toolkit --stream", "dev:mjb": "lerna run dev --scope my-joy-beta --stream", "commitmsg": "commitlint -e", "precommit": "cross-env CI=1 redrun -s lint-staged format-staged", @@ -73,11 +73,10 @@ "lodash.defaults": "4.2.0", "lodash.assign": "4.2.0", "isarray": "'2.0.2", - "moment": "2.19.1", - "codemirror": "5.30.0", + "codemirror": "5.32.0", "react": "16.1.1", "react-dom": "16.1.1", - "react-modal": "2.4.1", + "react-modal": "3.1.3", "hoist-non-react-statics": "2.3.1", "webpack-sources": "1.0.1" } diff --git a/packages/icons/.babelrc b/packages/icons/.babelrc new file mode 100644 index 00000000..594acfe3 --- /dev/null +++ b/packages/icons/.babelrc @@ -0,0 +1,3 @@ +{ + "presets": ["joyent-portal"] +} diff --git a/packages/icons/.dockerignore b/packages/icons/.dockerignore new file mode 100644 index 00000000..06ad4916 --- /dev/null +++ b/packages/icons/.dockerignore @@ -0,0 +1,9 @@ +src/components/base/*.css +node_modules +coverage +.nyc_output +docs/static +!docs/static/index.html +docs/node_modules +dist +package-lock.json diff --git a/packages/icons/.eslintignore b/packages/icons/.eslintignore new file mode 100644 index 00000000..0dd1156c --- /dev/null +++ b/packages/icons/.eslintignore @@ -0,0 +1,4 @@ +.nyc_output +coverage +dist +styleguide \ No newline at end of file diff --git a/packages/icons/.eslintrc b/packages/icons/.eslintrc new file mode 100644 index 00000000..54492a1a --- /dev/null +++ b/packages/icons/.eslintrc @@ -0,0 +1,8 @@ +{ + "extends": "joyent-portal", + "rules": { + "no-console": 1, + "new-cap": 0, + "jsx-a11y/href-no-hash": 0 + } +} diff --git a/packages/icons/.tern-project b/packages/icons/.tern-project new file mode 100644 index 00000000..b4542e69 --- /dev/null +++ b/packages/icons/.tern-project @@ -0,0 +1,12 @@ +{ + "libs": [ + "ecmascript", + "browser" + ], + "plugins": { + "doc_comment": true, + "local-scope": true, + "jsx": true, + "node": true + } +} diff --git a/packages/icons/.yarnclean b/packages/icons/.yarnclean new file mode 100644 index 00000000..e69de29b diff --git a/packages/icons/README.md b/packages/icons/README.md new file mode 100644 index 00000000..805697ee --- /dev/null +++ b/packages/icons/README.md @@ -0,0 +1,29 @@ +# joyent-icons + +[![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg)](https://opensource.org/licenses/MPL-2.0) +[![standard-readme compliant](https://img.shields.io/badge/standard--readme-OK-green.svg)](https://github.com/RichardLitt/standard-readme) + +## Table of Contents + +* [Install](#install) +* [Usage](#usage) +* [License](#license) + +## Install + +``` +yarn add --dev joyent-icons +``` + +## Usage + +```js +import React from 'react'; +import { Arrow } from 'joyent-icons'; + +export default () => ; +``` + +## License + +MPL-2.0 diff --git a/packages/icons/package.json b/packages/icons/package.json new file mode 100644 index 00000000..bd25cf7d --- /dev/null +++ b/packages/icons/package.json @@ -0,0 +1,38 @@ +{ + "name": "joyent-icons", + "version": "1.0.1", + "license": "MPL-2.0", + "repository": "github:yldio/joyent-portal", + "main": "dist/umd/index.js", + "jsnext:main": "dist/es/index.js", + "module": "dist/es/index.js", + "scripts": { + "lint-ci": "eslint . --ext .js --ext .md", + "lint": "eslint . --fix --ext .js --ext .md", + "test-ci": "redrun -s test", + "test": "NODE_ENV=test joyent-react-scripts test --env=jsdom", + "compile-watch:es": "NODE_ENV=development babel src --out-dir dist/es --source-maps inline --watch", + "compile:es": "NODE_ENV=development babel src --out-dir dist/es --source-maps inline", + "compile:umd": "NODE_ENV=test babel src --out-dir dist/umd --source-maps inline", + "compile-watch:umd": "NODE_ENV=test babel src --out-dir dist/umd --source-maps inline --watch", + "compile": "redrun -p compile:*", + "dev": "redrun -p compile-watch:*", + "prepublish": "redrun -s compile" + }, + "dependencies": { + "remcalc": "^1.0.9", + "styled-components": "^2.2.3" + }, + "devDependencies": { + "babel-cli": "^6.26.0", + "babel-preset-joyent-portal": "^3.3.3", + "eslint": "^4.11.0", + "eslint-config-joyent-portal": "^3.2.0", + "joyent-react-scripts": "^3.1.1", + "react": "^16.1.1", + "redrun": "^5.10.0" + }, + "peerDependencies": { + "react": "^16.1.1" + } +} diff --git a/packages/icons/src/__tests__/__snapshots__/icons.spec.js.snap b/packages/icons/src/__tests__/__snapshots__/icons.spec.js.snap new file mode 100644 index 00000000..2acf60b4 --- /dev/null +++ b/packages/icons/src/__tests__/__snapshots__/icons.spec.js.snap @@ -0,0 +1,675 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`renders without throwing 1`] = ` + + + + + +`; + +exports[`renders without throwing 1`] = ` + + + + + +`; + +exports[`renders without throwing 1`] = ` + + + +`; + +exports[`renders without throwing 1`] = ` + + + +`; + +exports[`renders without throwing 1`] = ` + + + +`; + +exports[`renders without throwing 1`] = ` + + + + +`; + +exports[`renders without throwing 1`] = ` + + + + +`; + +exports[`renders without throwing 1`] = ` + + + + + +`; + +exports[`renders without throwing 1`] = ` + + + +`; + +exports[`renders without throwing 1`] = ` + + + + +`; + +exports[`renders without throwing 1`] = ` + + + +`; + +exports[`renders without throwing 1`] = ` + + + +`; + +exports[`renders without throwing 1`] = ` + + + +`; + +exports[`renders without throwing 1`] = ` + + + +`; + +exports[`renders without throwing 1`] = ` + + + +`; + +exports[`renders without throwing 1`] = ` +.c0 { + width: 0.375rem; + height: 0.375rem; + border-radius: 0.1875rem; + display: inline-block; +} + + +`; + +exports[`renders without throwing 1`] = ` + + + + + + +`; + +exports[`renders without throwing 1`] = ` + + + + + + +`; + +exports[`renders without throwing 1`] = ` + + + + + + + + + + + + + + + + + + +`; + +exports[`renders without throwing 1`] = ` + + + +`; + +exports[`renders without throwing 1`] = ` + + + +`; + +exports[`renders without throwing 1`] = ` + + + + + + + + +`; + +exports[`renders without throwing 1`] = ` + + + +`; + +exports[`renders without throwing 1`] = ` + + + +`; + +exports[`renders without throwing 2`] = ` + + + +`; + +exports[`renders without throwing 1`] = ` + + + +`; + +exports[`renders without throwing 1`] = ` + + + +`; + +exports[`renders without throwing 1`] = ` + + + +`; + +exports[`renders without throwing 1`] = ` + + + +`; + +exports[`renders without throwing 1`] = ` + + + +`; + +exports[`renders without throwing 1`] = ` + + + + + + + + + + + + + + +`; + +exports[`renders without throwing 1`] = ` + + + +`; diff --git a/packages/icons/src/__tests__/icons.spec.js b/packages/icons/src/__tests__/icons.spec.js new file mode 100644 index 00000000..c84270d3 --- /dev/null +++ b/packages/icons/src/__tests__/icons.spec.js @@ -0,0 +1,378 @@ +import React from 'react'; +import { ThemeProvider } from 'styled-components'; +import renderer from 'react-test-renderer'; +import 'jest-styled-components'; +import { colors } from '../colors'; + +import { + Actions, + Affinity, + Arrow, + Bin, + Checkcircle, + Chevron, + Close, + DataCenter, + Dot, + Health, + Import, + Instances, + Loading, + Minus, + Package, + Plus, + Triton, + User +} from '..'; + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); + +it('renders without throwing', () => { + const tree = renderer + .create( + + + + ) + .toJSON(); + expect(tree).toMatchSnapshot(); +}); diff --git a/packages/icons/src/actions.js b/packages/icons/src/actions.js new file mode 100644 index 00000000..a749b999 --- /dev/null +++ b/packages/icons/src/actions.js @@ -0,0 +1,16 @@ +import React from 'react'; +import remcalc from 'remcalc'; + +import Colors from './colors'; + +export default ({ light = false, ...rest }) => ( + + {({ white, secondary }) => ( + + + + + + )} + +); diff --git a/packages/icons/src/affinity.js b/packages/icons/src/affinity.js new file mode 100644 index 00000000..69a24faa --- /dev/null +++ b/packages/icons/src/affinity.js @@ -0,0 +1,22 @@ +import React from 'react'; +import Colors from './colors'; + +export default ({ light = false, ...rest }) => ( + + {({ white, secondary }) => ( + + + + )} + +); diff --git a/packages/icons/src/arrow.js b/packages/icons/src/arrow.js new file mode 100644 index 00000000..eb3dddbe --- /dev/null +++ b/packages/icons/src/arrow.js @@ -0,0 +1,22 @@ +import React from 'react'; +import Colors from './colors'; + +export default ({ light = false, ...rest }) => ( + + {({ white, secondary }) => ( + + + + )} + +); diff --git a/packages/icons/src/bin.js b/packages/icons/src/bin.js new file mode 100644 index 00000000..70ba9ca0 --- /dev/null +++ b/packages/icons/src/bin.js @@ -0,0 +1,13 @@ +import React from 'react'; + +export default props => ( + + + +); diff --git a/packages/icons/src/checkcircle.js b/packages/icons/src/checkcircle.js new file mode 100644 index 00000000..3ca64940 --- /dev/null +++ b/packages/icons/src/checkcircle.js @@ -0,0 +1,115 @@ +import React from 'react'; +import remcalc from 'remcalc'; + +import Colors from './colors'; + +export const Tick = props => ( + + + +); + +export const Completed = props => ( + + {({ white, secondary, greenDark }) => ( + + + + + )} + +); + +export const PartCompleted = props => ( + + {({ white, secondary, greenDark }) => ( + + + + + + )} + +); + +export const Incomplete = props => ( + + {({ white, secondary }) => ( + + + + + )} + +); + +export default ({ fill, checked, border, ...rest }) => { + if (fill && checked) { + return ; + } + + if (checked && border) { + return ; + } + + if (checked) { + return ; + } + + return ; +}; diff --git a/packages/icons/src/chevron.js b/packages/icons/src/chevron.js new file mode 100644 index 00000000..1ec4dfe1 --- /dev/null +++ b/packages/icons/src/chevron.js @@ -0,0 +1,23 @@ +import React from 'react'; +import Colors from './colors'; + +export default ({ light = false, ...rest }) => ( + + {({ white, secondary }) => ( + + + + )} + +); diff --git a/packages/icons/src/close.js b/packages/icons/src/close.js new file mode 100644 index 00000000..050d27b7 --- /dev/null +++ b/packages/icons/src/close.js @@ -0,0 +1,22 @@ +import React from 'react'; +import Colors from './colors'; + +export default ({ light = false, ...rest }) => ( + + {({ white, secondary }) => ( + + + + )} + +); diff --git a/packages/icons/src/colors.js b/packages/icons/src/colors.js new file mode 100644 index 00000000..100d5bd8 --- /dev/null +++ b/packages/icons/src/colors.js @@ -0,0 +1,22 @@ +import { withTheme } from 'styled-components'; + +export const colors = { + white: '#FFF', + secondary: '#464646', + greenDark: '#008138', + green: '#009858', + orange: '#e38200', + primary: '#3b46cc' +}; + +export default withTheme(({ theme = {}, children, ...rest }) => + children( + Object.keys(rest).reduce( + (sum, name) => ({ + ...sum, + [name]: theme[name] || colors[name] || rest[name] + }), + rest + ) + ) +); diff --git a/packages/icons/src/data-center.js b/packages/icons/src/data-center.js new file mode 100644 index 00000000..f4250810 --- /dev/null +++ b/packages/icons/src/data-center.js @@ -0,0 +1,22 @@ +import React from 'react'; +import Colors from './colors'; + +export default ({ light = false, ...rest }) => ( + + {({ white, secondary }) => ( + + + + )} + +); diff --git a/packages/ui-toolkit/src/icons/dot.js b/packages/icons/src/dot.js similarity index 75% rename from packages/ui-toolkit/src/icons/dot.js rename to packages/icons/src/dot.js index 71a04586..aca39ea1 100644 --- a/packages/ui-toolkit/src/icons/dot.js +++ b/packages/icons/src/dot.js @@ -1,12 +1,10 @@ import remcalc from 'remcalc'; import styled from 'styled-components'; -import Baseline from '../baseline'; - -export default Baseline(styled.span` +export default styled.span` width: ${remcalc(6)}; height: ${remcalc(6)}; border-radius: ${remcalc(3)}; background-color: ${props => props.theme[props.color]}; display: inline-block; -`); +`; diff --git a/packages/icons/src/health.js b/packages/icons/src/health.js new file mode 100644 index 00000000..c5439a73 --- /dev/null +++ b/packages/icons/src/health.js @@ -0,0 +1,24 @@ +import React from 'react'; +import Colors from './colors'; + +export default ({ healthy = true, ...rest }) => ( + + {({ green, orange }) => ( + + + + + + + )} + +); diff --git a/packages/icons/src/import.js b/packages/icons/src/import.js new file mode 100644 index 00000000..08ae866c --- /dev/null +++ b/packages/icons/src/import.js @@ -0,0 +1,50 @@ +import React from 'react'; +import Colors from './colors'; + +export default props => ( + + {({ white, secondary }) => ( + + + + + + + + + + + + + + + + + + + )} + +); diff --git a/packages/icons/src/index.js b/packages/icons/src/index.js new file mode 100644 index 00000000..694946b5 --- /dev/null +++ b/packages/icons/src/index.js @@ -0,0 +1,18 @@ +export { default as Actions } from './actions'; +export { default as Affinity } from './affinity'; +export { default as Arrow } from './arrow'; +export { default as Bin } from './bin'; +export { default as Checkcircle } from './checkcircle'; +export { default as Chevron } from './chevron'; +export { default as Close } from './close'; +export { default as DataCenter } from './data-center'; +export { default as Dot } from './dot'; +export { default as Health } from './health'; +export { default as Import } from './import'; +export { default as Instances } from './instances'; +export { default as Loading } from './loading'; +export { default as Minus } from './minus'; +export { default as Package } from './package'; +export { default as Plus } from './plus'; +export { default as Triton } from './triton'; +export { default as User } from './user'; diff --git a/packages/icons/src/instances.js b/packages/icons/src/instances.js new file mode 100644 index 00000000..2a8f5f78 --- /dev/null +++ b/packages/icons/src/instances.js @@ -0,0 +1,22 @@ +import React from 'react'; +import Colors from './colors'; + +export default ({ light = false, ...rest }) => ( + + {({ white, secondary }) => ( + + + + )} + +); diff --git a/packages/icons/src/loading.js b/packages/icons/src/loading.js new file mode 100644 index 00000000..248f8ae6 --- /dev/null +++ b/packages/icons/src/loading.js @@ -0,0 +1,34 @@ +import React from 'react'; +import Colors from './colors'; + +export default props => ( + + {({ primary }) => ( + + + + + + + + + )} + +); diff --git a/packages/icons/src/minus.js b/packages/icons/src/minus.js new file mode 100644 index 00000000..d20e1dbb --- /dev/null +++ b/packages/icons/src/minus.js @@ -0,0 +1,22 @@ +import React from 'react'; +import Colors from './colors'; + +export default ({ light = false, ...rest }) => ( + + {({ white, secondary }) => ( + + + + )} + +); diff --git a/packages/icons/src/package.js b/packages/icons/src/package.js new file mode 100644 index 00000000..9d659409 --- /dev/null +++ b/packages/icons/src/package.js @@ -0,0 +1,22 @@ +import React from 'react'; +import Colors from './colors'; + +export default ({ light = false, ...rest }) => ( + + {({ white, secondary }) => ( + + + + )} + +); diff --git a/packages/icons/src/plus.js b/packages/icons/src/plus.js new file mode 100644 index 00000000..d57cae2e --- /dev/null +++ b/packages/icons/src/plus.js @@ -0,0 +1,22 @@ +import React from 'react'; +import Colors from './colors'; + +export default ({ light = false, ...rest }) => ( + + {({ white, secondary }) => ( + + + + )} + +); diff --git a/packages/icons/src/triton.js b/packages/icons/src/triton.js new file mode 100644 index 00000000..e338c27f --- /dev/null +++ b/packages/icons/src/triton.js @@ -0,0 +1,62 @@ +import React from 'react'; + +const TritonBeta = props => ( + + + + + + + + + + + + + + +); + +const Triton = props => ( + + + +); + +export default ({ beta = false, ...rest }) => + beta ? : ; diff --git a/packages/icons/src/user.js b/packages/icons/src/user.js new file mode 100644 index 00000000..6a0d1165 --- /dev/null +++ b/packages/icons/src/user.js @@ -0,0 +1,12 @@ +import React from 'react'; +import Colors from './colors'; + +export default ({ light = false, ...rest }) => ( + + {({ white, secondary }) => ( + + + + )} + +); diff --git a/packages/my-joy-beta/src/components/instances/list.js b/packages/my-joy-beta/src/components/instances/list.js index 3bf3f3da..cc2aec48 100644 --- a/packages/my-joy-beta/src/components/instances/list.js +++ b/packages/my-joy-beta/src/components/instances/list.js @@ -25,7 +25,7 @@ import { Checkbox, P, DotIcon, - IconActions, + ActionsIcon, PopoverContainer, PopoverTarget, Popover, @@ -77,7 +77,7 @@ const Item = ({ - + {!allowedActions.stop ? null : ( diff --git a/packages/my-joy-beta/src/components/navigation/header.js b/packages/my-joy-beta/src/components/navigation/header.js index ea83a8af..f43c4979 100644 --- a/packages/my-joy-beta/src/components/navigation/header.js +++ b/packages/my-joy-beta/src/components/navigation/header.js @@ -5,15 +5,15 @@ import remcalc from 'remcalc'; import { Header, HeaderBrand, - TritonBetaIcon, - DataCenterIconLight, - UserIconLight, + TritonIcon, + DataCenterIcon, + UserIcon, HeaderNav, HeaderAnchor, HeaderItem } from 'joyent-ui-toolkit'; -const Logo = styled(TritonBetaIcon)` +const Logo = styled(TritonIcon)` padding-top: ${remcalc(11)}; `; @@ -21,7 +21,7 @@ export default () => (
- + @@ -36,12 +36,12 @@ export default () => ( - eu-east-1 + eu-east-1 - Nicola + Nicola
diff --git a/packages/ui-toolkit/README.md b/packages/ui-toolkit/README.md index 57b116a7..0240803c 100644 --- a/packages/ui-toolkit/README.md +++ b/packages/ui-toolkit/README.md @@ -1,10 +1,7 @@ # joyent-portal-ui-toolkit -[![Docker Repository on Quay](https://quay.io/repository/yldio/joyent-ui-toolkit/status)](https://quay.io/repository/yldio/joyent-ui-toolkit) [![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg)](https://opensource.org/licenses/MPL-2.0) [![standard-readme compliant](https://img.shields.io/badge/standard--readme-OK-green.svg)](https://github.com/RichardLitt/standard-readme) -[![demo master](https://img.shields.io/badge/demo-master-3B47CC.svg)](http://styleguide-master.svc.f4b20699-b323-4452-9091-977895896da6.eu-ams-1.triton.zone:6060) -[![demo staging](https://img.shields.io/badge/demo-staging-3B47CC.svg)](http://styleguide-staging.svc.f4b20699-b323-4452-9091-977895896da6.eu-ams-1.triton.zone:6060) ## Table of Contents diff --git a/packages/ui-toolkit/package.json b/packages/ui-toolkit/package.json index 5e0dd2d1..c663e3e9 100644 --- a/packages/ui-toolkit/package.json +++ b/packages/ui-toolkit/package.json @@ -7,27 +7,20 @@ "jsnext:main": "dist/es/index.js", "module": "dist/es/index.js", "scripts": { - "lint-ci": - "eslint . --ext .js --ext .md && echo 0 `# stylelint './src/**/*.js'`", - "lint": - "eslint . --fix --ext .js --ext .md && echo 0 `# stylelint './src/**/*.js'`", + "lint-ci": "eslint . --ext .js --ext .md && echo 0 `# stylelint './src/**/*.js'`", + "lint": "eslint . --fix --ext .js --ext .md && echo 0 `# stylelint './src/**/*.js'`", "test-ci": "echo 0", "test": "echo 0", "test:visual": "run-p serve jest", "jest": "jest", "serve": "http-server styleguide -p 6060 -s", - "copy-fonts": - "rm -rf dist; mkdir -p dist/es/typography; mkdir -p dist/umd/typography; cp -r src/typography/libre-franklin dist/es/typography; cp -r src/typography/libre-franklin dist/umd/typography", - "compile-watch:es": - "NODE_ENV=development babel src --out-dir dist/es --source-maps inline --watch", - "compile:es": - "NODE_ENV=development babel src --out-dir dist/es --source-maps inline", - "compile:umd": - "NODE_ENV=test babel src --out-dir dist/umd --source-maps inline", - "compile-watch:umd": - "NODE_ENV=test babel src --out-dir dist/umd --source-maps inline --watch", + "copy-fonts": "rm -rf dist; mkdir -p dist/es/typography; mkdir -p dist/umd/typography; cp -r src/typography/libre-franklin dist/es/typography; cp -r src/typography/libre-franklin dist/umd/typography", + "compile-watch:es": "NODE_ENV=development babel src --out-dir dist/es --source-maps inline --watch", + "compile:es": "NODE_ENV=development babel src --out-dir dist/es --source-maps inline", + "compile:umd": "NODE_ENV=test babel src --out-dir dist/umd --source-maps inline", + "compile-watch:umd": "NODE_ENV=test babel src --out-dir dist/umd --source-maps inline --watch", "compile": "redrun -p compile:*", - "watch": "redrun copy-fonts && redrun -p compile-watch:*", + "dev": "redrun copy-fonts && redrun -p compile-watch:*", "styleguide:build": "NODE_ENV=production styleguidist build", "styleguide": "NODE_ENV=development styleguidist server", "prepublish": "redrun -s copy-fonts compile" @@ -37,6 +30,7 @@ "disable-scroll": "^0.3.0", "fontfaceobserver": "^2.0.13", "joy-react-broadcast": "^0.6.9", + "joyent-icons": "^1.0.1", "joyent-manifest-editor": "^3.0.1", "lodash.isboolean": "^3.0.3", "lodash.isstring": "^4.0.1", diff --git a/packages/ui-toolkit/src/breadcrumb/item.js b/packages/ui-toolkit/src/breadcrumb/item.js index 110a22d7..714b36dd 100644 --- a/packages/ui-toolkit/src/breadcrumb/item.js +++ b/packages/ui-toolkit/src/breadcrumb/item.js @@ -5,7 +5,7 @@ import remcalc from 'remcalc'; import typography from '../typography'; import { H2 } from '../text/headings'; -import Chevron from '../icons/chevron'; +import { Chevron } from '../icons'; const LinkChild = styled(Link)` text-decoration: none; diff --git a/packages/ui-toolkit/src/card/demo.md b/packages/ui-toolkit/src/card/demo.md index 2c277856..2a9678bd 100644 --- a/packages/ui-toolkit/src/card/demo.md +++ b/packages/ui-toolkit/src/card/demo.md @@ -22,7 +22,7 @@ const { default: Card, Header, HeaderBox, HeaderMeta } = require('.'); const { Row, Col } = require('react-styled-flexboxgrid'); const { H4, P } = require('../text'); -const { InstancesIconLight, IconActionsLight } = require('../icons'); +const { Instances, Actions } = require('../icons');
@@ -33,13 +33,13 @@ const { InstancesIconLight, IconActionsLight } = require('../icons');

- 4 of 4 instances + 4 of 4 instances

- +
; @@ -54,9 +54,9 @@ const { Row, Col } = require('react-styled-flexboxgrid'); const { H4, P } = require('../text'); const { - InstancesIconLight, - HealthyIcon, - IconActionsLight + Instances, + Health, + Actions } = require('../icons'); @@ -68,13 +68,13 @@ const {

- 4 of 4 instances + 4 of 4 instances

- + @@ -90,7 +90,7 @@ const { }} >

- Healthy + Healthy

@@ -105,7 +105,7 @@ const { default: Card, Header, HeaderBox, HeaderMeta, Outlet } = require('.'); const { Row, Col } = require('react-styled-flexboxgrid'); const { H4, P, Small } = require('../text'); -const { InstancesIconLight, IconActionsLight } = require('../icons'); +const { Instances, Actions } = require('../icons');
@@ -116,13 +116,13 @@ const { InstancesIconLight, IconActionsLight } = require('../icons');

- 4 of 4 instances + 4 of 4 instances

- +
@@ -143,10 +143,9 @@ const { H4, P } = require('../text'); const { default: StatusLoader } = require('../status-loader'); const { - IconActions, - IconActionsLight, - InstancesIconLight, - HealthyIcon + Actions, + Instances, + Health } = require('../icons'); [ @@ -165,7 +164,7 @@ const { - + @@ -183,13 +182,13 @@ const {

- 4 of 4 instances + 4 of 4 instances

- + @@ -213,7 +212,7 @@ const { />

- Healthy + Healthy

@@ -230,7 +229,7 @@ const React = require('react'); const { default: Card, Header, HeaderBox, HeaderMeta, Outlet } = require('.'); const { Row, Col } = require('react-styled-flexboxgrid'); const { H4, P } = require('../text'); -const { IconActions } = require('../icons'); +const { Actions } = require('../icons');
@@ -245,7 +244,7 @@ const { IconActions } = require('../icons'); - +
@@ -258,7 +257,7 @@ const { IconActions } = require('../icons'); const React = require('react'); const { default: Card, Outlet } = require('.'); const { H4, P } = require('../text'); -const { HealthyIcon } = require('../icons'); +const { Health } = require('../icons'); @@ -277,7 +276,7 @@ const { HealthyIcon } = require('../icons');

percona_primary

- Healthy + Healthy

@@ -290,7 +289,7 @@ const { HealthyIcon } = require('../icons'); const React = require('react'); const { default: Card, Outlet } = require('.'); const { H4, P } = require('../text'); -const { HealthyIcon } = require('../icons'); +const { Health } = require('../icons'); @@ -309,7 +308,7 @@ const { HealthyIcon } = require('../icons');

percona_primary

- Healthy + Healthy

@@ -322,7 +321,7 @@ const { HealthyIcon } = require('../icons'); const React = require('react'); const { default: Card, Outlet } = require('.'); const { H4, P } = require('../text'); -const { HealthyIcon } = require('../icons'); +const { Health } = require('../icons'); [ @@ -342,7 +341,7 @@ const { HealthyIcon } = require('../icons');

percona_secondary

- Healthy + Healthy

@@ -364,7 +363,7 @@ const { HealthyIcon } = require('../icons');

percona_secondary

- Healthy + Healthy

@@ -386,7 +385,7 @@ const { HealthyIcon } = require('../icons');

percona_secondary

- Healthy + Healthy

@@ -401,7 +400,7 @@ const React = require('react'); const { default: Card, Header, HeaderBox, HeaderMeta } = require('.'); const { Row, Col } = require('react-styled-flexboxgrid'); const { H4, P } = require('../text'); -const { HealthyIcon, IconActions, DataCenterIcon } = require('../icons'); +const { Health, Actions, DataCenter } = require('../icons'); [ @@ -413,18 +412,18 @@ const { HealthyIcon, IconActions, DataCenterIcon } = require('../icons');

- Healthy + Healthy

- eu-ams-1 + eu-ams-1

- + diff --git a/packages/ui-toolkit/src/close-button/index.js b/packages/ui-toolkit/src/close-button/index.js index 63d3b561..1dfc2bff 100644 --- a/packages/ui-toolkit/src/close-button/index.js +++ b/packages/ui-toolkit/src/close-button/index.js @@ -2,7 +2,7 @@ import React from 'react'; import unitcalc from 'unitcalc'; import theme from '../theme'; import Button from '../button'; -import { CloseIcon } from '../icons'; +import { Close } from '../icons'; const StyledCloseButton = Button.extend` background-color: ${theme.white}; @@ -27,7 +27,7 @@ const StyledCloseButton = Button.extend` */ const CloseButton = props => ( - + ); diff --git a/packages/ui-toolkit/src/form/number-input.js b/packages/ui-toolkit/src/form/number-input.js index fb879021..24c04784 100644 --- a/packages/ui-toolkit/src/form/number-input.js +++ b/packages/ui-toolkit/src/form/number-input.js @@ -6,7 +6,7 @@ import styled from 'styled-components'; import unitcalc from 'unitcalc'; import Baseline from '../baseline'; -import { PlusIcon, MinusIcon } from '../icons'; +import { Plus, Minus } from '../icons'; import IconButton from '../icon-button'; const StyledContainer = styled.div` @@ -41,10 +41,10 @@ const NumberInput = BaseInput(props => { - + - + ); diff --git a/packages/ui-toolkit/src/header/brand.js b/packages/ui-toolkit/src/header/brand.js index 4cd2e83c..3c68df09 100644 --- a/packages/ui-toolkit/src/header/brand.js +++ b/packages/ui-toolkit/src/header/brand.js @@ -1,6 +1,5 @@ import React from 'react'; import styled from 'styled-components'; -import is from 'styled-is'; import remcalc from 'remcalc'; import { H2 } from '../text/headings'; diff --git a/packages/ui-toolkit/src/header/nav.js b/packages/ui-toolkit/src/header/nav.js index 3c8a7342..1745a54a 100644 --- a/packages/ui-toolkit/src/header/nav.js +++ b/packages/ui-toolkit/src/header/nav.js @@ -7,24 +7,7 @@ const UL = styled.ul` margin: 0; display: flex; list-style: none; - a { - padding: ${remcalc(15)}; - line-height: ${remcalc(24)}; - font-size: ${remcalc(15)}; - color: ${props => props.theme.white}; - text-decoration: none; - display: flex; - align-items: center; - justify-content: center; - transition: all 200ms ease; - max-height: ${remcalc(53)}; - min-height: ${remcalc(53)}; - box-sizing: border-box; - &:hover, - &.active { - background: rgba(255, 255, 255, 0.15); - } - } + color: ${props => props.theme.white}; `; export default ({ children, ...rest }) =>
    {children}
; diff --git a/packages/ui-toolkit/src/header/usage.md b/packages/ui-toolkit/src/header/usage.md index 5a5cedb4..de8923e3 100644 --- a/packages/ui-toolkit/src/header/usage.md +++ b/packages/ui-toolkit/src/header/usage.md @@ -2,16 +2,26 @@ const React = require('react'); const { default: HeaderBrand } = require('./brand.js'); const { default: HeaderItem } = require('./item.js'); -const { default: HeaderNav, HeaderAnchor } = require('./nav.js'); +const { default: HeaderNav } = require('./nav.js'); +const { Triton, DataCenter, User } = require('../icons');
- + + + -
  • Compute
    • -
  • Network
    • +
  • + Compute +
    • - Return to existing portal - eu-east-1 - Nicola + + Return to existing portal + + + eu-east-1 + + + Nicola +
    ``` diff --git a/packages/ui-toolkit/src/icons/actions-light.js b/packages/ui-toolkit/src/icons/actions-light.js deleted file mode 100644 index 68a1839f..00000000 --- a/packages/ui-toolkit/src/icons/actions-light.js +++ /dev/null @@ -1,6 +0,0 @@ -// eslint-disable-next-line no-unused-vars -import React from 'react'; - -import ActionsIconLight from './svg/icon_actions_light.svg'; - -export default ActionsIconLight; diff --git a/packages/ui-toolkit/src/icons/actions.js b/packages/ui-toolkit/src/icons/actions.js deleted file mode 100644 index 20d0f95d..00000000 --- a/packages/ui-toolkit/src/icons/actions.js +++ /dev/null @@ -1,6 +0,0 @@ -// eslint-disable-next-line no-unused-vars -import React from 'react'; - -import ActionsIcon from './svg/icon_actions.svg'; - -export default ActionsIcon; diff --git a/packages/ui-toolkit/src/icons/affinity.js b/packages/ui-toolkit/src/icons/affinity.js deleted file mode 100644 index d4795a59..00000000 --- a/packages/ui-toolkit/src/icons/affinity.js +++ /dev/null @@ -1,6 +0,0 @@ -// eslint-disable-next-line no-unused-vars -import React from 'react'; - -import AffinityIcon from './svg/affinity.svg'; - -export default AffinityIcon; \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/arrow-light.js b/packages/ui-toolkit/src/icons/arrow-light.js deleted file mode 100644 index 18b62174..00000000 --- a/packages/ui-toolkit/src/icons/arrow-light.js +++ /dev/null @@ -1,6 +0,0 @@ -// eslint-disable-next-line no-unused-vars -import React from 'react'; - -import ArrowIconLight from './svg/icon_arrow_light.svg'; - -export default ArrowIconLight; diff --git a/packages/ui-toolkit/src/icons/arrow.js b/packages/ui-toolkit/src/icons/arrow.js deleted file mode 100644 index 5edb1837..00000000 --- a/packages/ui-toolkit/src/icons/arrow.js +++ /dev/null @@ -1,6 +0,0 @@ -// eslint-disable-next-line no-unused-vars -import React from 'react'; - -import ArrowIcon from './svg/icon_arrow.svg'; - -export default ArrowIcon; diff --git a/packages/ui-toolkit/src/icons/bin.js b/packages/ui-toolkit/src/icons/bin.js deleted file mode 100644 index 082a3bdc..00000000 --- a/packages/ui-toolkit/src/icons/bin.js +++ /dev/null @@ -1,6 +0,0 @@ -// eslint-disable-next-line no-unused-vars -import React from 'react'; - -import BinIcon from './svg/icon_bin.svg'; - -export default BinIcon; diff --git a/packages/ui-toolkit/src/icons/chevron.js b/packages/ui-toolkit/src/icons/chevron.js deleted file mode 100644 index b9167b71..00000000 --- a/packages/ui-toolkit/src/icons/chevron.js +++ /dev/null @@ -1,7 +0,0 @@ -import Basealign from '../basealign'; -// eslint-disable-next-line no-unused-vars -import React from 'react'; - -import ChevronIcon from './svg/icon_chevron.svg'; - -export default Basealign(ChevronIcon); diff --git a/packages/ui-toolkit/src/icons/close.js b/packages/ui-toolkit/src/icons/close.js deleted file mode 100644 index 5116e95d..00000000 --- a/packages/ui-toolkit/src/icons/close.js +++ /dev/null @@ -1,6 +0,0 @@ -// eslint-disable-next-line no-unused-vars -import React from 'react'; - -import CloseIcon from './svg/icon_close_cross.svg'; - -export default CloseIcon; diff --git a/packages/ui-toolkit/src/icons/completed.js b/packages/ui-toolkit/src/icons/completed.js deleted file mode 100644 index ef212560..00000000 --- a/packages/ui-toolkit/src/icons/completed.js +++ /dev/null @@ -1,6 +0,0 @@ -// eslint-disable-next-line no-unused-vars -import React from 'react'; - -import CompletedIcon from './svg/icon_completed.svg'; - -export default CompletedIcon; diff --git a/packages/ui-toolkit/src/icons/data-center-light.js b/packages/ui-toolkit/src/icons/data-center-light.js deleted file mode 100644 index 1fff121f..00000000 --- a/packages/ui-toolkit/src/icons/data-center-light.js +++ /dev/null @@ -1,7 +0,0 @@ -import Basealign from '../basealign'; -// eslint-disable-next-line no-unused-vars -import React from 'react'; - -import DataCenterIconLight from './svg/icon_data_center_light.svg'; - -export default Basealign(DataCenterIconLight); diff --git a/packages/ui-toolkit/src/icons/data-center.js b/packages/ui-toolkit/src/icons/data-center.js deleted file mode 100644 index cc1d385a..00000000 --- a/packages/ui-toolkit/src/icons/data-center.js +++ /dev/null @@ -1,7 +0,0 @@ -import Basealign from '../basealign'; -// eslint-disable-next-line no-unused-vars -import React from 'react'; - -import DataCenterIcon from './svg/icon_data_center.svg'; - -export default Basealign(DataCenterIcon); diff --git a/packages/ui-toolkit/src/icons/healthy.js b/packages/ui-toolkit/src/icons/healthy.js deleted file mode 100644 index fedcda0d..00000000 --- a/packages/ui-toolkit/src/icons/healthy.js +++ /dev/null @@ -1,14 +0,0 @@ -// eslint-disable-next-line no-unused-vars -import React from 'react'; -import styled from 'styled-components'; - -import HealthyIcon from './svg/icon_healthy.svg'; - -const StyledHealthyIcon = styled(HealthyIcon)` - fill: ${props => - !props.healthy || props.healthy === 'HEALTHY' - ? props.theme.green - : props.theme.orange}; -`; - -export default StyledHealthyIcon; diff --git a/packages/ui-toolkit/src/icons/icons.js b/packages/ui-toolkit/src/icons/icons.js index 4296fae9..7ca4e8f4 100644 --- a/packages/ui-toolkit/src/icons/icons.js +++ b/packages/ui-toolkit/src/icons/icons.js @@ -6,31 +6,21 @@ import styled from 'styled-components'; import { default as Label } from '../label'; import { - IconActions, - IconActionsLight, - CloseIcon, - PlusIcon, - MinusIcon, - ArrowIcon, - ArrowIconLight, - TickIcon, - InstancesIcon, - InstancesIconLight, - HealthyIcon, - UnhealthyIcon, - BinIcon, - UserIcon, - UserIconLight, - DataCenterIcon, - DataCenterIconLight, - ChevronIcon, - TritonIcon, - TritonBetaIcon, - CompletedIcon, - PartCompletedIcon, - IncompleteIcon, - LoadingIcon, - ImportIcon + Actions, + Arrow, + Bin, + Checkcircle, + Chevron, + Close, + DataCenter, + Health, + Import, + Instances, + Loading, + Minus, + Plus, + Triton, + User } from './'; const List = styled.ul` @@ -43,14 +33,14 @@ const List = styled.ul` const Icon = styled.div` width: ${remcalc(180)}; height: ${remcalc(180)}; - border: ${remcalc(2)} solid #d8d8d8; + border: ${remcalc(2)} solid ${props => props.theme.grey}; align-items: center; justify-content: center; display: flex; margin-bottom: ${remcalc(18)}; ${is('dark')` - background: #464646; + background: ${props => props.theme.secondary}; `}; `; @@ -67,151 +57,151 @@ const Icons = () => ( - + - - + + - - + + - + - + - + - + - + - - - - - - - + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/packages/ui-toolkit/src/icons/import.js b/packages/ui-toolkit/src/icons/import.js deleted file mode 100644 index 981a7c38..00000000 --- a/packages/ui-toolkit/src/icons/import.js +++ /dev/null @@ -1,6 +0,0 @@ -// eslint-disable-next-line no-unused-vars -import React from 'react'; - -import Import from './svg/import.svg'; - -export default Import; diff --git a/packages/ui-toolkit/src/icons/incomplete.js b/packages/ui-toolkit/src/icons/incomplete.js deleted file mode 100644 index f989b4f9..00000000 --- a/packages/ui-toolkit/src/icons/incomplete.js +++ /dev/null @@ -1,6 +0,0 @@ -// eslint-disable-next-line no-unused-vars -import React from 'react'; - -import IncompleteIcon from './svg/icon_incomplete.svg'; - -export default IncompleteIcon; diff --git a/packages/ui-toolkit/src/icons/index.js b/packages/ui-toolkit/src/icons/index.js index 84586ed4..371fd33f 100644 --- a/packages/ui-toolkit/src/icons/index.js +++ b/packages/ui-toolkit/src/icons/index.js @@ -1,28 +1,41 @@ -export { default as CloseIcon } from './close'; -export { default as PlusIcon } from './plus'; -export { default as MinusIcon } from './minus'; -export { default as IconActions } from './actions'; -export { default as IconActionsLight } from './actions-light'; -export { default as ArrowIcon } from './arrow'; -export { default as ArrowIconLight } from './arrow-light'; -export { default as TickIcon } from './tick'; -export { default as InstancesIcon } from './instances'; -export { default as InstancesIconLight } from './instances-light'; -export { default as HealthyIcon } from './healthy'; -export { default as UnhealthyIcon } from './unhealthy'; -export { default as BinIcon } from './bin'; -export { default as UserIcon } from './user'; -export { default as UserIconLight } from './user-light'; -export { default as DataCenterIcon } from './data-center'; -export { default as DataCenterIconLight } from './data-center-light'; -export { default as DotIcon } from './dot'; -export { default as ChevronIcon } from './chevron'; -export { default as TritonIcon } from './triton'; -export { default as TritonBetaIcon } from './triton-beta'; -export { default as CompletedIcon } from './completed'; -export { default as PartCompletedIcon } from './part-complete'; -export { default as IncompleteIcon } from './incomplete'; -export { default as LoadingIcon } from './loading'; -export { default as ImportIcon } from './import'; -export { default as AffinityIcon } from './affinity'; -export { default as PackageIcon } from './package'; +import Baseline from '../baseline'; + +import { + Actions as BaseActions, + Affinity as BaseAffinity, + Arrow as BaseArrow, + Bin as BaseBin, + Checkcircle as BaseCheckcircle, + Chevron as BaseChevron, + Close as BaseClose, + DataCenter as BaseDataCenter, + Dot as BaseDot, + Health as BaseHealth, + Import as BaseImport, + Instances as BaseInstances, + Loading as BaseLoading, + Minus as BaseMinus, + Package as BasePackage, + Plus as BasePlus, + Triton as BaseTriton, + User as BaseUser +} from 'joyent-icons'; + +export const Actions = Baseline(BaseActions); +export const Affinity = Baseline(BaseAffinity); +export const Arrow = Baseline(BaseArrow); +export const Bin = Baseline(BaseBin); +export const Checkcircle = Baseline(BaseCheckcircle); +export const Chevron = Baseline(BaseChevron); +export const Close = Baseline(BaseClose); +export const DataCenter = Baseline(BaseDataCenter); +export const Dot = Baseline(BaseDot); +export const Health = Baseline(BaseHealth); +export const Import = Baseline(BaseImport); +export const Instances = Baseline(BaseInstances); +export const Loading = Baseline(BaseLoading); +export const Minus = Baseline(BaseMinus); +export const Package = Baseline(BasePackage); +export const Plus = Baseline(BasePlus); +export const Triton = Baseline(BaseTriton); +export const User = Baseline(BaseUser); diff --git a/packages/ui-toolkit/src/icons/instances-light.js b/packages/ui-toolkit/src/icons/instances-light.js deleted file mode 100644 index f2c1d31e..00000000 --- a/packages/ui-toolkit/src/icons/instances-light.js +++ /dev/null @@ -1,6 +0,0 @@ -// eslint-disable-next-line no-unused-vars -import React from 'react'; - -import InstancesIconLight from './svg/icon_instances_light.svg'; - -export default InstancesIconLight; diff --git a/packages/ui-toolkit/src/icons/instances.js b/packages/ui-toolkit/src/icons/instances.js deleted file mode 100644 index 28bc6a38..00000000 --- a/packages/ui-toolkit/src/icons/instances.js +++ /dev/null @@ -1,6 +0,0 @@ -// eslint-disable-next-line no-unused-vars -import React from 'react'; - -import InstancesIcon from './svg/icon_instances.svg'; - -export default InstancesIcon; diff --git a/packages/ui-toolkit/src/icons/loading.js b/packages/ui-toolkit/src/icons/loading.js deleted file mode 100644 index 3a62c6d9..00000000 --- a/packages/ui-toolkit/src/icons/loading.js +++ /dev/null @@ -1,6 +0,0 @@ -// eslint-disable-next-line no-unused-vars -import React from 'react'; - -import LoadingIcon from './svg/icon_loading.svg'; - -export default LoadingIcon; diff --git a/packages/ui-toolkit/src/icons/minus.js b/packages/ui-toolkit/src/icons/minus.js deleted file mode 100644 index 7dd50e87..00000000 --- a/packages/ui-toolkit/src/icons/minus.js +++ /dev/null @@ -1,7 +0,0 @@ -import Basealign from '../basealign'; -// eslint-disable-next-line no-unused-vars -import React from 'react'; - -import MinusIcon from './svg/icon_minus.svg'; - -export default Basealign(MinusIcon); diff --git a/packages/ui-toolkit/src/icons/package.js b/packages/ui-toolkit/src/icons/package.js deleted file mode 100644 index d6ecc3cb..00000000 --- a/packages/ui-toolkit/src/icons/package.js +++ /dev/null @@ -1,6 +0,0 @@ -// eslint-disable-next-line no-unused-vars -import React from 'react'; - -import PackageIcon from './svg/package.svg'; - -export default PackageIcon; diff --git a/packages/ui-toolkit/src/icons/part-complete.js b/packages/ui-toolkit/src/icons/part-complete.js deleted file mode 100644 index 8e05a09e..00000000 --- a/packages/ui-toolkit/src/icons/part-complete.js +++ /dev/null @@ -1,6 +0,0 @@ -// eslint-disable-next-line no-unused-vars -import React from 'react'; - -import PartCompletedIcon from './svg/icon_part_completed.svg'; - -export default PartCompletedIcon; diff --git a/packages/ui-toolkit/src/icons/plus.js b/packages/ui-toolkit/src/icons/plus.js deleted file mode 100644 index 2d97797d..00000000 --- a/packages/ui-toolkit/src/icons/plus.js +++ /dev/null @@ -1,7 +0,0 @@ -import Basealign from '../basealign'; -// eslint-disable-next-line no-unused-vars -import React from 'react'; - -import CloseIcon from './svg/icon_plus.svg'; - -export default Basealign(CloseIcon); diff --git a/packages/ui-toolkit/src/icons/svg/affinity.svg b/packages/ui-toolkit/src/icons/svg/affinity.svg deleted file mode 100644 index 18475c64..00000000 --- a/packages/ui-toolkit/src/icons/svg/affinity.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/packages/ui-toolkit/src/icons/svg/icon_actions.svg b/packages/ui-toolkit/src/icons/svg/icon_actions.svg deleted file mode 100644 index bed73ac1..00000000 --- a/packages/ui-toolkit/src/icons/svg/icon_actions.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/svg/icon_actions_light.svg b/packages/ui-toolkit/src/icons/svg/icon_actions_light.svg deleted file mode 100644 index d1be596b..00000000 --- a/packages/ui-toolkit/src/icons/svg/icon_actions_light.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/svg/icon_alert.svg b/packages/ui-toolkit/src/icons/svg/icon_alert.svg deleted file mode 100755 index d26efbdc..00000000 --- a/packages/ui-toolkit/src/icons/svg/icon_alert.svg +++ /dev/null @@ -1 +0,0 @@ -icon: alert \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/svg/icon_arrow.svg b/packages/ui-toolkit/src/icons/svg/icon_arrow.svg deleted file mode 100755 index e8102125..00000000 --- a/packages/ui-toolkit/src/icons/svg/icon_arrow.svg +++ /dev/null @@ -1 +0,0 @@ -arrow: right \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/svg/icon_arrow_light.svg b/packages/ui-toolkit/src/icons/svg/icon_arrow_light.svg deleted file mode 100755 index e5facb89..00000000 --- a/packages/ui-toolkit/src/icons/svg/icon_arrow_light.svg +++ /dev/null @@ -1 +0,0 @@ -arrow: right \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/svg/icon_bin.svg b/packages/ui-toolkit/src/icons/svg/icon_bin.svg deleted file mode 100644 index 2028e6a9..00000000 --- a/packages/ui-toolkit/src/icons/svg/icon_bin.svg +++ /dev/null @@ -1 +0,0 @@ -icon: delete \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/svg/icon_calendar.svg b/packages/ui-toolkit/src/icons/svg/icon_calendar.svg deleted file mode 100755 index f6170608..00000000 --- a/packages/ui-toolkit/src/icons/svg/icon_calendar.svg +++ /dev/null @@ -1 +0,0 @@ -calendar_ \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/svg/icon_chevron.svg b/packages/ui-toolkit/src/icons/svg/icon_chevron.svg deleted file mode 100644 index 129328e5..00000000 --- a/packages/ui-toolkit/src/icons/svg/icon_chevron.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/svg/icon_close_cross.svg b/packages/ui-toolkit/src/icons/svg/icon_close_cross.svg deleted file mode 100755 index 0e62f3b2..00000000 --- a/packages/ui-toolkit/src/icons/svg/icon_close_cross.svg +++ /dev/null @@ -1 +0,0 @@ -icon: close \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/svg/icon_completed.svg b/packages/ui-toolkit/src/icons/svg/icon_completed.svg deleted file mode 100644 index 4499d341..00000000 --- a/packages/ui-toolkit/src/icons/svg/icon_completed.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/svg/icon_cpu.svg b/packages/ui-toolkit/src/icons/svg/icon_cpu.svg deleted file mode 100755 index 16334d63..00000000 --- a/packages/ui-toolkit/src/icons/svg/icon_cpu.svg +++ /dev/null @@ -1 +0,0 @@ -icon: cpu \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/svg/icon_data_center.svg b/packages/ui-toolkit/src/icons/svg/icon_data_center.svg deleted file mode 100755 index e721f11e..00000000 --- a/packages/ui-toolkit/src/icons/svg/icon_data_center.svg +++ /dev/null @@ -1 +0,0 @@ -icon: data center \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/svg/icon_data_center_light.svg b/packages/ui-toolkit/src/icons/svg/icon_data_center_light.svg deleted file mode 100755 index 707245c3..00000000 --- a/packages/ui-toolkit/src/icons/svg/icon_data_center_light.svg +++ /dev/null @@ -1 +0,0 @@ -icon: data center \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/svg/icon_disk.svg b/packages/ui-toolkit/src/icons/svg/icon_disk.svg deleted file mode 100755 index eeeb1c11..00000000 --- a/packages/ui-toolkit/src/icons/svg/icon_disk.svg +++ /dev/null @@ -1 +0,0 @@ -icon: disk \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/svg/icon_error_failure.svg b/packages/ui-toolkit/src/icons/svg/icon_error_failure.svg deleted file mode 100755 index bfe7772c..00000000 --- a/packages/ui-toolkit/src/icons/svg/icon_error_failure.svg +++ /dev/null @@ -1 +0,0 @@ -icon: error \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/svg/icon_healthy.svg b/packages/ui-toolkit/src/icons/svg/icon_healthy.svg deleted file mode 100755 index 25b551ba..00000000 --- a/packages/ui-toolkit/src/icons/svg/icon_healthy.svg +++ /dev/null @@ -1 +0,0 @@ -icon: state \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/svg/icon_incomplete.svg b/packages/ui-toolkit/src/icons/svg/icon_incomplete.svg deleted file mode 100644 index ab21aade..00000000 --- a/packages/ui-toolkit/src/icons/svg/icon_incomplete.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/svg/icon_instances.svg b/packages/ui-toolkit/src/icons/svg/icon_instances.svg deleted file mode 100755 index adf3d19c..00000000 --- a/packages/ui-toolkit/src/icons/svg/icon_instances.svg +++ /dev/null @@ -1 +0,0 @@ -icon: instances \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/svg/icon_instances_light.svg b/packages/ui-toolkit/src/icons/svg/icon_instances_light.svg deleted file mode 100755 index ef37688b..00000000 --- a/packages/ui-toolkit/src/icons/svg/icon_instances_light.svg +++ /dev/null @@ -1 +0,0 @@ -icon: instances \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/svg/icon_loading.svg b/packages/ui-toolkit/src/icons/svg/icon_loading.svg deleted file mode 100644 index 54dfd755..00000000 --- a/packages/ui-toolkit/src/icons/svg/icon_loading.svg +++ /dev/null @@ -1 +0,0 @@ -Icons > LoadingCreated using Figma \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/svg/icon_minus.svg b/packages/ui-toolkit/src/icons/svg/icon_minus.svg deleted file mode 100644 index d84716cd..00000000 --- a/packages/ui-toolkit/src/icons/svg/icon_minus.svg +++ /dev/null @@ -1 +0,0 @@ -icon: plus \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/svg/icon_part_completed.svg b/packages/ui-toolkit/src/icons/svg/icon_part_completed.svg deleted file mode 100644 index df81a0da..00000000 --- a/packages/ui-toolkit/src/icons/svg/icon_part_completed.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/svg/icon_plus.svg b/packages/ui-toolkit/src/icons/svg/icon_plus.svg deleted file mode 100644 index d3b71800..00000000 --- a/packages/ui-toolkit/src/icons/svg/icon_plus.svg +++ /dev/null @@ -1 +0,0 @@ -icon: plus \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/svg/icon_ran.svg b/packages/ui-toolkit/src/icons/svg/icon_ran.svg deleted file mode 100755 index 9e6e1c81..00000000 --- a/packages/ui-toolkit/src/icons/svg/icon_ran.svg +++ /dev/null @@ -1 +0,0 @@ -icon: cpu \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/svg/icon_tick.svg b/packages/ui-toolkit/src/icons/svg/icon_tick.svg deleted file mode 100755 index 2ce42adb..00000000 --- a/packages/ui-toolkit/src/icons/svg/icon_tick.svg +++ /dev/null @@ -1 +0,0 @@ -tick \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/svg/icon_upload_manifest.svg b/packages/ui-toolkit/src/icons/svg/icon_upload_manifest.svg deleted file mode 100755 index 5e9e064e..00000000 --- a/packages/ui-toolkit/src/icons/svg/icon_upload_manifest.svg +++ /dev/null @@ -1 +0,0 @@ -Fill 1 \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/svg/icon_user.svg b/packages/ui-toolkit/src/icons/svg/icon_user.svg deleted file mode 100755 index ac02871a..00000000 --- a/packages/ui-toolkit/src/icons/svg/icon_user.svg +++ /dev/null @@ -1 +0,0 @@ -Shape \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/svg/icon_user_light.svg b/packages/ui-toolkit/src/icons/svg/icon_user_light.svg deleted file mode 100755 index 1b7a1d8f..00000000 --- a/packages/ui-toolkit/src/icons/svg/icon_user_light.svg +++ /dev/null @@ -1 +0,0 @@ -Shape \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/svg/import.svg b/packages/ui-toolkit/src/icons/svg/import.svg deleted file mode 100644 index 5fa71f93..00000000 --- a/packages/ui-toolkit/src/icons/svg/import.svg +++ /dev/null @@ -1,26 +0,0 @@ - -Import -Created using Figma - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/ui-toolkit/src/icons/svg/package.svg b/packages/ui-toolkit/src/icons/svg/package.svg deleted file mode 100644 index 613418e0..00000000 --- a/packages/ui-toolkit/src/icons/svg/package.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/packages/ui-toolkit/src/icons/svg/triton_beta.svg b/packages/ui-toolkit/src/icons/svg/triton_beta.svg deleted file mode 100644 index b661ee40..00000000 --- a/packages/ui-toolkit/src/icons/svg/triton_beta.svg +++ /dev/null @@ -1,18 +0,0 @@ - -Group -Created using Figma - - - - - - - - - - - - - diff --git a/packages/ui-toolkit/src/icons/svg/triton_logo.svg b/packages/ui-toolkit/src/icons/svg/triton_logo.svg deleted file mode 100644 index 7fc2ac60..00000000 --- a/packages/ui-toolkit/src/icons/svg/triton_logo.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/ui-toolkit/src/icons/tick.js b/packages/ui-toolkit/src/icons/tick.js deleted file mode 100644 index 79ed2fe9..00000000 --- a/packages/ui-toolkit/src/icons/tick.js +++ /dev/null @@ -1,6 +0,0 @@ -// eslint-disable-next-line no-unused-vars -import React from 'react'; - -import TickIcon from './svg/icon_tick.svg'; - -export default TickIcon; diff --git a/packages/ui-toolkit/src/icons/triton-beta.js b/packages/ui-toolkit/src/icons/triton-beta.js deleted file mode 100644 index c56c8c1c..00000000 --- a/packages/ui-toolkit/src/icons/triton-beta.js +++ /dev/null @@ -1,6 +0,0 @@ -// eslint-disable-next-line no-unused-vars -import React from 'react'; - -import TritonBetaIcon from './svg/triton_beta.svg'; - -export default TritonBetaIcon; diff --git a/packages/ui-toolkit/src/icons/triton.js b/packages/ui-toolkit/src/icons/triton.js deleted file mode 100644 index 72ef538d..00000000 --- a/packages/ui-toolkit/src/icons/triton.js +++ /dev/null @@ -1,7 +0,0 @@ -import Basealign from '../basealign'; -// eslint-disable-next-line no-unused-vars -import React from 'react'; - -import TritonIcon from './svg/triton_logo.svg'; - -export default Basealign(TritonIcon); diff --git a/packages/ui-toolkit/src/icons/unhealthy.js b/packages/ui-toolkit/src/icons/unhealthy.js deleted file mode 100644 index 4a01d2d6..00000000 --- a/packages/ui-toolkit/src/icons/unhealthy.js +++ /dev/null @@ -1,6 +0,0 @@ -// eslint-disable-next-line no-unused-vars -import React from 'react'; - -import UnhealthyIcon from './svg/icon_error_failure.svg'; - -export default UnhealthyIcon; diff --git a/packages/ui-toolkit/src/icons/user-light.js b/packages/ui-toolkit/src/icons/user-light.js deleted file mode 100644 index 43cec649..00000000 --- a/packages/ui-toolkit/src/icons/user-light.js +++ /dev/null @@ -1,6 +0,0 @@ -// eslint-disable-next-line no-unused-vars -import React from 'react'; - -import UserIconLight from './svg/icon_user_light.svg'; - -export default UserIconLight; diff --git a/packages/ui-toolkit/src/icons/user.js b/packages/ui-toolkit/src/icons/user.js deleted file mode 100644 index 2b2afcd4..00000000 --- a/packages/ui-toolkit/src/icons/user.js +++ /dev/null @@ -1,6 +0,0 @@ -// eslint-disable-next-line no-unused-vars -import React from 'react'; - -import UserIcon from './svg/icon_user.svg'; - -export default UserIcon; diff --git a/packages/ui-toolkit/src/index.js b/packages/ui-toolkit/src/index.js index 2c4e3ec0..fb4b82c6 100644 --- a/packages/ui-toolkit/src/index.js +++ b/packages/ui-toolkit/src/index.js @@ -88,34 +88,24 @@ export { } from './section-list'; export { - CloseIcon, - PlusIcon, - MinusIcon, - IconActions, - IconActionsLight, - ArrowIcon, - ArrowIconLight, - TickIcon, - InstancesIcon, - InstancesIconLight, - HealthyIcon, - UnhealthyIcon, - BinIcon, - UserIcon, - DataCenterIcon, - DataCenterIconLight, - DotIcon, - ChevronIcon, - TritonIcon, - UserIconLight, - TritonBetaIcon, - CompletedIcon, - PartCompletedIcon, - IncompleteIcon, - LoadingIcon, - ImportIcon, - AffinityIcon, - PackageIcon + Actions as ActionsIcon, + Affinity as AffinityIcon, + Arrow as ArrowIcon, + Bin as BinIcon, + Checkcircle, + Chevron as ChevronIcon, + Close as CloseIcon, + DataCenter as DataCenterIcon, + Dot as DotIcon, + Health as HealthIcon, + Import as ImportIcon, + Instances as InstancesIcon, + Loading as LoadingIcon, + Minus as MinusIcon, + Package as PackageIcon, + Plus as PlusIcon, + Triton as TritonIcon, + User as UserIcon } from './icons'; export { diff --git a/packages/ui-toolkit/src/message/Readme.md b/packages/ui-toolkit/src/message/Readme.md index 7b511421..0fcb37f7 100644 --- a/packages/ui-toolkit/src/message/Readme.md +++ b/packages/ui-toolkit/src/message/Readme.md @@ -2,15 +2,15 @@ ```jsx const React = require('react'); -const { Message, MessageTitle, MessageDescription } = require('.'); +const { Message, Title, Description } = require('.'); - Choosing deployment data center - + Choosing deployment data center + Not all data centres have all configurations of instances available. Make sure that you choose the data center that suits your requirements. Learn more - + ; ``` @@ -18,11 +18,11 @@ const { Message, MessageTitle, MessageDescription } = require('.'); ```jsx const React = require('react'); -const { Message, MessageTitle, MessageDescription } = require('.'); +const { Message, Title, Description } = require('.'); - Choosing deployment data center - Oh no + Choosing deployment data center + Oh no ; ``` @@ -30,10 +30,10 @@ const { Message, MessageTitle, MessageDescription } = require('.'); ```jsx const React = require('react'); -const { Message, MessageTitle, MessageDescription } = require('.'); +const { Message, Title, Description } = require('.'); - Choosing deployment data center - There were some issues + Choosing deployment data center + There were some issues ; ``` diff --git a/packages/ui-toolkit/src/progress-bar/indicator.js b/packages/ui-toolkit/src/progress-bar/indicator.js index a1b5c166..c9c4067a 100644 --- a/packages/ui-toolkit/src/progress-bar/indicator.js +++ b/packages/ui-toolkit/src/progress-bar/indicator.js @@ -2,10 +2,10 @@ import React from 'react'; import styled from 'styled-components'; import remcalc from 'remcalc'; import Baseline from '../baseline'; -import { TickIcon } from '../icons'; +import { Checkcircle as BaseCheckcircle } from '../icons'; import is, { isOr } from 'styled-is'; -const Tick = styled(TickIcon)` +const Checkcircle = styled(BaseCheckcircle)` fill: none; ${is('active')` @@ -47,7 +47,7 @@ const Indicator = ({ first, completed, active, last, ...rest }) => { return ( - + ); }; diff --git a/packages/ui-toolkit/src/text/headings.js b/packages/ui-toolkit/src/text/headings.js index d1e51030..24453975 100644 --- a/packages/ui-toolkit/src/text/headings.js +++ b/packages/ui-toolkit/src/text/headings.js @@ -137,7 +137,6 @@ export const H5 = styled.h4` } `; - export const H6 = styled.h6` margin: 0; ${typography.color}; diff --git a/packages/ui-toolkit/styleguide.config.js b/packages/ui-toolkit/styleguide.config.js index ebd4874a..0b757c3e 100644 --- a/packages/ui-toolkit/styleguide.config.js +++ b/packages/ui-toolkit/styleguide.config.js @@ -1,4 +1,9 @@ -const webpackConfig = require('joyent-react-scripts/config/webpack.config.dev.js'); +const { NODE_ENV } = process.env; + +const env = NODE_ENV === 'production' ? 'prod' : 'dev'; + +// const resolvePkg = require('resolve-pkg'); +const webpackConfig = require(`joyent-react-scripts/config/webpack.config.${env}.js`); const { defaultHandlers } = require('react-docgen'); const dnHandler = require('react-docgen-displayname-handler'); const path = require('path'); diff --git a/prototypes/create-instance-icons/README.md b/prototypes/create-instance-icons/README.md index f220b9a3..a9ae7035 100644 --- a/prototypes/create-instance-icons/README.md +++ b/prototypes/create-instance-icons/README.md @@ -1,6 +1,5 @@ # my-joyent -[![Docker Repository on Quay](https://quay.io/repository/yldio/my-joyent/status)](https://quay.io/repository/yldio/my-joyent) [![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg)](https://opensource.org/licenses/MPL-2.0) [![standard-readme compliant](https://img.shields.io/badge/standard--readme-OK-green.svg)](https://github.com/RichardLitt/standard-readme) diff --git a/prototypes/create-instance-icons/src/components/navigation/header.js b/prototypes/create-instance-icons/src/components/navigation/header.js index d3a2ba4c..a62320e2 100644 --- a/prototypes/create-instance-icons/src/components/navigation/header.js +++ b/prototypes/create-instance-icons/src/components/navigation/header.js @@ -6,11 +6,11 @@ import remcalc from 'remcalc'; import { Header, HeaderBrand, - TritonBetaIcon, + TritonIcon beta, HeaderNav, HeaderItem, - DataCenterIconLight, - UserIconLight + DataCenterIcon, + UserIcon } from 'joyent-ui-toolkit'; const HeaderBrandStyled = styled(HeaderBrand)` @@ -20,7 +20,7 @@ const HeaderBrandStyled = styled(HeaderBrand)` const NavHeader = () => (
    - +
  • @@ -31,10 +31,10 @@ const NavHeader = () => ( Return to existing portal - eu-east-1 + eu-east-1 - Nicola + Nicola
    • ); diff --git a/prototypes/create-instance/README.md b/prototypes/create-instance/README.md index f220b9a3..a9ae7035 100644 --- a/prototypes/create-instance/README.md +++ b/prototypes/create-instance/README.md @@ -1,6 +1,5 @@ # my-joyent -[![Docker Repository on Quay](https://quay.io/repository/yldio/my-joyent/status)](https://quay.io/repository/yldio/my-joyent) [![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg)](https://opensource.org/licenses/MPL-2.0) [![standard-readme compliant](https://img.shields.io/badge/standard--readme-OK-green.svg)](https://github.com/RichardLitt/standard-readme) diff --git a/yarn.lock b/yarn.lock index b8e5bc43..27a3ca51 100644 --- a/yarn.lock +++ b/yarn.lock @@ -251,8 +251,8 @@ ajv@^4.9.1: json-stable-stringify "^1.0.1" ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5, ajv@^5.2.0, ajv@^5.2.3, ajv@^5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.3.0.tgz#4414ff74a50879c208ee5fdc826e32c303549eda" + version "5.4.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.4.0.tgz#32d1cf08dbc80c432f426f12e10b2511f6b46474" dependencies: co "^4.6.0" fast-deep-equal "^1.0.0" @@ -1743,8 +1743,8 @@ big.js@^3.1.3: resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e" binary-extensions@^1.0.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.10.0.tgz#9aeb9a6c5e88638aad171e167f5900abe24835d0" + version "1.11.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205" block-stream@*: version "0.0.9" @@ -1923,11 +1923,11 @@ browserify-sign@^4.0.0: inherits "^2.0.1" parse-asn1 "^5.0.0" -browserify-zlib@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d" +browserify-zlib@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f" dependencies: - pako "~0.2.0" + pako "~1.0.5" browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: version "1.7.7" @@ -1937,10 +1937,10 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: electron-to-chromium "^1.2.7" browserslist@^2.1.2, browserslist@^2.5.1: - version "2.9.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.9.0.tgz#706aca15c53be15610f466e348cbfa0c00a6a379" + version "2.9.1" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.9.1.tgz#b72d3982ab01b5cd24da62ff6d45573886aff275" dependencies: - caniuse-lite "^1.0.30000760" + caniuse-lite "^1.0.30000770" electron-to-chromium "^1.3.27" bser@1.0.2: @@ -2090,12 +2090,12 @@ caniuse-api@^1.5.2: lodash.uniq "^4.5.0" caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: - version "1.0.30000764" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000764.tgz#d73ab11ae62f6a9e2f69867d6d9c23ae3f2e5d8d" + version "1.0.30000770" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000770.tgz#cf68ae1cb8a82f6d3c35df41c62dc6973e470244" -caniuse-lite@^1.0.30000748, caniuse-lite@^1.0.30000760: - version "1.0.30000764" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000764.tgz#97ea7472f9d3e691eede34f21983cfc219ac7842" +caniuse-lite@^1.0.30000748, caniuse-lite@^1.0.30000770: + version "1.0.30000770" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000770.tgz#bc8e7f50b073273390db6ab357378909a14e9bdb" capture-stack-trace@^1.0.0: version "1.0.0" @@ -2176,6 +2176,10 @@ character-reference-invalid@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.1.tgz#942835f750e4ec61a308e60c2ef8cc1011202efc" +chardet@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.0.tgz#0bbe1355ac44d7a3ed4a925707c4ef70f8190f6c" + checksum@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/checksum/-/checksum-0.1.1.tgz#dc6527d4c90be8560dbd1ed4cecf3297d528e9e9" @@ -2220,8 +2224,8 @@ chrome-remote-interface@^0.24.1: ws "2.0.x" ci-info@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.1.tgz#47b44df118c48d2597b56d342e7e25791060171a" + version "1.1.2" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.2.tgz#03561259db48d0474c8bdc90f5b47b068b6bbfb4" cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: version "1.0.4" @@ -2350,9 +2354,9 @@ code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" -codemirror@5.30.0, codemirror@^5.30.0, codemirror@^5.31.0: - version "5.30.0" - resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.30.0.tgz#86e57dd5ea5535acbcf9c720797b4cefe05b5a70" +codemirror@5.32.0, codemirror@^5.30.0, codemirror@^5.31.0: + version "5.32.0" + resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.32.0.tgz#cb6ff5d8ef36d0b10f031130e2d9ebeee92c902e" coleman-liau@^1.0.0: version "1.0.2" @@ -2427,10 +2431,14 @@ commander@2.1.x, commander@~2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.1.0.tgz#d121bbae860d9992a3d517ba96f56588e47c6781" -commander@2.11.x, commander@^2.11.0, commander@^2.9.0, commander@~2.11.0: +commander@2.11.x, commander@~2.11.0: version "2.11.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563" +commander@^2.11.0, commander@^2.9.0: + version "2.12.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.1.tgz#468635c4168d06145b9323356d1da84d14ac4a7a" + commitizen@^2.9.6: version "2.9.6" resolved "https://registry.yarnpkg.com/commitizen/-/commitizen-2.9.6.tgz#c0d00535ef264da7f63737edfda4228983fa2291" @@ -2462,8 +2470,8 @@ common-sequence@^1.0.2: resolved "https://registry.yarnpkg.com/common-sequence/-/common-sequence-1.0.2.tgz#30e07f3f8f6f7f9b3dee854f20b2d39eee086de8" common-shake@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/common-shake/-/common-shake-2.0.2.tgz#2c016fa2aa36c6461afdde5cb7605c77ccbb855f" + version "2.1.0" + resolved "https://registry.yarnpkg.com/common-shake/-/common-shake-2.1.0.tgz#690f93cec9f7387ac384703e4c033897220a250b" dependencies: acorn "^5.1.1" debug "^2.6.8" @@ -2719,8 +2727,8 @@ conventional-recommended-bump@^1.0.1: object-assign "^4.0.1" convert-source-map@^1.4.0, convert-source-map@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5" + version "1.5.1" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5" cookie-signature@1.0.6: version "1.0.6" @@ -2742,17 +2750,15 @@ copy-concurrently@^1.0.0: run-queue "^1.0.0" copy-webpack-plugin@^4.0.1: - version "4.2.0" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.2.0.tgz#252bb94597f96399d23d7fad355f8d3a661ac096" + version "4.2.3" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.2.3.tgz#4a3c61089f3b635777f0f0af346c338b39d63755" dependencies: bluebird "^3.5.1" - fs-extra "^4.0.2" glob "^7.1.2" is-glob "^4.0.0" loader-utils "^0.2.15" lodash "^4.3.0" minimatch "^3.0.4" - node-dir "^0.1.10" core-js@^1.0.0: version "1.2.7" @@ -3096,8 +3102,8 @@ decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2: resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" declarative-redux-form@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/declarative-redux-form/-/declarative-redux-form-1.0.3.tgz#3f9bd1968e04b2028591e7185a1dd87a95254675" + version "1.0.4" + resolved "https://registry.yarnpkg.com/declarative-redux-form/-/declarative-redux-form-1.0.4.tgz#34e08d473f9a655e261c7c295ef1106c40e8fef7" dependencies: lodash.isequal "^4.5.0" lodash.isundefined "^3.0.1" @@ -3213,8 +3219,8 @@ detect-indent@^5.0.0: resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" detect-libc@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.2.tgz#71ad5d204bf17a6a6ca8f450c61454066ef461e1" + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" detect-node@^2.0.3: version "2.0.3" @@ -3494,8 +3500,8 @@ enzyme-adapter-react-16@^1.0.0: react-test-renderer "^16.0.0-0" enzyme-adapter-utils@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.1.1.tgz#689de8853f0751710590d6dfa730ff4056ea36b2" + version "1.2.0" + resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.2.0.tgz#7f4471ee0a70b91169ec8860d2bf0a6b551664b2" dependencies: lodash "^4.17.4" object.assign "^4.0.4" @@ -3532,8 +3538,8 @@ es-to-primitive@^1.1.1: is-symbol "^1.0.1" es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14: - version "0.10.35" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.35.tgz#18ee858ce6a3c45c7d79e91c15fcca9ec568494f" + version "0.10.37" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.37.tgz#0ee741d148b80069ba27d020393756af257defc3" dependencies: es6-iterator "~2.0.1" es6-symbol "~3.1.1" @@ -3628,8 +3634,8 @@ eslint-config-joyent-portal@3.2.0, eslint-config-joyent-portal@^3.2.0: resolved "https://registry.yarnpkg.com/eslint-config-joyent-portal/-/eslint-config-joyent-portal-3.2.0.tgz#20de54035938ea6918160393dc4b387e2792d57f" eslint-config-prettier@^2.6.0, eslint-config-prettier@^2.7.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-2.7.0.tgz#7bbfef66ad783277836f4ea556e68b9bcc9da4d0" + version "2.8.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-2.8.0.tgz#929861a11de0249677686eba908118175d1a26bc" dependencies: get-stdin "^5.0.1" @@ -3738,7 +3744,7 @@ eslint-plugin-prettier@^2.3.1: fast-diff "^1.1.1" jest-docblock "^21.0.0" -eslint-plugin-react@7.4.0, eslint-plugin-react@^7.4.0: +eslint-plugin-react@7.4.0: version "7.4.0" resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.4.0.tgz#300a95861b9729c087d362dd64abcc351a74364a" dependencies: @@ -3747,6 +3753,15 @@ eslint-plugin-react@7.4.0, eslint-plugin-react@^7.4.0: jsx-ast-utils "^2.0.0" prop-types "^15.5.10" +eslint-plugin-react@^7.4.0: + version "7.5.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.5.1.tgz#52e56e8d80c810de158859ef07b880d2f56ee30b" + dependencies: + doctrine "^2.0.0" + has "^1.0.1" + jsx-ast-utils "^2.0.0" + prop-types "^15.6.0" + eslint-scope@^3.7.1: version "3.7.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8" @@ -4058,11 +4073,11 @@ external-editor@^1.1.0: tmp "^0.0.29" external-editor@^2.0.4: - version "2.0.5" - resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.0.5.tgz#52c249a3981b9ba187c7cacf5beb50bf1d91a6bc" + version "2.1.0" + resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.1.0.tgz#3d026a21b7f95b5726387d4200ac160d372c3b48" dependencies: + chardet "^0.4.0" iconv-lite "^0.4.17" - jschardet "^1.4.2" tmp "^0.0.33" extglob@^0.3.1: @@ -4397,7 +4412,7 @@ fs-extra@3.0.1: jsonfile "^3.0.0" universalify "^0.1.0" -fs-extra@4.0.2, fs-extra@^4.0.1, fs-extra@^4.0.2: +fs-extra@4.0.2, fs-extra@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.2.tgz#f91704c53d1b461f893452b0c307d9997647ab6b" dependencies: @@ -4633,8 +4648,8 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2: path-is-absolute "^1.0.0" global-dirs@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.0.tgz#10d34039e0df04272e262cf24224f7209434df4f" + version "0.1.1" + resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" dependencies: ini "^1.3.4" @@ -4673,8 +4688,8 @@ global-prefix@^1.0.1: which "^1.2.14" globals@^10.0.0: - version "10.3.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-10.3.0.tgz#716aba93657b56630b5a0e77de5ea8ac6215afaa" + version "10.4.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-10.4.0.tgz#5c477388b128a9e4c5c5d01c7a2aca68c68b2da7" globals@^9.17.0, globals@^9.18.0: version "9.18.0" @@ -4762,16 +4777,16 @@ graphql-anywhere@^3.0.1: resolved "https://registry.yarnpkg.com/graphql-anywhere/-/graphql-anywhere-3.1.0.tgz#3ea0d8e8646b5cee68035016a9a7557c15c21e96" graphql-config@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/graphql-config/-/graphql-config-1.0.7.tgz#424bda7da2e70ad6bbec4bd26c83f1d9cb49b271" + version "1.0.8" + resolved "https://registry.yarnpkg.com/graphql-config/-/graphql-config-1.0.8.tgz#6dd1cd76ff6fbb01662704f8bddc403f6b0c24d9" dependencies: - graphql "^0.11.6" - graphql-request "^1.2.0" - js-yaml "^3.9.0" + graphql "^0.11.7" + graphql-request "^1.4.0" + js-yaml "^3.10.0" minimatch "^3.0.4" - rimraf "^2.6.1" + rimraf "^2.6.2" -graphql-request@^1.2.0: +graphql-request@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-1.4.0.tgz#f5b067c83070296d93fb45760e83dfad0d9f537a" dependencies: @@ -4787,7 +4802,7 @@ graphql@^0.10.0, graphql@^0.10.3, graphql@^0.10.5: dependencies: iterall "^1.1.0" -graphql@^0.11.6, graphql@^0.11.7: +graphql@^0.11.7: version "0.11.7" resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.11.7.tgz#e5abaa9cb7b7cccb84e9f0836bf4370d268750c6" dependencies: @@ -5103,9 +5118,9 @@ http-signature@~1.2.0: jsprim "^1.2.2" sshpk "^1.7.0" -https-browserify@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82" +https-browserify@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" husky@^0.14.3: version "0.14.3" @@ -5194,8 +5209,8 @@ inherits@2.0.1: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" ini@^1.3.2, ini@^1.3.4, ini@~1.3.0: - version "1.3.4" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e" + version "1.3.5" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" inquirer@0.11.0: version "0.11.0" @@ -5938,8 +5953,8 @@ jest-jasmine2@^21.2.1: p-cancelable "^0.3.0" jest-junit@^3.1.0, jest-junit@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-3.2.1.tgz#e58f06979e5a8d551fedb5f8e11f942fc35a00e9" + version "3.3.0" + resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-3.3.0.tgz#473b8c00d171a84a61ad6e456a29936ee0b64f40" dependencies: mkdirp "^0.5.1" strip-ansi "^4.0.0" @@ -6214,7 +6229,7 @@ js-tokens@^3.0.0, js-tokens@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" -js-yaml@^3.4.3, js-yaml@^3.7.0, js-yaml@^3.9.0, js-yaml@^3.9.1: +js-yaml@^3.10.0, js-yaml@^3.4.3, js-yaml@^3.7.0, js-yaml@^3.9.0, js-yaml@^3.9.1: version "3.10.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc" dependencies: @@ -6232,10 +6247,6 @@ jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" -jschardet@^1.4.2: - version "1.6.0" - resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-1.6.0.tgz#c7d1a71edcff2839db2f9ec30fc5d5ebd3c1a678" - jsdom@^9.12.0: version "9.12.0" resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-9.12.0.tgz#e8c546fffcb06c00d4833ca84410fed7f8a097d4" @@ -6988,10 +6999,14 @@ mime-types@2.1.17, mime-types@^2.1.12, mime-types@~2.1.15, mime-types@~2.1.16, m dependencies: mime-db "~1.30.0" -mime@1.4.1, mime@^1.2.11, mime@^1.3.4, mime@^1.4.1: +mime@1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6" +mime@^1.2.11, mime@^1.4.1: + version "1.5.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.5.0.tgz#59c20e03ae116089edeb7d3b34a6788c5b3cccea" + mimic-fn@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18" @@ -7061,9 +7076,9 @@ modify-values@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.0.tgz#e2b6cdeb9ce19f99317a53722f3dbf5df5eaaab2" -moment@2.19.1, moment@^2.19.2, moment@^2.6.0: - version "2.19.1" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.1.tgz#56da1a2d1cbf01d38b7e1afc31c10bcfa1929167" +moment@^2.19.2, moment@^2.6.0: + version "2.19.2" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.2.tgz#8a7f774c95a64550b4c7ebd496683908f9419dbe" move-concurrently@^1.0.1: version "1.0.1" @@ -7089,8 +7104,8 @@ multicast-dns-service-types@^1.1.0: resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901" multicast-dns@^6.0.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.1.1.tgz#6e7de86a570872ab17058adea7160bbeca814dde" + version "6.2.0" + resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.0.tgz#13f22d0c32dc5ee82a32878e3c380d875b3eab22" dependencies: dns-packet "^1.0.1" thunky "^0.1.0" @@ -7199,28 +7214,28 @@ node-int64@^0.4.0: resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" node-libs-browser@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.0.0.tgz#a3a59ec97024985b46e958379646f96c4b616646" + version "2.1.0" + resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df" dependencies: assert "^1.1.1" - browserify-zlib "^0.1.4" + browserify-zlib "^0.2.0" buffer "^4.3.0" console-browserify "^1.1.0" constants-browserify "^1.0.0" crypto-browserify "^3.11.0" domain-browser "^1.1.1" events "^1.0.0" - https-browserify "0.0.1" - os-browserify "^0.2.0" + https-browserify "^1.0.0" + os-browserify "^0.3.0" path-browserify "0.0.0" - process "^0.11.0" + process "^0.11.10" punycode "^1.2.4" querystring-es3 "^0.2.0" - readable-stream "^2.0.5" + readable-stream "^2.3.3" stream-browserify "^2.0.1" - stream-http "^2.3.1" - string_decoder "^0.10.25" - timers-browserify "^2.0.2" + stream-http "^2.7.2" + string_decoder "^1.0.0" + timers-browserify "^2.0.4" tty-browserify "0.0.0" url "^0.11.0" util "^0.10.3" @@ -7476,9 +7491,9 @@ original@>=0.0.5: dependencies: url-parse "1.0.x" -os-browserify@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.2.1.tgz#63fc4ccee5d2d7763d26bbf8601078e6c2e0044f" +os-browserify@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" os-homedir@^1.0.0, os-homedir@^1.0.1: version "1.0.2" @@ -7571,9 +7586,9 @@ pad-right@^0.2.2: dependencies: repeat-string "^1.5.2" -pako@~0.2.0: - version "0.2.9" - resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75" +pako@~1.0.5: + version "1.0.6" + resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258" parallel-transform@^1.1.0: version "1.1.0" @@ -7793,8 +7808,8 @@ pluralize@^7.0.0: resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" pngjs@^3.0.0, pngjs@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.3.0.tgz#1f5730c189c94933b81beda2ab2f8e2855263a8f" + version "3.3.1" + resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.3.1.tgz#8e14e6679ee7424b544334c3b2d21cea6d8c209a" popper.js@^1.12.5: version "1.12.9" @@ -7979,8 +7994,8 @@ postcss-minify-selectors@^2.0.4: postcss-selector-parser "^2.0.0" postcss-modules-extract-imports@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85" + version "1.1.0" + resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz#b614c9720be6816eaee35fb3a5faa1dba6a05ddb" dependencies: postcss "^6.0.1" @@ -8180,7 +8195,7 @@ process-nextick-args@~1.0.6: version "1.0.7" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" -process@^0.11.0: +process@^0.11.10: version "0.11.10" resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" @@ -8238,8 +8253,8 @@ public-encrypt@^4.0.0: randombytes "^2.0.1" pump@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.2.tgz#3b3ee6512f94f0e575538c17995f9f16990a5d51" + version "1.0.3" + resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz#5dfe8311c33bbf6fc18261f9f34702c47c08a954" dependencies: end-of-stream "^1.1.0" once "^1.3.1" @@ -8543,8 +8558,8 @@ react-icons@^2.2.7: react-icon-base "2.1.0" react-input-range@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/react-input-range/-/react-input-range-1.2.1.tgz#10ff5fc1ec6ab9d95e15cddebe6f6879db2c3386" + version "1.2.2" + resolved "https://registry.yarnpkg.com/react-input-range/-/react-input-range-1.2.2.tgz#65c295d8a9ab34cbd3b8f357579f4e66be215ea9" dependencies: autobind-decorator "^1.3.4" prop-types "^15.5.8" @@ -8558,9 +8573,9 @@ react-json-view@^1.13.3: react-base16-styling "^0.5.3" react-textarea-autosize "^5.1.0" -react-modal@2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-2.4.1.tgz#cb09b26711b148eb9f59cb180e1b7d82980ded05" +react-modal@3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.1.3.tgz#bead112cd84681a1ccd18ee1e96c73d881793b75" dependencies: exenv "^1.2.0" prop-types "^15.5.10" @@ -8820,7 +8835,7 @@ read-pkg@^2.0.0: normalize-package-data "^2.3.2" path-type "^2.0.0" -"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6, readable-stream@^2.2.9: +"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6, readable-stream@^2.2.9, readable-stream@^2.3.3: version "2.3.3" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c" dependencies: @@ -9459,7 +9474,7 @@ right-pad@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/right-pad/-/right-pad-1.0.1.tgz#8ca08c2cbb5b55e74dafa96bf7fd1a27d568c8d0" -rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1: +rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" dependencies: @@ -9578,14 +9593,10 @@ semver-utils@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/semver-utils/-/semver-utils-1.1.1.tgz#27d92fec34d27cfa42707d3b40d025ae9855f2df" -"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1: +"semver@2 || 3 || 4 || 5", semver@5.4.1, semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1: version "5.4.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e" -semver@5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" - send@0.16.1: version "0.16.1" resolved "https://registry.yarnpkg.com/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3" @@ -9954,7 +9965,7 @@ stream-each@^1.1.0: end-of-stream "^1.1.0" stream-shift "^1.0.0" -stream-http@^2.3.1: +stream-http@^2.7.2: version "2.7.2" resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.2.tgz#40a050ec8dc3b53b33d9909415c02c0bf1abfbad" dependencies: @@ -10006,16 +10017,16 @@ string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -string_decoder@^0.10.25, string_decoder@~0.10.x: - version "0.10.31" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" - -string_decoder@~1.0.3: +string_decoder@^1.0.0, string_decoder@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" dependencies: safe-buffer "~5.1.0" +string_decoder@~0.10.x: + version "0.10.31" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + stringify-entities@^1.0.1: version "1.3.1" resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-1.3.1.tgz#b150ec2d72ac4c1b5f324b51fb6b28c9cdff058c" @@ -10164,12 +10175,13 @@ stylelint-config-styled-components@^0.1.1: resolved "https://registry.yarnpkg.com/stylelint-config-styled-components/-/stylelint-config-styled-components-0.1.1.tgz#b408388d7c687833ab4be4c4e6522d97d2827ede" stylelint-processor-styled-components@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/stylelint-processor-styled-components/-/stylelint-processor-styled-components-1.0.0.tgz#5fae7f1848cbc38a8ed684a5e114f2d958eefe3b" + version "1.1.0" + resolved "https://registry.yarnpkg.com/stylelint-processor-styled-components/-/stylelint-processor-styled-components-1.1.0.tgz#27658def7844629960e194ae1b1af6b13f6e83d8" dependencies: babel-traverse "^6.16.0" babylon "^6.12.0" - typescript-eslint-parser "^7.0.0" + postcss "^6.0.14" + typescript-eslint-parser "^9.0.0" stylelint@^8.2.0: version "8.2.0" @@ -10214,8 +10226,8 @@ stylelint@^8.2.0: table "^4.0.1" stylis@3.x: - version "3.4.3" - resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.4.3.tgz#875bd0db3db37bb6de08f89275fc38ee2e32ee75" + version "3.4.4" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.4.4.tgz#7dbc7e3ca3c8707b796cd217fe6f8fbe81e78464" sugarss@^1.0.0: version "1.0.1" @@ -10454,7 +10466,7 @@ timed-out@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" -timers-browserify@^2.0.2: +timers-browserify@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.4.tgz#96ca53f4b794a5e7c0e1bd7cc88a372298fa01e6" dependencies: @@ -10641,27 +10653,27 @@ typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" -typescript-eslint-parser@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/typescript-eslint-parser/-/typescript-eslint-parser-7.0.0.tgz#be57d8768e37707af825e339ea2af18d7393cabb" +typescript-eslint-parser@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/typescript-eslint-parser/-/typescript-eslint-parser-9.0.0.tgz#6a9e9c4bafbebc7e6df53c631bc7036597227d18" dependencies: lodash.unescape "4.0.1" - semver "5.3.0" + semver "5.4.1" ua-parser-js@^0.7.9: version "0.7.17" resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac" uglify-es@^3.0.24: - version "3.1.9" - resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.1.9.tgz#6c82df628ac9eb7af9c61fd70c744a084abe6161" + version "3.1.10" + resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.1.10.tgz#f1840c3b52771d17555a02ce158cf46f689384bd" dependencies: commander "~2.11.0" source-map "~0.6.1" uglify-js@3.1.x, uglify-js@^3.0.13: - version "3.1.9" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.1.9.tgz#dffca799308cf327ec3ac77eeacb8e196ce3b452" + version "3.1.10" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.1.10.tgz#c4a5f9b5c6276b40cb971c1d97c9eeb26af9509c" dependencies: commander "~2.11.0" source-map "~0.6.1" @@ -10704,8 +10716,8 @@ uid-number@^0.0.6: resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81" ultron@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.0.tgz#b07a2e6a541a815fc6a34ccd4533baec307ca864" + version "1.1.1" + resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c" unherit@^1.0.4: version "1.1.0" @@ -10715,8 +10727,8 @@ unherit@^1.0.4: xtend "^4.0.1" unified@^6.0.0, unified@^6.1.2, unified@^6.1.5: - version "6.1.5" - resolved "https://registry.yarnpkg.com/unified/-/unified-6.1.5.tgz#716937872621a63135e62ced2f3ac6a063c6fb87" + version "6.1.6" + resolved "https://registry.yarnpkg.com/unified/-/unified-6.1.6.tgz#5ea7f807a0898f1f8acdeefe5f25faa010cc42b1" dependencies: bail "^1.0.0" extend "^3.0.0" @@ -10764,6 +10776,10 @@ unique-string@^1.0.0: dependencies: crypto-random-string "^1.0.0" +unist-util-is@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-2.1.1.tgz#0c312629e3f960c66e931e812d3d80e77010947b" + unist-util-modify-children@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/unist-util-modify-children/-/unist-util-modify-children-1.1.1.tgz#66d7e6a449e6f67220b976ab3cb8b5ebac39e51d" @@ -10780,7 +10796,7 @@ unist-util-remove-position@^1.0.0: dependencies: unist-util-visit "^1.1.0" -unist-util-stringify-position@^1.0.0: +unist-util-stringify-position@^1.0.0, unist-util-stringify-position@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-1.1.1.tgz#3ccbdc53679eed6ecf3777dd7f5e3229c1b6aa3c" @@ -10789,8 +10805,10 @@ unist-util-visit-children@^1.0.0: resolved "https://registry.yarnpkg.com/unist-util-visit-children/-/unist-util-visit-children-1.1.1.tgz#eba63b371116231181068837118b6e6e10ec8844" unist-util-visit@^1.0.0, unist-util-visit@^1.1.0, unist-util-visit@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.1.3.tgz#ec268e731b9d277a79a5b5aa0643990e405d600b" + version "1.2.0" + resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.2.0.tgz#9dc78d1f95cd242e865f7f93f327d3296bb9a718" + dependencies: + unist-util-is "^2.1.1" unitcalc@^1.1.1: version "1.1.1" @@ -10981,6 +10999,12 @@ vfile-location@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.2.tgz#d3675c59c877498e492b4756ff65e4af1a752255" +vfile-message@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-1.0.0.tgz#a6adb0474ea400fa25d929f1d673abea6a17e359" + dependencies: + unist-util-stringify-position "^1.1.1" + vfile-reporter@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/vfile-reporter/-/vfile-reporter-3.1.0.tgz#a9b398c5e6dcbc8a9a08e6cf425f092e86a37000" @@ -10996,12 +11020,13 @@ vfile-statistics@^1.0.0: resolved "https://registry.yarnpkg.com/vfile-statistics/-/vfile-statistics-1.1.0.tgz#02104c60fdeed1d11b1f73ad65330b7634b3d895" vfile@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/vfile/-/vfile-2.2.0.tgz#ce47a4fb335922b233e535db0f7d8121d8fced4e" + version "2.3.0" + resolved "https://registry.yarnpkg.com/vfile/-/vfile-2.3.0.tgz#e62d8e72b20e83c324bc6c67278ee272488bf84a" dependencies: is-buffer "^1.1.4" replace-ext "1.0.0" unist-util-stringify-position "^1.0.0" + vfile-message "^1.0.0" vlq@^0.2.1: version "0.2.3" @@ -11093,11 +11118,11 @@ webpack-common-shake@^1.5.3: webpack-sources "^1.0.1" webpack-dev-middleware@^1.11.0: - version "1.12.0" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.0.tgz#d34efefb2edda7e1d3b5dbe07289513219651709" + version "1.12.1" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.1.tgz#338be3ca930973be1c2ce07d84d275e997e1a25a" dependencies: memory-fs "~0.4.1" - mime "^1.3.4" + mime "^1.4.1" path-is-absolute "^1.0.0" range-parser "^1.0.3" time-stamp "^2.0.0" @@ -11260,8 +11285,8 @@ wordwrap@~1.0.0: resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" worker-farm@^1.3.1, worker-farm@^1.4.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.1.tgz#8e9f4a7da4f3c595aa600903051b969390423fa1" + version "1.5.2" + resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.2.tgz#32b312e5dc3d5d45d79ef44acc2587491cd729ae" dependencies: errno "^0.1.4" xtend "^4.0.1"