From 74d25d1550ca1517366a95bcb8fa65343e8ea38e Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Mon, 18 May 2020 12:10:56 +0200
Subject: [PATCH 1/3] github/workflows: fix build step to include dependencies
 as well

---
 .github/workflows/frontend.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index 4ee0f5246b..d916141588 100644
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -64,7 +64,8 @@ jobs:
 
       - name: build changed packages
         if: ${{ steps.yarn-lock.outcome == 'success' }}
-        run: yarn lerna -- run build --since origin/master
+        # Need to build all dependencies as well to be able to run tests later
+        run: yarn lerna -- run build --since origin/master --include-dependencies
 
       - name: build all packages
         if: ${{ steps.yarn-lock.outcome == 'failure' }}

From 33c412d961de540e3e1eaf303f1b57b416218317 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Mon, 18 May 2020 12:25:55 +0200
Subject: [PATCH 2/3] packages/core: fix type issues in sidebar

---
 packages/core/src/layout/Sidebar/Items.tsx           | 4 ++--
 packages/core/src/layout/Sidebar/Sidebar.stories.tsx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/layout/Sidebar/Items.tsx b/packages/core/src/layout/Sidebar/Items.tsx
index 60132f0bc9..bd5faa5631 100644
--- a/packages/core/src/layout/Sidebar/Items.tsx
+++ b/packages/core/src/layout/Sidebar/Items.tsx
@@ -139,7 +139,7 @@ export const SidebarItem: FC<SidebarItemProps> = ({
       <NavLink
         className={clsx(classes.root, classes.closed)}
         activeClassName={classes.selected}
-        isActive={(match) => match && !disableSelected}
+        isActive={(match) => Boolean(match && !disableSelected)}
         exact
         to={to}
         onClick={onClick}
@@ -153,7 +153,7 @@ export const SidebarItem: FC<SidebarItemProps> = ({
     <NavLink
       className={clsx(classes.root, classes.open)}
       activeClassName={classes.selected}
-      isActive={(match) => match && !disableSelected}
+      isActive={(match) => Boolean(match && !disableSelected)}
       exact
       to={to}
       onClick={onClick}
diff --git a/packages/core/src/layout/Sidebar/Sidebar.stories.tsx b/packages/core/src/layout/Sidebar/Sidebar.stories.tsx
index fc0025caca..1b9ba5bbab 100644
--- a/packages/core/src/layout/Sidebar/Sidebar.stories.tsx
+++ b/packages/core/src/layout/Sidebar/Sidebar.stories.tsx
@@ -48,7 +48,7 @@ export const SampleSidebar = () => (
     {/* <SidebarLogo /> */}
     <SidebarSearchField onSearch={handleSearch} />
     <SidebarDivider />
-    <SidebarItem selected icon={HomeOutlinedIcon} to="#" text="Home" />
+    <SidebarItem icon={HomeOutlinedIcon} to="#" text="Home" />
     <SidebarItem icon={HomeOutlinedIcon} to="#" text="Plugins" />
     <SidebarItem icon={AddCircleOutlineIcon} to="#" text="Create..." />
     <SidebarDivider />

From 1362820792cd705b87555d15b182259a756a8e78 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Mon, 18 May 2020 12:39:30 +0200
Subject: [PATCH 3/3] packages/core: export sidebar context type

---
 packages/core/src/layout/Sidebar/config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/src/layout/Sidebar/config.ts b/packages/core/src/layout/Sidebar/config.ts
index e101153bfb..8ea6cc94f9 100644
--- a/packages/core/src/layout/Sidebar/config.ts
+++ b/packages/core/src/layout/Sidebar/config.ts
@@ -40,7 +40,7 @@ export const sidebarConfig = {
 export const SIDEBAR_INTRO_LOCAL_STORAGE =
   '@backstage/core/sidebar-intro-dismissed';
 
-type SidebarContextType = {
+export type SidebarContextType = {
   isOpen: boolean;
 };