Merge pull request #4244 from signalco-io/next

signalco-io · Jan 4, 2024 · d9705d0 · d9705d0 · vercel · Jan 4, 2024
2 parents e2895e2 + 84896a6
commit d9705d0
Show file tree

Hide file tree

Showing 19 changed files with 165 additions and 125 deletions.
diff --git a/cloud/src/Signalco.Channel.GitHubApp/Signalco.Channel.GitHubApp.csproj b/cloud/src/Signalco.Channel.GitHubApp/Signalco.Channel.GitHubApp.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.20.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.16.4" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.OpenApi" Version="1.5.1" />
-    <PackageReference Include="Octokit" Version="9.0.0" />
+    <PackageReference Include="Octokit" Version="9.1.0" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.0.3" />
   </ItemGroup>
   <ItemGroup>

diff --git a/infra/apps/cloud-primary/package.json b/infra/apps/cloud-primary/package.json
@@ -31,7 +31,7 @@
         "@pulumi/cloudflare": "5.17.0",
         "@pulumi/command": "0.9.2",
         "@pulumi/docker": "4.5.0",
-        "@pulumi/pulumi": "3.99.0",
+        "@pulumi/pulumi": "3.100.0",
         "@pulumiverse/vercel": "1.0.1"
     }
 }
diff --git a/infra/apps/remote-browser/package.json b/infra/apps/remote-browser/package.json
@@ -27,7 +27,7 @@
         "@pulumi/cloudflare": "5.17.0",
         "@pulumi/command": "0.9.2",
         "@pulumi/docker": "4.5.0",
-        "@pulumi/pulumi": "3.99.0",
+        "@pulumi/pulumi": "3.100.0",
         "@pulumiverse/vercel": "1.0.1"
     }
 }
diff --git a/infra/apps/uier/package.json b/infra/apps/uier/package.json
@@ -31,7 +31,7 @@
         "@pulumi/cloudflare": "5.17.0",
         "@pulumi/command": "0.9.2",
         "@pulumi/docker": "4.5.0",
-        "@pulumi/pulumi": "3.99.0",
+        "@pulumi/pulumi": "3.100.0",
         "@pulumiverse/vercel": "1.0.1"
     }
 }
diff --git a/infra/packages/pulumi/package.json b/infra/packages/pulumi/package.json
@@ -47,7 +47,7 @@
         "@pulumi/cloudflare": "5.17.0",
         "@pulumi/command": "0.9.2",
         "@pulumi/docker": "4.5.0",
-        "@pulumi/pulumi": "3.99.0",
+        "@pulumi/pulumi": "3.100.0",
         "@pulumiverse/vercel": "1.0.1"
     }
 }
diff --git a/infra/pnpm-lock.yaml b/infra/pnpm-lock.yaml
diff --git a/web/apps/app/app/page.tsx b/web/apps/app/app/page.tsx
@@ -1,10 +1,6 @@
-import { Suspense } from 'react';
-import { RootRedirect } from '../components/RootRedirect';
+import { redirect } from 'next/navigation';
+import { KnownPages } from '../src/knownPages';
 
 export default function Dashboard() {
-    return (
-        <Suspense>
-            <RootRedirect />
-        </Suspense>
-    );
+    redirect(KnownPages.Spaces);
 }
diff --git a/web/apps/app/components/RootRedirect.tsx b/web/apps/app/components/RootRedirect.tsx
diff --git a/web/apps/app/components/layouts/AppLayout.tsx b/web/apps/app/components/layouts/AppLayout.tsx
@@ -28,7 +28,7 @@ export function AppLayout(props: React.PropsWithChildren) {
                     )}
                     <div className={cx(
                         'relative w-full grow overflow-hidden',
-                        isFullScreen ? '' : 'mt-[70px] sm:ml-[82px] sm:mt-0'
+                        isFullScreen ? '' : 'mt-[70px] sm:ml-[66px] sm:mt-0'
                     )}>
                         <Stack>
                             <div className="hidden p-2 sm:block">

