Merge pull request #3933 from signalco-io/next

signalco-io · Nov 24, 2023 · 4b48097 · 4b48097 · vercel · Nov 24, 2023
2 parents ed8dd71 + f5df204
commit 4b48097
Show file tree

Hide file tree

Showing 466 changed files with 2,234 additions and 1,497 deletions.
diff --git a/.github/workflows/web-nextjs_bundle_analysis.yml b/.github/workflows/web-nextjs_bundle_analysis.yml
@@ -67,6 +67,6 @@ jobs:
     uses: ./.github/workflows/nextjs_bundle_analysis_reusable.yml
     with:
       workflowName: 'web-nextjs_bundle_analysis.yml'
-      name: 'doprocess.app'
-      path: 'web/apps/doprocess.app'
+      name: 'doprocess'
+      path: 'web/apps/doprocess'
     secrets: inherit
diff --git a/cloud/infrastructure/Pulumi.next.yaml b/cloud/infrastructure/Pulumi.next.yaml
@@ -37,3 +37,6 @@ config:
     secure: AAABACrv5fJbGdQBkKEIwC1TMQbqEKliXocv5gGQtk7BJ5U7k4CfpThQNjxS9Rg4cY3uOgXj+TreDQDHZ1SoaQ==
   cloudflare:apiToken:
     secure: AAABABIFMUa2hoSAjN4tRIiARzu+FiFCb842rFMQGXetZE9E4RaT7WsUfmCYdU8C9OssOyw69ilRamfh32gtSAHWaojblHS0
+  vercel:apiToken:
+    secure: AAABAApk3IR9EuaMRv7LxIuHt9e57ERNFjIb7fMbZ5voF4twLchHtNVY1pD86iYunrDdOflpk3E=
+  vercel:team: team_Ade0MlfC3211ml3wYJZ4c9hn
diff --git a/cloud/infrastructure/Pulumi.production.yaml b/cloud/infrastructure/Pulumi.production.yaml
@@ -37,3 +37,6 @@ config:
     secure: AAABAN2VoVSuH03hLA7i6aV9BM8CZpjwa8j/SrWuC9PDYFKPKVAdB8v9ovYO3+N0kaofdJ11dB8j67aeQP82ig==
   cloudflare:apiToken:
     secure: AAABANKU5Rx6Iv2c/mou/eirMx20W0tHXnF2+f2UXbiftUXbgXkWdtQBsSL5/8WqkCBicum89jN6sPp+9RgEZ2+6M70TS3gY
+  vercel:apiToken:
+    secure: AAABADTd8/fNg3PbjgPfU6WFDBhJozYFy2lViWXoCC0LsMBREq012eY+LRnURvOMhbsLwJ3JEak=
+  vercel:team: team_Ade0MlfC3211ml3wYJZ4c9hn
diff --git a/cloud/infrastructure/package.json b/cloud/infrastructure/package.json
@@ -8,7 +8,7 @@
         "restart-functions": "node tools/restart-functions.js"
     },
     "devDependencies": {
-        "@types/node": "18.18.11",
+        "@types/node": "18.18.13",
         "@typescript-eslint/eslint-plugin": "6.12.0",
         "@typescript-eslint/parser": "6.12.0",
         "eslint": "8.54.0",
@@ -26,6 +26,7 @@
         "@pulumi/cloudflare": "5.15.0",
         "@pulumi/command": "0.9.2",
         "@pulumi/docker": "4.5.0",
-        "@pulumi/pulumi": "3.94.2"
+        "@pulumi/pulumi": "3.94.2",
+        "@pulumiverse/vercel": "0.16.0"
     }
 }
