Skip to content

Fixed IDE import autocomplete #931

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.

Sign up for GitHub

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

Merged
themarolt merged 1 commit into from
Jun 1, 2023
Merged

Fixed IDE import autocomplete #931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 50 additions & 0 deletions services/apps/integration_data_worker/package-lock.json
View file
Open in desktop

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

7 changes: 4 additions & 3 deletions services/apps/integration_data_worker/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"version": "1.0.0",
"private": true,
"scripts": {
"start": "node -r ts-node/register src/main.ts --transpile-only",
"start:debug:local": "set -a && . ../../../backend/.env.dist.local && . ../../../backend/.env.override.local && set +a && SERVICE=integration-data-worker LOG_LEVEL=trace node --inspect=0.0.0.0:9232 -r ts-node/register src/main.ts --transpile-only",
"start:debug": "SERVICE=integration-data-worker LOG_LEVEL=trace node --inspect=0.0.0.0:9232 -r ts-node/register src/main.ts --transpile-only",
"start": "node -r tsconfig-paths/register -r ts-node/register src/main.ts --transpile-only",
"start:debug:local": "set -a && . ../../../backend/.env.dist.local && . ../../../backend/.env.override.local && set +a && SERVICE=integration-data-worker LOG_LEVEL=trace node --inspect=0.0.0.0:9232 -r tsconfig-paths/register -r ts-node/register src/main.ts --transpile-only",
"start:debug": "SERVICE=integration-data-worker LOG_LEVEL=trace node --inspect=0.0.0.0:9232 -r tsconfig-paths/register -r ts-node/register src/main.ts --transpile-only",
"start:watch:local": "nodemon --watch src --ext ts --exec npm run start:debug:local",
"start:watch": "nodemon --watch src --ext ts --exec npm run start:debug",
"dev:local": "concurrently \"npm run start:watch:local\" \"../../scripts/watch_libs.sh --service integration_data_worker\"",
Expand All @@ -27,6 +27,7 @@
"@types/node": "^18.16.3",
"config": "^3.3.9",
"ts-node": "^10.9.1",
"tsconfig-paths": "^4.2.0",
"typescript": "^5.0.4"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion ...tegration_data_worker/src/config/index.ts → ...integration_data_worker/src/conf/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { IDatabaseConfig } from '@crowd/database'
import { IRedisConfiguration } from '@crowd/redis'
import { ISqsClientConfig } from '@crowd/sqs'
import config = require('config')
import config from 'config'

export interface IWorkerSettings {
maxDataRetries: number
Expand Down
2 changes: 1 addition & 1 deletion services/apps/integration_data_worker/src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getServiceLogger } from '@crowd/logging'
import { DB_CONFIG, REDIS_CONFIG, SQS_CONFIG } from './config'
import { DB_CONFIG, REDIS_CONFIG, SQS_CONFIG } from './conf'
import { getRedisClient } from '@crowd/redis'
import { getDbConnection } from '@crowd/database'
import { DataSinkWorkerEmitter, IntegrationStreamWorkerEmitter, getSqsClient } from '@crowd/sqs'
Expand Down
2 changes: 1 addition & 1 deletion services/apps/integration_data_worker/src/service/integrationDataService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import IntegrationDataRepository from '../repo/integrationData.repo'
import { IActivityData, IntegrationResultType } from '@crowd/types'
import { addSeconds, singleOrDefault } from '@crowd/common'
import { INTEGRATION_SERVICES, IProcessDataContext } from '@crowd/integrations'
import { WORKER_SETTINGS, PLATFORM_CONFIG } from '../config'
import { WORKER_SETTINGS, PLATFORM_CONFIG } from '@/conf'
import { DataSinkWorkerEmitter, IntegrationStreamWorkerEmitter } from '@crowd/sqs'

export default class IntegrationDataService extends LoggerBase {
Expand Down
6 changes: 4 additions & 2 deletions services/apps/integration_data_worker/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@
"sourceMap": true,
"moduleResolution": "node16",
"experimentalDecorators": true,
"baseUrl": ".",
"esModuleInterop": true,
"baseUrl": "./src",
"paths": {
"@crowd/*": ["../../libs/*/dist"]
"@crowd/*": ["../../../libs/*/dist"],
"@/*": ["./*"]
}
},
"include": ["src/**/*"]
Expand Down
50 changes: 50 additions & 0 deletions services/apps/integration_run_worker/package-lock.json
View file
Open in desktop

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

9 changes: 5 additions & 4 deletions services/apps/integration_run_worker/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"version": "1.0.0",
"private": true,
"scripts": {
"start": "node -r ts-node/register src/main.ts --transpile-only",
"start:debug:local": "set -a && . ../../../backend/.env.dist.local && . ../../../backend/.env.override.local && set +a && SERVICE=integration-run-worker LOG_LEVEL=trace node --inspect=0.0.0.0:9230 -r ts-node/register src/main.ts --transpile-only",
"start:debug": "SERVICE=integration-run-worker LOG_LEVEL=trace node --inspect=0.0.0.0:9230 -r ts-node/register src/main.ts --transpile-only",
"start:watc:local": "nodemon --watch src --ext ts --exec npm run start:debug:local",
"start": "node -r tsconfig-paths/register -r ts-node/register src/main.ts --transpile-only",
"start:debug:local": "set -a && . ../../../backend/.env.dist.local && . ../../../backend/.env.override.local && set +a && SERVICE=integration-run-worker LOG_LEVEL=trace node --inspect=0.0.0.0:9230 -r tsconfig-paths/register -r ts-node/register src/main.ts --transpile-only",
"start:debug": "SERVICE=integration-run-worker LOG_LEVEL=trace node --inspect=0.0.0.0:9230 -r tsconfig-paths/register -r ts-node/register src/main.ts --transpile-only",
"start:watch:local": "nodemon --watch src --ext ts --exec npm run start:debug:local",
"start:watch": "nodemon --watch src --ext ts --exec npm run start:debug",
"dev:local": "concurrently \"npm run start:watch:local\" \"../../scripts/watch_libs.sh --service integration_run_worker\"",
"dev": "concurrently \"npm run start:watch\" \"../../scripts/watch_libs.sh --service integration_run_worker\"",
Expand All @@ -27,6 +27,7 @@
"@types/node": "^18.16.3",
"config": "^3.3.9",
"ts-node": "^10.9.1",
"tsconfig-paths": "^4.2.0",
"typescript": "^5.0.4",
"uuid": "^9.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion ...ntegration_run_worker/src/config/index.ts → .../integration_run_worker/src/conf/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { IDatabaseConfig } from '@crowd/database'
import { IRedisConfiguration } from '@crowd/redis'
import { ISqsClientConfig } from '@crowd/sqs'
import config = require('config')
import config from 'config'

export interface INangoConfig {
url: string
Expand Down
2 changes: 1 addition & 1 deletion services/apps/integration_run_worker/src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { getDbConnection } from '@crowd/database'
import { getServiceLogger } from '@crowd/logging'
import { IntegrationStreamWorkerEmitter, getSqsClient } from '@crowd/sqs'
import { DB_CONFIG, REDIS_CONFIG, SQS_CONFIG } from './config'
import { DB_CONFIG, REDIS_CONFIG, SQS_CONFIG } from './conf'
import { WorkerQueueReceiver } from './queue'
import { ApiPubSubEmitter, getRedisClient } from '@crowd/redis'

Expand Down
2 changes: 1 addition & 1 deletion services/apps/integration_run_worker/src/repo/integrationRun.data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IntegrationState, IntegrationRunState } from '@crowd/types'
import { IntegrationRunState, IntegrationState } from '@crowd/types'

export interface IGenerateStreamsData {
onboarding: boolean
Expand Down
2 changes: 1 addition & 1 deletion services/apps/integration_run_worker/src/repo/integrationRun.repo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { DbStore, RepositoryBase } from '@crowd/database'
import { Logger } from '@crowd/logging'
import { IGenerateStreamsData } from './integrationRun.data'
import { IntegrationRunState, IntegrationStreamState } from '@crowd/types'
import { WORKER_CONFIG } from '../config'
import { WORKER_CONFIG } from '../conf'

export default class IntegrationRunRepository extends RepositoryBase<IntegrationRunRepository> {
constructor(dbStore: DbStore, parentLog: Logger) {
Expand Down
2 changes: 1 addition & 1 deletion services/apps/integration_run_worker/src/service/integrationRunService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Logger, LoggerBase, getChildLogger } from '@crowd/logging'
import { ApiPubSubEmitter, RedisCache, RedisClient } from '@crowd/redis'
import { IntegrationStreamWorkerEmitter } from '@crowd/sqs'
import { IntegrationRunState, IntegrationStreamState } from '@crowd/types'
import { NANGO_CONFIG, PLATFORM_CONFIG } from '../config'
import { NANGO_CONFIG, PLATFORM_CONFIG } from '../conf'
import IntegrationRunRepository from '../repo/integrationRun.repo'
import MemberAttributeSettingsRepository from '../repo/memberAttributeSettings.repo'
import SampleDataRepository from '../repo/sampleData.repo'
Expand Down
6 changes: 4 additions & 2 deletions services/apps/integration_run_worker/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@
"moduleResolution": "node16",
"sourceMap": true,
"experimentalDecorators": true,
"baseUrl": ".",
"esModuleInterop": true,
"baseUrl": "./src",
"paths": {
"@crowd/*": ["../../libs/*/dist"]
"@crowd/*": ["../../../libs/*/dist"],
"@/*": ["./*"]
}
},
"include": ["src/**/*"]
Expand Down
Loading