From 2e4cbbca93a04f5604deb7e1436c5c22de459917 Mon Sep 17 00:00:00 2001
From: Andrew Alexander <account+github@adrw.ch>
Date: Thu, 2 May 2019 17:24:01 -0400
Subject: [PATCH] [CLI][#228] Fix new-tab.sh script and miskweb new command

---
 .../palette-exemplar/palette-exemplar.tgz     | Bin 10416 -> 10416 bytes
 examples/tabs/palette/palette.tgz             | Bin 10338 -> 10338 bytes
 new-tab/new-tab.sh                            |  36 ++++++++++++++----
 packages/@misk/cli/src/commands/new.ts        |   7 +++-
 4 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/examples/tabs/palette-exemplar/palette-exemplar.tgz b/examples/tabs/palette-exemplar/palette-exemplar.tgz
index 700984ba1d6dcc39bc86864bd0825af9b98c5c8c..05089ce072ad458a237f627750e77314b6535233 100644
GIT binary patch
delta 15
WcmdlGxFL{DzMF&LW%Ne2RT=;-vjvC%

delta 15
WcmdlGxFL{DzMF%A-D@M;Dh&WA5(Je1

diff --git a/examples/tabs/palette/palette.tgz b/examples/tabs/palette/palette.tgz
index 80b0db444af2e2aa16dc84a69f9ba0325b2b3168..3d4a72c7b688c4291c9d94ca1cb0438e4664ab61 100644
GIT binary patch
delta 15
WcmaD9@F;*yzMF&Lar8#E7!3e2Q3aL&

delta 15
WcmaD9@F;*yzMF%A-D@LTj0ONK)C8#j

diff --git a/new-tab/new-tab.sh b/new-tab/new-tab.sh
index de5ab0016b..22323bb520 100755
--- a/new-tab/new-tab.sh
+++ b/new-tab/new-tab.sh
@@ -18,13 +18,23 @@ echo "Misk-Web: New Tab"
 echo "A new tab will be created in $(pwd)/{new-tab}. If this is not right the directory, re-run this command in the correct directory."
 echo "You will now be guided through the steps to create a new tab based on the exemplar Palette tab"
 echo "Palette Exemplar Tab: https://github.com/square/misk-web/tree/master/examples/tabs/palette-exemplar"
+echo ""
 echo "New Tab Name"
 echo "You'll now be asked how you want your tab name written in different formats (ALLCAPCASE, TitleCase, Title With Space Case, camelCase, slug-case)."
-read -p "Tab Name in ALLCAPCASE: " -r NEW_ALL_CAP_CASE
-read -p "Tab Name in TitleCase: " -r NEW_TITLE_CASE
-read -p "Tab Name in Title Space Case: " -r NEW_TITLE_SPACE_CASE
-read -p "Tab Name in camelCase: " -r NEW_CAMEL_CASE
-read -p "Tab Name in slug-case: " -r NEW_SLUG_CASE
+echo "This is necessary to build your new tab off of palette-exemplar."
+echo ""
+echo "Example for new dino-food tab"
+echo "ALLCAPCASE: DINOFOOD"
+echo "TitleCase: DinoFood"
+echo "Title Space Case: Dino Food"
+echo "camelCase: dinoFood"
+echo "slug-case: dino-food"
+echo ""
+read -p "Your new tab name in ALLCAPCASE: " -r NEW_ALL_CAP_CASE
+read -p "Your new tab name in TitleCase: " -r NEW_TITLE_CASE
+read -p "Your new tab name in Title Space Case: " -r NEW_TITLE_SPACE_CASE
+read -p "Your new tab name in camelCase: " -r NEW_CAMEL_CASE
+read -p "Your new tab name in slug-case: " -r NEW_SLUG_CASE
 echo ""
 echo "Registered NEW_ALL_CAP_CASE     ${NEW_ALL_CAP_CASE}"
 echo "Registered NEW_TITLE_CASE       ${NEW_TITLE_CASE}"
@@ -71,8 +81,18 @@ sh -c "$CMD_SLUG_CASE"
 echo "Rename files with Palette in name"
 mv ./${NEW_SLUG_CASE}/src/ducks/${OLD_CAMEL_CASE}.ts ./${NEW_SLUG_CASE}/src/ducks/${NEW_CAMEL_CASE}.ts
 
-# Force generate the build files with miskweb CLI
-rm package.json tsconfig.json tslint.json webpack.config.js .gitignore
-miskweb prebuild
+# Set zipOnBuild to false in miskTab.json
+echo "Set zipOnBuild to false in miskTab.json"
+sed -i -e 's/"zipOnBuild": true,/"zipOnBuild": false,/g' ./${NEW_SLUG_CASE}/miskTab.json
+rm ./${NEW_SLUG_CASE}/miskTab.json-e
 
+echo "Remove intermediate new-tab files"
+rm palette-exemplar.tgz
+rm new-tab.sh
+
+echo ""
 echo "Done!"
+echo "Go check out your new tab ${NEW_SLUG_CASE} !"
+echo "Use '$ miskweb ci-build' to install, build, and run tests."
+echo "$ cd ${NEW_SLUG_CASE}"
+echo "$ miskweb ci-build"
diff --git a/packages/@misk/cli/src/commands/new.ts b/packages/@misk/cli/src/commands/new.ts
index d28b9a9536..0520305949 100644
--- a/packages/@misk/cli/src/commands/new.ts
+++ b/packages/@misk/cli/src/commands/new.ts
@@ -4,9 +4,14 @@ export const desc = "create a new tab in the current directory"
 export const handlerFn = async (...args: any) => {
   logDebug(command, desc)
   execute(
-    "curl -s https://raw.githubusercontent.com/square/misk-web/master/new-tab/get-new-tab.sh | bash -s && ./new-tab.sh",
+    "curl -s https://raw.githubusercontent.com/square/misk-web/master/new-tab/get-new-tab.sh | bash -s",
     ...args
   )
+  logDebug(
+    command,
+    "A new-tab.sh script has been downloaded. Run it to build your new tab off of the latest misk-web palette-exemplar."
+  )
+  logDebug(command, "$ ./new-tab.sh")
 }
 export const handler = async (yargs: any) =>
   handleCommand(yargs, handlerFn, ["e", "each"])