diff --git a/cloud/infrastructure/pnpm-lock.yaml b/cloud/infrastructure/pnpm-lock.yaml
diff --git a/cloud/infrastructure/src/Vercel/nextJsApp.ts b/cloud/infrastructure/src/Vercel/nextJsApp.ts
@@ -0,0 +1,7 @@
+import { vercelApp } from './vercelApp';
+
+export function nextJsApp(prefix: string, name: string) {
+    vercelApp(prefix, name, {
+        framework: 'nextjs',
+    });
+}
diff --git a/cloud/infrastructure/src/Vercel/vercelApp.ts b/cloud/infrastructure/src/Vercel/vercelApp.ts
@@ -0,0 +1,27 @@
+import { Project } from '@pulumiverse/vercel';
+
+export function vercelApp(prefix: string, name: string, {
+    framework,
+    ignoreCommand,
+    outputDirectory,
+}: {
+    framework?: 'nextjs';
+    ignoreCommand?: string;
+    outputDirectory?: string;
+}) {
+    new Project(`vercel-${prefix}`, {
+        framework,
+        gitRepository: {
+            productionBranch: 'main',
+            repo: 'signalco-io/signalco',
+            type: 'github',
+        },
+        buildCommand: `cd ../.. && npx turbo run build --filter=${name}...`,
+        installCommand: `pnpm install --frozen-lockfile --filter ${name}... --filter .`,
+        ignoreCommand,
+        outputDirectory,
+        name: `signalco-${name}`,
+        rootDirectory: `web/apps/${name}`,
+        serverlessFunctionRegion: 'iad1',
+    });
+}
diff --git a/cloud/infrastructure/src/index.ts b/cloud/infrastructure/src/index.ts
@@ -21,6 +21,8 @@ import createFunctionsStorage from './Azure/createFunctionsStorage';
 import { Dashboard } from '@checkly/pulumi/dashboard';
 import createLogWorkspace from './Azure/createLogWorkspace';
 import createAppInsights from './Azure/createAppInsights';
