diff --git a/packages/icons/package.json b/packages/icons/package.json index a88fe0b3..5e95e087 100644 --- a/packages/icons/package.json +++ b/packages/icons/package.json @@ -14,7 +14,8 @@ "compile:es": "babel src --out-dir dist/es", "compile:umd": "UMD=1 babel src --out-dir dist/umd", "compile": "redrun -p compile:*", - "dev": "NODE_ENV=development npm run compile -- -- --watch --source-maps inline", + "dev": + "NODE_ENV=development npm run compile -- -- --watch --source-maps inline", "prepublish": "NODE_ENV=production npm run compile" }, "dependencies": { @@ -26,7 +27,7 @@ "babel-preset-joyent-portal": "^6.0.1", "eslint": "^4.13.1", "eslint-config-joyent-portal": "^3.2.0", - "joyent-react-scripts": "^6.5.0", + "joyent-react-scripts": "^6.5.1", "react": "^16.2.0", "redrun": "^5.10.0" }, diff --git a/packages/my-joy-beta/.babelrc b/packages/my-joy-beta/.babelrc index d57f858e..eeb79b2f 100644 --- a/packages/my-joy-beta/.babelrc +++ b/packages/my-joy-beta/.babelrc @@ -1,9 +1,6 @@ { "presets": "joyent-portal", "plugins": [ - "styled-components", - ["inline-react-svg", { - "ignorePattern": "libre-franklin" - }] + "styled-components" ] } diff --git a/packages/my-joy-beta/package.json b/packages/my-joy-beta/package.json index e3eba7a5..b6a26e1c 100644 --- a/packages/my-joy-beta/package.json +++ b/packages/my-joy-beta/package.json @@ -63,7 +63,7 @@ "jest-snapshot": "^21.2.1", "jest-styled-components": "^4.9.0", "jest-transform-graphql": "^2.1.0", - "joyent-react-scripts": "^6.5.0", + "joyent-react-scripts": "^6.5.1", "react-test-renderer": "^16.2.0", "redrun": "^5.10.0", "serve": "^6.4.1", diff --git a/packages/my-joy-beta/src/containers/instances/create-snapshot.js b/packages/my-joy-beta/src/containers/instances/create-snapshot.js index 564b77a0..089fc730 100644 --- a/packages/my-joy-beta/src/containers/instances/create-snapshot.js +++ b/packages/my-joy-beta/src/containers/instances/create-snapshot.js @@ -6,7 +6,6 @@ import find from 'lodash.find'; import get from 'lodash.get'; import { - Title, ViewContainer, StatusLoader, Message, @@ -26,7 +25,6 @@ const CreateSnapshot = ({ handleSubmit, handleCancel }) => { - const _title = Create Snapshot; const _loading = !(loading && !instance) ? null : ; const CreateSnapshotForm = reduxForm({ @@ -51,7 +49,6 @@ const CreateSnapshot = ({ return ( - {_title} {_loading} {_error} {_form} diff --git a/packages/my-joy-beta/src/containers/instances/dns.js b/packages/my-joy-beta/src/containers/instances/dns.js index 75f1de56..d01db128 100644 --- a/packages/my-joy-beta/src/containers/instances/dns.js +++ b/packages/my-joy-beta/src/containers/instances/dns.js @@ -6,7 +6,6 @@ import get from 'lodash.get'; import { ViewContainer, - Title, StatusLoader, Message, MessageDescription, @@ -17,7 +16,6 @@ import ListDNS from '@graphql/list-dns.gql'; const DNS = ({ instance, loading, error }) => { const { name, dns_names } = instance || {}; - const _title = DNS; const _loading = loading && !name && !dns_names && ; const _summary = !_loading && instance && 
{JSON.stringify(dns_names, null, 2)}
; @@ -35,7 +33,6 @@ const DNS = ({ instance, loading, error }) => { return ( - {_title} {_loading} {_error} {_summary} diff --git a/packages/my-joy-beta/src/containers/instances/firewall.js b/packages/my-joy-beta/src/containers/instances/firewall.js index fd86540d..77564c42 100644 --- a/packages/my-joy-beta/src/containers/instances/firewall.js +++ b/packages/my-joy-beta/src/containers/instances/firewall.js @@ -7,7 +7,6 @@ import get from 'lodash.get'; import { ViewContainer, - Title, StatusLoader, Message, MessageDescription, @@ -31,7 +30,6 @@ const Firewall = ({ error }) => { const values = forceArray(firewallRules); - const _title = Firewall; const _loading = !(loading && !values.length) ? null : ; const _firewall = @@ -70,7 +68,6 @@ const Firewall = ({ return ( - {_title} {_loading} {_error} {_firewall} diff --git a/packages/my-joy-beta/src/containers/instances/metadata.js b/packages/my-joy-beta/src/containers/instances/metadata.js index 7617a0d7..04f61943 100644 --- a/packages/my-joy-beta/src/containers/instances/metadata.js +++ b/packages/my-joy-beta/src/containers/instances/metadata.js @@ -11,7 +11,6 @@ import get from 'lodash.get'; import { ViewContainer, - Title, StatusLoader, Message, MessageDescription, @@ -37,7 +36,6 @@ const Metadata = ({ handleUpdate, handleCreate }) => { - const _title = Metadata; const _loading = !(loading && !values.length) ? null : ; // metadata items forms @@ -96,8 +94,7 @@ const Metadata = ({ > {KeyValue} - ) - } + )} ); @@ -114,7 +111,6 @@ const Metadata = ({ return ( - {_title} {_loading} {_error} {_metadata} diff --git a/packages/my-joy-beta/src/containers/instances/networks.js b/packages/my-joy-beta/src/containers/instances/networks.js index 0b0f17d8..62d32bcb 100644 --- a/packages/my-joy-beta/src/containers/instances/networks.js +++ b/packages/my-joy-beta/src/containers/instances/networks.js @@ -7,7 +7,6 @@ import get from 'lodash.get'; import { ViewContainer, - Title, StatusLoader, Message, MessageDescription, @@ -25,7 +24,6 @@ import { Network as InstanceNetwork } from '@components/instances'; const Networks = ({ networks = [], loading, error }) => { const values = forceArray(networks); - const _title = Networks; const _loading = !(loading && !values.length) ? null : ; const _networks = @@ -67,7 +65,6 @@ const Networks = ({ networks = [], loading, error }) => { return ( - {_title} {_loading} {_error} {_networks} diff --git a/packages/my-joy-beta/src/containers/instances/resize.js b/packages/my-joy-beta/src/containers/instances/resize.js index 2cd59ac7..e1f8130d 100644 --- a/packages/my-joy-beta/src/containers/instances/resize.js +++ b/packages/my-joy-beta/src/containers/instances/resize.js @@ -7,7 +7,6 @@ import get from 'lodash.get'; import { StatusLoader, - Title, ViewContainer, Message, MessageTitle, @@ -26,7 +25,6 @@ const Resize = ({ match, loading, error, instance, packages }) => { const _packages = forceArray(packages); - const _title = Resize; const _loading = !(loading && (!_packages.length || !instance)) ? null : ( ); @@ -45,7 +43,6 @@ const Resize = ({ match, loading, error, instance, packages }) => { return ( - {_title} {_loading} {_error} {_resize} diff --git a/packages/my-joy-beta/src/containers/instances/snapshots.js b/packages/my-joy-beta/src/containers/instances/snapshots.js index df99ff38..926911e1 100644 --- a/packages/my-joy-beta/src/containers/instances/snapshots.js +++ b/packages/my-joy-beta/src/containers/instances/snapshots.js @@ -11,7 +11,6 @@ import { reduxForm, stopSubmit, startSubmit, change } from 'redux-form'; import { ViewContainer, - Title, Message, MessageTitle, MessageDescription @@ -37,8 +36,6 @@ const Snapshots = ({ error, handleAction }) => { - const _title = Snapshots; - const _values = forceArray(snapshots); const _loading = !_values.length && loading; @@ -55,7 +52,6 @@ const Snapshots = ({ return ( - {_title} {_error} ({ - ...rest, - created: moment.utc(created).unix(), - updated: moment.utc(updated).unix() - }) - ); + const snapshots = get( + instance, + 'snapshots', + [] + ).map(({ created, updated, ...rest }) => ({ + ...rest, + created: moment.utc(created).unix(), + updated: moment.utc(updated).unix() + })); const index = GenIndex( snapshots.map(({ name, ...rest }) => ({ ...rest, id: name })) diff --git a/packages/ui-toolkit/package.json b/packages/ui-toolkit/package.json index e42bd456..28c85aa4 100644 --- a/packages/ui-toolkit/package.json +++ b/packages/ui-toolkit/package.json @@ -15,7 +15,8 @@ "compile:es": "babel src --out-dir dist/es --ignore spec.js", "compile:umd": "UMD=1 babel src --out-dir dist/umd --ignore spec.js", "compile": "redrun -p compile:*", - "dev": "NODE_ENV=development npm run compile -- -- --watch --source-maps inline", + "dev": + "NODE_ENV=development npm run compile -- -- --watch --source-maps inline", "styleguide:build": "NODE_ENV=production styleguidist build", "styleguide": "NODE_ENV=development styleguidist server", "prepublish": "NODE_ENV=production npm run compile" @@ -46,7 +47,7 @@ "eslint": "^4.13.1", "eslint-config-joyent-portal": "^3.2.0", "jest-styled-components": "^4.9.0", - "joyent-react-scripts": "^6.5.0", + "joyent-react-scripts": "^6.5.1", "lodash.isboolean": "^3.0.3", "react": "^16.2.0", "react-docgen": "^3.0.0-beta8", diff --git a/prototypes/cra-boilerplate/package.json b/prototypes/cra-boilerplate/package.json index 2f779684..bd5d7f9d 100644 --- a/prototypes/cra-boilerplate/package.json +++ b/prototypes/cra-boilerplate/package.json @@ -9,8 +9,10 @@ "dev": "NODE_ENV=development joyent-react-scripts start", "build": "NODE_ENV=production joyent-react-scripts build", "fmt": "prettier --write --single-quote *.js src/*.js src/**/*.js", - "lint-ci": "eslint . --fix --ext .js --ext .md && echo 0 `# stylelint './src/**/*.js'`", - "lint": "eslint . --fix --ext .js --ext .md && echo 0 `# stylelint './src/**/*.js'`", + "lint-ci": + "eslint . --fix --ext .js --ext .md && echo 0 `# stylelint './src/**/*.js'`", + "lint": + "eslint . --fix --ext .js --ext .md && echo 0 `# stylelint './src/**/*.js'`", "prepublish": "echo 0" }, "dependencies": { @@ -32,9 +34,9 @@ "babel-preset-joyent-portal": "^6.0.1", "eslint": "^4.11.0", "eslint-config-joyent-portal": "^3.2.0", - "joyent-react-scripts": "^6.5.0", + "joyent-react-scripts": "^6.5.1", "prettier": "^1.8.2", "stylelint": "^8.4.0", "stylelint-config-joyent-portal": "^2.0.1" } -} \ No newline at end of file +} diff --git a/prototypes/create-instance-icons/.babelrc b/prototypes/create-instance-icons/.babelrc index e45e9fbd..bc07a154 100644 --- a/prototypes/create-instance-icons/.babelrc +++ b/prototypes/create-instance-icons/.babelrc @@ -1,8 +1,3 @@ { - "presets": "joyent-portal", - "plugins": [ - ["inline-react-svg", { - "ignorePattern": "libre-franklin" - }] - ] + "presets": "joyent-portal" } diff --git a/prototypes/create-instance-icons/package.json b/prototypes/create-instance-icons/package.json index 84b8857f..199efe7c 100644 --- a/prototypes/create-instance-icons/package.json +++ b/prototypes/create-instance-icons/package.json @@ -6,7 +6,8 @@ "repository": "github:yldio/joyent-portal", "main": "build/", "scripts": { - "dev": "REACT_APP_GQL_PORT=4000 PORT=3069 REACT_APP_GQL_PROTOCOL=http joyent-react-scripts start", + "dev": + "REACT_APP_GQL_PORT=4000 PORT=3069 REACT_APP_GQL_PROTOCOL=http joyent-react-scripts start", "start": "PORT=3069 joyent-react-scripts start", "build": "NODE_ENV=production joyent-react-scripts build", "lint:css": "echo 0 `# stylelint './src/**/*.js'`", @@ -62,7 +63,7 @@ "jest-snapshot": "^21.2.1", "jest-styled-components": "^4.9.0", "jest-transform-graphql": "^2.1.0", - "joyent-react-scripts": "^6.5.0", + "joyent-react-scripts": "^6.5.1", "lodash.sortby": "^4.7.0", "mz": "^2.7.0", "react-scripts": "^1.0.17", diff --git a/prototypes/create-instance-icons/src/components/navigation/header.js b/prototypes/create-instance-icons/src/components/navigation/header.js index a62320e2..cc2a5309 100644 --- a/prototypes/create-instance-icons/src/components/navigation/header.js +++ b/prototypes/create-instance-icons/src/components/navigation/header.js @@ -6,7 +6,7 @@ import remcalc from 'remcalc'; import { Header, HeaderBrand, - TritonIcon beta, + TritonIcon, HeaderNav, HeaderItem, DataCenterIcon, @@ -20,7 +20,7 @@ const HeaderBrandStyled = styled(HeaderBrand)` const NavHeader = () => (
- +
  • diff --git a/prototypes/create-instance/.babelrc b/prototypes/create-instance/.babelrc index e45e9fbd..bc07a154 100644 --- a/prototypes/create-instance/.babelrc +++ b/prototypes/create-instance/.babelrc @@ -1,8 +1,3 @@ { - "presets": "joyent-portal", - "plugins": [ - ["inline-react-svg", { - "ignorePattern": "libre-franklin" - }] - ] + "presets": "joyent-portal" } diff --git a/prototypes/create-instance/package.json b/prototypes/create-instance/package.json index ee3b9411..ed58983e 100644 --- a/prototypes/create-instance/package.json +++ b/prototypes/create-instance/package.json @@ -56,7 +56,7 @@ "jest-snapshot": "^21.2.1", "jest-styled-components": "^4.9.0", "jest-transform-graphql": "^2.1.0", - "joyent-react-scripts": "^6.5.0", + "joyent-react-scripts": "^6.5.1", "lodash.sortby": "^4.7.0", "mz": "^2.7.0", "react-scripts": "^1.0.17", diff --git a/yarn.lock b/yarn.lock index b5521870..4aa75e57 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6132,9 +6132,9 @@ joyent-manifest-editor@^1.4.0: prop-types "^15.6.0" react-codemirror "^1.0.0" -joyent-react-scripts@^6.5.0: - version "6.5.0" - resolved "https://registry.yarnpkg.com/joyent-react-scripts/-/joyent-react-scripts-6.5.0.tgz#eec24ccd879c8edcce8ec2d10b5838cb6ddeb42c" +joyent-react-scripts@^6.5.1: + version "6.5.1" + resolved "https://registry.yarnpkg.com/joyent-react-scripts/-/joyent-react-scripts-6.5.1.tgz#8f6fafa7dc6ac7e9bee1ad268cc9da827dbb26c5" dependencies: apr-for-each "^1.0.6" apr-main "^2.0.2"