From 831be945218b72f8a180531eba41d4de87331f9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Se=CC=81rgio=20Ramos?= <mail@sergioramos.me>
Date: Wed, 9 May 2018 00:03:57 +0100
Subject: [PATCH] build: fix ssr build

---
 .prettierignore                               |  1 +
 .../my-joy-images/src/state/validators.js     |  5 +-
 .../my-joy-instances/src/containers/create.js |  1 -
 package.json                                  |  3 +-
 packages/icons/package.json                   |  2 +-
 packages/instance-steps/.babelrc              | 11 +++-
 packages/instance-steps/package.json          |  2 +-
 packages/instance-steps/src/_aliases.js       |  9 +++
 packages/instance-steps/src/mocks/editor.js   |  3 +
 packages/logos/package.json                   |  2 +-
 packages/resource-step/package.json           |  2 +-
 packages/resource-widgets/package.json        |  2 +-
 yarn.lock                                     | 57 +++++++++++--------
 13 files changed, 64 insertions(+), 36 deletions(-)
 create mode 100644 packages/instance-steps/src/_aliases.js
 create mode 100644 packages/instance-steps/src/mocks/editor.js

diff --git a/.prettierignore b/.prettierignore
index 1ee201a6..baab93b4 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -15,6 +15,7 @@ yarn.lock
 dist
 build
 packages/*/lib/app
+consoles/*/lib/app
 
 *.ico
 *.html