+import { nextJsApp } from './Vercel/nextJsApp';
+import { vercelApp } from './Vercel/vercelApp';
 
 /*
  * NOTE: `parent` configuration is currently disabled for all resources because
@@ -268,6 +270,18 @@ export = async () => {
             dnsRecord('checkly-public-dashboard-txt', '_vercel', 'vc-domain-verify=status.signalco.io,563d86cd3501b049a1ad', 'TXT', false);
         }
 
+        // Vercel apps
+        nextJsApp('signalco-blog', 'blog');
+        nextJsApp('signalco-app', 'app');
+        nextJsApp('signalco-web', 'web');
+        nextJsApp('signalco-slco', 'slco');
+        nextJsApp('signalco-brandgrab', 'brandgrab');
+        nextJsApp('doprocess', 'doprocess');
+        vercelApp('signalco-ui-docs', 'ui-docs', {
+            ignoreCommand: 'npx turbo-ignore',
+            outputDirectory: 'storybook-static',
+        });
+
         // Vercel - Domains
         dnsRecord('vercel-web', 'www', 'cname.vercel-dns.com', 'CNAME', false);
         dnsRecord('vercel-app', 'app', 'cname.vercel-dns.com', 'CNAME', false);

diff --git a/station/Signal.Beacon.Channel.PhilipsHue/Signal.Beacon.Channel.PhilipsHue.csproj b/station/Signal.Beacon.Channel.PhilipsHue/Signal.Beacon.Channel.PhilipsHue.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="HueApi" Version="1.5.0" />
+    <PackageReference Include="HueApi" Version="1.5.1" />
     <PackageReference Include="HueApi.ColorConverters" Version="1.5.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />

diff --git a/web/apps/app/app/channels/[channelName]/page.tsx b/web/apps/app/app/channels/[channelName]/page.tsx
@@ -1,16 +1,16 @@
 'use client';
 
 import { useMemo } from 'react';
+import { Typography } from '@signalco/ui-primitives/Typography';
+import { Stack } from '@signalco/ui-primitives/Stack';
+import { Row } from '@signalco/ui-primitives/Row';
+import { ListItem } from '@signalco/ui-primitives/ListItem';
+import { List } from '@signalco/ui-primitives/List';
+import { Link } from '@signalco/ui-primitives/Link';
+import { Container } from '@signalco/ui-primitives/Container';
 import { Bug, Link as LinkIcon } from '@signalco/ui-icons';
-import { Typography } from '@signalco/ui/Typography';
-import { Stack } from '@signalco/ui/Stack';
-import { Row } from '@signalco/ui/Row';
 import { NoDataPlaceholder } from '@signalco/ui/NoDataPlaceholder';
 import { Loadable } from '@signalco/ui/Loadable';
-import { ListItem } from '@signalco/ui/ListItem';
-import { List } from '@signalco/ui/List';
-import { Link } from '@signalco/ui/Link';
-import { Container } from '@signalco/ui/Container';
 import { channelsData } from '@signalco/data/data';
 import { KnownPages } from '../../../src/knownPages';
 import useAllEntities from '../../../src/hooks/signalco/entity/useAllEntities';

diff --git a/web/apps/app/app/entities/[id]/layout.tsx b/web/apps/app/app/entities/[id]/layout.tsx
@@ -1,12 +1,12 @@
 'use client';
 
 import { type PropsWithChildren } from 'react';
+import { Stack } from '@signalco/ui-primitives/Stack';
+import { Row } from '@signalco/ui-primitives/Row';
+import { Chip } from '@signalco/ui-primitives/Chip';
 import { ExternalLink } from '@signalco/ui-icons';
 import { Timeago } from '@signalco/ui/Timeago';
-import { Stack } from '@signalco/ui/Stack';
-import { Row } from '@signalco/ui/Row';
 import { DisableButton } from '@signalco/ui/DisableButton';
-import { Chip } from '@signalco/ui/Chip';
 import { camelToSentenceCase } from '@signalco/js';
 import { useSearchParam } from '@signalco/hooks/useSearchParam';
 import useContact from '../../../src/hooks/signalco/useContact';

diff --git a/web/apps/app/app/entities/page.tsx b/web/apps/app/app/entities/page.tsx
@@ -2,13 +2,13 @@
 
 import React, { useCallback, useMemo, useState } from 'react';
 import { useRouter } from 'next/navigation';
+import { Stack } from '@signalco/ui-primitives/Stack';
+import { SelectItems } from '@signalco/ui-primitives/SelectItems';
+import { Row } from '@signalco/ui-primitives/Row';
+import { IconButton } from '@signalco/ui-primitives/IconButton';
+import { cx } from '@signalco/ui-primitives/cx';
 import { Add, Check, LayoutGrid, LayoutList } from '@signalco/ui-icons';
-import { Stack } from '@signalco/ui/Stack';
-import { SelectItems } from '@signalco/ui/SelectItems';
-import { Row } from '@signalco/ui/Row';
 import { Loadable } from '@signalco/ui/Loadable';
-import { IconButton } from '@signalco/ui/IconButton';
-import { cx } from '@signalco/ui/cx';
 import { useSearchParam } from '@signalco/hooks/useSearchParam';
 import { KnownPages } from '../../src/knownPages';
 import useUserSetting from '../../src/hooks/useUserSetting';

diff --git a/web/apps/app/app/logout/page.tsx b/web/apps/app/app/logout/page.tsx
@@ -1,7 +1,7 @@
 'use client';
 
 import { useEffect } from 'react';
-import { Stack } from '@signalco/ui/Stack';
+import { Stack } from '@signalco/ui-primitives/Stack';
 import { Loadable } from '@signalco/ui/Loadable';
 import { useAuth0 } from '@auth0/auth0-react';
 

diff --git a/web/apps/app/app/settings/page.tsx b/web/apps/app/app/settings/page.tsx
@@ -4,14 +4,14 @@ import { ResponsiveContainer } from 'recharts';
 import React, { ComponentProps, ReactNode, useEffect, useState } from 'react';
 import dynamic from 'next/dynamic';
 import { getTimeZones } from '@vvo/tzdb';
-import { Typography } from '@signalco/ui/Typography';
-import { Stack } from '@signalco/ui/Stack';
-import { SelectItems } from '@signalco/ui/SelectItems';
-import { Row } from '@signalco/ui/Row';
+import { Typography } from '@signalco/ui-primitives/Typography';
+import { Stack } from '@signalco/ui-primitives/Stack';
+import { SelectItems } from '@signalco/ui-primitives/SelectItems';
+import { Row } from '@signalco/ui-primitives/Row';
+import { Divider } from '@signalco/ui-primitives/Divider';
+import { Container } from '@signalco/ui-primitives/Container';
 import { Loadable } from '@signalco/ui/Loadable';
 import { FilterList } from '@signalco/ui/FilterList';
-import { Divider } from '@signalco/ui/Divider';
-import { Container } from '@signalco/ui/Container';
 import { arraySum, humanizeNumber, objectWithKey } from '@signalco/js';
 import { isNonEmptyString, isNotNull, noError } from '@enterwell/react-form-validation';
 import { FormBuilderComponent, FormBuilderComponents } from '@enterwell/react-form-builder/lib/FormBuilderProvider/FormBuilderProvider.types';

diff --git a/web/apps/app/components/Login.tsx b/web/apps/app/components/Login.tsx
@@ -1,10 +1,10 @@
 'use client';
 
 import React, { useState } from 'react';
-import { Stack } from '@signalco/ui/Stack';
-import { Row } from '@signalco/ui/Row';
-import { cx } from '@signalco/ui/cx';
-import { Button } from '@signalco/ui/Button';
+import { Stack } from '@signalco/ui-primitives/Stack';
+import { Row } from '@signalco/ui-primitives/Row';
+import { cx } from '@signalco/ui-primitives/cx';
+import { Button } from '@signalco/ui-primitives/Button';
 import { useTimeout } from '@signalco/hooks/useTimeout';
 
 export default function Login() {

diff --git a/web/apps/app/components/channels/ChannelGalleryItem.tsx b/web/apps/app/components/channels/ChannelGalleryItem.tsx
@@ -1,8 +1,8 @@
-import { Typography } from '@signalco/ui/Typography';
+import { Typography } from '@signalco/ui-primitives/Typography';
+import { Stack } from '@signalco/ui-primitives/Stack';
+import { Chip } from '@signalco/ui-primitives/Chip';
+import { Card } from '@signalco/ui-primitives/Card';
 import type { ColorPaletteProp } from '@signalco/ui/theme';
-import { Stack } from '@signalco/ui/Stack';
-import { Chip } from '@signalco/ui/Chip';
-import { Card } from '@signalco/ui/Card';
 import ChannelLogo from './ChannelLogo';
 
 type ChannelGalleryItemProps = {

diff --git a/web/apps/app/components/channels/ChannelLogo.tsx b/web/apps/app/components/channels/ChannelLogo.tsx
@@ -1,6 +1,6 @@
 import { useState } from 'react';
 import Image from 'next/image';
-import { Tooltip } from '@signalco/ui/Tooltip';
+import { Tooltip } from '@signalco/ui-primitives/Tooltip';
 
 export type ChannelLogoProps = {
     channelName: string;

diff --git a/web/apps/app/components/channels/partials/ChannelPartialSlack.tsx b/web/apps/app/components/channels/partials/ChannelPartialSlack.tsx
@@ -1,6 +1,6 @@
 import { useRouter } from 'next/navigation';
-import { Typography } from '@signalco/ui/Typography';
-import { Stack } from '@signalco/ui/Stack';
+import { Typography } from '@signalco/ui-primitives/Typography';
+import { Stack } from '@signalco/ui-primitives/Stack';
 import { objectWithKey } from '@signalco/js';
 import OAuthRedirectConnectButton from '../../oauth/OAuthRedirectConnectButton';
 import { requestAsync } from '../../../src/services/HttpService';

diff --git a/web/apps/app/components/dashboards/DashboardSelector.tsx b/web/apps/app/components/dashboards/DashboardSelector.tsx
@@ -1,11 +1,11 @@
 'use client';
 
 import { useEffect, useState } from 'react';
+import { Row } from '@signalco/ui-primitives/Row';
+import { Popper } from '@signalco/ui-primitives/Popper';
+import { ButtonDropdown } from '@signalco/ui-primitives/ButtonDropdown';
+import { Button } from '@signalco/ui-primitives/Button';
 import { showNotification } from '@signalco/ui-notifications';
-import { Row } from '@signalco/ui/Row';
-import { Popper } from '@signalco/ui/Popper';
-import { ButtonDropdown } from '@signalco/ui/ButtonDropdown';
-import { Button } from '@signalco/ui/Button';
 import { useSearchParam } from '@signalco/hooks/useSearchParam';
 import useDashboards from '../../src/hooks/dashboards/useDashboards';
 import DashboardSelectorMenu from './DashboardSelectorMenu';

diff --git a/web/apps/app/components/dashboards/DashboardSelectorMenu.tsx b/web/apps/app/components/dashboards/DashboardSelectorMenu.tsx
@@ -1,14 +1,14 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 /* eslint-disable @typescript-eslint/no-non-null-asserted-optional-chain */
 import React from 'react';
