Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enabling serverless in new next app #152

Draft
wants to merge 62 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
f81e016
bringing back previous wip https://github.com/openintegrations/openin…
pellicceama Dec 14, 2024
ae3c8a2
removing v0 edge
pellicceama Dec 14, 2024
a9eb8e5
adding missing file and copy env var script
pellicceama Dec 14, 2024
8712890
tweaking command
pellicceama Dec 14, 2024
374ab1d
removing connector copilot
pellicceama Dec 14, 2024
2c9c532
implementing temporary validator
pellicceama Dec 14, 2024
1b2e842
merging main
pellicceama Dec 15, 2024
7f68460
wip: getting drizzle schema in sync with db
openint-bot Dec 15, 2024
8a378fc
refactor: to new style drizzle api
openint-bot Dec 15, 2024
22a0cba
add drizzle relations
openint-bot Dec 15, 2024
5d77013
add snapshot json from introspect
openint-bot Dec 15, 2024
4f29b02
update schema
openint-bot Dec 15, 2024
53d57a7
fix: bad imports
openint-bot Dec 15, 2024
17a6e1a
chore: update drizzle config
openint-bot Dec 15, 2024
d973e1c
removing airtable, patching depd and removing currencies call that re…
pellicceama Dec 15, 2024
8c33972
renaming app
pellicceama Dec 15, 2024
6c721e1
clean up auto pulled schema
openint-bot Dec 15, 2024
38b0b01
add role to schema
openint-bot Dec 15, 2024
7d9cd65
upgrading trpc version
pellicceama Dec 15, 2024
a8ebeb5
workaround circular ref
openint-bot Dec 15, 2024
0b9b301
chore: upgrade drizzle to latest
openint-bot Dec 15, 2024
285d797
fix: type error
openint-bot Dec 15, 2024
3214f7c
fix: bugs in schema check
openint-bot Dec 15, 2024
e0baf4a
ignore
openint-bot Dec 16, 2024
4a590da
test switch to node postgres
openint-bot Dec 16, 2024
067a0d2
partial compiler fix
openint-bot Dec 16, 2024
70e734a
WIP query fixes, sync not fully working yet
pellicceama Dec 16, 2024
6dcd988
removing unecessasry ts ignores
pellicceama Dec 16, 2024
7df4dec
adding drizzle notes
pellicceama Dec 16, 2024
2727e1a
merging drizzle branch
pellicceama Dec 18, 2024
5b0aa63
enabling observability
pellicceama Dec 18, 2024
1aaf771
script to patch deps
pellicceama Dec 18, 2024
8381655
upgrading pg version
pellicceama Dec 18, 2024
ab49790
patching copy cmd
pellicceama Dec 18, 2024
3078dd5
Merge branch 'main' of github.com:openintegrations/openint into cf-new
pellicceama Dec 18, 2024
2bb9c27
caching client
pellicceama Dec 18, 2024
e7bac5d
not setting domain in non CF worker deploys
pellicceama Dec 18, 2024
a98508f
ensuring to set process.env for workers
pellicceama Dec 18, 2024
90a7431
hidding sql editor on non openint
pellicceama Dec 19, 2024
0469e15
patching body parsing
pellicceama Dec 19, 2024
ea5b94c
sidebar
pellicceama Dec 19, 2024
d89fe79
Merge branch 'main' of github.com:openintegrations/openint into cf-new
pellicceama Dec 19, 2024
5c2aae0
adding wrangler
pellicceama Dec 20, 2024
429fea7
setting new org id for gs
pellicceama Dec 23, 2024
ad92f19
patching cf script to include node version
pellicceama Dec 23, 2024
ceda247
merging main
pellicceama Dec 24, 2024
0ce5d12
fixing integration id
pellicceama Dec 24, 2024
c649c94
adding inngest block
pellicceama Dec 24, 2024
4c18d66
WIP
pellicceama Dec 26, 2024
25218a2
adding commit and branch
pellicceama Dec 30, 2024
89600b3
merging main
pellicceama Feb 13, 2025
d2a483e
removing instrumentation
pellicceama Feb 13, 2025
66d3bdd
removing instrumentation in edge
pellicceama Feb 14, 2025
8eb907e
merging issues addressing
pellicceama Feb 14, 2025
ce0ab7f
moving wrangler file to example
pellicceama Feb 14, 2025
479923e
removing unused functionality in cf
pellicceama Feb 15, 2025
94fb62b
tweaking example
pellicceama Feb 15, 2025
e8fa687
adding back empty instrumentation
pellicceama Feb 15, 2025
7289aa7
handling content without length
pellicceama Feb 21, 2025
6051edb
fixing typo
pellicceama Feb 21, 2025
eb0240a
removing file filter
pellicceama Feb 21, 2025
be47451
handling null conn.integrationId
pellicceama Feb 25, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
# next.js
/apps/web/.next/
/apps/web/out/
.worker-next/
.dev.vars

