Skip to content

Commit 0ed117a

Browse files
committed
Merge remote-tracking branch 'origin/main' into anmol/templates
# Conflicts: # functions/send-email-link/handler.ts # functions/send-email-link/package.json # functions/simple-email/package.json # functions/simple-email/src/index.ts # functions/simple-email/tsconfig.esm.json # package.json # packages/fn-runtime/tsconfig.json
2 parents 9e6b39a + 4d5e9c7 commit 0ed117a

32 files changed

Lines changed: 360 additions & 198 deletions

.eslintrc.json

Lines changed: 0 additions & 67 deletions
This file was deleted.

eslint.config.mjs

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
import js from '@eslint/js';
2+
import tseslint from 'typescript-eslint';
3+
import simpleImportSort from 'eslint-plugin-simple-import-sort';
4+
import unusedImports from 'eslint-plugin-unused-imports';
5+
import prettierConfig from 'eslint-config-prettier';
6+
import globals from 'globals';
7+
8+
export default [
9+
{
10+
ignores: ['**/dist/**', '**/node_modules/**']
11+
},
12+
js.configs.recommended,
13+
...tseslint.configs.recommended,
14+
{
15+
files: ['**/*.ts'],
16+
languageOptions: {
17+
parser: tseslint.parser,
18+
parserOptions: {
19+
ecmaVersion: 'latest',
20+
sourceType: 'module'
21+
},
22+
globals: {
23+
...globals.node,
24+
...globals.jest
25+
}
26+
},
27+
plugins: {
28+
'simple-import-sort': simpleImportSort,
29+
'unused-imports': unusedImports
30+
},
31+
rules: {
32+
indent: ['error', 2],
33+
quotes: ['error', 'single', { avoidEscape: true, allowTemplateLiterals: true }],
34+
'quote-props': ['error', 'as-needed'],
35+
semi: ['error', 'always'],
36+
'comma-dangle': ['error', 'never'],
37+
'simple-import-sort/imports': 1,
38+
'simple-import-sort/exports': 1,
39+
'unused-imports/no-unused-imports': 1,
40+
'@typescript-eslint/no-unused-vars': [1, { argsIgnorePattern: 'React|res|next|^_' }],
41+
'@typescript-eslint/no-explicit-any': 0,
42+
'@typescript-eslint/no-var-requires': 0,
43+
'no-console': 0,
44+
'@typescript-eslint/ban-ts-comment': 0,
45+
'prefer-const': 0,
46+
'prefer-spread': 0,
47+
'no-case-declarations': 0,
48+
'no-implicit-globals': 0,
49+
'@typescript-eslint/no-unsafe-declaration-merging': 0
50+
}
51+
},
52+
prettierConfig
53+
];

functions/example/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# @constructive-io/knative-job-example
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"extends": "./tsconfig.json",
3+
"compilerOptions": {
4+
"outDir": "dist/esm",
5+
"module": "es2022",
6+
"rootDir": "src/",
7+
"declaration": false
8+
}
9+
}

functions/send-email-link/handler.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import type { GraphQLClient } from 'graphql-request';
33
import gql from 'graphql-tag';
44
import { generate } from '@launchql/mjml';
55
import { send as sendPostmaster } from '@constructive-io/postmaster';
6-
import { send as sendSmtp } from 'simple-smtp-server';
76
import { parseEnvBoolean } from '@pgpmjs/env';
87

98
const GetUser = gql`

job/server/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# @constructive-io/knative-job-server

job/server/package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
"faas-job-server": "dist/run.js"
1010
},
1111
"scripts": {
12-
"build": "tsc -p tsconfig.json",
13-
"clean": "rimraf dist"
12+
"build": "makage build",
13+
"build:dev": "makage build --dev",
14+
"clean": "makage clean",
15+
"lint": "eslint . --fix"
1416
},
1517
"dependencies": {
1618
"@constructive-io/job-pg": "^1.1.0",
@@ -26,6 +28,7 @@
2628
"@types/express-serve-static-core": "^5.0.0",
2729
"@types/node": "^22.10.4",
2830
"@types/pg": "^8.11.0",
31+
"makage": "^0.1.10",
2932
"typescript": "^5.1.6"
3033
}
3134
}

job/server/src/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import express from 'express';
2-
import bodyParser from 'body-parser';
3-
import type { Pool, PoolClient } from 'pg';
4-
import * as jobs from '@constructive-io/job-utils';
51
import poolManager from '@constructive-io/job-pg';
2+
import * as jobs from '@constructive-io/job-utils';
63
import { createLogger } from '@pgpmjs/logger';
4+
import bodyParser from 'body-parser';
5+
import express from 'express';
6+
import type { Pool, PoolClient } from 'pg';
77

88
type JobRequestBody = {
99
message?: string;

job/server/src/run.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
#!/usr/bin/env node
22

3-
import server from './index';
43
import poolManager from '@constructive-io/job-pg';
54
import { getJobsCallbackPort } from '@constructive-io/job-utils';
65
import { createLogger } from '@pgpmjs/logger';
76

7+
import server from './index';
8+
89
const logger = createLogger('knative-job-server');
910
const pgPool = poolManager.getPool();
1011
const port = getJobsCallbackPort();

job/server/tsconfig.esm.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"extends": "./tsconfig.json",
3+
"compilerOptions": {
4+
"outDir": "dist/esm",
5+
"module": "es2022",
6+
"rootDir": "src/",
7+
"declaration": false
8+
}
9+
}

0 commit comments

Comments
 (0)