+import { Typography } from '@signalco/ui-primitives/Typography';
+import { Stack } from '@signalco/ui-primitives/Stack';
+import { Row } from '@signalco/ui-primitives/Row';
+import { IconButton } from '@signalco/ui-primitives/IconButton';
+import { Divider } from '@signalco/ui-primitives/Divider';
+import { cx } from '@signalco/ui-primitives/cx';
+import { Button } from '@signalco/ui-primitives/Button';
 import { Add, Pin, PinOff } from '@signalco/ui-icons';
-import { Typography } from '@signalco/ui/Typography';
-import { Stack } from '@signalco/ui/Stack';
-import { Row } from '@signalco/ui/Row';
-import { IconButton } from '@signalco/ui/IconButton';
-import { Divider } from '@signalco/ui/Divider';
-import { cx } from '@signalco/ui/cx';
-import { Button } from '@signalco/ui/Button';
 import { useSearchParam } from '@signalco/hooks/useSearchParam';
 import { CSS } from '@dnd-kit/utilities';
 import { SortableContext, arrayMove, sortableKeyboardCoordinates, useSortable } from '@dnd-kit/sortable';

diff --git a/web/apps/app/components/dashboards/DashboardSettings.tsx b/web/apps/app/components/dashboards/DashboardSettings.tsx
@@ -1,8 +1,8 @@
 import React, { useEffect, useState } from 'react';
