chore: cleanup deps and flows

.dockerignore

@@ -1,165 +0,0 @@
-### Bower ###
-bower_components
-.bower-cache
-.bower-registry
-.bower-tmp
-
-
-### Git ###
-*.orig
-
-
-### macOS ###
-*.DS_Store
-.AppleDouble
-.LSOverride
-
-# Thumbnails
-._*
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-
-### Node ###
-# Logs
-logs
-*.log
-npm-debug.log*
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules
-jspm_packages
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-
-### SublimeText ###
-# cache files for sublime text
-*.tmlanguage.cache
-*.tmPreferences.cache
-*.stTheme.cache
-
-# workspace files are user-specific
-*.sublime-workspace
-
-# project files should be checked into the repository, unless a significant
-# proportion of contributors will probably not be using SublimeText
-# *.sublime-project
-
-# sftp configuration file
-sftp-config.json
-
-# Package control specific files
-Package Control.last-run
-Package Control.ca-list
-Package Control.ca-bundle
-Package Control.system-ca-bundle
-Package Control.cache/
-Package Control.ca-certs/
-bh_unicode_properties.cache
-
-# Sublime-github package stores a github token in this file
-# https://packagecontrol.io/packages/sublime-github
-GitHub.sublime-settings
-
-
-### Vim ###
-# swap
-[._]*.s[a-w][a-z]
-[._]s[a-w][a-z]
-# session
-Session.vim
-# temporary
-.netrwhist
-*~
-# auto-generated tag files
-tags
-
-
-### Windows ###
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-
-### Application Specific ###
-.env
-
-# PostCSS
-*.postcss.js
-
-/cloudapi-graphql/credentials.json
-/docker-graphql/config.json
-tap-xunit
-/ui/dist
-
-_todo
-packages/*/dist
-packages/*/buid
-packages/ui-toolkit/styleguide
-packages/*/node_modules
-packages/*/Dockerfile
-legacy
-
-_env

.travis.yml

@@ -1,5 +1,5 @@
 language: node_js
 node_js:
-  - '8'
+  - '9'
 script:
-  - npm run test-ci
+  - yarn run test:ci

CONTRIBUTING.md

