Skip to content

Commit

Permalink
Merge pull request #3682 from signalco-io/next
Browse files Browse the repository at this point in the history
Next
  • Loading branch information
AleksandarDev authored Oct 19, 2023
2 parents ac78879 + ca2fae9 commit 2fcb198
Show file tree
Hide file tree
Showing 20 changed files with 713 additions and 721 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/nextjs_bundle_analysis_reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,14 @@ jobs:
body-includes: '<!-- __NEXTJS_BUNDLE_${{ inputs.name }} -->'

- name: Create Comment
uses: peter-evans/create-or-update-comment@v3.0.2
uses: peter-evans/create-or-update-comment@v3.1.0
if: success() && github.event.number && steps.fc.outputs.comment-id == 0
with:
issue-number: ${{ github.event.number }}
body: ${{ steps.get-comment-body.outputs.body }}

- name: Update Comment
uses: peter-evans/create-or-update-comment@v3.0.2
uses: peter-evans/create-or-update-comment@v3.1.0
if: success() && github.event.number && steps.fc.outputs.comment-id != 0
with:
issue-number: ${{ github.event.number }}
Expand Down
2 changes: 1 addition & 1 deletion cloud/infrastructure/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"dependencies": {
"@checkly/pulumi": "1.1.4",
"@pulumi/aws": "6.5.0",
"@pulumi/aws": "6.6.0",
"@pulumi/azure-native": "2.12.0",
"@pulumi/cloudflare": "5.12.0",
"@pulumi/command": "0.9.1",
Expand Down
8 changes: 4 additions & 4 deletions cloud/infrastructure/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Identity.Client" Version="4.56.0" />
<PackageReference Include="Microsoft.Identity.Client" Version="4.57.0" />
<PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="16.205.1" />
<PackageReference Include="Microsoft.VisualStudio.Services.Client" Version="16.205.1" />
<PackageReference Include="Microsoft.VisualStudio.Services.ServiceHooks.WebApi" Version="16.205.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.10.2" />
<PackageReference Include="Azure.Identity" Version="1.10.3" />
<PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.5.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion cloud/src/Signalco.Api.Public/Signalco.Api.Public.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Deterministic>true</Deterministic>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.10.2" />
<PackageReference Include="Azure.Identity" Version="1.10.3" />
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.19.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.15.1" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.OpenApi" Version="1.5.1" />
Expand Down
30 changes: 30 additions & 0 deletions web/apps/app/components/layouts/AppClientWrapper.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
'use client';

import { PropsWithChildren } from 'react';
import { PersistQueryClientProvider } from '@tanstack/react-query-persist-client'
import { QueryClient } from '@tanstack/react-query';
import { createSyncStoragePersister } from '@tanstack/query-sync-storage-persister';
import RealtimeService from '../../src/realtime/realtimeService';

const queryClient = new QueryClient({
defaultOptions: {
queries: {
gcTime: 1000 * 60 * 60 * 24, // 24 hours,
},
},
});
const persister = createSyncStoragePersister({
storage: typeof window !== 'undefined' ? window.localStorage : null,
});

export function AppClientWrapper({ children }: PropsWithChildren) {
RealtimeService.queryClient = queryClient;

return (
<PersistQueryClientProvider
client={queryClient}
persistOptions={{ persister }}>
{children}
</PersistQueryClientProvider>
);
}
10 changes: 3 additions & 7 deletions web/apps/app/components/layouts/AppLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,25 @@
import React from 'react';
import { cx } from 'classix';
import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { Minimize } from '@signalco/ui-icons';
import { Stack } from '@signalco/ui/dist/Stack';
import { IconButton } from '@signalco/ui/dist/IconButton';
import { useSearchParam } from '@signalco/hooks/dist/useSearchParam';
import { PageTitle } from '../navigation/PageTitle';
import NavProfile from '../navigation/NavProfile';
import RealtimeService from '../../src/realtime/realtimeService';
import { AuthWrapper } from './AuthWrapper';
import { AppClientWrapper } from './AppClientWrapper';

const queryClient = new QueryClient();

export function AppLayout(props: React.PropsWithChildren) {
const {
children
} = props;
const [isFullScreen, setFullScreen] = useSearchParam('fullscreen');

RealtimeService.queryClient = queryClient;

return (
<AuthWrapper>
<QueryClientProvider client={queryClient}>
<AppClientWrapper>
<div className="flex w-full flex-col sm:flex-row">
{isFullScreen !== 'true' && (
<NavProfile />
Expand Down Expand Up @@ -53,7 +49,7 @@ export function AppLayout(props: React.PropsWithChildren) {
</IconButton>
</div>
)}
</QueryClientProvider>
</AppClientWrapper>
</AuthWrapper>
);
}
20 changes: 11 additions & 9 deletions web/apps/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,23 @@
"@dnd-kit/modifiers": "6.0.1",
"@dnd-kit/sortable": "7.0.2",
"@dnd-kit/utilities": "3.2.1",
"@enterwell/react-hooks": "0.3.1",
"@enterwell/react-form-builder": "0.3.2",
"@enterwell/react-form-validation": "1.2.8",
"@enterwell/react-hooks": "0.3.1",
"@hcaptcha/react-hcaptcha": "1.8.1",
"@microsoft/signalr": "7.0.12",
"@monaco-editor/react": "4.6.0",
"@next/env": "13.5.5",
"@next/env": "13.5.6",
"@signalco/data": "workspace:*",
"@signalco/hooks": "workspace:*",
"@signalco/js": "workspace:*",
"@signalco/tailwindcss-config-signalco": "workspace:*",
"@signalco/ui": "workspace:*",
"@signalco/ui-icons": "workspace:*",
"@tanstack/query-sync-storage-persister": "5.0.0",
"@tanstack/react-query": "5.0.0",
"@tanstack/react-query-devtools": "5.0.0",
"@tanstack/react-query-devtools": "5.0.1",
"@tanstack/react-query-persist-client": "5.0.0",
"@vercel/analytics": "1.1.1",
"@vvo/tzdb": "6.108.0",
"autoprefixer": "10.4.16",
Expand All @@ -49,7 +51,7 @@
"d3": "7.8.5",
"date-fns": "2.30.0",
"monaco-editor": "0.44.0",
"next": "13.5.5",
"next": "13.5.6",
"next-pwa": "5.6.0",
"next-secure-headers": "2.2.0",
"next-themes": "0.2.1",
Expand All @@ -70,21 +72,21 @@
"devDependencies": {
"@axe-core/playwright": "4.8.1",
"@babel/core": "7.23.2",
"@next/bundle-analyzer": "13.5.5",
"@next/bundle-analyzer": "13.5.6",
"@playwright/test": "1.39.0",
"@signalco/eslint-config-signalco": "workspace:*",
"@signalco/tsconfig": "workspace:*",
"@total-typescript/ts-reset": "0.5.1",
"@types/color": "3.0.5",
"@types/d3": "7.4.2",
"@types/next-pwa": "5.6.7",
"@types/next-pwa": "5.6.8",
"@types/node": "18.18.6",
"@types/react": "18.2.29",
"@types/react-dom": "18.2.13",
"@types/react-dom": "18.2.14",
"@types/react-grid-layout": "1.3.4",
"@types/recharts": "1.8.25",
"@types/recharts": "1.8.26",
"@types/suncalc": "1.9.1",
"@types/uuid": "9.0.5",
"@types/uuid": "9.0.6",
"babel-loader": "9.1.3",
"colorette": "2.0.20",
"cross-env": "7.0.3",
Expand Down
10 changes: 5 additions & 5 deletions web/apps/blog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"dependencies": {
"@mdx-js/loader": "2.3.0",
"@mdx-js/react": "2.3.0",
"@next/env": "13.5.5",
"@next/mdx": "13.5.5",
"@next/env": "13.5.6",
"@next/mdx": "13.5.6",
"@signalco/data": "workspace:*",
"@signalco/hooks": "workspace:*",
"@signalco/js": "workspace:*",
Expand All @@ -33,7 +33,7 @@
"encoding": "0.1.13",
"fs-extra": "11.1.1",
"klaw": "4.1.0",
"next": "13.5.5",
"next": "13.5.6",
"next-secure-headers": "2.2.0",
"react": "18.2.0",
"react-cool-inview": "3.0.1",
Expand All @@ -46,7 +46,7 @@
"devDependencies": {
"@axe-core/playwright": "4.8.1",
"@babel/core": "7.23.2",
"@next/bundle-analyzer": "13.5.5",
"@next/bundle-analyzer": "13.5.6",
"@playwright/test": "1.39.0",
"@signalco/eslint-config-signalco": "workspace:*",
"@signalco/tsconfig": "workspace:*",
Expand All @@ -56,7 +56,7 @@
"@types/klaw": "3.0.5",
"@types/node": "18.18.6",
"@types/react": "18.2.29",
"@types/react-dom": "18.2.13",
"@types/react-dom": "18.2.14",
"colorette": "2.0.20",
"cross-env": "7.0.3",
"eslint": "8.51.0",
Expand Down
8 changes: 4 additions & 4 deletions web/apps/brandgrab/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
"test": "playwright test"
},
"dependencies": {
"@next/env": "13.5.5",
"@next/env": "13.5.6",
"@signalco/data": "workspace:*",
"@signalco/hooks": "workspace:*",
"@signalco/js": "workspace:*",
"@signalco/ui": "workspace:*",
"@signalco/ui-icons": "workspace:*",
"cheerio": "1.0.0-rc.12",
"classix": "2.1.35",
"next": "13.5.5",
"next": "13.5.6",
"next-secure-headers": "2.2.0",
"react": "18.2.0",
"react-dom": "18.2.0",
Expand All @@ -35,14 +35,14 @@
"devDependencies": {
"@axe-core/playwright": "4.8.1",
"@babel/core": "7.23.2",
"@next/bundle-analyzer": "13.5.5",
"@next/bundle-analyzer": "13.5.6",
"@playwright/test": "1.39.0",
"@signalco/eslint-config-signalco": "workspace:*",
"@signalco/tsconfig": "workspace:*",
"@types/color": "3.0.5",
"@types/node": "18.18.6",
"@types/react": "18.2.29",
"@types/react-dom": "18.2.13",
"@types/react-dom": "18.2.14",
"@types/sharp": "0.31.1",
"cross-env": "7.0.3",
"eslint": "8.51.0",
Expand Down
4 changes: 2 additions & 2 deletions web/apps/development/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
},
"devDependencies": {
"@types/react": "18.2.29",
"@types/react-dom": "18.2.13",
"@types/react-dom": "18.2.14",
"@vitejs/plugin-react-swc": "3.4.0",
"typescript": "5.2.2",
"vite": "4.4.11"
"vite": "4.5.0"
}
}
8 changes: 4 additions & 4 deletions web/apps/slco/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
},
"dependencies": {
"@hcaptcha/react-hcaptcha": "1.8.1",
"@next/env": "13.5.5",
"@next/env": "13.5.6",
"@signalco/data": "workspace:*",
"@signalco/ui": "workspace:*",
"@signalco/ui-icons": "workspace:*",
"@signalco/tailwindcss-config-signalco": "workspace:*",
"classix": "2.1.35",
"next": "13.5.5",
"next": "13.5.6",
"next-secure-headers": "2.2.0",
"react": "18.2.0",
"react-cool-inview": "3.0.1",
Expand All @@ -37,15 +37,15 @@
"devDependencies": {
"@axe-core/playwright": "4.8.1",
"@babel/core": "7.23.2",
"@next/bundle-analyzer": "13.5.5",
"@next/bundle-analyzer": "13.5.6",
"@playwright/test": "1.39.0",
"@signalco/eslint-config-signalco": "workspace:*",
"@signalco/tsconfig": "workspace:*",
"@total-typescript/ts-reset": "0.5.1",
"@types/color": "3.0.5",
"@types/node": "18.18.6",
"@types/react": "18.2.29",
"@types/react-dom": "18.2.13",
"@types/react-dom": "18.2.14",
"cross-env": "7.0.3",
"eslint": "8.51.0",
"next-sitemap": "4.2.3",
Expand Down
20 changes: 10 additions & 10 deletions web/apps/ui-docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
"devDependencies": {
"@babel/core": "7.23.2",
"@signalco/tsconfig": "workspace:*",
"@storybook/addon-essentials": "7.4.6",
"@storybook/addon-links": "7.4.6",
"@storybook/addons": "7.4.6",
"@storybook/manager-api": "7.4.6",
"@storybook/nextjs": "7.4.6",
"@storybook/react": "7.4.6",
"@storybook/theming": "7.4.6",
"@storybook/addon-essentials": "7.5.1",
"@storybook/addon-links": "7.5.1",
"@storybook/addons": "7.5.1",
"@storybook/manager-api": "7.5.1",
"@storybook/nextjs": "7.5.1",
"@storybook/react": "7.5.1",
"@storybook/theming": "7.5.1",
"@types/react": "18.2.29",
"@types/react-dom": "18.2.13",
"@types/react-dom": "18.2.14",
"autoprefixer": "10.4.16",
"css-loader": "6.8.1",
"postcss": "8.4.31",
Expand All @@ -32,7 +32,7 @@
"sass": "1.69.4",
"sass-loader": "13.3.2",
"styled-jsx": "5.1.2",
"storybook": "7.4.6",
"storybook": "7.5.1",
"storybook-addon-swc": "1.2.0",
"style-loader": "3.3.3",
"tailwindcss": "3.3.3",
Expand All @@ -43,7 +43,7 @@
"@signalco/ui": "workspace:*",
"@signalco/ui-icons": "workspace:*",
"@signalco/tailwindcss-config-signalco": "workspace:*",
"next": "13.5.5",
"next": "13.5.6",
"react": "18.2.0",
"react-dom": "18.2.0"
}
Expand Down
Loading

6 comments on commit 2fcb198

@vercel
Copy link

@vercel vercel bot commented on 2fcb198 Oct 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

signalco-slco – ./web/apps/slco

signalco-slco-git-main-signalco.vercel.app
signalco-slco-signalco.vercel.app
signalco-slco.vercel.app
slco.io
slco.signalco.io

@vercel
Copy link

@vercel vercel bot commented on 2fcb198 Oct 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

signalco-ui-docs – ./web/apps/ui-docs

signalco-ui-docs.vercel.app
signalco-ui-docs-signalco.vercel.app
signalco-ui-docs-git-main-signalco.vercel.app
ui.signalco.io

@vercel
Copy link

@vercel vercel bot commented on 2fcb198 Oct 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

signalco-blog – ./web/apps/blog

signalco-blog-git-main-signalco.vercel.app
signalco-blog.vercel.app
signalco-blog-signalco.vercel.app
blog.signalco.io

@vercel
Copy link

@vercel vercel bot commented on 2fcb198 Oct 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

signalco-app – ./web/apps/app

signalco-app.vercel.app
signalco-app-git-main-signalco.vercel.app
app.signalco.io
signalco-app-signalco.vercel.app

@vercel
Copy link

@vercel vercel bot commented on 2fcb198 Oct 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vercel
Copy link

@vercel vercel bot commented on 2fcb198 Oct 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.