-import { Typography } from '@signalco/ui/Typography';
-import { Stack } from '@signalco/ui/Stack';
-import { Input } from '@signalco/ui/Input';
-import { Button } from '@signalco/ui/Button';
+import { Typography } from '@signalco/ui-primitives/Typography';
+import { Stack } from '@signalco/ui-primitives/Stack';
+import { Input } from '@signalco/ui-primitives/Input';
+import { Button } from '@signalco/ui-primitives/Button';
 import { useSearchParam } from '@signalco/hooks/useSearchParam';
 import ConfirmDeleteButton from '../shared/dialog/ConfirmDeleteButton';
 import ConfigurationDialog from '../shared/dialog/ConfigurationDialog';

diff --git a/web/apps/app/components/dashboards/DashboardView.tsx b/web/apps/app/components/dashboards/DashboardView.tsx
@@ -2,10 +2,10 @@
 
 import { useState, useMemo, CSSProperties } from 'react';
 import Image from 'next/image';
-import { Typography } from '@signalco/ui/Typography';
-import { Stack } from '@signalco/ui/Stack';
-import { Row } from '@signalco/ui/Row';
-import { Button } from '@signalco/ui/Button';
+import { Typography } from '@signalco/ui-primitives/Typography';
+import { Stack } from '@signalco/ui-primitives/Stack';
+import { Row } from '@signalco/ui-primitives/Row';
+import { Button } from '@signalco/ui-primitives/Button';
 import { useResizeObserver } from '@enterwell/react-hooks';
 import useLocale from '../../src/hooks/useLocale';
 import { IDashboardModel } from '../../src/dashboards/DashboardsRepository';

diff --git a/web/apps/app/components/dashboards/Dashboards.tsx b/web/apps/app/components/dashboards/Dashboards.tsx
@@ -3,12 +3,12 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import Image from 'next/image';
 import dynamic from 'next/dynamic';
+import { Typography } from '@signalco/ui-primitives/Typography';
+import { Stack } from '@signalco/ui-primitives/Stack';
+import { Row } from '@signalco/ui-primitives/Row';
+import { Button } from '@signalco/ui-primitives/Button';
 import { showNotification } from '@signalco/ui-notifications';
-import { Typography } from '@signalco/ui/Typography';
-import { Stack } from '@signalco/ui/Stack';
-import { Row } from '@signalco/ui/Row';
 import { Loadable } from '@signalco/ui/Loadable';
-import { Button } from '@signalco/ui/Button';
 import { useSearchParam } from '@signalco/hooks/useSearchParam';
 import { widgetType } from '../widgets/Widget';
 import ConfigurationDialog from '../shared/dialog/ConfigurationDialog';