Skip to content

Commit

Permalink
Merge branch 'main' into fix/next-js-13-host
Browse files Browse the repository at this point in the history
  • Loading branch information
jpwilliams authored Nov 22, 2023
2 parents 158ff30 + be5544b commit 6d867ca
Show file tree
Hide file tree
Showing 29 changed files with 1,293 additions and 534 deletions.
5 changes: 5 additions & 0 deletions .changeset/wicked-beans-heal.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"inngest": patch
---

Fix correctness issues in generated `*.d.ts` files, causing errors for some versions/configurations of TypeScript with `skipLibCheck: false`
24 changes: 24 additions & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ jobs:
matrix:
tsVersion:
- 'latest'
- '~5.3.0'
- '~5.2.0'
- '~5.1.0'
- '~5.0.0'
Expand All @@ -61,6 +62,7 @@ jobs:
- uses: ./.github/actions/setup-and-build
- run: pnpm add -D typescript@${{ matrix.tsVersion }}
- run: pnpm run test:types
- run: pnpm run test:dist

inngest_api_diff:
name: "inngest: Local API diff"
Expand All @@ -84,6 +86,28 @@ jobs:
- uses: ./.github/actions/setup-and-build
- run: pnpm run lint

inngest_test_dist:
name: "inngest: Dist tests"
runs-on: ubuntu-latest
defaults:
run:
working-directory: packages/inngest
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/setup-and-build
- run: pnpm run test:dist

inngest_test_deps:
name: "inngest: Dependency tests"
runs-on: ubuntu-latest
defaults:
run:
working-directory: packages/inngest
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/setup-and-build
- run: pnpm run test:deps

"eslint-plugin_test":
name: "eslint-plugin: Test"
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"license": "ISC",
"dependencies": {
"@typescript-eslint/utils": "^6.11.0",
"typescript": "^5.2.2"
"typescript": "~5.3.0"
},
"devDependencies": {
"@typescript-eslint/rule-tester": "^6.11.0",
Expand Down
25 changes: 25 additions & 0 deletions packages/inngest/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,31 @@ module.exports = {
],
"import/consistent-type-specifier-style": ["error", "prefer-inline"],
"import/no-duplicates": ["error", { "prefer-inline": true }],
"import/no-extraneous-dependencies": [
"error",
{
devDependencies: [
"**/*.test.ts",
"**/test/**",
"**/scripts/**",
"src/cloudflare.ts",
"src/digitalocean.ts",
"src/edge.ts",
"src/express.ts",
"src/fastify.ts",
"src/h3.ts",
"src/koa.ts",
"src/lambda.ts",
"src/next.ts",
"src/nuxt.ts",
"src/redwood.ts",
"src/remix.ts",
"src/sveltekit.ts",
],
includeInternal: true,
includeTypes: true,
},
],
},
overrides: [
{
Expand Down
20 changes: 10 additions & 10 deletions packages/inngest/etc/inngest.api.md

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

20 changes: 11 additions & 9 deletions packages/inngest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
"itest": "tsx scripts/integrationTestRunner.ts",
"test:examples": "jest --logHeapUsage --maxWorkers=8 --testMatch \"**/test/functions/**/*.test.ts\" --ci --verbose",
"test:types": "tsc --noEmit --project tsconfig.types.json --listFiles",
"test:dist": "tsc --noEmit dist/**/*.d.ts",
"test:deps": "tsx scripts/checkDependencies.ts",
"clean": "rm -rf ./dist",
"lint": "eslint .",
"postversion": "pnpm run build && pnpm run build:copy",
Expand Down Expand Up @@ -127,7 +129,7 @@
"trailingComma": "es5"
},
"dependencies": {
"buffer": "^6.0.3",
"@types/debug": "^4.1.12",
"canonicalize": "^1.0.8",
"chalk": "^4.1.2",
"cross-fetch": "^4.0.0",
Expand All @@ -139,6 +141,7 @@
"serialize-error-cjs": "^0.1.3",
"strip-ansi": "^5.2.0",
"type-fest": "^3.13.1",
"type-plus": "^5.1.0",
"zod": "~3.22.3"
},
"devDependencies": {
Expand All @@ -151,7 +154,6 @@
"@sveltejs/kit": "^1.27.3",
"@total-typescript/shoehorn": "^0.1.1",
"@types/aws-lambda": "^8.10.108",
"@types/debug": "^4.1.8",
"@types/express": "^4.17.13",
"@types/inquirer": "^9.0.3",
"@types/jest": "^27.4.1",
Expand All @@ -161,17 +163,18 @@
"@types/ms": "^0.7.31",
"@types/node": "^18.16.16",
"@types/sha.js": "^2.4.0",
"@typescript-eslint/eslint-plugin": "^5.47.0",
"@typescript-eslint/parser": "^5.47.0",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"@vercel/node": "^2.15.9",
"concurrently": "^7.4.0",
"eslint": "^8.30.0",
"eslint-config-prettier": "^8.5.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-prettier": "^5.0.0",
"express": "^4.18.2",
"fastify": "^4.21.0",
"genversion": "^3.1.1",
"glob": "^10.3.10",
"inquirer": "^9.2.10",
"jest": "^29.3.1",
"koa": "^2.14.2",
Expand All @@ -180,12 +183,11 @@
"nock": "^13.2.9",
"node-mocks-http": "^1.11.0",
"nodemon": "^2.0.20",
"prettier": "^2.7.1",
"prettier": "^3.1.0",
"shx": "^0.3.4",
"ts-jest": "^29.1.0",
"tsx": "^3.12.7",
"type-plus": "^5.1.0",
"typescript": "^5.2.2",
"typescript": "~5.3.0",
"ulid": "^2.3.0"
},
"volta": {
Expand Down
Loading

0 comments on commit 6d867ca

Please sign in to comment.