diff --git a/consoles/my-joy-images/src/state/validators.js b/consoles/my-joy-images/src/state/validators.js
index 9f5e981f..d458aa9c 100644
--- a/consoles/my-joy-images/src/state/validators.js
+++ b/consoles/my-joy-images/src/state/validators.js
@@ -63,10 +63,7 @@ const Schemas = {
 
 /*****************************************************************************/
 
-export const addTag = tag => {
-  console.log(tag);
-  validateSchema(Schemas.tag, tag);
-};
+export const addTag = tag => validateSchema(Schemas.tag, tag);
 
 export const instanceName = ({ name }) =>
   !name ? null : validateSchema(Schemas.instanceName, { name });
diff --git a/consoles/my-joy-instances/src/containers/create.js b/consoles/my-joy-instances/src/containers/create.js
index 4f628ced..1ab52944 100644
--- a/consoles/my-joy-instances/src/containers/create.js
+++ b/consoles/my-joy-instances/src/containers/create.js
@@ -222,7 +222,6 @@ class CreateInstance extends Component {
             <ReduxForm form={IC_F} onSubmit={handleSubmit}>
               {({ handleSubmit, submitting }) => (
                 <form onSubmit={handleSubmit}>
-                  {console.log({ isFormValid: this.isFormValid() })}
                   <Button
                     disabled={disabled || !this.isFormValid()}
                     loading={submitting}
diff --git a/package.json b/package.json
index d12978c3..780430e7 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,8 @@
     "isarray": "1.0.0",
     "react": "16.3.1",
     "styled-is": "1.1.3",
-    "breeze-nexttick": "0.2.1"
+    "breeze-nexttick": "0.2.1",
+    "webpack-sources": "1.0.1"
   },
   "workspaces": ["packages/*", "consoles/*", "bundle"]
 }
diff --git a/packages/icons/package.json b/packages/icons/package.json
index 5a55ed33..48d59172 100644
--- a/packages/icons/package.json
+++ b/packages/icons/package.json
@@ -19,7 +19,7 @@
     "test": "NODE_ENV=test joyent-react-scripts test --env=jsdom",
     "test:ci": "redrun test",
     "build:es": "babel src --out-dir dist/es",
-    "build:umd": "UMD=1 babel src --out-dir dist/umd"
+    "build:umd": "SSR=1 UMD=1 babel src --out-dir dist/umd"
   },
   "dependencies": {
     "remcalc": "^1.0.10",
diff --git a/packages/instance-steps/.babelrc b/packages/instance-steps/.babelrc
index 594acfe3..797cdaca 100644
--- a/packages/instance-steps/.babelrc
+++ b/packages/instance-steps/.babelrc
@@ -1,3 +1,12 @@
 {
-  "presets": ["joyent-portal"]
+  "ignore": ["_aliases.js"],
+  "presets": [
+    [
+      "joyent-portal",
+      {
+        "aliases": true,
+        "autoAliases": false
+      }
+    ]
+  ]
 }
diff --git a/packages/instance-steps/package.json b/packages/instance-steps/package.json
index ed29a9a7..e30355be 100644
--- a/packages/instance-steps/package.json
+++ b/packages/instance-steps/package.json
@@ -12,7 +12,7 @@
     "dev": "NODE_ENV=development redrun -p build:es build:umd -- --watch --source-maps inline",
     "prepublish": "NODE_ENV=production redrun -p build:es build:umd",
     "build:es": "babel src --out-dir dist/es --copy-files",
-    "build:umd": "UMD=1 babel src --out-dir dist/umd --copy-files",
+    "build:umd": "SSR=1 UMD=1 babel src --out-dir dist/umd --copy-files",
     "build:test": "NODE_ENV=production redrun build:lib",
     "build:lib": "NODE_ENV=production redrun -p build:es build:umd",
     "build:bundle": "echo 0",
diff --git a/packages/instance-steps/src/_aliases.js b/packages/instance-steps/src/_aliases.js
new file mode 100644
index 00000000..7df515f6
--- /dev/null
+++ b/packages/instance-steps/src/_aliases.js
@@ -0,0 +1,9 @@
+const { SSR } = process.env;
+
+const aliases = {};
+
+if (SSR) {
+  aliases['^joyent-ui-toolkit/dist/es/editor$'] = './src/mocks/editor';
+}
+
+module.exports = aliases;
diff --git a/packages/instance-steps/src/mocks/editor.js b/packages/instance-steps/src/mocks/editor.js
new file mode 100644
index 00000000..ac7b4287
--- /dev/null
+++ b/packages/instance-steps/src/mocks/editor.js
@@ -0,0 +1,3 @@
+import React from 'react';
+
+export default () => <span>joyent-maifest-editor</span>;
diff --git a/packages/logos/package.json b/packages/logos/package.json
index e22ac4c4..dcbfca52 100644
--- a/packages/logos/package.json
+++ b/packages/logos/package.json
@@ -19,7 +19,7 @@
     "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"
+    "build:umd": "SSR=1 UMD=1 babel src --out-dir dist/umd"
   },
   "devDependencies": {
     "apr-for-each": "^3.0.3",
diff --git a/packages/resource-step/package.json b/packages/resource-step/package.json
index dd4c98cd..ef34c107 100644
--- a/packages/resource-step/package.json
+++ b/packages/resource-step/package.json
@@ -19,7 +19,7 @@
     "test": "NODE_ENV=test joyent-react-scripts test --env=jsdom",
     "test:ci": "redrun test",
     "build:es": "babel src --out-dir dist/es",
-    "build:umd": "UMD=1 babel src --out-dir dist/umd"
+    "build:umd": "SSR=1 UMD=1 babel src --out-dir dist/umd"
   },
   "dependencies": {
     "joy-react-broadcast": "^0.6.9",
diff --git a/packages/resource-widgets/package.json b/packages/resource-widgets/package.json
index e29874a8..5e78bd98 100644
--- a/packages/resource-widgets/package.json
+++ b/packages/resource-widgets/package.json
@@ -19,7 +19,7 @@
     "test": "NODE_ENV=test joyent-react-scripts test --env=jsdom",
     "test:ci": "redrun test",
     "build:es": "babel src --out-dir dist/es",
-    "build:umd": "UMD=1 babel src --out-dir dist/umd"
+    "build:umd": "SSR=1 UMD=1 babel src --out-dir dist/umd"
   },
   "dependencies": {
     "joyent-react-styled-flexboxgrid": "^2.2.3",
diff --git a/yarn.lock b/yarn.lock
index 46783914..181682a3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -438,13 +438,13 @@ ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5, ajv@^5.2.0, ajv@^5.2.3, ajv@^5.3.0:
     json-schema-traverse "^0.3.0"
 
 ajv@^6.0.1, ajv@^6.1.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.4.0.tgz#d3aff78e9277549771daf0164cff48482b754fc6"
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.0.tgz#4c8affdf80887d8f132c9c52ab8a2dc4d0b7b24c"
   dependencies:
-    fast-deep-equal "^1.0.0"
+    fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
-    uri-js "^3.0.2"
+    uri-js "^4.2.1"
 
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
@@ -4510,6 +4510,10 @@ fast-deep-equal@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
 
+fast-deep-equal@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+
 fast-diff@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.1.2.tgz#4b62c42b8e03de3f848460b639079920695d0154"
@@ -4621,12 +4625,12 @@ filesize@3.5.11:
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.11.tgz#1919326749433bb3cf77368bd158caabcc19e9ee"
 
 fill-range@^2.1.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
   dependencies:
     is-number "^2.1.0"
     isobject "^2.0.0"
-    randomatic "^1.1.3"
+    randomatic "^3.0.0"
     repeat-element "^1.1.2"
     repeat-string "^1.5.2"
 
@@ -6492,8 +6496,8 @@ jest@20.0.4:
     jest-cli "^20.0.4"
 
 joi@13.x.x:
-  version "13.2.0"
-  resolved "https://registry.yarnpkg.com/joi/-/joi-13.2.0.tgz#72307f1765bb40b068361f9368a4ba1092b8478e"
+  version "13.3.0"
+  resolved "https://registry.yarnpkg.com/joi/-/joi-13.3.0.tgz#4defd4333b539c5d10e444ab44f5a5583480f17c"
   dependencies:
     hoek "5.x.x"
     isemail "3.x.x"
@@ -6515,8 +6519,8 @@ joyent-manifest-editor@^1.4.0:
     react-codemirror "^1.0.0"
 
 joyent-react-scripts@^8.0.3, joyent-react-scripts@^8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/joyent-react-scripts/-/joyent-react-scripts-8.2.0.tgz#fb6d96e59775945d45264577e379c108a06b8cc6"
+  version "8.2.1"
+  resolved "https://registry.yarnpkg.com/joyent-react-scripts/-/joyent-react-scripts-8.2.1.tgz#6ccdf4f8e6af028cc8846e8099a2b7f486699f67"
   dependencies:
     apr-for-each "^3.0.3"
     apr-main "^4.0.3"
@@ -7208,6 +7212,10 @@ math-expression-evaluator@^1.2.14:
   version "1.2.17"
   resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
 
+math-random@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
+
 max-safe-int@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/max-safe-int/-/max-safe-int-1.0.0.tgz#44fba8ec993ded91fb2c5a35e71cf9c9f369ce52"
@@ -8806,12 +8814,13 @@ random-natural@^1.0.3:
     max-safe-int "^1.0.0"
     random-integral "^1.0.3"
 
-randomatic@^1.1.3:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
+randomatic@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.0.0.tgz#d35490030eb4f7578de292ce6dfb04a91a128923"
   dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
+    is-number "^4.0.0"
+    kind-of "^6.0.0"
+    math-random "^1.0.1"
 
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
   version "2.0.6"
@@ -10104,7 +10113,7 @@ source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
 
-source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0, source-map@~0.5.1:
+source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
@@ -11110,9 +11119,9 @@ upper-case@^1.0.3, upper-case@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
 
-uri-js@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-3.0.2.tgz#f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa"
+uri-js@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.1.tgz#4595a80a51f356164e22970df64c7abd6ade9850"
   dependencies:
     punycode "^2.1.0"
 
@@ -11456,12 +11465,12 @@ webpack-merge@^4.1.2:
   dependencies:
     lodash "^4.17.5"
 
-webpack-sources@^1.0.1, webpack-sources@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54"
+webpack-sources@1.0.1, webpack-sources@^1.0.1, webpack-sources@^1.1.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.0.1.tgz#c7356436a4d13123be2e2426a05d1dad9cbe65cf"
   dependencies:
     source-list-map "^2.0.0"
-    source-map "~0.6.1"
+    source-map "~0.5.3"
 
 webpack-visualizer-plugin@^0.1.11:
   version "0.1.11"