merge from master and fixed some more deprecations

Signed-off-by: Simon <simme.jakobsson@gmail.com>

packages/catalog-model/src/validation/CommonValidatorFunctions.test.ts

@@ -224,7 +224,7 @@ describe('CommonValidatorFunctions', () => {
     ['abc xyz', true],
     ['abc xyz abc.', true],
   ])(`isValidString %p ? %p`, (value, result) => {
-    expect(CommonValidatorFunctions.isValidString(value)).toBe(result);
+    expect(CommonValidatorFunctions.isNonEmptyString(value)).toBe(result);
   });
 
   it.each([

packages/config/src/index.ts

@@ -25,6 +25,6 @@ export type {
   JsonObject,
   JsonPrimitive,
   JsonValue,
-} from './deprecatedTypes';
+} from '@backstage/types';
 export { ConfigReader } from './reader';
 export type { AppConfig, Config } from './types';

packages/core-components/src/components/SupportButton/SupportButton.tsx

@@ -68,7 +68,7 @@ const SupportListItem = ({ item }: { item: SupportItem }) => {
       </ListItemIcon>
       <ListItemText
         primary={item.title}
-        secondary={item.links?.reduce<React.ReactNodeArray>(
+        secondary={item.links?.reduce<React.ReactNode[]>(
           (prev, link, idx) => [
             ...prev,
             idx > 0 && <br key={idx} />,

yarn.lock

@@ -38915,7 +38915,7 @@ __metadata:
 
 "typescript@patch:typescript@~4.6.0#~builtin<compat/typescript>, typescript@patch:typescript@~4.6.3#~builtin<compat/typescript>":
   version: 4.6.4
-  resolution: "typescript@patch:typescript@npm%3A4.6.4#~builtin<compat/typescript>::version=4.6.4&hash=a1c5e5"
+  resolution: "typescript@patch:typescript@npm%3A4.6.4#~builtin<compat/typescript>::version=4.6.4&hash=f456af"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
@@ -38925,7 +38925,7 @@ __metadata:
 
 "typescript@patch:typescript@~4.7.0#~builtin<compat/typescript>":
   version: 4.7.4
-  resolution: "typescript@patch:typescript@npm%3A4.7.4#~builtin<compat/typescript>::version=4.7.4&hash=a1c5e5"
+  resolution: "typescript@patch:typescript@npm%3A4.7.4#~builtin<compat/typescript>::version=4.7.4&hash=f456af"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver