From fd7e3ae8a21fb4ca2919250e63fb1cae831b887e Mon Sep 17 00:00:00 2001
From: Johan Haals <johan.haals@gmail.com>
Date: Wed, 17 Feb 2021 09:30:42 +0100
Subject: [PATCH] scaffolder: replace clsx with classNames

---
 plugins/scaffolder/package.json                         | 1 -
 plugins/scaffolder/src/components/TaskPage/TaskPage.tsx | 4 ++--
 yarn.lock                                               | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index f602f01b5b..9290d1d4bc 100644
--- a/plugins/scaffolder/package.json
+++ b/plugins/scaffolder/package.json
@@ -42,7 +42,6 @@
     "@rjsf/core": "^2.4.0",
     "@rjsf/material-ui": "^2.4.0",
     "classnames": "^2.2.6",
-    "clsx": "^1.1.1",
     "git-url-parse": "^11.4.4",
     "humanize-duration": "^3.25.1",
     "luxon": "^1.25.0",
diff --git a/plugins/scaffolder/src/components/TaskPage/TaskPage.tsx b/plugins/scaffolder/src/components/TaskPage/TaskPage.tsx
index b2f1773d0b..d4f75e51af 100644
--- a/plugins/scaffolder/src/components/TaskPage/TaskPage.tsx
+++ b/plugins/scaffolder/src/components/TaskPage/TaskPage.tsx
@@ -37,12 +37,12 @@ import {
 import { Status } from '../../types';
 import { DateTime, Interval } from 'luxon';
 import { useInterval } from 'react-use';
-import clsx from 'clsx';
 import Check from '@material-ui/icons/Check';
 import Cancel from '@material-ui/icons/Cancel';
 import FiberManualRecordIcon from '@material-ui/icons/FiberManualRecord';
 import { entityRoute } from '@backstage/plugin-catalog-react';
 import { parseEntityName } from '@backstage/catalog-model';
+import classNames from 'classnames';
 
 // typings are wrong for this library, so fallback to not parsing types.
 const humanizeDuration = require('humanize-duration');
@@ -143,7 +143,7 @@ function TaskStepIconComponent(props: StepIconProps) {
 
   return (
     <div
-      className={clsx(classes.root, {
+      className={classNames(classes.root, {
         [classes.active]: active,
         [classes.completed]: completed,
         [classes.error]: error,
diff --git a/yarn.lock b/yarn.lock
index c71f094684..879c3582d0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9669,7 +9669,7 @@ clone@^1.0.2:
   resolved "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
   integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
 
-clsx@^1.0.1, clsx@^1.0.2, clsx@^1.0.4, clsx@^1.1.0, clsx@^1.1.1:
+clsx@^1.0.1, clsx@^1.0.2, clsx@^1.0.4, clsx@^1.1.0:
   version "1.1.1"
   resolved "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188"
   integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==