From 81c7d1df9a5417989f0d01c3254eb4982296427d Mon Sep 17 00:00:00 2001
From: Frank Shotwell <frank@replicated.com>
Date: Fri, 2 Nov 2018 11:22:25 -0700
Subject: [PATCH] Yarn cleanup (#679)

* simplify replicatedhq/ship-init yarn linkage
---
 web/app/Makefile     |  2 --
 web/app/package.json |  2 +-
 web/app/yarn.lock    | 27 ++++++++++++++++++++++++---
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/web/app/Makefile b/web/app/Makefile
index 57cc685e5..1d3faf49d 100644
--- a/web/app/Makefile
+++ b/web/app/Makefile
@@ -13,7 +13,6 @@ $SRC = $(shell find . -path "./node_modules" -prune -o -path "./build" -prune -o
 		yarn --pure-lockfile && \
 		yarn build && \
 		yarn link
-		yarn link @replicatedhq/ship-init
 	@mkdir -p .state
 	@touch .state/package-init
 
@@ -22,7 +21,6 @@ $SRC = $(shell find . -path "./node_modules" -prune -o -path "./build" -prune -o
 		yarn --pure-lockfile && \
 		yarn build-dev && \
 		yarn link
-		yarn link @replicatedhq/ship-init
 	@mkdir -p .state
 	@touch .state/package-init-dev
 
diff --git a/web/app/package.json b/web/app/package.json
index 23732d060..6b2511488 100644
--- a/web/app/package.json
+++ b/web/app/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "@replicatedhq/react-scripts": "1.0.1",
-    "@replicatedhq/ship-init": "link:../init",
+    "@replicatedhq/ship-init": "1.4.1",
     "monaco-editor": "^0.14.3",
     "react": "^16.5.0",
     "react-dom": "^16.5.0"
diff --git a/web/app/yarn.lock b/web/app/yarn.lock
index 655c53f5d..4b87a004f 100644
--- a/web/app/yarn.lock
+++ b/web/app/yarn.lock
@@ -167,9 +167,30 @@
   optionalDependencies:
     fsevents "^1.1.3"
 
-"@replicatedhq/ship-init@link:../init":
-  version "0.0.0"
-  uid ""
+"@replicatedhq/ship-init@1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@replicatedhq/ship-init/-/ship-init-1.4.1.tgz#96f0d4cd3cd17f66cc508d2a3b0bc6fab39d513c"
+  integrity sha512-dNHj5OL1kknzxRdPBatnVDBXGlZTwCrH06QFAf3QIeorfBLu6VluWTNYBskES4R90B0I7U4uTxcySlyEg1uwdg==
+  dependencies:
+    brace "^0.11.1"
+    history "^4.7.2"
+    isomorphic-fetch "^2.2.1"
+    lodash "^4.17.11"
+    rc-progress "^2.2.5"
+    react-ace "^6.1.4"
+    react-document-title "^2.0.3"
+    react-modal "^3.5.1"
+    react-monaco-editor "^0.18.0"
+    react-redux "^5.0.7"
+    react-remarkable "^1.1.3"
+    react-router-dom "^4.2.2"
+    react-router-hash-link "^1.2.0"
+    react-tooltip "^3.6.1"
+    redux "^3.7.2"
+    redux-segment "^1.6.2"
+    redux-thunk "2.2.0"
+    replicated-lint "^0.12.12"
+    yaml-ast-parser "^0.0.41"
 
 "@types/blob-util@1.3.3":
   version "1.3.3"