Skip to content

Commit

Permalink
refactor: move core utils on new core package
Browse files Browse the repository at this point in the history
  • Loading branch information
magne4000 committed Jul 12, 2024
1 parent ec1d878 commit 55864d5
Show file tree
Hide file tree
Showing 20 changed files with 105 additions and 70 deletions.
5 changes: 2 additions & 3 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@
"plugin:@typescript-eslint/recommended",
"prettier"
],
"plugins": [
"@typescript-eslint"
],
"plugins": ["@typescript-eslint"],
"parserOptions": {
"sourceType": "module",
"ecmaVersion": "latest"
},
"ignorePatterns": ["playground/**"],
"rules": {
"no-unused-labels": 0,
"@typescript-eslint/ban-ts-comment": 0,
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,11 @@ jobs:
- name: Build
run: pnpm run build

- name: Run CI tests
run: pnpm run lint

- name: Run CI tests
run: pnpm run test:typecheck

- name: Run CI tests
run: pnpm run test
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"dev:hattip": "hattip serve ./playground/hattip-entry.ts --client",
"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
"build": "pnpm run -r build",
"test": "pnpm run -r --sequential test"
"test": "pnpm run -r --sequential test",
"test:typecheck": "pnpm run -r test:typecheck"
},
"keywords": [],
"author": "",
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-express/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"files": [
"dist"
],
"types": "./config.d.ts",
"exports": {
".": "./dist/index.js"
},
Expand All @@ -32,6 +31,7 @@
"devDependencies": {
"@brillout/release-me": "^0.3.9",
"@types/node": "^20.14.10",
"@universal-middleware/core": "workspace:^",
"express": "^4.19.2",
"helmet": "^7.1.0",
"mri": "^1.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-express/src/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import type {
Awaitable,
UniversalHandler,
UniversalMiddleware,
} from "./types.js";
} from "@universal-middleware/core";

export const contextSymbol = Symbol("unContext");
export const requestSymbol = Symbol("unRequest");
Expand Down
23 changes: 4 additions & 19 deletions packages/adapter-express/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,6 @@
{
"compilerOptions": {
"strict": true,
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"resolveJsonModule": true,
"skipLibCheck": true,
"sourceMap": true,
"verbatimModuleSyntax": true,
"noEmit": true,
"module": "NodeNext",
"moduleResolution": "NodeNext",
"target": "ES2022",
"lib": [
"ES2022",
"DOM",
"DOM.Iterable"
]
},
"exclude": ["**/dist/**/*"]
"extends": "../../tsconfig.json",
"compilerOptions": {
"types": ["@types/node"]
}
}
7 changes: 0 additions & 7 deletions packages/adapter-hono/config.d.ts

This file was deleted.

2 changes: 1 addition & 1 deletion packages/adapter-hono/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"files": [
"dist"
],
"types": "./config.d.ts",
"exports": {
".": "./dist/index.js"
},
Expand All @@ -29,6 +28,7 @@
"devDependencies": {
"@brillout/release-me": "^0.3.9",
"@types/node": "^20.14.10",
"@universal-middleware/core": "workspace:^",
"hono": "^4.4.13",
"mri": "^1.2.0",
"rimraf": "^6.0.0",
Expand Down
5 changes: 4 additions & 1 deletion packages/adapter-hono/src/common.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import type { Context as HonoContext, Handler, MiddlewareHandler } from "hono";
import type { UniversalHandler, UniversalMiddleware } from "./types.js";
import type {
UniversalHandler,
UniversalMiddleware,
} from "@universal-middleware/core";

export const contextSymbol = Symbol("unContext");

Expand Down
15 changes: 0 additions & 15 deletions packages/adapter-hono/src/types.ts

This file was deleted.

20 changes: 1 addition & 19 deletions packages/adapter-hono/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,3 @@
{
"compilerOptions": {
"strict": true,
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"resolveJsonModule": true,
"skipLibCheck": true,
"sourceMap": true,
"verbatimModuleSyntax": true,
"noEmit": true,
"module": "NodeNext",
"moduleResolution": "NodeNext",
"target": "ES2022",
"lib": [
"ES2022",
"DOM",
"DOM.Iterable"
]
},
"exclude": ["**/dist/**/*"]
"extends": "../../tsconfig.json"
}
File renamed without changes.
30 changes: 30 additions & 0 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"name": "@universal-middleware/core",
"version": "0.1.0",
"type": "module",
"description": "Universal middlewares core utilities",
"files": [
"dist"
],
"exports": {
".": "./dist/index.js"
},
"author": "Joël Charles <[email protected]>",
"repository": "https://github.com/magne4000/universal-handler",
"license": "MIT",
"scripts": {
"build": "rimraf dist && tsup",
"prepack": "pnpm build",
"test:typecheck": "tsc -p tsconfig.json --noEmit",
"release": "LANG=en_US release-me patch",
"release:minor": "LANG=en_US release-me minor",
"release:commit": "LANG=en_US release-me commit"
},
"devDependencies": {
"@brillout/release-me": "^0.3.9",
"@types/node": "^20.14.10",
"rimraf": "^6.0.0",
"tsup": "^8.1.0",
"typescript": "^5.5.3"
}
}
3 changes: 3 additions & 0 deletions packages/core/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# `@universal-middleware/core`

[Universal Middleware](https://github.com/magne4000/universal-middleware) core utilities.
5 changes: 5 additions & 0 deletions packages/core/src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export type {
Awaitable,
UniversalHandler,
UniversalMiddleware,
} from "./types.js";
File renamed without changes.
3 changes: 3 additions & 0 deletions packages/core/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": "../../tsconfig.json"
}
18 changes: 18 additions & 0 deletions packages/core/tsup.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { defineConfig } from "tsup";

export default defineConfig([
{
entry: ["./src/index.ts"],
format: ["esm"],
platform: "node",
target: "node18",
dts: {
banner: `declare global {
namespace Universal {
interface Context extends Record<string | number | symbol, unknown> {}
}
}`,
},
clean: true,
},
]);
24 changes: 24 additions & 0 deletions pnpm-lock.yaml

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

2 changes: 0 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"compilerOptions": {
"strict": true,
"allowJs": true,
"checkJs": true,
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"verbatimModuleSyntax": true,
Expand Down

0 comments on commit 55864d5

Please sign in to comment.