fix(boilerplate): #2230

moved assets/icons that only pertain to demo into subdir for removal via remove-demo

boilerplate/app/components/Icon.tsx

@@ -90,21 +90,21 @@ export const iconRegistry = {
   caretLeft: require("../../assets/icons/caretLeft.png"),
   caretRight: require("../../assets/icons/caretRight.png"),
   check: require("../../assets/icons/check.png"),
-  clap: require("../../assets/icons/clap.png"),
-  community: require("../../assets/icons/community.png"),
-  components: require("../../assets/icons/components.png"),
-  debug: require("../../assets/icons/debug.png"),
-  github: require("../../assets/icons/github.png"),
-  heart: require("../../assets/icons/heart.png"),
+  clap: require("../../assets/icons/demo/clap.png"), // @demo remove-current-line
+  community: require("../../assets/icons/demo/community.png"), // @demo remove-current-line
+  components: require("../../assets/icons/demo/components.png"), // @demo remove-current-line
+  debug: require("../../assets/icons/demo/debug.png"), // @demo remove-current-line
+  github: require("../../assets/icons/demo/github.png"), // @demo remove-current-line
+  heart: require("../../assets/icons/demo/heart.png"), // @demo remove-current-line
   hidden: require("../../assets/icons/hidden.png"),
   ladybug: require("../../assets/icons/ladybug.png"),
   lock: require("../../assets/icons/lock.png"),
   menu: require("../../assets/icons/menu.png"),
   more: require("../../assets/icons/more.png"),
-  pin: require("../../assets/icons/pin.png"),
-  podcast: require("../../assets/icons/podcast.png"),
+  pin: require("../../assets/icons/demo/pin.png"), // @demo remove-current-line
+  podcast: require("../../assets/icons/demo/podcast.png"), // @demo remove-current-line
   settings: require("../../assets/icons/settings.png"),
-  slack: require("../../assets/icons/slack.png"),
+  slack: require("../../assets/icons/demo/slack.png"), // @demo remove-current-line
   view: require("../../assets/icons/view.png"),
   x: require("../../assets/icons/x.png"),
 }

boilerplate/app/screens/DemoCommunityScreen.tsx

@@ -6,10 +6,10 @@ import { spacing } from "../theme"
 import { openLinkInBrowser } from "../utils/openLinkInBrowser"
 import { isRTL } from "../i18n"
 
-const chainReactLogo = require("../../assets/images/cr-logo.png")
-const reactNativeLiveLogo = require("../../assets/images/rnl-logo.png")
-const reactNativeRadioLogo = require("../../assets/images/rnr-logo.png")
-const reactNativeNewsletterLogo = require("../../assets/images/rnn-logo.png")
+const chainReactLogo = require("../../assets/images/demo/cr-logo.png")
+const reactNativeLiveLogo = require("../../assets/images/demo/rnl-logo.png")
+const reactNativeRadioLogo = require("../../assets/images/demo/rnr-logo.png")
+const reactNativeNewsletterLogo = require("../../assets/images/demo/rnn-logo.png")
 
 export const DemoCommunityScreen: FC<DemoTabScreenProps<"DemoCommunity">> =
   function DemoCommunityScreen(_props) {

boilerplate/app/screens/DemoPodcastListScreen.tsx

@@ -32,9 +32,9 @@ import { openLinkInBrowser } from "../utils/openLinkInBrowser"
 
 const ICON_SIZE = 14
 
-const rnrImage1 = require("../../assets/images/rnr-image-1.png")
-const rnrImage2 = require("../../assets/images/rnr-image-2.png")
-const rnrImage3 = require("../../assets/images/rnr-image-3.png")
+const rnrImage1 = require("../../assets/images/demo/rnr-image-1.png")
+const rnrImage2 = require("../../assets/images/demo/rnr-image-2.png")
+const rnrImage3 = require("../../assets/images/demo/rnr-image-3.png")
 const rnrImages = [rnrImage1, rnrImage2, rnrImage3]
 
 export const DemoPodcastListScreen: FC<DemoTabScreenProps<"DemoPodcastList">> = observer(

src/commands/remove-demo.ts

@@ -79,11 +79,28 @@ module.exports = {
       })
     }
 
+    function removeDemoAssets() {
+      const demoPaths = filesystem
+        .cwd(TARGET_DIR)
+        .find({
+          matching: [...MATCHING_GLOBS, "**/demo"],
+          recursive: true,
+          files: false,
+          directories: true,
+        })
+        .map((path) => pathlib.join(TARGET_DIR, path))
+      demoPaths.forEach((path) => {
+        if (!dryRun) filesystem.remove(path)
+        p(`Removed demo directory '${path}'`)
+      })
+    }
+
     // first pass
     removeEmptyDirs()
     // second pass, for nested directories that are now empty after the first pass
     // https://github.com/infinitered/ignite/issues/2225
     removeEmptyDirs()
+    removeDemoAssets()
 
     p(`Done removing demo code from '${TARGET_DIR}'${dryRun ? " (dry run)" : ""}`)
   },

test/vanilla/__snapshots__/ignite-remove-demo.test.ts.snap

@@ -5,6 +5,7 @@ exports[`ignite-cli remove-demo should print the expected response 1`] = `
    Removing demo code from '/user/home/ignite'
    Found '@demo remove-file' in /user/home/ignite/.maestro/FavoritePodcast.yaml
    Found '@demo remove-file' in /user/home/ignite/.maestro/Login.yaml
+   Found '@demo remove-current-line' in /user/home/ignite/app/components/Icon.tsx
    Found '@demo remove-current-line', '@demo remove-block-start', '@demo remove-block-end' in /user/home/ignite/app/i18n/ar.ts
    Found '@demo remove-current-line', '@demo remove-block-start', '@demo remove-block-end' in /user/home/ignite/app/i18n/en.ts
    Found '@demo remove-current-line', '@demo remove-block-start', '@demo remove-block-end' in /user/home/ignite/app/i18n/ko.ts
@@ -40,6 +41,8 @@ exports[`ignite-cli remove-demo should print the expected response 1`] = `
    Removed empty directory '/user/home/ignite/.maestro'
    Removed empty directory '/user/home/ignite/app/screens/DemoShowroomScreen/demos'
    Removed empty directory '/user/home/ignite/app/screens/DemoShowroomScreen'
+   Removed demo directory '/user/home/ignite/assets/icons/demo'
+   Removed demo directory '/user/home/ignite/assets/images/demo'
    Done removing demo code from '/user/home/ignite'
 "
 `;