Skip to content
This repository was archived by the owner on Nov 4, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = {
project: ['./tsconfig.eslint.json'],
},
plugins: ['@typescript-eslint', 'simple-import-sort'],
extends: ['plugin:@typescript-eslint/recommended', 'prettier', 'prettier/@typescript-eslint', 'prettier/react'],
extends: ['plugin:@typescript-eslint/recommended', 'prettier'],
ignorePatterns: ['bin', 'dist', 'node_modules'],
rules: {
'simple-import-sort/imports': 'error',
Expand Down
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,26 +98,26 @@
"@types/supertest": "^2.0.10",
"@types/tar-stream": "^2.1.0",
"@types/uuid": "^8.3.0",
"@typescript-eslint/eslint-plugin": "^4.14.0",
"@typescript-eslint/parser": "^4.14.0",
"@typescript-eslint/eslint-plugin": "^4.26.0",
"@typescript-eslint/parser": "^4.26.0",
"babel-eslint": "^10.1.0",
"eslint": "^7.18.0",
"eslint-config-prettier": "^7.2.0",
"eslint-plugin-import": "^2.20.2",
"eslint": "^7.28.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-import": "^2.23.4",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.1.1",
"eslint-plugin-react": "^7.20.0",
"eslint-plugin-promise": "^5.1.0",
"eslint-plugin-react": "^7.24.0",
"eslint-plugin-simple-import-sort": "^7.0.0",
"husky": ">=4",
"jest": "^26.6.3",
"lint-staged": ">=10.5.1",
"prettier": "^2.2.1",
"rimraf": "^3.0.0",
"supertest": "^6.0.1",
"ts-jest": "^26.4.4",
"ts-node": "^9.0.0",
"ts-node-dev": "^1.0.0",
"typescript": "^4.0.5"
"ts-jest": "^26.5.6",
"ts-node": "^10.0.0",
"ts-node-dev": "^1.1.6",
"typescript": "^4.3.2"
},
"husky": {
"hooks": {
Expand Down
3 changes: 2 additions & 1 deletion src/worker/vm/lazy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
PluginLogEntryType,
PluginTask,
PluginTaskType,
VMMethods,
} from '../../types'
import { clearError, processError } from '../../utils/db/error'
import { disablePlugin, setPluginCapabilities } from '../../utils/db/sql'
Expand Down Expand Up @@ -100,7 +101,7 @@ export class LazyPluginVM {

if (methods) {
for (const [key, value] of Object.entries(methods)) {
if (value) {
if (value as VMMethods[keyof VMMethods] | undefined) {
capabilities.methods.push(key)
}
}
Expand Down
4 changes: 2 additions & 2 deletions tests/clickhouse/e2e.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import { Hub } from '../../src/types'
import { delay, UUIDT } from '../../src/utils/utils'
import { makePiscina } from '../../src/worker/piscina'
import { createPosthog, DummyPostHog } from '../../src/worker/vm/extensions/posthog'
import { imports } from '../../src/worker/vm/imports'
import { writeToFile } from '../../src/worker/vm/extensions/test-utils'
import { resetTestDatabaseClickhouse } from '../helpers/clickhouse'
import { resetKafka } from '../helpers/kafka'
import { pluginConfig39 } from '../helpers/plugins'
import { resetTestDatabase } from '../helpers/sql'
import { delayUntilEventIngested } from '../shared/process-event'

const { console: testConsole } = imports['test-utils/write-to-file']
const { console: testConsole } = writeToFile

jest.setTimeout(60000) // 60 sec timeout

Expand Down
4 changes: 2 additions & 2 deletions tests/jobs.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { killProcess } from '../src/utils/kill'
import { delay } from '../src/utils/utils'
import { makePiscina } from '../src/worker/piscina'
import { createPosthog, DummyPostHog } from '../src/worker/vm/extensions/posthog'
import { imports } from '../src/worker/vm/imports'
import { writeToFile } from '../src/worker/vm/extensions/test-utils'
import { resetGraphileSchema } from './helpers/graphile'
import { pluginConfig39 } from './helpers/plugins'
import { resetTestDatabase } from './helpers/sql'
Expand All @@ -35,7 +35,7 @@ jest.mock('../src/utils/db/sql')
jest.mock('../src/utils/kill')
jest.setTimeout(60000) // 60 sec timeout

const { console: testConsole } = imports['test-utils/write-to-file']
const { console: testConsole } = writeToFile

const testCode = `
import { console } from 'test-utils/write-to-file'
Expand Down
4 changes: 2 additions & 2 deletions tests/postgres/e2e.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import { Hub } from '../../src/types'
import { delay, UUIDT } from '../../src/utils/utils'
import { makePiscina } from '../../src/worker/piscina'
import { createPosthog, DummyPostHog } from '../../src/worker/vm/extensions/posthog'
import { imports } from '../../src/worker/vm/imports'
import { writeToFile } from '../../src/worker/vm/extensions/test-utils'
import { pluginConfig39 } from '../helpers/plugins'
import { resetTestDatabase } from '../helpers/sql'
import { delayUntilEventIngested } from '../shared/process-event'

const { console: testConsole } = imports['test-utils/write-to-file']
const { console: testConsole } = writeToFile

jest.mock('../../src/utils/status')
jest.setTimeout(60000) // 60 sec timeout
Expand Down
Loading