diff --git a/web/apps/app/components/users/UserProfileAvatar.tsx b/web/apps/app/components/users/UserProfileAvatar.tsx
@@ -9,7 +9,7 @@ export function UserProfileAvatar() {
 
     return (
         <DropdownMenu>
-            <DropdownMenuTrigger>
+            <DropdownMenuTrigger asChild>
                 <UserProfileAvatarButton />
             </DropdownMenuTrigger>
             <DropdownMenuContent>

diff --git a/web/apps/app/components/users/UserProfileAvatarButton.tsx b/web/apps/app/components/users/UserProfileAvatarButton.tsx
@@ -10,7 +10,7 @@ const UserProfileAvatarButton = forwardRef<HTMLButtonElement>((props, ref) => {
     const user = useCurrentUser();
 
     return (
-        <Button variant="plain" className="relative py-6" ref={ref} {...props}>
+        <Button variant="plain" className="relative rounded-full p-0" ref={ref} {...props}>
             <UserAvatar user={user} />
             <div className="absolute -bottom-2 left-1/2 -translate-x-1/2">
                 <ApiBadge />

diff --git a/web/apps/app/components/widgets/parts/WidgetState.tsx b/web/apps/app/components/widgets/parts/WidgetState.tsx
@@ -1,11 +1,13 @@
 import React, { useMemo, useState } from 'react';
-import dynamic from 'next/dynamic'
 import { Typography } from '@signalco/ui-primitives/Typography';
 import { Stack } from '@signalco/ui-primitives/Stack';
 import { Button } from '@signalco/ui-primitives/Button';
 import { showNotification } from '@signalco/ui-notifications';
 import { Loadable } from '@signalco/ui/Loadable';
 import { WidgetSharedProps } from '../Widget';
+import TvVisual from '../../icons/TvVisual';
+import LightBulbVisual from '../../icons/LightBulbVisual';
+import FanVisual from '../../icons/FanVisual';
 import { DefaultLabel, DefaultTargetWithValueMultiple } from '../../../src/widgets/WidgetConfigurationOptions';
 import IWidgetConfigurationOption from '../../../src/widgets/IWidgetConfigurationOption';
 import useWidgetOptions from '../../../src/hooks/widgets/useWidgetOptions';
@@ -32,10 +34,6 @@ const stateOptions: IWidgetConfigurationOption<ConfigProps>[] = [
     { name: 'visual', label: 'Visual', type: 'selectVisual', default: 'lightbulb' },
 ];
 
-const TvVisual = dynamic(() => import('../../icons/TvVisual'));
-const LightBulbVisual = dynamic(() => import('../../icons/LightBulbVisual'));
-const FanVisual = dynamic(() => import('../../icons/FanVisual'));
-
 export type StateAction = IContactPointer & {
     valueSerialized?: string,
     delay?: number

diff --git a/web/apps/app/package.json b/web/apps/app/package.json
@@ -41,10 +41,10 @@
         "@signalco/ui-primitives": "workspace:*",
         "@signalco/ui-notifications": "workspace:*",
         "@signalco/ui-icons": "workspace:*",
-        "@tanstack/query-sync-storage-persister": "5.17.0",
-        "@tanstack/react-query": "5.17.0",
-        "@tanstack/react-query-devtools": "5.17.0",
-        "@tanstack/react-query-persist-client": "5.17.0",
+        "@tanstack/query-sync-storage-persister": "5.17.1",
+        "@tanstack/react-query": "5.17.1",
+        "@tanstack/react-query-devtools": "5.17.1",
+        "@tanstack/react-query-persist-client": "5.17.1",
         "@vercel/analytics": "1.1.1",
         "@vercel/speed-insights": "1.0.2",
         "@vvo/tzdb": "6.123.0",
@@ -74,7 +74,7 @@
     },
     "devDependencies": {
         "@axe-core/playwright": "4.8.2",
-        "@ducanh2912/next-pwa": "10.0.2",
+        "@ducanh2912/next-pwa": "10.1.0",
         "@next/bundle-analyzer": "14.0.4",
         "@playwright/test": "1.40.1",
         "@signalco/eslint-config-signalco": "workspace:*",

diff --git a/web/apps/doprocess/package.json b/web/apps/doprocess/package.json
@@ -42,8 +42,8 @@
     "@signalco/ui-icons": "workspace:*",
     "@signalco/ui-notifications": "workspace:*",
     "@signalco/ui-primitives": "workspace:*",
-    "@tanstack/react-query": "5.17.0",
-    "@tanstack/react-query-devtools": "5.17.0",
+    "@tanstack/react-query": "5.17.1",
+    "@tanstack/react-query-devtools": "5.17.1",
     "@vercel/analytics": "1.1.1",
     "classix": "2.1.35",
     "drizzle-orm": "0.29.3",
@@ -63,7 +63,7 @@
   "devDependencies": {
     "@axe-core/playwright": "4.8.2",
     "@babel/core": "7.23.7",
-    "@ducanh2912/next-pwa": "10.0.2",
+    "@ducanh2912/next-pwa": "10.1.0",
     "@next/bundle-analyzer": "14.0.4",
     "@playwright/test": "1.40.1",
     "@signalco/eslint-config-signalco": "workspace:*",

diff --git a/web/apps/ui-docs/package.json b/web/apps/ui-docs/package.json
@@ -17,7 +17,7 @@
         "@signalco/tsconfig": "workspace:*",
         "@storybook/addon-essentials": "7.6.7",
         "@storybook/addon-links": "7.6.7",
-        "@storybook/addon-styling-webpack": "0.0.5",
+        "@storybook/addon-styling-webpack": "0.0.6",
         "@storybook/addon-themes": "7.6.7",
         "@storybook/addons": "7.6.7",
         "@storybook/manager-api": "7.6.7",

diff --git a/web/apps/uier/package.json b/web/apps/uier/package.json
@@ -29,8 +29,8 @@
         "@signalco/ui-icons": "workspace:*",
         "@signalco/ui-notifications": "workspace:*",
         "@signalco/ui-primitives": "workspace:*",
-        "@tanstack/react-query": "5.17.0",
-        "@tanstack/react-query-devtools": "5.17.0",
+        "@tanstack/react-query": "5.17.1",
+        "@tanstack/react-query-devtools": "5.17.1",
         "@vercel/analytics": "1.1.1",
         "classix": "2.1.35",
         "next": "14.0.4",
@@ -45,7 +45,7 @@
     "devDependencies": {
         "@axe-core/playwright": "4.8.2",
         "@babel/core": "7.23.7",
-        "@ducanh2912/next-pwa": "10.0.2",
+        "@ducanh2912/next-pwa": "10.1.0",
         "@next/bundle-analyzer": "14.0.4",
         "@playwright/test": "1.40.1",
         "@signalco/eslint-config-signalco": "workspace:*",

diff --git a/web/apps/web/package.json b/web/apps/web/package.json
@@ -52,7 +52,7 @@
     "devDependencies": {
         "@axe-core/playwright": "4.8.2",
         "@babel/core": "7.23.7",
-        "@ducanh2912/next-pwa": "10.0.2",
+        "@ducanh2912/next-pwa": "10.1.0",
         "@next/bundle-analyzer": "14.0.4",
         "@playwright/test": "1.40.1",
         "@signalco/eslint-config-signalco": "workspace:*",

diff --git a/web/packages/uier-toolbar/package.json b/web/packages/uier-toolbar/package.json
@@ -38,7 +38,7 @@
         "classix": "2.1.35",
         "postcss": "8.4.32",
         "postcss-preset-env": "9.3.0",
-        "@tanstack/react-query": "5.17.0",
+        "@tanstack/react-query": "5.17.1",
         "react": "18.2.0",
         "react-dom": "18.2.0",
         "react-timeago": "7.2.0",