# production
/apps/web/build
Expand Down Expand Up @@ -64,10 +66,14 @@ dist/
/gateway/config.json
/gateway/wrangler.toml

# Cloudflare
.wrangler
.dev.vars

# CI Artifacts
/artifacts

# Next.js
.next/

wrangler.toml
10 changes: 0 additions & 10 deletions apps/app-config/connectors/connectors.def.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
// generated by _generateConnectorLists.ts. Do not modify by hand
import {default as connectorAircall} from '@openint/connector-aircall/def'
import {default as connectorAirtable} from '@openint/connector-airtable/def'
import {default as connectorApollo} from '@openint/connector-apollo/def'
import {default as connectorBeancount} from '@openint/connector-beancount/def'
import {default as connectorBrex} from '@openint/connector-brex/def'
Expand All @@ -9,8 +7,6 @@ import {default as connectorConfluence} from '@openint/connector-confluence/def'
import {default as connectorDebug} from '@openint/connector-debug/def'
import {default as connectorDiscord} from '@openint/connector-discord/def'
import {default as connectorFinch} from '@openint/connector-finch/def'
import {default as connectorFirebase} from '@openint/connector-firebase/def'
import {default as connectorForeceipt} from '@openint/connector-foreceipt/def'
import {default as connectorFs} from '@openint/connector-fs/def'
import {default as connectorGithub} from '@openint/connector-github/def'
import {default as connectorGong} from '@openint/connector-gong/def'
Expand All @@ -27,7 +23,6 @@ import {default as connectorLunchmoney} from '@openint/connector-lunchmoney/def'
import {default as connectorMercury} from '@openint/connector-mercury/def'
import {default as connectorMerge} from '@openint/connector-merge/def'
import {default as connectorMicrosoft} from '@openint/connector-microsoft/def'
import {default as connectorMongodb} from '@openint/connector-mongodb/def'
import {default as connectorMoota} from '@openint/connector-moota/def'
import {default as connectorOnebrick} from '@openint/connector-onebrick/def'
import {default as connectorOutreach} from '@openint/connector-outreach/def'
Expand Down Expand Up @@ -55,8 +50,6 @@ import {default as connectorYodlee} from '@openint/connector-yodlee/def'
import {default as connectorZohodesk} from '@openint/connector-zohodesk/def'

