From cad42eed54d2322785d3867484cba9b0956c635b Mon Sep 17 00:00:00 2001 From: Faruk AYDIN Date: Fri, 14 Oct 2022 23:41:00 +0200 Subject: [PATCH 01/13] refactor: Remove test run methods from triggers --- .../backend/src/apps/twitter/triggers/my-tweets/index.ts | 4 ---- .../src/apps/twitter/triggers/new-follower-of-me/index.ts | 4 ---- .../src/apps/twitter/triggers/search-tweets/index.ts | 6 ------ .../backend/src/apps/twitter/triggers/user-tweets/index.ts | 7 ------- packages/types/index.d.ts | 3 +-- 5 files changed, 1 insertion(+), 23 deletions(-) diff --git a/packages/backend/src/apps/twitter/triggers/my-tweets/index.ts b/packages/backend/src/apps/twitter/triggers/my-tweets/index.ts index 591e6a28..bd033d35 100644 --- a/packages/backend/src/apps/twitter/triggers/my-tweets/index.ts +++ b/packages/backend/src/apps/twitter/triggers/my-tweets/index.ts @@ -23,8 +23,4 @@ export default { lastInternalId: $.flow.lastInternalId, }); }, - - async testRun($: IGlobalVariable) { - return await getUserTweets($, { currentUser: true }); - }, }; diff --git a/packages/backend/src/apps/twitter/triggers/new-follower-of-me/index.ts b/packages/backend/src/apps/twitter/triggers/new-follower-of-me/index.ts index 3bc6335d..4a873ea0 100644 --- a/packages/backend/src/apps/twitter/triggers/new-follower-of-me/index.ts +++ b/packages/backend/src/apps/twitter/triggers/new-follower-of-me/index.ts @@ -20,8 +20,4 @@ export default { async run($: IGlobalVariable) { return await myFollowers($, $.flow.lastInternalId); }, - - async testRun($: IGlobalVariable) { - return await myFollowers($); - }, }; diff --git a/packages/backend/src/apps/twitter/triggers/search-tweets/index.ts b/packages/backend/src/apps/twitter/triggers/search-tweets/index.ts index 2eb450aa..eb9b9e7a 100644 --- a/packages/backend/src/apps/twitter/triggers/search-tweets/index.ts +++ b/packages/backend/src/apps/twitter/triggers/search-tweets/index.ts @@ -35,10 +35,4 @@ export default { searchTerm: $.step.parameters.searchTerm as string, }); }, - - async testRun($: IGlobalVariable) { - return await searchTweets($, { - searchTerm: $.step.parameters.searchTerm as string, - }); - }, }; diff --git a/packages/backend/src/apps/twitter/triggers/user-tweets/index.ts b/packages/backend/src/apps/twitter/triggers/user-tweets/index.ts index a116e6fe..fe981cb9 100644 --- a/packages/backend/src/apps/twitter/triggers/user-tweets/index.ts +++ b/packages/backend/src/apps/twitter/triggers/user-tweets/index.ts @@ -36,11 +36,4 @@ export default { lastInternalId: $.flow.lastInternalId, }); }, - - async testRun($: IGlobalVariable) { - return await getUserTweets($, { - currentUser: false, - userId: $.step.parameters.username as string, - }); - }, }; diff --git a/packages/types/index.d.ts b/packages/types/index.d.ts index 61452076..e860fc56 100644 --- a/packages/types/index.d.ts +++ b/packages/types/index.d.ts @@ -208,7 +208,6 @@ export interface ITrigger { substeps: ISubstep[]; getInterval(parameters: IGlobalVariable['step']['parameters']): string; run($: IGlobalVariable): Promise; - testRun($: IGlobalVariable): Promise; } export interface IActionOutput { @@ -271,7 +270,7 @@ export type IGlobalVariable = { execution?: { id: string; testRun: boolean; - } + }; process?: (triggerDataItem: ITriggerDataItem) => Promise; }; From 8a883765d43fe6daaa3624721fa64a23cc740b1f Mon Sep 17 00:00:00 2001 From: Faruk AYDIN Date: Fri, 14 Oct 2022 23:51:00 +0200 Subject: [PATCH 02/13] refactor: Do not expose search term separately for search tweets --- .../src/apps/twitter/triggers/search-tweets/index.ts | 4 +--- .../twitter/triggers/search-tweets/search-tweets.ts | 12 +++--------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/packages/backend/src/apps/twitter/triggers/search-tweets/index.ts b/packages/backend/src/apps/twitter/triggers/search-tweets/index.ts index eb9b9e7a..0d10ed8c 100644 --- a/packages/backend/src/apps/twitter/triggers/search-tweets/index.ts +++ b/packages/backend/src/apps/twitter/triggers/search-tweets/index.ts @@ -31,8 +31,6 @@ export default { ], async run($: IGlobalVariable) { - return await searchTweets($, { - searchTerm: $.step.parameters.searchTerm as string, - }); + return await searchTweets($); }, }; diff --git a/packages/backend/src/apps/twitter/triggers/search-tweets/search-tweets.ts b/packages/backend/src/apps/twitter/triggers/search-tweets/search-tweets.ts index a9d38636..475403b5 100644 --- a/packages/backend/src/apps/twitter/triggers/search-tweets/search-tweets.ts +++ b/packages/backend/src/apps/twitter/triggers/search-tweets/search-tweets.ts @@ -7,15 +7,9 @@ import qs from 'qs'; import generateRequest from '../../common/generate-request'; import { omitBy, isEmpty } from 'lodash'; -type ISearchTweetsOptions = { - searchTerm: string; - lastInternalId?: string; -}; +const searchTweets = async ($: IGlobalVariable) => { + const searchTerm = $.step.parameters.searchTerm as string; -const searchTweets = async ( - $: IGlobalVariable, - options: ISearchTweetsOptions -) => { let response; const tweets: ITriggerOutput = { @@ -24,7 +18,7 @@ const searchTweets = async ( do { const params: IJSONObject = { - query: options.searchTerm, + query: searchTerm, since_id: $.execution.testRun ? null : $.flow.lastInternalId, pagination_token: response?.data?.meta?.next_token, }; From 39792d25d8d181f84f64691c47242225058df43b Mon Sep 17 00:00:00 2001 From: Thu Huynh <32840471+ThuH2305@users.noreply.github.com> Date: Fri, 14 Oct 2022 23:55:35 +0200 Subject: [PATCH 03/13] docs(readme): remove github community link --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index a55216f5..f2bbf0df 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,6 @@ You can use `user@automatisch.io` email address and `sample` password to login t ## Community Links -- [Github](https://github.com/automatisch/automatisch) - [Discord](https://discord.gg/dJSah9CVrC) - [Twitter](https://twitter.com/automatischio) From b5e5ae73217050451eaf07d4bdaf5c315988d669 Mon Sep 17 00:00:00 2001 From: Faruk AYDIN Date: Sat, 15 Oct 2022 11:38:10 +0200 Subject: [PATCH 04/13] fix: Do not sort user tweets since it's in reverse-chronological order --- .../src/apps/twitter/common/get-user-tweets.ts | 14 +++++--------- .../src/apps/twitter/triggers/my-tweets/index.ts | 1 - .../src/apps/twitter/triggers/user-tweets/index.ts | 2 -- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/packages/backend/src/apps/twitter/common/get-user-tweets.ts b/packages/backend/src/apps/twitter/common/get-user-tweets.ts index 4cce058f..6a2f5360 100644 --- a/packages/backend/src/apps/twitter/common/get-user-tweets.ts +++ b/packages/backend/src/apps/twitter/common/get-user-tweets.ts @@ -12,8 +12,6 @@ import getUserByUsername from './get-user-by-username'; type IGetUserTweetsOptions = { currentUser: boolean; - userId?: string; - lastInternalId?: string; }; const getUserTweets = async ( @@ -39,7 +37,7 @@ const getUserTweets = async ( do { const params: IJSONObject = { - since_id: options.lastInternalId, + since_id: $.execution.testRun ? null : $.flow.lastInternalId, pagination_token: response?.data?.meta?.next_token, }; @@ -63,15 +61,13 @@ const getUserTweets = async ( response.data.data.forEach((tweet: IJSONObject) => { tweets.data.push({ raw: tweet, - meta: { internalId: tweet.id as string }, + meta: { + internalId: tweet.id as string, + }, }); }); } - } while (response.data.meta.next_token && options.lastInternalId); - - tweets.data.sort((tweet, nextTweet) => { - return (tweet.raw.id as number) - (nextTweet.raw.id as number); - }); + } while (response.data.meta.next_token && !$.execution.testRun); return tweets; }; diff --git a/packages/backend/src/apps/twitter/triggers/my-tweets/index.ts b/packages/backend/src/apps/twitter/triggers/my-tweets/index.ts index bd033d35..7e33be4f 100644 --- a/packages/backend/src/apps/twitter/triggers/my-tweets/index.ts +++ b/packages/backend/src/apps/twitter/triggers/my-tweets/index.ts @@ -20,7 +20,6 @@ export default { async run($: IGlobalVariable) { return await getUserTweets($, { currentUser: true, - lastInternalId: $.flow.lastInternalId, }); }, }; diff --git a/packages/backend/src/apps/twitter/triggers/user-tweets/index.ts b/packages/backend/src/apps/twitter/triggers/user-tweets/index.ts index fe981cb9..db576159 100644 --- a/packages/backend/src/apps/twitter/triggers/user-tweets/index.ts +++ b/packages/backend/src/apps/twitter/triggers/user-tweets/index.ts @@ -32,8 +32,6 @@ export default { async run($: IGlobalVariable) { return await getUserTweets($, { currentUser: false, - userId: $.step.parameters.username as string, - lastInternalId: $.flow.lastInternalId, }); }, }; From c0dfc101b2a4e1fe248a2abdedaf3e799376a947 Mon Sep 17 00:00:00 2001 From: Ali BARIN Date: Sat, 15 Oct 2022 13:35:14 +0200 Subject: [PATCH 05/13] fix: only show apps with actions in action step --- packages/backend/src/graphql/queries/get-apps.ts | 5 +++++ packages/backend/src/graphql/schema.graphql | 2 +- .../web/src/components/ChooseAppAndEventSubstep/index.tsx | 3 ++- packages/web/src/components/ExecutionStep/index.tsx | 3 ++- packages/web/src/components/FlowStep/index.tsx | 3 ++- packages/web/src/graphql/queries/get-apps.ts | 4 ++-- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/packages/backend/src/graphql/queries/get-apps.ts b/packages/backend/src/graphql/queries/get-apps.ts index d0928b44..95de6f0a 100644 --- a/packages/backend/src/graphql/queries/get-apps.ts +++ b/packages/backend/src/graphql/queries/get-apps.ts @@ -4,6 +4,7 @@ import { IApp } from '@automatisch/types'; type Params = { name: string; onlyWithTriggers: boolean; + onlyWithActions: boolean; }; const getApps = async (_parent: unknown, params: Params) => { @@ -13,6 +14,10 @@ const getApps = async (_parent: unknown, params: Params) => { return apps.filter((app: IApp) => app.triggers?.length); } + if (params.onlyWithActions) { + return apps.filter((app: IApp) => app.actions?.length); + } + return apps; }; diff --git a/packages/backend/src/graphql/schema.graphql b/packages/backend/src/graphql/schema.graphql index 689f660c..98c7ef73 100644 --- a/packages/backend/src/graphql/schema.graphql +++ b/packages/backend/src/graphql/schema.graphql @@ -1,5 +1,5 @@ type Query { - getApps(name: String, onlyWithTriggers: Boolean): [App] + getApps(name: String, onlyWithTriggers: Boolean, onlyWithActions: Boolean): [App] getApp(key: AvailableAppsEnumType!): App getConnectedApps(name: String): [App] testConnection(id: String!): Connection diff --git a/packages/web/src/components/ChooseAppAndEventSubstep/index.tsx b/packages/web/src/components/ChooseAppAndEventSubstep/index.tsx index 3b53c52e..3a50c4bd 100644 --- a/packages/web/src/components/ChooseAppAndEventSubstep/index.tsx +++ b/packages/web/src/components/ChooseAppAndEventSubstep/index.tsx @@ -49,9 +49,10 @@ function ChooseAppAndEventSubstep( const editorContext = React.useContext(EditorContext); const isTrigger = step.type === 'trigger'; + const isAction = step.type === 'action'; const { data } = useQuery(GET_APPS, { - variables: { onlyWithTriggers: isTrigger }, + variables: { onlyWithTriggers: isTrigger, onlyWithActions: isAction }, }); const apps: IApp[] = data?.getApps; const app = apps?.find((currentApp: IApp) => currentApp.key === step.appKey); diff --git a/packages/web/src/components/ExecutionStep/index.tsx b/packages/web/src/components/ExecutionStep/index.tsx index 3159679a..b11caaaa 100644 --- a/packages/web/src/components/ExecutionStep/index.tsx +++ b/packages/web/src/components/ExecutionStep/index.tsx @@ -31,8 +31,9 @@ export default function ExecutionStep(props: ExecutionStepProps): React.ReactEle const [activeTabIndex, setActiveTabIndex] = React.useState(0); const step: IStep = executionStep.step; const isTrigger = step.type === 'trigger'; + const isAction = step.type === 'action'; const formatMessage = useFormatMessage(); - const { data } = useQuery(GET_APPS, { variables: { onlyWithTriggers: isTrigger }}); + const { data } = useQuery(GET_APPS, { variables: { onlyWithTriggers: isTrigger, onlyWithActions: isAction }}); const apps: IApp[] = data?.getApps; const app = apps?.find((currentApp: IApp) => currentApp.key === step.appKey); diff --git a/packages/web/src/components/FlowStep/index.tsx b/packages/web/src/components/FlowStep/index.tsx index 0910378a..ece980f9 100644 --- a/packages/web/src/components/FlowStep/index.tsx +++ b/packages/web/src/components/FlowStep/index.tsx @@ -108,10 +108,11 @@ export default function FlowStep( null ); const isTrigger = step.type === 'trigger'; + const isAction = step.type === 'action'; const formatMessage = useFormatMessage(); const [currentSubstep, setCurrentSubstep] = React.useState(0); const { data } = useQuery(GET_APPS, { - variables: { onlyWithTriggers: isTrigger }, + variables: { onlyWithTriggers: isTrigger, onlyWithActions: isAction }, }); const [ getStepWithTestExecutions, diff --git a/packages/web/src/graphql/queries/get-apps.ts b/packages/web/src/graphql/queries/get-apps.ts index f22a3adf..6c6df728 100644 --- a/packages/web/src/graphql/queries/get-apps.ts +++ b/packages/web/src/graphql/queries/get-apps.ts @@ -1,8 +1,8 @@ import { gql } from '@apollo/client'; export const GET_APPS = gql` - query GetApps($name: String, $onlyWithTriggers: Boolean) { - getApps(name: $name, onlyWithTriggers: $onlyWithTriggers) { + query GetApps($name: String, $onlyWithTriggers: Boolean, $onlyWithActions: Boolean) { + getApps(name: $name, onlyWithTriggers: $onlyWithTriggers, onlyWithActions: $onlyWithActions) { name key iconUrl From 6f0a7635898a51aaf074e227b9355c5953748860 Mon Sep 17 00:00:00 2001 From: Ali BARIN Date: Sat, 15 Oct 2022 20:26:25 +0200 Subject: [PATCH 06/13] fix(scheduler): return TriggerDataItem --- .../scheduler/triggers/every-day/index.ts | 23 +++++++++---------- .../scheduler/triggers/every-hour/index.ts | 23 +++++++++---------- .../scheduler/triggers/every-month/index.ts | 23 +++++++++---------- .../scheduler/triggers/every-week/index.ts | 23 +++++++++---------- 4 files changed, 44 insertions(+), 48 deletions(-) diff --git a/packages/backend/src/apps/scheduler/triggers/every-day/index.ts b/packages/backend/src/apps/scheduler/triggers/every-day/index.ts index b92de092..1946925a 100644 --- a/packages/backend/src/apps/scheduler/triggers/every-day/index.ts +++ b/packages/backend/src/apps/scheduler/triggers/every-day/index.ts @@ -154,23 +154,22 @@ export default { return cronTimes.everyDayExcludingWeekendsAt(parameters.hour as number); }, - async run($: IGlobalVariable, startDateTime: Date) { - const dateTime = DateTime.fromJSDate(startDateTime); - const dateTimeObjectRepresentation = getDateTimeObjectRepresentation( - dateTime - ) as IJSONValue; - - return { data: [dateTimeObjectRepresentation] }; - }, - - async testRun($: IGlobalVariable) { + async run($: IGlobalVariable) { const nextCronDateTime = getNextCronDateTime( this.getInterval($.step.parameters) ); + const dateTime = DateTime.now(); const dateTimeObjectRepresentation = getDateTimeObjectRepresentation( - nextCronDateTime + $.execution.testRun ? nextCronDateTime : dateTime ) as IJSONValue; - return { data: [dateTimeObjectRepresentation] }; + const dataItem = { + raw: dateTimeObjectRepresentation, + meta: { + internalId: dateTime.toMillis().toString(), + }, + }; + + return { data: [dataItem] }; }, }; diff --git a/packages/backend/src/apps/scheduler/triggers/every-hour/index.ts b/packages/backend/src/apps/scheduler/triggers/every-hour/index.ts index b0c11cd8..2d08dee3 100644 --- a/packages/backend/src/apps/scheduler/triggers/every-hour/index.ts +++ b/packages/backend/src/apps/scheduler/triggers/every-hour/index.ts @@ -48,23 +48,22 @@ export default { return cronTimes.everyHourExcludingWeekends; }, - async run($: IGlobalVariable, startDateTime: Date) { - const dateTime = DateTime.fromJSDate(startDateTime); - const dateTimeObjectRepresentation = getDateTimeObjectRepresentation( - dateTime - ) as IJSONValue; - - return { data: [dateTimeObjectRepresentation] }; - }, - - async testRun($: IGlobalVariable) { + async run($: IGlobalVariable) { const nextCronDateTime = getNextCronDateTime( this.getInterval($.step.parameters) ); + const dateTime = DateTime.now(); const dateTimeObjectRepresentation = getDateTimeObjectRepresentation( - nextCronDateTime + $.execution.testRun ? nextCronDateTime : dateTime ) as IJSONValue; - return { data: [dateTimeObjectRepresentation] }; + const dataItem = { + raw: dateTimeObjectRepresentation, + meta: { + internalId: dateTime.toMillis().toString(), + }, + }; + + return { data: [dataItem] }; }, }; diff --git a/packages/backend/src/apps/scheduler/triggers/every-month/index.ts b/packages/backend/src/apps/scheduler/triggers/every-month/index.ts index 5850503b..f2a40d8c 100644 --- a/packages/backend/src/apps/scheduler/triggers/every-month/index.ts +++ b/packages/backend/src/apps/scheduler/triggers/every-month/index.ts @@ -270,23 +270,22 @@ export default { return interval; }, - async run($: IGlobalVariable, startDateTime: Date) { - const dateTime = DateTime.fromJSDate(startDateTime); - const dateTimeObjectRepresentation = getDateTimeObjectRepresentation( - dateTime - ) as IJSONValue; - - return { data: [dateTimeObjectRepresentation] }; - }, - - async testRun($: IGlobalVariable) { + async run($: IGlobalVariable) { const nextCronDateTime = getNextCronDateTime( this.getInterval($.step.parameters) ); + const dateTime = DateTime.now(); const dateTimeObjectRepresentation = getDateTimeObjectRepresentation( - nextCronDateTime + $.execution.testRun ? nextCronDateTime : dateTime ) as IJSONValue; - return { data: [dateTimeObjectRepresentation] }; + const dataItem = { + raw: dateTimeObjectRepresentation, + meta: { + internalId: dateTime.toMillis().toString(), + }, + }; + + return { data: [dataItem] }; }, }; diff --git a/packages/backend/src/apps/scheduler/triggers/every-week/index.ts b/packages/backend/src/apps/scheduler/triggers/every-week/index.ts index 878b005b..7204eebc 100644 --- a/packages/backend/src/apps/scheduler/triggers/every-week/index.ts +++ b/packages/backend/src/apps/scheduler/triggers/every-week/index.ts @@ -174,23 +174,22 @@ export default { return interval; }, - async run($: IGlobalVariable, startDateTime: Date) { - const dateTime = DateTime.fromJSDate(startDateTime); - const dateTimeObjectRepresentation = getDateTimeObjectRepresentation( - dateTime - ) as IJSONValue; - - return { data: [dateTimeObjectRepresentation] }; - }, - - async testRun($: IGlobalVariable) { + async run($: IGlobalVariable) { const nextCronDateTime = getNextCronDateTime( this.getInterval($.step.parameters) ); + const dateTime = DateTime.now(); const dateTimeObjectRepresentation = getDateTimeObjectRepresentation( - nextCronDateTime + $.execution.testRun ? nextCronDateTime : dateTime ) as IJSONValue; - return { data: [dateTimeObjectRepresentation] }; + const dataItem = { + raw: dateTimeObjectRepresentation, + meta: { + internalId: dateTime.toMillis().toString(), + }, + }; + + return { data: [dataItem] }; }, }; From fd0d4dcecafcfb06389bacce3109ea2a148eff12 Mon Sep 17 00:00:00 2001 From: Faruk AYDIN Date: Sat, 15 Oct 2022 21:58:24 +0200 Subject: [PATCH 07/13] feat: Use clean URLs for docs --- packages/docs/package.json | 3 + packages/docs/pages/.vitepress/config.js | 1 + yarn.lock | 498 ++++++++++++++--------- 3 files changed, 311 insertions(+), 191 deletions(-) diff --git a/packages/docs/package.json b/packages/docs/package.json index 87be15e9..e4dda26d 100644 --- a/packages/docs/package.json +++ b/packages/docs/package.json @@ -26,5 +26,8 @@ }, "bugs": { "url": "https://github.com/automatisch/automatisch/issues" + }, + "dependencies": { + "vitepress": "^1.0.0-alpha.21" } } diff --git a/packages/docs/pages/.vitepress/config.js b/packages/docs/pages/.vitepress/config.js index 3781dda4..5aa4a640 100644 --- a/packages/docs/pages/.vitepress/config.js +++ b/packages/docs/pages/.vitepress/config.js @@ -8,6 +8,7 @@ export default defineConfig({ title: 'Automatisch Docs', description: 'Build workflow automation without spending time and money. No code is required.', + cleanUrls: 'with-subfolders', themeConfig: { siteTitle: 'Automatisch', nav: [ diff --git a/yarn.lock b/yarn.lock index 052d7583..3a507d95 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1542,27 +1542,27 @@ combined-stream "^1.0.8" mime-types "^2.1.12" -"@docsearch/css@3.2.0", "@docsearch/css@^3.0.0": - version "3.2.0" - resolved "https://registry.yarnpkg.com/@docsearch/css/-/css-3.2.0.tgz#9f0f7ccb315cfe2db4565264569e1cb4b26dc26d" - integrity sha512-jnNrO2JVYYhj2pP2FomlHIy6220n6mrLn2t9v2/qc+rM7M/fbIcKMgk9ky4RN+L/maUEmteckzg6/PIYoAAXJg== +"@docsearch/css@3.2.1", "@docsearch/css@^3.2.1": + version "3.2.1" + resolved "https://registry.yarnpkg.com/@docsearch/css/-/css-3.2.1.tgz#c05d7818b0e43b42f9efa2d82a11c36606b37b27" + integrity sha512-gaP6TxxwQC+K8D6TRx5WULUWKrcbzECOPA2KCVMuI+6C7dNiGUk5yXXzVhc5sld79XKYLnO9DRTI4mjXDYkh+g== -"@docsearch/js@^3.0.0": - version "3.2.0" - resolved "https://registry.yarnpkg.com/@docsearch/js/-/js-3.2.0.tgz#461ed26a3a86c41b4399c394fe9fc38a5bc2c7ae" - integrity sha512-FEgXW8a+ZKBjSDteFPsKQ7Hlzk6+18A2Y7NffjV+VTsE7P3uTvHPKHKDCeYMnAgXTatRCGHWCfP7YImTSwEFQA== +"@docsearch/js@^3.2.1": + version "3.2.1" + resolved "https://registry.yarnpkg.com/@docsearch/js/-/js-3.2.1.tgz#d6856fb6223c7a47091640264d5144d59806bc30" + integrity sha512-H1PekEtSeS0msetR2YGGey2w7jQ2wAKfGODJvQTygSwMgUZ+2DHpzUgeDyEBIXRIfaBcoQneqrzsljM62pm6Xg== dependencies: - "@docsearch/react" "3.2.0" + "@docsearch/react" "3.2.1" preact "^10.0.0" -"@docsearch/react@3.2.0": - version "3.2.0" - resolved "https://registry.yarnpkg.com/@docsearch/react/-/react-3.2.0.tgz#440c91e57cd48b87ff8e7d7fd446620ada9e677a" - integrity sha512-ATS3w5JBgQGQF0kHn5iOAPfnCCaoLouZQMmI7oENV//QMFrYbjhUZxBU9lIwAT7Rzybud+Jtb4nG5IEjBk3Ixw== +"@docsearch/react@3.2.1": + version "3.2.1" + resolved "https://registry.yarnpkg.com/@docsearch/react/-/react-3.2.1.tgz#112ad88db07367fa6fd933d67d58421d8d8289aa" + integrity sha512-EzTQ/y82s14IQC5XVestiK/kFFMe2aagoYFuTAIfIb/e+4FU7kSMKonRtLwsCiLQHmjvNQq+HO+33giJ5YVtaQ== dependencies: "@algolia/autocomplete-core" "1.7.1" "@algolia/autocomplete-preset-algolia" "1.7.1" - "@docsearch/css" "3.2.0" + "@docsearch/css" "3.2.1" algoliasearch "^4.0.0" "@emotion/babel-plugin@^11.3.0": @@ -1666,10 +1666,15 @@ resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46" integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA== -"@esbuild/linux-loong64@0.14.54": - version "0.14.54" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz#de2a4be678bd4d0d1ffbb86e6de779cde5999028" - integrity sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw== +"@esbuild/android-arm@0.15.11": + version "0.15.11" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.15.11.tgz#bdd9c3e098183bdca97075aa4c3e0152ed3e10ee" + integrity sha512-PzMcQLazLBkwDEkrNPi9AbjFt6+3I7HKbiYF2XtWQ7wItrHvEOeO3T8Am434zAozWtVP7lrTue1bEfc2nYWeCA== + +"@esbuild/linux-loong64@0.15.11": + version "0.15.11" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.11.tgz#2f4f9a1083dcb4fc65233b6f59003c406abf32e5" + integrity sha512-geWp637tUhNmhL3Xgy4Bj703yXB9dqiLJe05lCUfjSFDrQf9C/8pArusyPUbUbPwlC/EAUjBw32sxuIl/11dZw== "@eslint/eslintrc@^1.0.5": version "1.0.5" @@ -4537,10 +4542,10 @@ "@types/expect" "^1.20.4" "@types/node" "*" -"@types/web-bluetooth@^0.0.14": - version "0.0.14" - resolved "https://registry.yarnpkg.com/@types/web-bluetooth/-/web-bluetooth-0.0.14.tgz#94e175b53623384bff1f354cdb3197a8d63cdbe5" - integrity sha512-5d2RhCard1nQUC3aHcq/gHzWYO6K0WJmAbjO7mQJgCQKtZpgXxv1rOM6O/dBDhDYYVutk1sciOgNSe+5YyfM8A== +"@types/web-bluetooth@^0.0.15": + version "0.0.15" + resolved "https://registry.yarnpkg.com/@types/web-bluetooth/-/web-bluetooth-0.0.15.tgz#d60330046a6ed8a13b4a53df3813c44942ebdf72" + integrity sha512-w7hEHXnPMEZ+4nGKl/KDRVpxkwYxYExuHOYXyzIzCDzEZ9ZCGMAewulr9IqJu2LR4N37fcnb1XVeuZ09qgOxhA== "@types/ws@^7.4.7": version "7.4.7" @@ -4749,10 +4754,10 @@ "@typescript-eslint/types" "5.10.0" eslint-visitor-keys "^3.0.0" -"@vitejs/plugin-vue@^2.3.2": - version "2.3.4" - resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-2.3.4.tgz#966a6279060eb2d9d1a02ea1a331af071afdcf9e" - integrity sha512-IfFNbtkbIm36O9KB8QodlwwYvTEsJb4Lll4c2IwB3VHc2gie2mSPtSzL0eYay7X2jd/2WX02FjSGTWR6OPr/zg== +"@vitejs/plugin-vue@^3.1.2": + version "3.1.2" + resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-3.1.2.tgz#3cd52114e8871a0b5e7bd7d837469c032e503036" + integrity sha512-3zxKNlvA3oNaKDYX0NBclgxTQ1xaFdL7PzwF6zj9tGFziKwmBa3Q/6XcJQxudlT81WxDjEhHmevvIC4Orc1LhQ== "@vue/compiler-core@3.2.37": version "3.2.37" @@ -4764,6 +4769,16 @@ estree-walker "^2.0.2" source-map "^0.6.1" +"@vue/compiler-core@3.2.41": + version "3.2.41" + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.41.tgz#fb5b25f23817400f44377d878a0cdead808453ef" + integrity sha512-oA4mH6SA78DT+96/nsi4p9DX97PHcNROxs51lYk7gb9Z4BPKQ3Mh+BLn6CQZBw857Iuhu28BfMSRHAlPvD4vlw== + dependencies: + "@babel/parser" "^7.16.4" + "@vue/shared" "3.2.41" + estree-walker "^2.0.2" + source-map "^0.6.1" + "@vue/compiler-dom@3.2.37": version "3.2.37" resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.37.tgz#10d2427a789e7c707c872da9d678c82a0c6582b5" @@ -4772,6 +4787,14 @@ "@vue/compiler-core" "3.2.37" "@vue/shared" "3.2.37" +"@vue/compiler-dom@3.2.41": + version "3.2.41" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.41.tgz#dc63dcd3ce8ca8a8721f14009d498a7a54380299" + integrity sha512-xe5TbbIsonjENxJsYRbDJvthzqxLNk+tb3d/c47zgREDa/PCp6/Y4gC/skM4H6PIuX5DAxm7fFJdbjjUH2QTMw== + dependencies: + "@vue/compiler-core" "3.2.41" + "@vue/shared" "3.2.41" + "@vue/compiler-sfc@3.2.37": version "3.2.37" resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.37.tgz#3103af3da2f40286edcd85ea495dcb35bc7f5ff4" @@ -4788,6 +4811,22 @@ postcss "^8.1.10" source-map "^0.6.1" +"@vue/compiler-sfc@3.2.41": + version "3.2.41" + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.41.tgz#238fb8c48318408c856748f4116aff8cc1dc2a73" + integrity sha512-+1P2m5kxOeaxVmJNXnBskAn3BenbTmbxBxWOtBq3mQTCokIreuMULFantBUclP0+KnzNCMOvcnKinqQZmiOF8w== + dependencies: + "@babel/parser" "^7.16.4" + "@vue/compiler-core" "3.2.41" + "@vue/compiler-dom" "3.2.41" + "@vue/compiler-ssr" "3.2.41" + "@vue/reactivity-transform" "3.2.41" + "@vue/shared" "3.2.41" + estree-walker "^2.0.2" + magic-string "^0.25.7" + postcss "^8.1.10" + source-map "^0.6.1" + "@vue/compiler-ssr@3.2.37": version "3.2.37" resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.37.tgz#4899d19f3a5fafd61524a9d1aee8eb0505313cff" @@ -4796,10 +4835,18 @@ "@vue/compiler-dom" "3.2.37" "@vue/shared" "3.2.37" -"@vue/devtools-api@^6.1.4": - version "6.2.1" - resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.2.1.tgz#6f2948ff002ec46df01420dfeff91de16c5b4092" - integrity sha512-OEgAMeQXvCoJ+1x8WyQuVZzFo0wcyCmUR3baRVLmKBo1LmYZWMlRiXlux5jd0fqVJu6PfDbOrZItVqUEzLobeQ== +"@vue/compiler-ssr@3.2.41": + version "3.2.41" + resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.41.tgz#344f564d68584b33367731c04ffc949784611fcb" + integrity sha512-Y5wPiNIiaMz/sps8+DmhaKfDm1xgj6GrH99z4gq2LQenfVQcYXmHIOBcs5qPwl7jaW3SUQWjkAPKMfQemEQZwQ== + dependencies: + "@vue/compiler-dom" "3.2.41" + "@vue/shared" "3.2.41" + +"@vue/devtools-api@^6.4.4": + version "6.4.4" + resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.4.4.tgz#0b024fc8ca91bb4b6035abaf53c5aecc17119b3b" + integrity sha512-Ku31WzpOV/8cruFaXaEZKF81WkNnvCSlBY4eOGtz5WMSdJvX1v1WWlSMGZeqUwPtQ27ZZz7B62erEMq8JDjcXw== "@vue/reactivity-transform@3.2.37": version "3.2.37" @@ -4812,6 +4859,17 @@ estree-walker "^2.0.2" magic-string "^0.25.7" +"@vue/reactivity-transform@3.2.41": + version "3.2.41" + resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.41.tgz#9ff938877600c97f646e09ac1959b5150fb11a0c" + integrity sha512-mK5+BNMsL4hHi+IR3Ft/ho6Za+L3FA5j8WvreJ7XzHrqkPq8jtF/SMo7tuc9gHjLDwKZX1nP1JQOKo9IEAn54A== + dependencies: + "@babel/parser" "^7.16.4" + "@vue/compiler-core" "3.2.41" + "@vue/shared" "3.2.41" + estree-walker "^2.0.2" + magic-string "^0.25.7" + "@vue/reactivity@3.2.37": version "3.2.37" resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.37.tgz#5bc3847ac58828e2b78526e08219e0a1089f8848" @@ -4819,6 +4877,13 @@ dependencies: "@vue/shared" "3.2.37" +"@vue/reactivity@3.2.41": + version "3.2.41" + resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.41.tgz#0ad3bdf76d76822da1502dc9f394dafd02642963" + integrity sha512-9JvCnlj8uc5xRiQGZ28MKGjuCoPhhTwcoAdv3o31+cfGgonwdPNuvqAXLhlzu4zwqavFEG5tvaoINQEfxz+l6g== + dependencies: + "@vue/shared" "3.2.41" + "@vue/runtime-core@3.2.37": version "3.2.37" resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.37.tgz#7ba7c54bb56e5d70edfc2f05766e1ca8519966e3" @@ -4827,6 +4892,14 @@ "@vue/reactivity" "3.2.37" "@vue/shared" "3.2.37" +"@vue/runtime-core@3.2.41": + version "3.2.41" + resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.41.tgz#775bfc00b3fadbaddab77138f23322aee3517a76" + integrity sha512-0LBBRwqnI0p4FgIkO9q2aJBBTKDSjzhnxrxHYengkAF6dMOjeAIZFDADAlcf2h3GDALWnblbeprYYpItiulSVQ== + dependencies: + "@vue/reactivity" "3.2.41" + "@vue/shared" "3.2.41" + "@vue/runtime-dom@3.2.37": version "3.2.37" resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.37.tgz#002bdc8228fa63949317756fb1e92cdd3f9f4bbd" @@ -4836,6 +4909,15 @@ "@vue/shared" "3.2.37" csstype "^2.6.8" +"@vue/runtime-dom@3.2.41": + version "3.2.41" + resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.41.tgz#cdf86be7410f7b15c29632a96ce879e5b4c9ab92" + integrity sha512-U7zYuR1NVIP8BL6jmOqmapRAHovEFp7CSw4pR2FacqewXNGqZaRfHoNLQsqQvVQ8yuZNZtxSZy0FFyC70YXPpA== + dependencies: + "@vue/runtime-core" "3.2.41" + "@vue/shared" "3.2.41" + csstype "^2.6.8" + "@vue/server-renderer@3.2.37": version "3.2.37" resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.2.37.tgz#840a29c8dcc29bddd9b5f5ffa22b95c0e72afdfc" @@ -4844,30 +4926,43 @@ "@vue/compiler-ssr" "3.2.37" "@vue/shared" "3.2.37" +"@vue/server-renderer@3.2.41": + version "3.2.41" + resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.2.41.tgz#ca64552c05878f94e8d191ac439141c06c0fb2ad" + integrity sha512-7YHLkfJdTlsZTV0ae5sPwl9Gn/EGr2hrlbcS/8naXm2CDpnKUwC68i1wGlrYAfIgYWL7vUZwk2GkYLQH5CvFig== + dependencies: + "@vue/compiler-ssr" "3.2.41" + "@vue/shared" "3.2.41" + "@vue/shared@3.2.37": version "3.2.37" resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.37.tgz#8e6adc3f2759af52f0e85863dfb0b711ecc5c702" integrity sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw== -"@vueuse/core@^8.5.0": - version "8.9.4" - resolved "https://registry.yarnpkg.com/@vueuse/core/-/core-8.9.4.tgz#c7db40f19390b3c9f4ff9294a30461497f62ec19" - integrity sha512-B/Mdj9TK1peFyWaPof+Zf/mP9XuGAngaJZBwPaXBvU3aCTZlx3ltlrFFFyMV4iGBwsjSCeUCgZrtkEj9dS2Y3Q== +"@vue/shared@3.2.41": + version "3.2.41" + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.41.tgz#fbc95422df654ea64e8428eced96ba6ad555d2bb" + integrity sha512-W9mfWLHmJhkfAmV+7gDjcHeAWALQtgGT3JErxULl0oz6R6+3ug91I7IErs93eCFhPCZPHBs4QJS7YWEV7A3sxw== + +"@vueuse/core@^9.3.0": + version "9.3.0" + resolved "https://registry.yarnpkg.com/@vueuse/core/-/core-9.3.0.tgz#74d855bd19cb5eadd2edb30c871918fac881e8b8" + integrity sha512-64Rna8IQDWpdrJxgitDg7yv1yTp41ZmvV8zlLEylK4QQLWAhz1OFGZDPZ8bU4lwcGgbEJ2sGi2jrdNh4LttUSQ== dependencies: - "@types/web-bluetooth" "^0.0.14" - "@vueuse/metadata" "8.9.4" - "@vueuse/shared" "8.9.4" + "@types/web-bluetooth" "^0.0.15" + "@vueuse/metadata" "9.3.0" + "@vueuse/shared" "9.3.0" vue-demi "*" -"@vueuse/metadata@8.9.4": - version "8.9.4" - resolved "https://registry.yarnpkg.com/@vueuse/metadata/-/metadata-8.9.4.tgz#a4132db33e4c1b1023636acfa20aa7b37ab3d978" - integrity sha512-IwSfzH80bnJMzqhaapqJl9JRIiyQU0zsRGEgnxN6jhq7992cPUJIRfV+JHRIZXjYqbwt07E1gTEp0R0zPJ1aqw== +"@vueuse/metadata@9.3.0": + version "9.3.0" + resolved "https://registry.yarnpkg.com/@vueuse/metadata/-/metadata-9.3.0.tgz#c107fe77a577e1f221536cd1b291039c0c7c4bce" + integrity sha512-GnnfjbzIPJIh9ngL9s9oGU1+Hx/h5/KFqTfJykzh/1xjaHkedV9g0MASpdmPZIP+ynNhKAcEfA6g5i8KXwtoMA== -"@vueuse/shared@8.9.4": - version "8.9.4" - resolved "https://registry.yarnpkg.com/@vueuse/shared/-/shared-8.9.4.tgz#c9741c30ffb666b50d62f0dd80b76119fd47573e" - integrity sha512-wt+T30c4K6dGRMVqPddexEVLa28YwxW5OFIPmzUHICjphfAuBFTTdDoyqREZNDOFJZ44ARH1WWQNCUK8koJ+Ag== +"@vueuse/shared@9.3.0": + version "9.3.0" + resolved "https://registry.yarnpkg.com/@vueuse/shared/-/shared-9.3.0.tgz#40fc138ba4e379c894075830aa2e15404aaa8a5b" + integrity sha512-caGUWLY0DpPC6l31KxeUy6vPVNA0yKxx81jFYLoMpyP6cF84FG5Dkf69DfSUqL57wX8JcUkJDMnQaQIZPWFEQQ== dependencies: vue-demi "*" @@ -6018,7 +6113,7 @@ body-parser@1.19.2: raw-body "2.4.3" type-is "~1.6.18" -body-scroll-lock@^4.0.0-beta.0: +body-scroll-lock@4.0.0-beta.0: version "4.0.0-beta.0" resolved "https://registry.yarnpkg.com/body-scroll-lock/-/body-scroll-lock-4.0.0-beta.0.tgz#4f78789d10e6388115c0460cd6d7d4dd2bbc4f7e" integrity sha512-a7tP5+0Mw3YlUJcGAKUqIBkYYGlYxk2fnCasq/FUph1hadxlTRjF+gAcZksxANnaMnALjxEddmSi/H3OR8ugcQ== @@ -8244,132 +8339,133 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" -esbuild-android-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.54.tgz#505f41832884313bbaffb27704b8bcaa2d8616be" - integrity sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ== +esbuild-android-64@0.15.11: + version "0.15.11" + resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.15.11.tgz#50402129c3e85bb06434e212374c5f693e4c5f01" + integrity sha512-rrwoXEiuI1kaw4k475NJpexs8GfJqQUKcD08VR8sKHmuW9RUuTR2VxcupVvHdiGh9ihxL9m3lpqB1kju92Ialw== -esbuild-android-arm64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.54.tgz#8ce69d7caba49646e009968fe5754a21a9871771" - integrity sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg== +esbuild-android-arm64@0.15.11: + version "0.15.11" + resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.11.tgz#49bee35218ea2ccf1a0c5f187af77c1c0a5dee71" + integrity sha512-/hDubOg7BHOhUUsT8KUIU7GfZm5bihqssvqK5PfO4apag7YuObZRZSzViyEKcFn2tPeHx7RKbSBXvAopSHDZJQ== -esbuild-darwin-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.54.tgz#24ba67b9a8cb890a3c08d9018f887cc221cdda25" - integrity sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug== +esbuild-darwin-64@0.15.11: + version "0.15.11" + resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.11.tgz#89a90c8cf6f0029ac4169bfedd012a0412c1575f" + integrity sha512-1DqHD0ms3AhiwkKnjRUzmiW7JnaJJr5FKrPiR7xuyMwnjDqvNWDdMq4rKSD9OC0piFNK6n0LghsglNMe2MwJtA== -esbuild-darwin-arm64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.54.tgz#3f7cdb78888ee05e488d250a2bdaab1fa671bf73" - integrity sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw== +esbuild-darwin-arm64@0.15.11: + version "0.15.11" + resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.11.tgz#556f4385c6de806cc81132dd7b8af00fe9d292df" + integrity sha512-OMzhxSbS0lwwrW40HHjRCeVIJTURdXFA8c3GU30MlHKuPCcvWNUIKVucVBtNpJySXmbkQMDJdJNrXzNDyvoqvQ== -esbuild-freebsd-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.54.tgz#09250f997a56ed4650f3e1979c905ffc40bbe94d" - integrity sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg== +esbuild-freebsd-64@0.15.11: + version "0.15.11" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.11.tgz#fd86fd1b3b65366048f35b996d9cdf3547384eee" + integrity sha512-8dKP26r0/Qyez8nTCwpq60QbuYKOeBygdgOAWGCRalunyeqWRoSZj9TQjPDnTTI9joxd3QYw3UhVZTKxO9QdRg== -esbuild-freebsd-arm64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.54.tgz#bafb46ed04fc5f97cbdb016d86947a79579f8e48" - integrity sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q== +esbuild-freebsd-arm64@0.15.11: + version "0.15.11" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.11.tgz#d346bcacfe9779ebc1a11edac1bdedeff6dda3b1" + integrity sha512-aSGiODiukLGGnSg/O9+cGO2QxEacrdCtCawehkWYTt5VX1ni2b9KoxpHCT9h9Y6wGqNHmXFnB47RRJ8BIqZgmQ== -esbuild-linux-32@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.54.tgz#e2a8c4a8efdc355405325033fcebeb941f781fe5" - integrity sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw== +esbuild-linux-32@0.15.11: + version "0.15.11" + resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.15.11.tgz#64b50e774bf75af7dcc6a73ad509f2eb0ac4487b" + integrity sha512-lsrAfdyJBGx+6aHIQmgqUonEzKYeBnyfJPkT6N2dOf1RoXYYV1BkWB6G02tjsrz1d5wZzaTc3cF+TKmuTo/ZwA== -esbuild-linux-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz#de5fdba1c95666cf72369f52b40b03be71226652" - integrity sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg== +esbuild-linux-64@0.15.11: + version "0.15.11" + resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.15.11.tgz#fba3a78b95769772863f8f6dc316abca55cf8416" + integrity sha512-Y2Rh+PcyVhQqXKBTacPCltINN3uIw2xC+dsvLANJ1SpK5NJUtxv8+rqWpjmBgaNWKQT1/uGpMmA9olALy9PLVA== -esbuild-linux-arm64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.54.tgz#dae4cd42ae9787468b6a5c158da4c84e83b0ce8b" - integrity sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig== +esbuild-linux-arm64@0.15.11: + version "0.15.11" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.11.tgz#c0cb31980eee066bfd39a4593660a0ecebe926cb" + integrity sha512-uhcXiTwTmD4OpxJu3xC5TzAAw6Wzf9O1XGWL448EE9bqGjgV1j+oK3lIHAfsHnuIn8K4nDW8yjX0Sv5S++oRuw== -esbuild-linux-arm@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.54.tgz#a2c1dff6d0f21dbe8fc6998a122675533ddfcd59" - integrity sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw== +esbuild-linux-arm@0.15.11: + version "0.15.11" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.11.tgz#7824d20099977aa671016c7de7a5038c9870010f" + integrity sha512-TJllTVk5aSyqPFvvcHTvf6Wu1ZKhWpJ/qNmZO8LL/XeB+LXCclm7HQHNEIz6MT7IX8PmlC1BZYrOiw2sXSB95A== -esbuild-linux-mips64le@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.54.tgz#d9918e9e4cb972f8d6dae8e8655bf9ee131eda34" - integrity sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw== +esbuild-linux-mips64le@0.15.11: + version "0.15.11" + resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.11.tgz#10627331c90164e553429ed25e025184bba485b6" + integrity sha512-WD61y/R1M4BLe4gxXRypoQ0Ci+Vjf714QYzcPNkiYv5I8K8WDz2ZR8Bm6cqKxd6rD+e/rZgPDbhQ9PCf7TMHmA== -esbuild-linux-ppc64le@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.54.tgz#3f9a0f6d41073fb1a640680845c7de52995f137e" - integrity sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ== +esbuild-linux-ppc64le@0.15.11: + version "0.15.11" + resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.11.tgz#be42679a36a5246b893fc8b898135ebacb5a0a14" + integrity sha512-JVleZS9oPVLTlBhPTWgOwxFWU/wMUdlBwTbGA4GF8c38sLbS13cupj+C8bLq929jU7EMWry4SaL+tKGIaTlqKg== -esbuild-linux-riscv64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.54.tgz#618853c028178a61837bc799d2013d4695e451c8" - integrity sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg== +esbuild-linux-riscv64@0.15.11: + version "0.15.11" + resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.11.tgz#3ac2f328e3db73cbff833ada94314d8e79503e54" + integrity sha512-9aLIalZ2HFHIOZpmVU11sEAS9F8TnHw49daEjcgMpBXHFF57VuT9f9/9LKJhw781Gda0P9jDkuCWJ0tFbErvJw== -esbuild-linux-s390x@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.54.tgz#d1885c4c5a76bbb5a0fe182e2c8c60eb9e29f2a6" - integrity sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA== +esbuild-linux-s390x@0.15.11: + version "0.15.11" + resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.11.tgz#e774e0df061b6847d86783bf3c8c4300a72e03ad" + integrity sha512-sZHtiXXOKsLI3XGBGoYO4qKBzJlb8xNsWmvFiwFMHFzA4AXgDP1KDp7Dawe9C2pavTRBDvl+Ok4n/DHQ59oaTg== -esbuild-netbsd-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.54.tgz#69ae917a2ff241b7df1dbf22baf04bd330349e81" - integrity sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w== +esbuild-netbsd-64@0.15.11: + version "0.15.11" + resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.11.tgz#55e265fa4489e3f396b16c81f6f5a11d6ca2a9a4" + integrity sha512-hUC9yN06K9sg7ju4Vgu9ChAPdsEgtcrcLfyNT5IKwKyfpLvKUwCMZSdF+gRD3WpyZelgTQfJ+pDx5XFbXTlB0A== -esbuild-openbsd-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.54.tgz#db4c8495287a350a6790de22edea247a57c5d47b" - integrity sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw== +esbuild-openbsd-64@0.15.11: + version "0.15.11" + resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.11.tgz#bc04103ccfd8c2f2241e1add0b51a095955b73c4" + integrity sha512-0bBo9SQR4t66Wd91LGMAqmWorzO0TTzVjYiifwoFtel8luFeXuPThQnEm5ztN4g0fnvcp7AnUPPzS/Depf17wQ== -esbuild-sunos-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.54.tgz#54287ee3da73d3844b721c21bc80c1dc7e1bf7da" - integrity sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw== +esbuild-sunos-64@0.15.11: + version "0.15.11" + resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.11.tgz#ccd580305d31fde07b5c386da79c942aaf069013" + integrity sha512-EuBdTGlsMTjEl1sQnBX2jfygy7iR6CKfvOzi+gEOfhDqbHXsmY1dcpbVtcwHAg9/2yUZSfMJHMAgf1z8M4yyyw== -esbuild-windows-32@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.54.tgz#f8aaf9a5667630b40f0fb3aa37bf01bbd340ce31" - integrity sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w== +esbuild-windows-32@0.15.11: + version "0.15.11" + resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.15.11.tgz#40fe1d48f9b20a76f6db5109aaaf1511aed58c71" + integrity sha512-O0/Wo1Wk6dc0rZSxkvGpmTNIycEznHmkObTFz2VHBhjPsO4ZpCgfGxNkCpz4AdAIeMczpTXt/8d5vdJNKEGC+Q== -esbuild-windows-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz#bf54b51bd3e9b0f1886ffdb224a4176031ea0af4" - integrity sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ== +esbuild-windows-64@0.15.11: + version "0.15.11" + resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.15.11.tgz#80c58b1ef2ff030c78e3a06e7a922776cc4cb687" + integrity sha512-x977Q4HhNjnHx00b4XLAnTtj5vfbdEvkxaQwC1Zh5AN8g5EX+izgZ6e5QgqJgpzyRNJqh4hkgIJF1pyy1be0mQ== -esbuild-windows-arm64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.54.tgz#937d15675a15e4b0e4fafdbaa3a01a776a2be982" - integrity sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg== +esbuild-windows-arm64@0.15.11: + version "0.15.11" + resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.11.tgz#018624023b5c3f0cca334cc99f5ef7134d396333" + integrity sha512-VwUHFACuBahrvntdcMKZteUZ9HaYrBRODoKe4tIWxguQRvvYoYb7iu5LrcRS/FQx8KPZNaa72zuqwVtHeXsITw== -esbuild@^0.14.27: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.54.tgz#8b44dcf2b0f1a66fc22459943dccf477535e9aa2" - integrity sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA== +esbuild@^0.15.9: + version "0.15.11" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.15.11.tgz#524d48612a9aa7edc1753c83459cb6fcae0cb66e" + integrity sha512-OgHGuhlfZ//mToxjte1D5iiiQgWfJ2GByVMwEC/IuoXsBGkuyK1+KrjYu0laSpnN/L1UmLUCv0s25vObdc1bVg== optionalDependencies: - "@esbuild/linux-loong64" "0.14.54" - esbuild-android-64 "0.14.54" - esbuild-android-arm64 "0.14.54" - esbuild-darwin-64 "0.14.54" - esbuild-darwin-arm64 "0.14.54" - esbuild-freebsd-64 "0.14.54" - esbuild-freebsd-arm64 "0.14.54" - esbuild-linux-32 "0.14.54" - esbuild-linux-64 "0.14.54" - esbuild-linux-arm "0.14.54" - esbuild-linux-arm64 "0.14.54" - esbuild-linux-mips64le "0.14.54" - esbuild-linux-ppc64le "0.14.54" - esbuild-linux-riscv64 "0.14.54" - esbuild-linux-s390x "0.14.54" - esbuild-netbsd-64 "0.14.54" - esbuild-openbsd-64 "0.14.54" - esbuild-sunos-64 "0.14.54" - esbuild-windows-32 "0.14.54" - esbuild-windows-64 "0.14.54" - esbuild-windows-arm64 "0.14.54" + "@esbuild/android-arm" "0.15.11" + "@esbuild/linux-loong64" "0.15.11" + esbuild-android-64 "0.15.11" + esbuild-android-arm64 "0.15.11" + esbuild-darwin-64 "0.15.11" + esbuild-darwin-arm64 "0.15.11" + esbuild-freebsd-64 "0.15.11" + esbuild-freebsd-arm64 "0.15.11" + esbuild-linux-32 "0.15.11" + esbuild-linux-64 "0.15.11" + esbuild-linux-arm "0.15.11" + esbuild-linux-arm64 "0.15.11" + esbuild-linux-mips64le "0.15.11" + esbuild-linux-ppc64le "0.15.11" + esbuild-linux-riscv64 "0.15.11" + esbuild-linux-s390x "0.15.11" + esbuild-netbsd-64 "0.15.11" + esbuild-openbsd-64 "0.15.11" + esbuild-sunos-64 "0.15.11" + esbuild-windows-32 "0.15.11" + esbuild-windows-64 "0.15.11" + esbuild-windows-arm64 "0.15.11" escalade@^3.1.1: version "3.1.1" @@ -14842,7 +14938,7 @@ postcss@^7.0.35: picocolors "^0.2.1" source-map "^0.6.1" -postcss@^8.1.10, postcss@^8.4.13: +postcss@^8.1.10: version "8.4.16" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz#33a1d675fac39941f5f445db0de4db2b6e01d43c" integrity sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ== @@ -14860,6 +14956,15 @@ postcss@^8.2.15, postcss@^8.3.5, postcss@^8.4.4: picocolors "^1.0.0" source-map-js "^1.0.1" +postcss@^8.4.16: + version "8.4.18" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.18.tgz#6d50046ea7d3d66a85e0e782074e7203bc7fbca2" + integrity sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA== + dependencies: + nanoid "^3.3.4" + picocolors "^1.0.0" + source-map-js "^1.0.2" + postgres-array@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz#48f8fce054fbc69671999329b8834b772652d82e" @@ -15940,7 +16045,7 @@ resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.19 path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" -resolve@^1.22.0: +resolve@^1.22.1: version "1.22.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== @@ -16028,13 +16133,6 @@ rollup-plugin-terser@^7.0.0: serialize-javascript "^4.0.0" terser "^5.0.0" -"rollup@>=2.59.0 <2.78.0": - version "2.77.3" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.77.3.tgz#8f00418d3a2740036e15deb653bed1a90ee0cc12" - integrity sha512-/qxNTG7FbmefJWoeeYJFbHehJ2HNWnjkAFRKzWN/45eNBBF/r8lo992CwcJXEzyVxs5FmfId+vTSTQDb+bxA+g== - optionalDependencies: - fsevents "~2.3.2" - rollup@^2.43.1: version "2.66.0" resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.66.0.tgz#ee529ea15a20485d579039637fec3050bad03bbb" @@ -16042,6 +16140,13 @@ rollup@^2.43.1: optionalDependencies: fsevents "~2.3.2" +rollup@~2.78.0: + version "2.78.1" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.78.1.tgz#52fe3934d9c83cb4f7c4cb5fb75d88591be8648f" + integrity sha512-VeeCgtGi4P+o9hIg+xz4qQpRl6R401LWEXBmxYKOV4zlF82lyhgh2hTZnheFUbANE8l2A41F458iwj2vEYaXJg== + optionalDependencies: + fsevents "~2.3.2" + rootpath@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/rootpath/-/rootpath-0.1.2.tgz#5b379a87dca906e9b91d690a599439bef267ea6b" @@ -16402,14 +16507,14 @@ shelljs@^0.8.5: interpret "^1.0.0" rechoir "^0.6.2" -shiki@^0.10.1: - version "0.10.1" - resolved "https://registry.yarnpkg.com/shiki/-/shiki-0.10.1.tgz#6f9a16205a823b56c072d0f1a0bcd0f2646bef14" - integrity sha512-VsY7QJVzU51j5o1+DguUd+6vmCmZ5v/6gYu4vyYAhzjuNQU6P/vmSy4uQaOhvje031qQMiW0d2BwgMH52vqMng== +shiki@^0.11.1: + version "0.11.1" + resolved "https://registry.yarnpkg.com/shiki/-/shiki-0.11.1.tgz#df0f719e7ab592c484d8b73ec10e215a503ab8cc" + integrity sha512-EugY9VASFuDqOexOgXR18ZV+TbFrQHeCpEYaXamO+SZlsnT/2LxuLBX25GGtIrwaEVFXUAbUQ601SWE2rMwWHA== dependencies: jsonc-parser "^3.0.0" vscode-oniguruma "^1.6.1" - vscode-textmate "5.2.0" + vscode-textmate "^6.0.0" shx@^0.3.3: version "0.3.4" @@ -18122,49 +18227,49 @@ vinyl@^2.0.1: remove-trailing-separator "^1.0.1" replace-ext "^1.0.0" -vite@^2.9.7: - version "2.9.15" - resolved "https://registry.yarnpkg.com/vite/-/vite-2.9.15.tgz#2858dd5b2be26aa394a283e62324281892546f0b" - integrity sha512-fzMt2jK4vQ3yK56te3Kqpkaeq9DkcZfBbzHwYpobasvgYmP2SoAr6Aic05CsB4CzCZbsDv4sujX3pkEGhLabVQ== +vite@^3.1.6: + version "3.1.8" + resolved "https://registry.yarnpkg.com/vite/-/vite-3.1.8.tgz#fa29144167d19b773baffd65b3972ea4c12359c9" + integrity sha512-m7jJe3nufUbuOfotkntGFupinL/fmuTNuQmiVE7cH2IZMuf4UbfbGYMUT3jVWgGYuRVLY9j8NnrRqgw5rr5QTg== dependencies: - esbuild "^0.14.27" - postcss "^8.4.13" - resolve "^1.22.0" - rollup ">=2.59.0 <2.78.0" + esbuild "^0.15.9" + postcss "^8.4.16" + resolve "^1.22.1" + rollup "~2.78.0" optionalDependencies: fsevents "~2.3.2" -vitepress@^1.0.0-alpha.4: - version "1.0.0-alpha.4" - resolved "https://registry.yarnpkg.com/vitepress/-/vitepress-1.0.0-alpha.4.tgz#2d9929e2cade3d98f57f61848c01968fb386cee0" - integrity sha512-bOAA4KW6vYGlkbcrPLZLTKWTgXVroObU+o9xj9EENyEl6yg26WWvfN7DGA4BftjdM5O8nR93Z5khPQ3W/tFE7Q== +vitepress@^1.0.0-alpha.21: + version "1.0.0-alpha.21" + resolved "https://registry.yarnpkg.com/vitepress/-/vitepress-1.0.0-alpha.21.tgz#ef440c23ed4f461b55b3917957ddd2bc2025f1d8" + integrity sha512-D/tkoDW16uUZ9pnWd28Kk1vX26zNiTml3m9oGbfx2pAfYg99PHd1GceZyEm4jZsJU0+n9S++1ctFxoQvsq376A== dependencies: - "@docsearch/css" "^3.0.0" - "@docsearch/js" "^3.0.0" - "@vitejs/plugin-vue" "^2.3.2" - "@vue/devtools-api" "^6.1.4" - "@vueuse/core" "^8.5.0" - body-scroll-lock "^4.0.0-beta.0" - shiki "^0.10.1" - vite "^2.9.7" - vue "^3.2.33" + "@docsearch/css" "^3.2.1" + "@docsearch/js" "^3.2.1" + "@vitejs/plugin-vue" "^3.1.2" + "@vue/devtools-api" "^6.4.4" + "@vueuse/core" "^9.3.0" + body-scroll-lock "4.0.0-beta.0" + shiki "^0.11.1" + vite "^3.1.6" + vue "^3.2.40" vscode-oniguruma@^1.6.1: version "1.6.2" resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.6.2.tgz#aeb9771a2f1dbfc9083c8a7fdd9cccaa3f386607" integrity sha512-KH8+KKov5eS/9WhofZR8M8dMHWN2gTxjMsG4jd04YhpbPR91fUj7rYQ2/XjeHCJWbg7X++ApRIU9NUwM2vTvLA== -vscode-textmate@5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-5.2.0.tgz#01f01760a391e8222fe4f33fbccbd1ad71aed74e" - integrity sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ== +vscode-textmate@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-6.0.0.tgz#a3777197235036814ac9a92451492f2748589210" + integrity sha512-gu73tuZfJgu+mvCSy4UZwd2JXykjK9zAZsfmDeut5dx/1a7FeTk0XwJsSuqQn+cuMCGVbIBfl+s53X4T19DnzQ== vue-demi@*: version "0.13.7" resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.13.7.tgz#5ae380b15c13be556ac4a0da0a48450c98a01d4b" integrity sha512-hbhlvpx1gFW3TB5HxJ0mNxyA9Jh5iQt409taOs6zkhpvfJ7YzLs1rsLufJmDsjH5PI1cOyfikY1fE/meyHfU5A== -vue@^3.2.33, vue@^3.2.37: +vue@^3.2.37: version "3.2.37" resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.37.tgz#da220ccb618d78579d25b06c7c21498ca4e5452e" integrity sha512-bOKEZxrm8Eh+fveCqS1/NkG/n6aMidsI6hahas7pa0w/l7jkbssJVsRhVDs07IdDq7h9KHswZOgItnwJAgtVtQ== @@ -18175,6 +18280,17 @@ vue@^3.2.33, vue@^3.2.37: "@vue/server-renderer" "3.2.37" "@vue/shared" "3.2.37" +vue@^3.2.40: + version "3.2.41" + resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.41.tgz#ed452b8a0f7f2b962f055c8955139c28b1c06806" + integrity sha512-uuuvnrDXEeZ9VUPljgHkqB5IaVO8SxhPpqF2eWOukVrBnRBx2THPSGQBnVRt0GrIG1gvCmFXMGbd7FqcT1ixNQ== + dependencies: + "@vue/compiler-dom" "3.2.41" + "@vue/compiler-sfc" "3.2.41" + "@vue/runtime-dom" "3.2.41" + "@vue/server-renderer" "3.2.41" + "@vue/shared" "3.2.41" + w3c-hr-time@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" From ace2436e43c8ce338d6646732c169104dcb6de67 Mon Sep 17 00:00:00 2001 From: Ali BARIN Date: Sat, 15 Oct 2022 19:13:28 +0200 Subject: [PATCH 08/13] feat(FlowEditor): allow adding new connection in step --- .../src/components/AddAppConnection/index.tsx | 4 +- .../ChooseConnectionSubstep/index.tsx | 64 +++++++++++++++++-- .../web/src/components/FlowStep/index.tsx | 3 +- packages/web/src/locales/en.json | 3 + 4 files changed, 66 insertions(+), 8 deletions(-) diff --git a/packages/web/src/components/AddAppConnection/index.tsx b/packages/web/src/components/AddAppConnection/index.tsx index 193bcde9..726d555e 100644 --- a/packages/web/src/components/AddAppConnection/index.tsx +++ b/packages/web/src/components/AddAppConnection/index.tsx @@ -19,7 +19,7 @@ const generateDocsLink = (link: string) => (str: string) => ( ); type AddAppConnectionProps = { - onClose: () => void; + onClose: (response: Record) => void; application: IApp; connectionId?: string; }; @@ -76,7 +76,7 @@ export default function AddAppConnection(props: AddAppConnectionProps): React.Re stepIndex++; if (stepIndex === steps.length) { - onClose(); + onClose(response); } } diff --git a/packages/web/src/components/ChooseConnectionSubstep/index.tsx b/packages/web/src/components/ChooseConnectionSubstep/index.tsx index f99e51bc..1c32c932 100644 --- a/packages/web/src/components/ChooseConnectionSubstep/index.tsx +++ b/packages/web/src/components/ChooseConnectionSubstep/index.tsx @@ -6,13 +6,16 @@ import Collapse from '@mui/material/Collapse'; import ListItem from '@mui/material/ListItem'; import Autocomplete from '@mui/material/Autocomplete'; +import type { IApp, IConnection, IStep, ISubstep } from '@automatisch/types'; +import useFormatMessage from 'hooks/useFormatMessage'; import { EditorContext } from 'contexts/Editor'; import FlowSubstepTitle from 'components/FlowSubstepTitle'; -import type { IApp, IConnection, IStep, ISubstep } from '@automatisch/types'; +import AddAppConnection from 'components/AddAppConnection'; import { GET_APP_CONNECTIONS } from 'graphql/queries/get-app-connections'; import { TEST_CONNECTION } from 'graphql/queries/test-connection'; type ChooseConnectionSubstepProps = { + application: IApp; substep: ISubstep, expanded?: boolean; onExpand: () => void; @@ -22,6 +25,8 @@ type ChooseConnectionSubstepProps = { step: IStep; }; +const ADD_CONNECTION_VALUE = 'ADD_CONNECTION'; + const optionGenerator = (connection: IConnection): { label: string; value: string; } => ({ label: connection?.formattedData?.screenName as string ?? 'Unnamed', value: connection?.id as string, @@ -38,13 +43,16 @@ function ChooseConnectionSubstep(props: ChooseConnectionSubstepProps): React.Rea step, onSubmit, onChange, + application, } = props; const { connection, appKey, } = step; + const formatMessage = useFormatMessage(); const editorContext = React.useContext(EditorContext); - const { data, loading } = useQuery(GET_APP_CONNECTIONS, { variables: { key: appKey }}); + const [showAddConnectionDialog, setShowAddConnectionDialog] = React.useState(false); + const { data, loading, refetch } = useQuery(GET_APP_CONNECTIONS, { variables: { key: appKey }}); // TODO: show detailed error when connection test/verification fails const [ testConnection, @@ -72,10 +80,41 @@ function ChooseConnectionSubstep(props: ChooseConnectionSubstepProps): React.Rea // intentionally no dependencies for initial test }, []); - const connectionOptions = React.useMemo(() => (data?.getApp as IApp)?.connections?.map((connection) => optionGenerator(connection)) || [], [data]); + const connectionOptions = React.useMemo(() => { + const appWithConnections = data?.getApp as IApp; + const options = appWithConnections + ?.connections + ?.map((connection) => optionGenerator(connection)) || []; + + options.push({ + label: formatMessage('chooseConnectionSubstep.addNewConnection'), + value: ADD_CONNECTION_VALUE + }) + + return options; + }, [data, formatMessage]); const { name } = substep; + const handleAddConnectionClose = React.useCallback(async (response) => { + setShowAddConnectionDialog(false); + + const connectionId = response?.createConnection.id; + + if (connectionId) { + await refetch(); + + onChange({ + step: { + ...step, + connection: { + id: connectionId, + }, + }, + }); + } + }, [onChange, refetch, step]); + const handleChange = React.useCallback((event: React.SyntheticEvent, selectedOption: unknown) => { if (typeof selectedOption === 'object') { // TODO: try to simplify type casting below. @@ -83,6 +122,11 @@ function ChooseConnectionSubstep(props: ChooseConnectionSubstepProps): React.Rea const option: { value: string } = typedSelectedOption; const connectionId = option?.value as string; + if (connectionId === ADD_CONNECTION_VALUE) { + setShowAddConnectionDialog(true); + return; + } + if (connectionId !== step.connection?.id) { onChange({ step: { @@ -122,7 +166,12 @@ function ChooseConnectionSubstep(props: ChooseConnectionSubstepProps): React.Rea disableClearable disabled={editorContext.readOnly} options={connectionOptions} - renderInput={(params) => } + renderInput={(params) => ( + + )} value={getOption(connectionOptions, connection?.id)} onChange={handleChange} loading={loading} @@ -136,10 +185,15 @@ function ChooseConnectionSubstep(props: ChooseConnectionSubstepProps): React.Rea sx={{ mt: 2 }} disabled={testResultLoading || !connection?.verified || editorContext.readOnly}data-test="flow-substep-continue-button" > - Continue + {formatMessage('chooseConnectionSubstep.continue')} + + {application && showAddConnectionDialog && } ); } diff --git a/packages/web/src/components/FlowStep/index.tsx b/packages/web/src/components/FlowStep/index.tsx index ece980f9..5b77edb5 100644 --- a/packages/web/src/components/FlowStep/index.tsx +++ b/packages/web/src/components/FlowStep/index.tsx @@ -251,7 +251,7 @@ export default function FlowStep( index: number ) => ( - {substep.key === 'chooseConnection' && ( + {substep.key === 'chooseConnection' && app && ( toggleSubstep(index + 1)} onSubmit={expandNextStep} onChange={handleChange} + application={app} step={step} /> )} diff --git a/packages/web/src/locales/en.json b/packages/web/src/locales/en.json index cbe8c1c0..eb3c71c9 100644 --- a/packages/web/src/locales/en.json +++ b/packages/web/src/locales/en.json @@ -57,6 +57,9 @@ "flowEditor.pollIntervalValue": "Every {minutes} minutes", "flowEditor.triggerEvent": "Trigger event", "flowEditor.actionEvent": "Action event", + "chooseConnectionSubstep.continue": "Continue", + "chooseConnectionSubstep.addNewConnection": "Add new connection", + "chooseConnectionSubstep.chooseConnection": "Choose connection", "flow.createdAt": "created {datetime}", "flow.updatedAt": "updated {datetime}", "flow.view": "View", From 9005256cd303ac934819973c3625020e36974a23 Mon Sep 17 00:00:00 2001 From: Thu Huynh <32840471+ThuH2305@users.noreply.github.com> Date: Sat, 15 Oct 2022 23:53:50 +0200 Subject: [PATCH 09/13] chore(docs): update copyright date --- packages/docs/pages/.vitepress/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/docs/pages/.vitepress/config.js b/packages/docs/pages/.vitepress/config.js index 5aa4a640..6dbb00ab 100644 --- a/packages/docs/pages/.vitepress/config.js +++ b/packages/docs/pages/.vitepress/config.js @@ -94,7 +94,7 @@ export default defineConfig({ text: 'Edit this page on GitHub', }, footer: { - copyright: 'Copyright © 2021 Automatisch. All rights reserved.', + copyright: 'Copyright © 2022 Automatisch. All rights reserved.', }, }, }); From 8f5901753e20edde5c6fb64efa7ba74fcb678842 Mon Sep 17 00:00:00 2001 From: Faruk AYDIN Date: Sun, 16 Oct 2022 00:50:21 +0200 Subject: [PATCH 10/13] fix: Use dev dependencies for vitepress --- packages/docs/package.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/docs/package.json b/packages/docs/package.json index e4dda26d..5446ff51 100644 --- a/packages/docs/package.json +++ b/packages/docs/package.json @@ -10,7 +10,7 @@ "serve": "vitepress serve pages" }, "devDependencies": { - "vitepress": "^1.0.0-alpha.4", + "vitepress": "^1.0.0-alpha.21", "vue": "^3.2.37" }, "contributors": [ @@ -26,8 +26,5 @@ }, "bugs": { "url": "https://github.com/automatisch/automatisch/issues" - }, - "dependencies": { - "vitepress": "^1.0.0-alpha.21" } } From fe40e16e333f01f29e486be261f028e69745fd71 Mon Sep 17 00:00:00 2001 From: Faruk AYDIN Date: Sun, 16 Oct 2022 01:23:34 +0200 Subject: [PATCH 11/13] chore: Add canonical URLs to doc pages --- packages/docs/pages/.vitepress/config.js | 28 ++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/packages/docs/pages/.vitepress/config.js b/packages/docs/pages/.vitepress/config.js index 6dbb00ab..21ca4903 100644 --- a/packages/docs/pages/.vitepress/config.js +++ b/packages/docs/pages/.vitepress/config.js @@ -97,4 +97,32 @@ export default defineConfig({ copyright: 'Copyright © 2022 Automatisch. All rights reserved.', }, }, + + async transformHead(ctx) { + if (ctx.pageData.relativePath === '') return; // Skip 404 page. + + const isHomepage = ctx.pageData.relativePath === 'index.md'; + let canonicalUrl = 'https://automatisch.io/docs'; + + if (!isHomepage) { + canonicalUrl = + `${canonicalUrl}/` + ctx.pageData.relativePath.replace('.md', ''); + } + + // Added for logging purposes to check if there is something + // wrong with the canonical URL in the deployment pipeline. + console.log(''); + console.log('File path : ', ctx.pageData.relativePath); + console.log('Canonical URL: ', canonicalUrl); + + return [ + [ + 'link', + { + rel: 'canonical', + href: canonicalUrl, + }, + ], + ]; + }, }); From 92a2d68a8120075bbba9df686dbf7158a3b1d37f Mon Sep 17 00:00:00 2001 From: Ali BARIN Date: Sat, 15 Oct 2022 22:16:10 +0200 Subject: [PATCH 12/13] feat: add defineTrigger and defineAction --- packages/backend/package.json | 4 +- .../scheduler/common/get-date-time-object.ts | 3 +- packages/backend/src/apps/scheduler/index.ts | 1 - .../scheduler/triggers/every-day/index.ts | 9 ++- .../scheduler/triggers/every-hour/index.ts | 11 +-- .../scheduler/triggers/every-month/index.ts | 73 ++++++++++--------- .../scheduler/triggers/every-week/index.ts | 9 ++- .../actions/find-message/find-message.ts | 2 +- .../apps/slack/actions/find-message/index.ts | 8 +- .../send-a-message-to-channel/index.ts | 8 +- .../apps/twitter/triggers/my-tweets/index.ts | 8 +- .../triggers/new-follower-of-me/index.ts | 8 +- .../twitter/triggers/search-tweets/index.ts | 8 +- .../twitter/triggers/user-tweets/index.ts | 8 +- .../backend/src/helpers/app-info-converter.ts | 12 ++- packages/backend/src/helpers/define-action.ts | 5 ++ .../backend/src/helpers/define-trigger.ts | 5 ++ packages/backend/src/helpers/get-app.ts | 24 +++--- packages/backend/src/services/action.ts | 2 +- packages/types/index.d.ts | 62 ++++++++-------- .../web/src/components/FlowStep/index.tsx | 2 +- .../web/src/components/InputCreator/index.tsx | 2 +- packages/web/src/hooks/useDynamicData.ts | 4 +- 23 files changed, 147 insertions(+), 131 deletions(-) create mode 100644 packages/backend/src/helpers/define-action.ts create mode 100644 packages/backend/src/helpers/define-trigger.ts diff --git a/packages/backend/package.json b/packages/backend/package.json index 03ec212a..9590711a 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -4,7 +4,7 @@ "license": "AGPL-3.0", "description": "The open source Zapier alternative. Build workflow automation without spending time and money.", "scripts": { - "dev": "ts-node-dev src/server.ts", + "dev": "ts-node-dev --exit-child src/server.ts", "worker": "nodemon --watch 'src/**/*.ts' --exec 'ts-node' src/worker.ts", "build": "tsc && yarn copy-statics", "build:watch": "nodemon --watch 'src/**/*.ts' --watch 'bin/**/*.ts' --exec yarn build --ext ts", @@ -134,4 +134,4 @@ "publishConfig": { "access": "public" } -} +} \ No newline at end of file diff --git a/packages/backend/src/apps/scheduler/common/get-date-time-object.ts b/packages/backend/src/apps/scheduler/common/get-date-time-object.ts index 9a48cbf2..f4bae73e 100644 --- a/packages/backend/src/apps/scheduler/common/get-date-time-object.ts +++ b/packages/backend/src/apps/scheduler/common/get-date-time-object.ts @@ -1,4 +1,5 @@ import { DateTime } from 'luxon'; +import { IJSONObject } from '@automatisch/types'; export default function getDateTimeObjectRepresentation(dateTime: DateTime) { const defaults = dateTime.toObject(); @@ -10,5 +11,5 @@ export default function getDateTimeObjectRepresentation(dateTime: DateTime) { pretty_time: dateTime.toLocaleString(DateTime.TIME_WITH_SECONDS), pretty_day_of_week: dateTime.toFormat('cccc'), day_of_week: dateTime.weekday, - }; + } as IJSONObject; } diff --git a/packages/backend/src/apps/scheduler/index.ts b/packages/backend/src/apps/scheduler/index.ts index 60f6c4c4..94c6e6bb 100644 --- a/packages/backend/src/apps/scheduler/index.ts +++ b/packages/backend/src/apps/scheduler/index.ts @@ -6,5 +6,4 @@ export default { authDocUrl: "https://automatisch.io/docs/connections/scheduler", primaryColor: "0059F7", supportsConnections: false, - requiresAuthentication: false, }; diff --git a/packages/backend/src/apps/scheduler/triggers/every-day/index.ts b/packages/backend/src/apps/scheduler/triggers/every-day/index.ts index 1946925a..eb4bf570 100644 --- a/packages/backend/src/apps/scheduler/triggers/every-day/index.ts +++ b/packages/backend/src/apps/scheduler/triggers/every-day/index.ts @@ -1,10 +1,11 @@ import { DateTime } from 'luxon'; import { IGlobalVariable, IJSONValue } from '@automatisch/types'; +import defineTrigger from '../../../../helpers/define-trigger'; import cronTimes from '../../common/cron-times'; import getNextCronDateTime from '../../common/get-next-cron-date-time'; import getDateTimeObjectRepresentation from '../../common/get-date-time-object'; -export default { +export default defineTrigger({ name: 'Every day', key: 'everyDay', description: 'Triggers every day.', @@ -154,14 +155,14 @@ export default { return cronTimes.everyDayExcludingWeekendsAt(parameters.hour as number); }, - async run($: IGlobalVariable) { + async run($) { const nextCronDateTime = getNextCronDateTime( this.getInterval($.step.parameters) ); const dateTime = DateTime.now(); const dateTimeObjectRepresentation = getDateTimeObjectRepresentation( $.execution.testRun ? nextCronDateTime : dateTime - ) as IJSONValue; + ); const dataItem = { raw: dateTimeObjectRepresentation, @@ -172,4 +173,4 @@ export default { return { data: [dataItem] }; }, -}; +}); diff --git a/packages/backend/src/apps/scheduler/triggers/every-hour/index.ts b/packages/backend/src/apps/scheduler/triggers/every-hour/index.ts index 2d08dee3..dce95040 100644 --- a/packages/backend/src/apps/scheduler/triggers/every-hour/index.ts +++ b/packages/backend/src/apps/scheduler/triggers/every-hour/index.ts @@ -1,10 +1,11 @@ import { DateTime } from 'luxon'; -import { IGlobalVariable, IJSONValue } from '@automatisch/types'; +import { IGlobalVariable } from '@automatisch/types'; +import defineTrigger from '../../../../helpers/define-trigger'; import cronTimes from '../../common/cron-times'; import getNextCronDateTime from '../../common/get-next-cron-date-time'; import getDateTimeObjectRepresentation from '../../common/get-date-time-object'; -export default { +export default defineTrigger({ name: 'Every hour', key: 'everyHour', description: 'Triggers every hour.', @@ -48,14 +49,14 @@ export default { return cronTimes.everyHourExcludingWeekends; }, - async run($: IGlobalVariable) { + async run($) { const nextCronDateTime = getNextCronDateTime( this.getInterval($.step.parameters) ); const dateTime = DateTime.now(); const dateTimeObjectRepresentation = getDateTimeObjectRepresentation( $.execution.testRun ? nextCronDateTime : dateTime - ) as IJSONValue; + ); const dataItem = { raw: dateTimeObjectRepresentation, @@ -66,4 +67,4 @@ export default { return { data: [dataItem] }; }, -}; +}); diff --git a/packages/backend/src/apps/scheduler/triggers/every-month/index.ts b/packages/backend/src/apps/scheduler/triggers/every-month/index.ts index f2a40d8c..cbbdebd1 100644 --- a/packages/backend/src/apps/scheduler/triggers/every-month/index.ts +++ b/packages/backend/src/apps/scheduler/triggers/every-month/index.ts @@ -1,10 +1,11 @@ import { DateTime } from 'luxon'; -import { IGlobalVariable, IJSONValue } from '@automatisch/types'; +import { IGlobalVariable } from '@automatisch/types'; +import defineTrigger from '../../../../helpers/define-trigger'; import cronTimes from '../../common/cron-times'; import getNextCronDateTime from '../../common/get-next-cron-date-time'; import getDateTimeObjectRepresentation from '../../common/get-date-time-object'; -export default { +export default defineTrigger({ name: 'Every month', key: 'everyMonth', description: 'Triggers every month.', @@ -22,127 +23,127 @@ export default { variables: false, options: [ { - label: 1, + label: '1', value: 1, }, { - label: 2, + label: '2', value: 2, }, { - label: 3, + label: '3', value: 3, }, { - label: 4, + label: '4', value: 4, }, { - label: 5, + label: '5', value: 5, }, { - label: 6, + label: '6', value: 6, }, { - label: 7, + label: '7', value: 7, }, { - label: 8, + label: '8', value: 8, }, { - label: 9, + label: '9', value: 9, }, { - label: 10, + label: '10', value: 10, }, { - label: 11, + label: '11', value: 11, }, { - label: 12, + label: '12', value: 12, }, { - label: 13, + label: '13', value: 13, }, { - label: 14, + label: '14', value: 14, }, { - label: 15, + label: '15', value: 15, }, { - label: 16, + label: '16', value: 16, }, { - label: 17, + label: '17', value: 17, }, { - label: 18, + label: '18', value: 18, }, { - label: 19, + label: '19', value: 19, }, { - label: 20, + label: '20', value: 20, }, { - label: 21, + label: '21', value: 21, }, { - label: 22, + label: '22', value: 22, }, { - label: 23, + label: '23', value: 23, }, { - label: 24, + label: '24', value: 24, }, { - label: 25, + label: '25', value: 25, }, { - label: 26, + label: '26', value: 26, }, { - label: 27, + label: '27', value: 27, }, { - label: 28, + label: '28', value: 28, }, { - label: 29, + label: '29', value: 29, }, { - label: 30, + label: '30', value: 30, }, { - label: 31, + label: '31', value: 31, }, ], @@ -270,14 +271,14 @@ export default { return interval; }, - async run($: IGlobalVariable) { + async run($) { const nextCronDateTime = getNextCronDateTime( this.getInterval($.step.parameters) ); const dateTime = DateTime.now(); const dateTimeObjectRepresentation = getDateTimeObjectRepresentation( $.execution.testRun ? nextCronDateTime : dateTime - ) as IJSONValue; + ); const dataItem = { raw: dateTimeObjectRepresentation, @@ -288,4 +289,4 @@ export default { return { data: [dataItem] }; }, -}; +}); diff --git a/packages/backend/src/apps/scheduler/triggers/every-week/index.ts b/packages/backend/src/apps/scheduler/triggers/every-week/index.ts index 7204eebc..ccdcdb04 100644 --- a/packages/backend/src/apps/scheduler/triggers/every-week/index.ts +++ b/packages/backend/src/apps/scheduler/triggers/every-week/index.ts @@ -1,10 +1,11 @@ import { DateTime } from 'luxon'; import { IGlobalVariable, IJSONValue } from '@automatisch/types'; +import defineTrigger from '../../../../helpers/define-trigger'; import cronTimes from '../../common/cron-times'; import getNextCronDateTime from '../../common/get-next-cron-date-time'; import getDateTimeObjectRepresentation from '../../common/get-date-time-object'; -export default { +export default defineTrigger({ name: 'Every week', key: 'everyWeek', description: 'Triggers every week.', @@ -174,14 +175,14 @@ export default { return interval; }, - async run($: IGlobalVariable) { + async run($) { const nextCronDateTime = getNextCronDateTime( this.getInterval($.step.parameters) ); const dateTime = DateTime.now(); const dateTimeObjectRepresentation = getDateTimeObjectRepresentation( $.execution.testRun ? nextCronDateTime : dateTime - ) as IJSONValue; + ); const dataItem = { raw: dateTimeObjectRepresentation, @@ -192,4 +193,4 @@ export default { return { data: [dataItem] }; }, -}; +}); diff --git a/packages/backend/src/apps/slack/actions/find-message/find-message.ts b/packages/backend/src/apps/slack/actions/find-message/find-message.ts index 31206bb6..05ac902f 100644 --- a/packages/backend/src/apps/slack/actions/find-message/find-message.ts +++ b/packages/backend/src/apps/slack/actions/find-message/find-message.ts @@ -28,7 +28,7 @@ const findMessage = async ($: IGlobalVariable, options: FindMessageOptions) => { const message: IActionOutput = { data: { - raw: data?.data?.messages.matches[0], + raw: data?.messages.matches[0], }, error: response?.integrationError || (!data.ok && data), }; diff --git a/packages/backend/src/apps/slack/actions/find-message/index.ts b/packages/backend/src/apps/slack/actions/find-message/index.ts index 26d7a333..679ce201 100644 --- a/packages/backend/src/apps/slack/actions/find-message/index.ts +++ b/packages/backend/src/apps/slack/actions/find-message/index.ts @@ -1,7 +1,7 @@ -import { IGlobalVariable } from '@automatisch/types'; +import defineAction from '../../../../helpers/define-action'; import findMessage from './find-message'; -export default { +export default defineAction({ name: 'Find message', key: 'findMessage', description: 'Find a Slack message using the Slack Search feature.', @@ -71,7 +71,7 @@ export default { }, ], - async run($: IGlobalVariable) { + async run($) { const parameters = $.step.parameters; const query = parameters.query as string; const sortBy = parameters.sortBy as string; @@ -87,4 +87,4 @@ export default { return messages; }, -}; +}); diff --git a/packages/backend/src/apps/slack/actions/send-a-message-to-channel/index.ts b/packages/backend/src/apps/slack/actions/send-a-message-to-channel/index.ts index d5806108..5f7ef5fe 100644 --- a/packages/backend/src/apps/slack/actions/send-a-message-to-channel/index.ts +++ b/packages/backend/src/apps/slack/actions/send-a-message-to-channel/index.ts @@ -1,7 +1,7 @@ -import { IGlobalVariable } from '@automatisch/types'; +import defineAction from '../../../../helpers/define-action'; import postMessage from './post-message'; -export default { +export default defineAction({ name: 'Send a message to channel', key: 'sendMessageToChannel', description: 'Send a message to a specific channel you specify.', @@ -48,7 +48,7 @@ export default { }, ], - async run($: IGlobalVariable) { + async run($) { const channelId = $.step.parameters.channel as string; const text = $.step.parameters.message as string; @@ -56,4 +56,4 @@ export default { return message; }, -}; +}); diff --git a/packages/backend/src/apps/twitter/triggers/my-tweets/index.ts b/packages/backend/src/apps/twitter/triggers/my-tweets/index.ts index 7e33be4f..32562090 100644 --- a/packages/backend/src/apps/twitter/triggers/my-tweets/index.ts +++ b/packages/backend/src/apps/twitter/triggers/my-tweets/index.ts @@ -1,7 +1,7 @@ -import { IGlobalVariable } from '@automatisch/types'; +import defineTrigger from '../../../../helpers/define-trigger'; import getUserTweets from '../../common/get-user-tweets'; -export default { +export default defineTrigger({ name: 'My Tweets', key: 'myTweets', pollInterval: 15, @@ -17,9 +17,9 @@ export default { }, ], - async run($: IGlobalVariable) { + async run($) { return await getUserTweets($, { currentUser: true, }); }, -}; +}); diff --git a/packages/backend/src/apps/twitter/triggers/new-follower-of-me/index.ts b/packages/backend/src/apps/twitter/triggers/new-follower-of-me/index.ts index 4a873ea0..e4d875d8 100644 --- a/packages/backend/src/apps/twitter/triggers/new-follower-of-me/index.ts +++ b/packages/backend/src/apps/twitter/triggers/new-follower-of-me/index.ts @@ -1,7 +1,7 @@ -import { IGlobalVariable } from '@automatisch/types'; +import defineTrigger from '../../../../helpers/define-trigger'; import myFollowers from './my-followers'; -export default { +export default defineTrigger({ name: 'New follower of me', key: 'myFollowers', pollInterval: 15, @@ -17,7 +17,7 @@ export default { }, ], - async run($: IGlobalVariable) { + async run($) { return await myFollowers($, $.flow.lastInternalId); }, -}; +}); diff --git a/packages/backend/src/apps/twitter/triggers/search-tweets/index.ts b/packages/backend/src/apps/twitter/triggers/search-tweets/index.ts index 0d10ed8c..b2bb95fe 100644 --- a/packages/backend/src/apps/twitter/triggers/search-tweets/index.ts +++ b/packages/backend/src/apps/twitter/triggers/search-tweets/index.ts @@ -1,7 +1,7 @@ -import { IGlobalVariable } from '@automatisch/types'; +import defineTrigger from '../../../../helpers/define-trigger'; import searchTweets from './search-tweets'; -export default { +export default defineTrigger({ name: 'Search Tweets', key: 'searchTweets', pollInterval: 15, @@ -30,7 +30,7 @@ export default { }, ], - async run($: IGlobalVariable) { + async run($) { return await searchTweets($); }, -}; +}); diff --git a/packages/backend/src/apps/twitter/triggers/user-tweets/index.ts b/packages/backend/src/apps/twitter/triggers/user-tweets/index.ts index db576159..723d21bc 100644 --- a/packages/backend/src/apps/twitter/triggers/user-tweets/index.ts +++ b/packages/backend/src/apps/twitter/triggers/user-tweets/index.ts @@ -1,7 +1,7 @@ -import { IGlobalVariable } from '@automatisch/types'; +import defineTrigger from '../../../../helpers/define-trigger'; import getUserTweets from '../../common/get-user-tweets'; -export default { +export default defineTrigger({ name: 'User Tweets', key: 'userTweets', pollInterval: 15, @@ -29,9 +29,9 @@ export default { }, ], - async run($: IGlobalVariable) { + async run($) { return await getUserTweets($, { currentUser: false, }); }, -}; +}); diff --git a/packages/backend/src/helpers/app-info-converter.ts b/packages/backend/src/helpers/app-info-converter.ts index 8ea38c2a..99936eb1 100644 --- a/packages/backend/src/helpers/app-info-converter.ts +++ b/packages/backend/src/helpers/app-info-converter.ts @@ -9,10 +9,14 @@ const appInfoConverter = (rawAppData: IApp) => { if (rawAppData.auth?.fields) { rawAppData.auth.fields = rawAppData.auth.fields.map((field) => { - return { - ...field, - value: field.value?.replace('{WEB_APP_URL}', appConfig.webAppUrl), - }; + if (typeof field.value === 'string') { + return { + ...field, + value: field.value.replace('{WEB_APP_URL}', appConfig.webAppUrl), + }; + } + + return field }); } diff --git a/packages/backend/src/helpers/define-action.ts b/packages/backend/src/helpers/define-action.ts new file mode 100644 index 00000000..bc21ceb9 --- /dev/null +++ b/packages/backend/src/helpers/define-action.ts @@ -0,0 +1,5 @@ +import { IAction } from '@automatisch/types'; + +export default function defineAction(actionDefinition: IAction): IAction { + return actionDefinition; +} diff --git a/packages/backend/src/helpers/define-trigger.ts b/packages/backend/src/helpers/define-trigger.ts new file mode 100644 index 00000000..3e093858 --- /dev/null +++ b/packages/backend/src/helpers/define-trigger.ts @@ -0,0 +1,5 @@ +import { ITrigger } from '@automatisch/types'; + +export default function defineTrigger(triggerDefinition: ITrigger): ITrigger { + return triggerDefinition; +} diff --git a/packages/backend/src/helpers/get-app.ts b/packages/backend/src/helpers/get-app.ts index da620bbf..b3e9f5d4 100644 --- a/packages/backend/src/helpers/get-app.ts +++ b/packages/backend/src/helpers/get-app.ts @@ -16,17 +16,13 @@ async function getFileContent( path: string, stripFuncs: boolean ): Promise { - try { - const fileContent = await getDefaultExport(path); + const fileContent = await getDefaultExport(path); - if (stripFuncs) { - return stripFunctions(fileContent); - } - - return fileContent; - } catch (err) { - return null; + if (stripFuncs) { + return stripFunctions(fileContent); } + + return fileContent; } async function getChildrenContentInDirectory( @@ -55,10 +51,12 @@ async function getChildrenContentInDirectory( const getApp = async (appKey: string, stripFuncs = true) => { const appData: IApp = await getDefaultExport(`../apps/${appKey}`); - appData.auth = await getFileContent( - `../apps/${appKey}/auth`, - stripFuncs - ); + if (appData.supportsConnections) { + appData.auth = await getFileContent( + `../apps/${appKey}/auth`, + stripFuncs + ); + } appData.triggers = await getChildrenContentInDirectory( `${appKey}/triggers`, stripFuncs diff --git a/packages/backend/src/services/action.ts b/packages/backend/src/services/action.ts index bbac7990..e05948cf 100644 --- a/packages/backend/src/services/action.ts +++ b/packages/backend/src/services/action.ts @@ -48,7 +48,7 @@ export const processAction = async (options: ProcessActionOptions) => { status: actionOutput.error ? 'failure' : 'success', dataIn: computedParameters, dataOut: actionOutput.error ? null : actionOutput.data.raw, - errorDetails: actionOutput.error, + errorDetails: actionOutput.error ? actionOutput.error : null, }); return { flowId, stepId, executionId, executionStep }; diff --git a/packages/types/index.d.ts b/packages/types/index.d.ts index e860fc56..a404dd1f 100644 --- a/packages/types/index.d.ts +++ b/packages/types/index.d.ts @@ -90,45 +90,45 @@ export interface IFieldDropdown { label: string; type: 'dropdown'; required: boolean; - readOnly: boolean; - value: string; - placeholder: string | null; - description: string; - docUrl: string; - clickToCopy: boolean; + readOnly?: boolean; + value?: string | boolean; + placeholder?: string | null; + description?: string; + docUrl?: string; + clickToCopy?: boolean; + variables?: boolean; + dependsOn?: string[]; + options?: IFieldDropdownOption[]; + source?: IFieldDropdownSource; +} + +export interface IFieldDropdownSource { + type: string; name: string; - variables: boolean; - dependsOn: string[]; - options: IFieldDropdownOption[]; - source: { - type: string; + arguments: { name: string; - arguments: { - name: string; - value: string; - }[]; - }; + value: string; + }[]; } export interface IFieldDropdownOption { label: string; - value: boolean | string; + value: boolean | string | number; } export interface IFieldText { key: string; label: string; type: 'string'; - required: boolean; - readOnly: boolean; - value: string; - placeholder: string | null; - description: string; - docUrl: string; - clickToCopy: boolean; - name: string; - variables: boolean; - dependsOn: string[]; + required?: boolean; + readOnly?: boolean; + value?: string; + placeholder?: string | null; + description?: string; + docUrl?: string; + clickToCopy?: boolean; + variables?: boolean; + dependsOn?: string[]; } export type IField = IFieldDropdown | IFieldText; @@ -202,11 +202,11 @@ export interface ITriggerDataItem { export interface ITrigger { name: string; key: string; - pollInterval: number; + pollInterval?: number; description: string; - dedupeStrategy: 'greatest' | 'unique' | 'last'; + dedupeStrategy?: 'greatest' | 'unique' | 'last'; substeps: ISubstep[]; - getInterval(parameters: IGlobalVariable['step']['parameters']): string; + getInterval?(parameters: IGlobalVariable['step']['parameters']): string; run($: IGlobalVariable): Promise; } @@ -238,7 +238,7 @@ export interface IAuthentication { export interface ISubstep { key: string; name: string; - arguments: IField[]; + arguments?: IField[]; } export type IHttpClientParams = { diff --git a/packages/web/src/components/FlowStep/index.tsx b/packages/web/src/components/FlowStep/index.tsx index 5b77edb5..a30ff26b 100644 --- a/packages/web/src/components/FlowStep/index.tsx +++ b/packages/web/src/components/FlowStep/index.tsx @@ -69,7 +69,7 @@ function generateValidationSchema(substeps: ISubstep[]) { } // if the field depends on another field, add the dependsOn required validation - if (dependsOn?.length > 0) { + if (Array.isArray(dependsOn) && dependsOn.length > 0) { for (const dependsOnKey of dependsOn) { const missingDependencyValueMessage = `We're having trouble loading '${key}' data as required field '${dependsOnKey}' is missing.`; diff --git a/packages/web/src/components/InputCreator/index.tsx b/packages/web/src/components/InputCreator/index.tsx index cfedf0f3..ced9757e 100644 --- a/packages/web/src/components/InputCreator/index.tsx +++ b/packages/web/src/components/InputCreator/index.tsx @@ -22,7 +22,7 @@ type RawOption = { }; const optionGenerator = (options: RawOption[]): IFieldDropdownOption[] => options?.map(({ name, value }) => ({ label: name as string, value: value })); -const getOption = (options: IFieldDropdownOption[], value: string) => options?.find(option => option.value === value); +const getOption = (options: IFieldDropdownOption[], value?: string | boolean) => options?.find(option => option.value === value); export default function InputCreator(props: InputCreatorProps): React.ReactElement { const { diff --git a/packages/web/src/hooks/useDynamicData.ts b/packages/web/src/hooks/useDynamicData.ts index f5375a7c..15839bac 100644 --- a/packages/web/src/hooks/useDynamicData.ts +++ b/packages/web/src/hooks/useDynamicData.ts @@ -4,13 +4,13 @@ import { useFormContext } from 'react-hook-form'; import set from 'lodash/set'; import type { UseFormReturn } from 'react-hook-form'; import isEqual from 'lodash/isEqual'; -import type { IField, IFieldDropdown, IJSONObject } from '@automatisch/types'; +import type { IField, IFieldDropdownSource, IJSONObject } from '@automatisch/types'; import { GET_DATA } from 'graphql/queries/get-data'; const variableRegExp = /({.*?})/g; -function computeArguments(args: IFieldDropdown["source"]["arguments"], getValues: UseFormReturn["getValues"]): IJSONObject { +function computeArguments(args: IFieldDropdownSource["arguments"], getValues: UseFormReturn["getValues"]): IJSONObject { const initialValue = {}; return args.reduce( (result, { name, value }) => { From efc4588a0088cb153f39f212200ea2676deec987 Mon Sep 17 00:00:00 2001 From: Thu Huynh <32840471+ThuH2305@users.noreply.github.com> Date: Sun, 16 Oct 2022 13:20:15 +0200 Subject: [PATCH 13/13] docs(readme): remove trailing slash in docs link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f2bbf0df..f11860d4 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ There are other existing solutions in the market, like Zapier and Integromat, so ## Documentation -The official documentation can be found here: [https://automatisch.io/docs/](https://automatisch.io/docs/) +The official documentation can be found here: [https://automatisch.io/docs](https://automatisch.io/docs) ## Installation