@@ -26,13 +26,13 @@ In this scenario, the contributor should open a pull request instead.
 Follow [Git blessed](http://chris.beams.io/posts/git-commit/) and
 [Conventional Commits](https://conventionalcommits.org)
 
-1. Separate subject from body with a blank line
+1.  Separate subject from body with a blank line
-1. Limit the subject line to 50 characters
+1.  Limit the subject line to 50 characters
-1. Capitalize the subject line
+1.  Capitalize the subject line
-1. Do not end the subject line with a period
+1.  Do not end the subject line with a period
-1. Use the imperative mood in the subject line
+1.  Use the imperative mood in the subject line
-1. Wrap the body at 72 characters
+1.  Wrap the body at 72 characters
-1. Use the body to explain what and why vs. how
+1.  Use the body to explain what and why vs. how
 
 Types:
 

bundle/package.json

@@ -5,22 +5,26 @@
   "license": "MPL-2.0",
   "scripts": {
     "start": "UMD=1 NODE_ENV=development PORT=3069 REACT_APP_GQL_PORT=3069 REACT_APP_GQL_HOSTNAME=localhost REACT_APP_GQL_PROTOCOL=http node src/index.js",
-    "lint-ci": "echo 0",
+    "dev": "echo 0",
+    "build:test": "echo 0",
+    "build:lib": "echo 0",
+    "build:bundle": "echo 0",
+    "prepublish": "echo 0",
     "lint": "echo 0",
-    "test-ci": "echo 0",
+    "lint:ci": "echo 0",
     "test": "echo 0",
-    "prepublish": "echo 0"
+    "test:ci": "echo 0"
   },
   "dependencies": {
     "brok": "^2.0.0",
     "brule": "^3.1.0",
     "cloudapi-gql": "^6.1.1",
     "hapi": "^17.2.0",
-    "hapi-triton-auth": "^1.0.0",
+    "hapi-triton-auth": "^2.0.0",
     "inert": "^5.1.0",
     "joyent-navigation": "*",
-    "my-images-console": "*",
+    "my-joy-images": "*",
-    "my-joy-beta": "*",
+    "my-joy-instances": "*",
     "rollover": "^1.0.0"
   }
 }

bundle/src/index.js

@@ -61,21 +61,19 @@ async function main() {
     {
       plugin: Sso,
       options: {
+        ssoUrl: 'https://sso.joyent.com',
+        baseUrl: BASE_URL,
+        apiBaseUrl: SDC_URL,
+        keyId: '/' + SDC_ACCOUNT + '/keys/' + SDC_KEY_ID,
+        keyPath: SDC_KEY_PATH || join(homedir(), '.ssh/id_rsa'),
+        permissions: { cloudapi: ['/my/*'] },
+        isDev: NODE_ENV === 'development',
         cookie: {
-          password: COOKIE_PASSWORD,
-          domain: COOKIE_DOMAIN,
-          isSecure: false,
           isHttpOnly: true,
-          ttl: 1000 * 60 * 60 // 1 hour
+          isSecure: false,
-        },
+          password: COOKIE_PASSWORD,
-        sso: {
+          ttl: 1000 * 60 * 60, // 1 hour
-          keyPath: SDC_KEY_PATH || join(homedir(), '.ssh/id_rsa'),
+          domain: COOKIE_DOMAIN
-          keyId: '/' + SDC_ACCOUNT + '/keys/' + SDC_KEY_ID,
-          apiBaseUrl: SDC_URL,
-          url: 'https://sso.joyent.com/login',
-          permissions: { cloudapi: ['/my/*'] },
-          baseUrl: BASE_URL,
-          isDev: NODE_ENV === 'development'
         }
       }
     },

commitlint.config.js

@@ -4,7 +4,7 @@ module.exports = {
     'scope-enum': [
       2,
       'always',
-      ['ui-toolkit', 'icons', 'my-joy-beta', 'navigation', 'bundle', 'images']
+      ['ui-toolkit', 'icons', 'instances', 'navigation', 'bundle', 'images']
     ]
   }
 };

joyent.code-workspace

@@ -1,17 +0,0 @@
-{
-	"folders": [
-		{
-			"path": "packages/ui-toolkit"
-		},
-		{
-			"path": "packages/icons"
-		},
-		{
-			"path": "packages/my-joy-beta"
-		},
-		{
-			"path": "."
-		}
-	],
-	"settings": {}
-}

package.json

@@ -5,88 +5,73 @@
   "license": "MPL-2.0",
   "repository": "github:yldio/joyent-portal",
   "scripts": {
+    "dev": "lerna run dev --parallel --stream",
+    "test": "redrun -s build:test test:run",
+    "test:ci": "CI=1 redrun -s build:test test:ci:run",
+    "lint": "lerna run lint --stream",
+    "lint:ci": "lerna run lint:ci --stream",
+    "build:bundle": "redrun -s build:bundle:lib build:bundle:app",
+    "build:bundle:lib": "lerna run build:lib --parallel --stream",
+    "build:bundle:app": "lerna run build:bundle --parallel --stream",
+    "build:test": "lerna run build:test --parallel --stream",
+    "test:run": "lerna run test --parallel --stream",
+    "test:ci:run": "lerna exec 'yarn run test:ci'",
     "format": "./scripts/format",
     "lint-staged": "./scripts/run-staged-pkg --lint",
     "format-staged": "./scripts/format --staged",
     "lint-license": "./scripts/license-to-fail",
     "lint-docs": "./scripts/quality-docs",
-    "lint-ci:root": "eslint . --ext .js --ext .md",
-    "lint:root": "eslint . --fix --ext .js --ext .md",
-    "lint-ci:packages": "lerna run lint-ci  --parallel --stream",
-    "lint:packages": "lerna run lint  --parallel --stream",
-    "lint-ci": "redrun -s lint-ci:*",
-    "lint": "redrun -s lint:*",
-    "test-ci": "CI=1 lerna run test-ci --stream",
-    "test": "lerna run test --parallel --stream",
     "clean": "lerna clean --yes",
-    "dev": "lerna run dev --parallel --stream",
     "commitmsg": "commitlint -e",
-    "precommit": "cross-env CI=1 redrun -s lint-staged format-staged",
+    "precommit": "CI=1 redrun -s lint-staged format-staged",
-    "postinstall": "lerna run prepublish --parallel --stream",
     "commit": "commit"
   },
   "devDependencies": {
     "@commitlint/cli": "^4.2.1",
     "@commitlint/config-angular": "^4.2.1",
     "@commitlint/prompt-cli": "^4.2.1",
-    "apr-awaitify": "^3.0.2",
+    "apr-awaitify": "^3.0.3",
-    "apr-filter": "^3.0.2",
+    "apr-filter": "^3.0.3",
-    "apr-for-each": "^3.0.2",
+    "apr-for-each": "^3.0.3",
-    "apr-main": "^4.0.2",
+    "apr-main": "^4.0.3",
-    "apr-map": "^3.0.2",
+    "apr-map": "^3.0.3",
-    "apr-parallel": "^3.0.2",
+    "apr-parallel": "^3.0.3",
-    "apr-reduce": "^3.0.2",
+    "apr-reduce": "^3.0.3",
-    "babel-eslint": "^8.0.1",
+    "babel-eslint": "^8.2.2",
     "checksum": "^0.1.1",
-    "cross-env": "^5.1.0",
+    "eslint": "^4.18.1",
-    "eslint": "^4.9.0",
+    "eslint-config-prettier": "^2.9.0",
-    "eslint-config-joyent-portal": "^3.2.0",
+    "eslint-config-react-app": "^2.1.0",
-    "eslint-config-prettier": "^2.6.0",
+    "eslint-config-xo-space": "^0.18.0",
-    "eslint-config-react-app": "^2.0.1",
+    "eslint-plugin-flowtype": "^2.46.1",
-    "eslint-config-xo-space": "^0.17.0",
+    "eslint-plugin-import": "^2.9.0",
-    "eslint-plugin-flowtype": "^2.39.1",
+    "eslint-plugin-jsx-a11y": "^6.0.3",
-    "eslint-plugin-graphql": "^1.4.0-1",
-    "eslint-plugin-import": "^2.8.0",
-    "eslint-plugin-jsx-a11y": "^6.0.2",
     "eslint-plugin-markdown": "^1.0.0-beta.6",
-    "eslint-plugin-prettier": "^2.3.1",
+    "eslint-plugin-prettier": "^2.6.0",
-    "eslint-plugin-react": "^7.4.0",
+    "eslint-plugin-react": "^7.7.0",
-    "execa": "^0.8.0",
+    "execa": "^0.9.0",
     "force-array": "^3.1.0",
     "husky": "^0.14.3",
-    "lerna": "^2.4.0",
+    "lerna": "^2.9.0",
     "license-to-fail": "^2.2.0",
     "lodash.uniq": "^4.5.0",
-    "prettier": "1.7.4",
+    "prettier": "1.11.0",
     "quality-docs": "^3.3.0",
-    "read-pkg": "^2.0.0",
+    "redrun": "^5.10.5",
-    "redrun": "^5.9.18",
     "staged-git-files": "0.0.4",
     "yargs": "^10.0.3"
   },
   "resolutions": {
-    "component-type": "1.2.1",
-    "styled-components": "3.1.4",
     "axios": "0.16.2",
-    "apollo-utilities": "1.0.4",
-    "follow-redirects": "1.4.1",
-    "debug": "3.1.0",
-    "node-fetch": "1.7.3",
-    "ansi-styles": "3.2.0",
-    "strip-ansi": "4.0.0",
-    "supports-color": "4.5.0",
-    "ansi-regex": "3.0.0",
     "core-js": "2.5.3",
     "regenerator-runtime": "0.11.1",
     "pify": "3.0.0",
-    "has-flag": "2.0.0",
     "parse-json": "3.0.0",
-    "hoist-non-react-statics": "2.3.1",
+    "hoist-non-react-statics": "2.5.0",
     "stylis-rule-sheet": "0.0.7",
     "react": "16.2.0",
     "breeze-nexttick": "0.2.1",
-    "zen-observable": "0.7.1",
+    "isarray": "1.0.0"
-    "styled-is": "1.1.2"
   },
   "workspaces": [
     "packages/*",

packages/icons/package.json

@@ -6,16 +6,19 @@
   "main": "dist/umd/index.js",
   "jsnext:main": "dist/es/index.js",
   "module": "dist/es/index.js",
+  "files": ["dist"],
   "scripts": {
-    "lint-ci": "eslint . --ext .js --ext .md",
+    "dev": "NODE_ENV=development redrun -p build:es build:umd -- --watch --source-maps inline",
-    "lint": "eslint . --fix --ext .js --ext .md",
+    "build:test": "NODE_ENV=production redrun build:lib",
-    "test-ci": "redrun -s test",
+    "build:lib": "NODE_ENV=production redrun -p build:es build:umd",
+    "build:bundle": "echo 0",
+    "prepublish": "NODE_ENV=production redrun build:lib",
+    "lint": "redrun lint:ci -- -- --fix",
+    "lint:ci": "NODE_ENV=test eslint . --ext .js --ext .md",
     "test": "NODE_ENV=test joyent-react-scripts test --env=jsdom",
-    "compile:es": "babel src --out-dir dist/es",
+    "test:ci": "redrun test",
-    "compile:umd": "UMD=1 babel src --out-dir dist/umd",
+    "build:es": "babel src --out-dir dist/es",
-    "compile": "redrun -p compile:*",
+    "build:umd": "UMD=1 babel src --out-dir dist/umd"
-    "dev": "NODE_ENV=development npm run compile -- -- --watch --source-maps inline",
-    "prepublish": "NODE_ENV=production npm run compile"
   },
   "dependencies": {
     "remcalc": "^1.0.10",

packages/icons/readme.md

@@ -1,7 +1,7 @@
 # joyent-icons
 
-[![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg)](https://opensource.org/licenses/MPL-2.0)
+[![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg?style=flat-square)](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)
+[![standard-readme compliant](https://img.shields.io/badge/standard--readme-OK-green.svg?style=flat-square)](https://github.com/RichardLitt/standard-readme)
 
 ## Table of Contents
 

packages/logos/convert.js

@@ -20,13 +20,16 @@ main(async () => {
   await forEach(files, async file => {
     const svg = await readFile(file, 'utf-8');
     const jsx = converter.convert(svg);
-    const header = jsx.match(/(^<svg)([^>]*)/ig)[0];
+    const header = jsx.match(/(^<svg)([^>]*)/gi)[0];
 
     await writeFile(
       file.replace(/logos\/assets\//, '/logos/src/').replace(/\.svg$/, '.js'),
       `
       import React from 'react';\n
-      export default (props) => (${jsx.replace(header, `${header} {...props}`)});
+      export default (props) => (${jsx.replace(
+        header,
+        `${header} {...props}`
+      )});
     `
     );
   });

packages/logos/package.json

@@ -6,14 +6,19 @@
   "main": "dist/umd/index.js",
   "jsnext:main": "dist/es/index.js",
   "module": "dist/es/index.js",
+  "files": ["dist"],
   "scripts": {
-    "test-ci": "redrun -s test",
+    "dev": "NODE_ENV=development redrun -p build:es build:umd -- --watch --source-maps inline",
-    "test": "NODE_ENV=test joyent-react-scripts test --env=jsdom",
+    "build:test": "NODE_ENV=production redrun build:lib",
-    "compile:es": "babel src --out-dir dist/es",
+    "build:lib": "NODE_ENV=production redrun -p build:es build:umd",
-    "compile:umd": "UMD=1 babel src --out-dir dist/umd",
+    "build:bundle": "echo 0",
-    "compile": "redrun -p compile:*",
+    "prepublish": "NODE_ENV=production redrun build:lib",
-    "dev": "NODE_ENV=development npm run compile -- -- --watch --source-maps inline",
+    "lint": "redrun lint:ci -- -- --fix",
-    "prepublish": "NODE_ENV=production npm run compile"
+    "lint:ci": "NODE_ENV=test eslint . --ext .js --ext .md",
+    "test": "echo 0",
+    "test:ci": "redrun test",
+    "build:es": "babel src --out-dir dist/es",
+    "build:umd": "UMD=1 babel src --out-dir dist/umd"
   },
   "devDependencies": {
     "apr-for-each": "^3.0.3",
@@ -27,7 +32,7 @@
     "htmltojsx": "^0.3.0",
     "joyent-react-scripts": "^7.3.0",
     "mz": "^2.7.0",
-    "prettier": "^1.10.2",
+    "prettier": "^1.11.0",
     "react": "^16.2.0",
     "redrun": "^5.10.5"
   },

packages/logos/readme.md

@@ -1,7 +1,7 @@
 # joyent-icons
 
-[![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg)](https://opensource.org/licenses/MPL-2.0)
+[![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg?style=flat-square)](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)
+[![standard-readme compliant](https://img.shields.io/badge/standard--readme-OK-green.svg?style=flat-square)](https://github.com/RichardLitt/standard-readme)
 
 ## Table of Contents
 

packages/my-joy-images/.npmignore

@@ -0,0 +1,26 @@
+# See https://help.github.com/ignore-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env
+npm-debug.log*
+yarn-debug.log*
+
+yarn-error.log*
+
+## Image Snapshots Diff
+
+**/__diff_output__
+
+
+!lib/app
+!dist

packages/my-joy-images/lib/index.js

@@ -85,10 +85,12 @@ exports.register = async server => {
           const res = await Wreck.request('GET', location);
           const body = await Wreck.read(res);
 
-          const _body = body.toString().replace(
+          const _body = body
-            /https:\/\/fonts\.gstatic\.com/g,
+            .toString()
-            `http://${url.host}/font`
+            .replace(
-          );
+              /https:\/\/fonts\.gstatic\.com/g,
+              `http://${url.host}/font`
+            );
 
           return h
             .response(_body)

packages/my-joy-images/package.json

@@ -1,30 +1,30 @@
 {
-  "name": "my-images-console",
+  "name": "my-joy-images",
   "version": "1.0.0",
   "license": "MPL-2.0",
   "private": true,
   "repository": "github:yldio/joyent-portal",
   "main": "lib/index.js",
   "scripts": {
-    "dev": "REACT_APP_GQL_PORT=4000 PORT=3070 REACT_APP_GQL_PROTOCOL=http joyent-react-scripts start",
+    "dev": "NODE_ENV=development REACT_APP_GQL_PORT=4000 PORT=3070 joyent-react-scripts start",
-    "start": "PORT=3069 joyent-react-scripts start",
+    "build:test": "echo 0",
-    "build:app": "NODE_ENV=production joyent-react-scripts build",
+    "build:lib": "echo 0",
-    "build:lib": "NODE_ENV=production SSR=1 UMD=1 babel src --out-dir lib/app --copy-files",
+    "build:bundle": "NODE_ENV=production redrun -p build:frontend build:ssr",
-    "lint-ci": "eslint . --ext .js --ext .md",
+    "prepublish": "NODE_ENV=production redrun build:bundle",
-    "lint": "eslint . --fix --ext .js --ext .md",
+    "lint": "redrun lint:ci -- -- --fix",
-    "test-ci": "NODE_ENV=test joyent-react-scripts test --env=jsdom --testPathIgnorePatterns='.ui.js'",
+    "lint:ci": "NODE_ENV=test eslint . --ext .js --ext .md",
-    "test": "DEFAULT_TIMEOUT_INTERVAL=100000 NODE_ENV=test joyent-react-scripts test --env=jsdom",
+    "test": "redrun test:ci",
-    "postinstall": "npm run build:app",
+    "test:ci": "echo 0",
-    "prepublish": "npm run build:lib"
+    "build:frontend": "joyent-react-scripts build",
+    "build:ssr": "SSR=1 UMD=1 babel src --out-dir lib/app --copy-files"
   },
   "dependencies": {
     "@manaflair/redux-batch": "^0.1.0",
     "apollo": "^0.2.2",
     "apollo-cache-inmemory": "^1.1.9",
     "apollo-client": "^2.2.5",
-    "apollo-link-http": "^1.5.1",
+    "apollo-link-http": "^1.5.2",
     "apr-intercept": "^3.0.3",
-    "babel-preset-joyent-portal": "^7.0.1",
     "date-fns": "^1.29.0",
     "declarative-redux-form": "^2.0.8",
     "force-array": "^3.1.0",
@@ -39,9 +39,8 @@
     "lodash.isfunction": "^3.0.9",
     "lodash.omit": "^4.5.0",
     "lodash.uniqby": "^4.7.0",
-    "lunr": "^2.1.5",
+    "lunr": "^2.1.6",
     "param-case": "^2.1.1",
-    "prop-types": "^15.6.0",
     "punycode": "^2.1.0",
     "react": "^16.2.0",
     "react-apollo": "^2.0.4",
@@ -53,7 +52,6 @@
     "redux": "^3.7.2",
     "redux-form": "^7.2.3",
     "remcalc": "^1.0.10",
-    "scroll-to-element": "^2.0.0",
     "styled-components": "^3.1.6",
     "styled-components-spacing": "^2.1.3",
     "styled-flex-component": "^2.2.1",
@@ -62,12 +60,14 @@
   },
   "devDependencies": {
     "babel-cli": "^6.26.0",
+    "babel-preset-joyent-portal": "^7.0.1",
     "eslint": "^4.18.1",
     "eslint-config-joyent-portal": "^3.3.1",
     "jest-image-snapshot": "^2.3.0",
-    "jest-styled-components": "^4.11.0-0",
+    "jest-styled-components": "^5.0.0",
     "joyent-react-scripts": "^7.3.0",
     "react-screenshot-renderer": "^1.1.2",
-    "react-test-renderer": "^16.2.0"
+    "react-test-renderer": "^16.2.0",
+    "redrun": "^5.10.5"
   }
 }

packages/my-joy-images/readme.md

@@ -1,7 +1,7 @@
 # images
 
-[![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg)](https://opensource.org/licenses/MPL-2.0)
+[![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg?style=flat-square)](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)
+[![standard-readme compliant](https://img.shields.io/badge/standard--readme-OK-green.svg?style=flat-square)](https://github.com/RichardLitt/standard-readme)
 
 ## Table of Contents
 

packages/my-joy-images/src/components/menu.js

@@ -1,7 +1,6 @@
 import React from 'react';
 import { Margin } from 'styled-components-spacing';
 import { NavLink } from 'react-router-dom';
-import PropTypes from 'prop-types';
 import forceArray from 'force-array';
 
 import {
@@ -36,13 +35,4 @@ const Menu = ({ links = [] }) => {
   );
 };
 
-Menu.propTypes = {
-  links: PropTypes.arrayOf(
-    PropTypes.shape({
-      name: PropTypes.string,
-      pathname: PropTypes.string
-    })
-  )
-};
-
 export default Menu;

packages/my-joy-images/src/containers/create-image/animated.js

@@ -58,4 +58,5 @@ const Animated = WrappedComponent =>
       );
     }
   };
+
 export default Animated;

packages/my-joy-images/src/containers/create-image/details.js

@@ -13,7 +13,6 @@ import { Row, Col } from 'joyent-react-styled-flexboxgrid';
 import { NameIcon, H3, Button, H4, P } from 'joyent-ui-toolkit';
 
 import Title from '@components/create-image/title';
-import Animated from '@containers/create-image/animated';
 import Details from '@components/create-image/details';
 import Description from '@components/description';
 import GetRandomName from '@graphql/get-random-name.gql';
@@ -109,7 +108,6 @@ const NameContainer = ({
 );
 
 export default compose(
-  Animated,
   graphql(GetRandomName, {
     options: () => ({
       fetchPolicy: 'network-only',

packages/my-joy-images/src/containers/create-image/tags.js

@@ -19,7 +19,6 @@ import {
 } from 'joyent-ui-toolkit';
 
 import Title from '@components/create-image/title';
-import Animated from '@containers/create-image/animated';
 import Description from '@components/description';
 import Tag from '@components/tags';
 import { Forms } from '@root/constants';
@@ -128,7 +127,6 @@ export const Tags = ({
 );
 
 export default compose(
-  Animated,
   connect(({ values }, ownProps) => ({
     proceeded: get(values, `${Forms.CREATE_TAGS}-proceeded`, false),
     addOpen: get(values, `${Forms.CREATE_TAGS}-add-open`, false),

packages/my-joy-instances/.npmignore

@@ -0,0 +1,25 @@
+# See https://help.github.com/ignore-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env
+npm-debug.log*
+yarn-debug.log*
+
+yarn-error.log*
+
+## Image Snapshots Diff
+
+**/__diff_output__
+
+!build
+!lib

packages/my-joy-instances/lib/index.js

@@ -85,10 +85,12 @@ exports.register = async server => {
           const res = await Wreck.request('GET', location);
           const body = await Wreck.read(res);
 
-          const _body = body.toString().replace(
+          const _body = body
-            /https:\/\/fonts\.gstatic\.com/g,
+            .toString()
-            `http://${url.host}/font`
+            .replace(
-          );
+              /https:\/\/fonts\.gstatic\.com/g,
+              `http://${url.host}/font`
+            );
 
           return h
             .response(_body)

packages/my-joy-instances/package.json

@@ -1,34 +1,33 @@
 {
-  "name": "my-joy-beta",
+  "name": "my-joy-instances",
   "version": "2.0.0",
   "license": "MPL-2.0",
   "private": true,
   "repository": "github:yldio/joyent-portal",
   "main": "lib/index.js",
   "scripts": {
-    "dev": "REACT_APP_GQL_PORT=4000 PORT=3069 REACT_APP_GQL_PROTOCOL=http joyent-react-scripts start",
+    "dev": "NODE_ENV=development REACT_APP_GQL_PORT=4000 PORT=3069 joyent-react-scripts start",
-    "start": "PORT=3069 joyent-react-scripts start",
+    "build:test": "echo 0",
-    "build:app": "NODE_ENV=production joyent-react-scripts build",
+    "build:lib": "echo 0",
-    "build:lib": "NODE_ENV=production SSR=1 UMD=1 babel src --out-dir lib/app --copy-files",
+    "build:bundle": "NODE_ENV=production redrun -p build:frontend build:ssr",
-    "lint-ci": "eslint . --ext .js --ext .md",
+    "prepublish": "NODE_ENV=production redrun build:bundle",
-    "lint": "eslint . --fix --ext .js --ext .md",
+    "lint": "redrun lint:ci -- -- --fix",
-    "test-ci": "NODE_ENV=test joyent-react-scripts test --env=jsdom --testPathIgnorePatterns='.ui.js'",
+    "lint:ci": "NODE_ENV=test eslint . --ext .js --ext .md",
     "test": "DEFAULT_TIMEOUT_INTERVAL=100000 NODE_ENV=test joyent-react-scripts test --env=jsdom",
-    "postinstall": "npm run build:app",
+    "test:ci": "NODE_ENV=test joyent-react-scripts test --env=jsdom --testPathIgnorePatterns='.ui.js'",
-    "prepublish": "npm run build:lib"
+    "build:frontend": "joyent-react-scripts build",
+    "build:ssr": "SSR=1 UMD=1 babel src --out-dir lib/app --copy-files"
   },
   "dependencies": {
     "@manaflair/redux-batch": "^0.1.0",
     "apollo": "^0.2.2",
     "apr-intercept": "^3.0.3",
-    "babel-preset-joyent-portal": "^7.0.1",
     "bytes": "^3.0.0",
     "clipboard-copy": "^1.4.2",
     "constant-case": "^2.0.0",
     "cross-fetch": "^1.1.1",
     "date-fns": "^1.29.0",
     "declarative-redux-form": "^2.0.8",
-    "execa": "^0.9.0",
     "exenv": "^1.2.2",
     "fuse.js": "^3.2.0",
     "hapi-render-react": "^2.1.0",
@@ -36,7 +35,6 @@
     "inert": "^5.1.0",
     "joyent-logo-assets": "^1.0.0",
     "joyent-manifest-editor": "^1.4.0",
-    "joyent-react-scripts": "^7.3.0",
     "joyent-react-styled-flexboxgrid": "^2.2.3",
     "joyent-ui-toolkit": "^5.0.0",
     "lodash.find": "^4.6.0",
@@ -48,16 +46,13 @@
     "lodash.isfinite": "^3.3.2",
     "lodash.isfunction": "^3.0.9",
     "lodash.isinteger": "^4.0.4",
-    "lodash.isstring": "^4.0.1",
     "lodash.omit": "^4.5.0",
     "lodash.reverse": "^4.0.1",
     "lodash.some": "^4.6.0",
     "lodash.sortby": "^4.7.0",
     "lodash.uniqby": "^4.7.0",
     "lodash.values": "^4.3.0",
-    "normalized-styled-components": "^1.0.18",
     "param-case": "^2.1.1",
-    "prop-types": "^15.6.0",
     "punycode": "^2.1.0",
     "query-string": "^5.1.0",
     "react": "^16.2.0",
@@ -68,10 +63,8 @@
     "react-router": "^4.2.0",
     "react-router-dom": "^4.2.2",
     "redux": "^3.7.2",
-    "redux-actions": "^2.2.1",
     "redux-form": "^7.2.3",
     "remcalc": "^1.0.10",
-    "scroll-to-element": "^2.0.0",
     "styled-components": "^3.1.6",
     "styled-components-spacing": "^2.1.3",
     "styled-flex-component": "^2.2.1",
@@ -79,11 +72,14 @@
   },
   "devDependencies": {
     "babel-cli": "^6.26.0",
+    "babel-preset-joyent-portal": "^7.0.1",
     "eslint": "^4.18.1",
     "eslint-config-joyent-portal": "^3.3.1",
     "jest-image-snapshot": "^2.3.0",
-    "jest-styled-components": "^4.11.0-0",
+    "jest-styled-components": "^5.0.0",
+    "joyent-react-scripts": "^7.3.0",
     "react-screenshot-renderer": "^1.1.2",
-    "react-test-renderer": "^16.2.0"
+    "react-test-renderer": "^16.2.0",
+    "redrun": "^5.10.5"
   }
 }

packages/my-joy-instances/readme.md

@@ -1,7 +1,7 @@
 # my-joy-beta
 
-[![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg)](https://opensource.org/licenses/MPL-2.0)
+[![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg?style=flat-square)](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)
+[![standard-readme compliant](https://img.shields.io/badge/standard--readme-OK-green.svg?style=flat-square)](https://github.com/RichardLitt/standard-readme)
 
 ## Table of Contents