export const defConnectors = {
aircall: connectorAircall,
airtable: connectorAirtable,
apollo: connectorApollo,
beancount: connectorBeancount,
brex: connectorBrex,
Expand All @@ -65,8 +58,6 @@ export const defConnectors = {
debug: connectorDebug,
discord: connectorDiscord,
finch: connectorFinch,
firebase: connectorFirebase,
foreceipt: connectorForeceipt,
fs: connectorFs,
github: connectorGithub,
gong: connectorGong,
Expand All @@ -83,7 +74,6 @@ export const defConnectors = {
mercury: connectorMercury,
merge: connectorMerge,
microsoft: connectorMicrosoft,
mongodb: connectorMongodb,
moota: connectorMoota,
onebrick: connectorOnebrick,
outreach: connectorOutreach,
Expand Down
40 changes: 0 additions & 40 deletions apps/app-config/connectors/connectors.merged.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
// generated by _generateConnectorLists.ts. Do not modify by hand
import {default as connectorAircall_def} from '@openint/connector-aircall/def'
import {default as connectorAircall_server} from '@openint/connector-aircall/server'
import {default as connectorAirtable_def} from '@openint/connector-airtable/def'
import {default as connectorAirtable_server} from '@openint/connector-airtable/server'
import {default as connectorApollo_def} from '@openint/connector-apollo/def'
import {default as connectorApollo_server} from '@openint/connector-apollo/server'
import {default as connectorBeancount_def} from '@openint/connector-beancount/def'
Expand All @@ -19,10 +15,6 @@ import {default as connectorDiscord_def} from '@openint/connector-discord/def'
import {default as connectorDiscord_server} from '@openint/connector-discord/server'
import {default as connectorFinch_def} from '@openint/connector-finch/def'
import {default as connectorFinch_server} from '@openint/connector-finch/server'
import {default as connectorFirebase_def} from '@openint/connector-firebase/def'
import {default as connectorFirebase_server} from '@openint/connector-firebase/server'
import {default as connectorForeceipt_def} from '@openint/connector-foreceipt/def'
import {default as connectorForeceipt_server} from '@openint/connector-foreceipt/server'
import {default as connectorFs_def} from '@openint/connector-fs/def'
import {default as connectorFs_server} from '@openint/connector-fs/server'
import {default as connectorGithub_def} from '@openint/connector-github/def'
Expand Down Expand Up @@ -54,8 +46,6 @@ import {default as connectorMerge_def} from '@openint/connector-merge/def'
import {default as connectorMerge_server} from '@openint/connector-merge/server'
import {default as connectorMicrosoft_def} from '@openint/connector-microsoft/def'
import {default as connectorMicrosoft_server} from '@openint/connector-microsoft/server'
import {default as connectorMongodb_def} from '@openint/connector-mongodb/def'
import {default as connectorMongodb_server} from '@openint/connector-mongodb/server'
import {default as connectorMoota_def} from '@openint/connector-moota/def'
import {default as connectorMoota_server} from '@openint/connector-moota/server'
import {default as connectorOnebrick_def} from '@openint/connector-onebrick/def'
Expand Down Expand Up @@ -106,16 +96,6 @@ import {default as connectorYodlee_server} from '@openint/connector-yodlee/serve
import {default as connectorZohodesk_def} from '@openint/connector-zohodesk/def'
import {default as connectorZohodesk_server} from '@openint/connector-zohodesk/server'

const connectorAircall = {
...connectorAircall_def,
...connectorAircall_server,
}

const connectorAirtable = {
...connectorAirtable_def,
...connectorAirtable_server,
}

const connectorApollo = {
...connectorApollo_def,
...connectorApollo_server,
Expand Down Expand Up @@ -156,16 +136,6 @@ const connectorFinch = {
...connectorFinch_server,
}

const connectorFirebase = {
...connectorFirebase_def,
...connectorFirebase_server,
}

const connectorForeceipt = {
...connectorForeceipt_def,
...connectorForeceipt_server,
}

const connectorFs = {
...connectorFs_def,
...connectorFs_server,
Expand Down Expand Up @@ -245,11 +215,6 @@ const connectorMicrosoft = {
...connectorMicrosoft_server,
}

const connectorMongodb = {
...connectorMongodb_def,
...connectorMongodb_server,
}

const connectorMoota = {
...connectorMoota_def,
...connectorMoota_server,
Expand Down Expand Up @@ -375,8 +340,6 @@ const connectorZohodesk = {
}

export const mergedConnectors = {
aircall: connectorAircall,
airtable: connectorAirtable,
apollo: connectorApollo,
beancount: connectorBeancount,
brex: connectorBrex,
Expand All @@ -385,8 +348,6 @@ export const mergedConnectors = {
debug: connectorDebug,
discord: connectorDiscord,
finch: connectorFinch,
firebase: connectorFirebase,
foreceipt: connectorForeceipt,
fs: connectorFs,
github: connectorGithub,
gong: connectorGong,
Expand All @@ -403,7 +364,6 @@ export const mergedConnectors = {
mercury: connectorMercury,
merge: connectorMerge,
microsoft: connectorMicrosoft,
mongodb: connectorMongodb,
moota: connectorMoota,
onebrick: connectorOnebrick,
outreach: connectorOutreach,
Expand Down
10 changes: 0 additions & 10 deletions apps/app-config/connectors/connectors.server.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
// generated by _generateConnectorLists.ts. Do not modify by hand
import {default as connectorAircall} from '@openint/connector-aircall/server'
import {default as connectorAirtable} from '@openint/connector-airtable/server'
import {default as connectorApollo} from '@openint/connector-apollo/server'
import {default as connectorBeancount} from '@openint/connector-beancount/server'
import {default as connectorBrex} from '@openint/connector-brex/server'
Expand All @@ -9,8 +7,6 @@ import {default as connectorConfluence} from '@openint/connector-confluence/serv
import {default as connectorDebug} from '@openint/connector-debug/server'
import {default as connectorDiscord} from '@openint/connector-discord/server'
import {default as connectorFinch} from '@openint/connector-finch/server'
import {default as connectorFirebase} from '@openint/connector-firebase/server'
import {default as connectorForeceipt} from '@openint/connector-foreceipt/server'
import {default as connectorFs} from '@openint/connector-fs/server'
import {default as connectorGithub} from '@openint/connector-github/server'
import {default as connectorGong} from '@openint/connector-gong/server'
Expand All @@ -26,7 +22,6 @@ import {default as connectorLinear} from '@openint/connector-linear/server'
import {default as connectorLunchmoney} from '@openint/connector-lunchmoney/server'
import {default as connectorMerge} from '@openint/connector-merge/server'
import {default as connectorMicrosoft} from '@openint/connector-microsoft/server'
import {default as connectorMongodb} from '@openint/connector-mongodb/server'
import {default as connectorMoota} from '@openint/connector-moota/server'
import {default as connectorOnebrick} from '@openint/connector-onebrick/server'
import {default as connectorOutreach} from '@openint/connector-outreach/server'
Expand All @@ -53,8 +48,6 @@ import {default as connectorYodlee} from '@openint/connector-yodlee/server'
import {default as connectorZohodesk} from '@openint/connector-zohodesk/server'

export const serverConnectors = {
aircall: connectorAircall,
airtable: connectorAirtable,
apollo: connectorApollo,
beancount: connectorBeancount,
brex: connectorBrex,
Expand All @@ -63,8 +56,6 @@ export const serverConnectors = {
debug: connectorDebug,
discord: connectorDiscord,
finch: connectorFinch,
firebase: connectorFirebase,
foreceipt: connectorForeceipt,
fs: connectorFs,
github: connectorGithub,
gong: connectorGong,
Expand All @@ -80,7 +71,6 @@ export const serverConnectors = {
lunchmoney: connectorLunchmoney,
merge: connectorMerge,
microsoft: connectorMicrosoft,
mongodb: connectorMongodb,
moota: connectorMoota,
onebrick: connectorOnebrick,
outreach: connectorOutreach,
Expand Down
46 changes: 0 additions & 46 deletions apps/app-config/connectors/meta.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,6 @@ module.exports = [
server: '@openint/connector-aircall/server',
},
},
{
name: 'airtable',
dirName: 'connector-airtable',
varName: 'connectorAirtable',
imports: {
def: '@openint/connector-airtable/def',
server: '@openint/connector-airtable/server',
},
},
{
dirName: 'connector-alphavantage',
varName: 'connectorAlphavantage',
Expand Down Expand Up @@ -60,16 +51,6 @@ module.exports = [
server: '@openint/connector-coda/server',
},
},
{
name: 'confluence',
dirName: 'connector-confluence',
varName: 'connectorConfluence',
imports: {
def: '@openint/connector-confluence/def',
server: '@openint/connector-confluence/server',
},
},
{dirName: 'connector-copilot', varName: 'connectorCopilot', imports: {}},
{
name: 'debug',
dirName: 'connector-debug',
Expand Down Expand Up @@ -99,24 +80,6 @@ module.exports = [
server: '@openint/connector-finch/server',
},
},
{
name: 'firebase',
dirName: 'connector-firebase',
varName: 'connectorFirebase',
imports: {
def: '@openint/connector-firebase/def',
server: '@openint/connector-firebase/server',
},
},
{
name: 'foreceipt',
dirName: 'connector-foreceipt',
varName: 'connectorForeceipt',
imports: {
def: '@openint/connector-foreceipt/def',
server: '@openint/connector-foreceipt/server',
},
},
{
name: 'fs',
dirName: 'connector-fs',
Expand Down Expand Up @@ -259,15 +222,6 @@ module.exports = [
server: '@openint/connector-microsoft/server',
},
},
{
name: 'mongodb',
dirName: 'connector-mongodb',
varName: 'connectorMongodb',
imports: {
def: '@openint/connector-mongodb/def',
server: '@openint/connector-mongodb/server',
},
},
{
name: 'moota',
dirName: 'connector-moota',
Expand Down
5 changes: 0 additions & 5 deletions apps/app-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
"dependencies": {
"@clerk/nextjs": "5.6.0",
"@openint/cdk": "workspace:*",
"@openint/connector-aircall": "workspace:*",
"@openint/connector-airtable": "workspace:*",
"@openint/connector-alphavantage": "workspace:*",
"@openint/connector-apollo": "workspace:*",
"@openint/connector-beancount": "workspace:*",
Expand All @@ -24,8 +22,6 @@
"@openint/connector-discord": "workspace:*",
"@openint/connector-expensify": "workspace:*",
"@openint/connector-finch": "workspace:*",
"@openint/connector-firebase": "workspace:*",
"@openint/connector-foreceipt": "workspace:*",
"@openint/connector-fs": "workspace:*",
"@openint/connector-github": "workspace:*",
"@openint/connector-gong": "workspace:*",
Expand All @@ -42,7 +38,6 @@
"@openint/connector-mercury": "workspace:*",
"@openint/connector-merge": "workspace:*",
"@openint/connector-microsoft": "workspace:*",
"@openint/connector-mongodb": "workspace:*",
"@openint/connector-moota": "workspace:*",
"@openint/connector-onebrick": "workspace:*",
"@openint/connector-outreach": "workspace:*",
Expand Down
3 changes: 1 addition & 2 deletions apps/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"@openint/connector-beancount": "workspace:*",
"@openint/connector-brex": "workspace:*",
"@openint/connector-expensify": "workspace:*",
"@openint/connector-firebase": "workspace:*",
"@openint/connector-fs": "workspace:*",
"@openint/connector-heron": "workspace:*",
"@openint/connector-lunchmoney": "workspace:*",
Expand All @@ -33,7 +32,7 @@
"@openint/meta-service-airbyte": "workspace:*",
"@openint/meta-service-postgres": "workspace:*",
"@openint/util": "workspace:*",
"@trpc/server": "10.40.0",
"@trpc/server": "10.45.2",
"cac": "6.7.12",
"keytar": "7.9.0",
"micro": "9.3.5-canary.3",
Expand Down
6 changes: 6 additions & 0 deletions apps/web/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,10 @@ CLERK_SECRET_KEY="xxx"
NEXT_PUBLIC_NANGO_PUBLIC_KEY="xxx"
NANGO_SECRET_KEY="xxx"


NEXT_PUBLIC_SERVER_URL="https://local.openint.dev"
NEXT_PUBLIC_API_URL="https://local.openint.dev"

## Can also be "edge" for cloudflare workers
NEXT_PUBLIC_RUNTIME_ENV="standard"
INTEGRATION_TEST_SECRET="xxx"
2 changes: 2 additions & 0 deletions apps/web/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
# next.js
/.next/
/out/
.open-next/
.next-bak

# production
/build
Expand Down
Loading