Skip to content

Commit

Permalink
Merge branch 'master' into feat/inline-external-types
Browse files Browse the repository at this point in the history
Signed-off-by: Marcus S. Abildskov <8391194+marcus-sa@users.noreply.github.com>
  • Loading branch information
marcus-sa committed Jan 18, 2024
2 parents 749d118 + f67cf73 commit c926db5
Show file tree
Hide file tree
Showing 212 changed files with 4,569 additions and 1,160 deletions.
3 changes: 3 additions & 0 deletions .github/actionlint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
self-hosted-runner:
labels:
- buildjet-2vcpu-ubuntu-2004
33 changes: 33 additions & 0 deletions .github/workflows/commitlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
on:
pull_request:
types: [synchronize, edited, opened]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0

- uses: actions/setup-node@v1
with:
node-version: 20.6.0

- name: npm install
run: npm ci

- name: Lint commit messages
run: npx commitlint --from $BASE_SHA --to $HEAD_SHA --verbose
env:
BASE_SHA: ${{ github.event.pull_request.base.sha }}
HEAD_SHA: ${{ github.event.pull_request.head.sha }}

- name: Lint pull request title
run: echo $PR_TITLE | npx commitlint --verbose
env:
PR_TITLE: ${{ github.event.pull_request.title }}
48 changes: 24 additions & 24 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ jobs:
matrix:
node-version: [20.6.0]
services:
storage-ftp:
image: garethflowers/ftp-server:0.7.0
env:
FTP_USER: user
FTP_PASS: '123'
ports:
- "20-21:20-21"
- "40000-40009:40000-40009"
storage-sftp:
image: atmoz/sftp:alpine
env:
SFTP_USERS: user:123:::upload
ports:
- "2222:22"
storage-ftp:
image: garethflowers/ftp-server:0.7.0
env:
FTP_USER: user
FTP_PASS: '123'
ports:
- '20-21:20-21'
- '40000-40009:40000-40009'
storage-sftp:
image: atmoz/sftp:alpine
env:
SFTP_USERS: user:123:::upload
ports:
- '2222:22'
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
strategy:
matrix:
node-version: [20.6.0]
postgres-version: [ 14 ]
postgres-version: [14]
services:
postgres:
image: postgres:${{ matrix.postgres-version }}
Expand All @@ -101,7 +101,7 @@ jobs:
POSTGRES_PASSWORD: ''
POSTGRES_HOST_AUTH_METHOD: trust
ports:
- "5432:5432"
- '5432:5432'
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
steps:
- uses: actions/checkout@v2
Expand All @@ -112,7 +112,7 @@ jobs:
- name: Cache node_modules
uses: actions/cache@v1
with:
path: "**/node_modules"
path: '**/node_modules'
key: ${{ runner.os }}-postgres-node_modules-${{ hashFiles('**/package-lock.json') }}
- name: npm install
run: npm ci
Expand All @@ -131,16 +131,16 @@ jobs:
strategy:
matrix:
node-version: [20.6.0]
mysql-version: [ 8.0 ]
mysql-version: [8.0]
services:
mysql:
image: "mysql:${{ matrix.mysql-version }}"
image: 'mysql:${{ matrix.mysql-version }}'
options: >-
--health-cmd "mysqladmin ping --silent"
-e MYSQL_ALLOW_EMPTY_PASSWORD=yes
-e MYSQL_DATABASE=default
ports:
- "3306:3306"
- '3306:3306'
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
Expand All @@ -150,7 +150,7 @@ jobs:
- name: Cache node_modules
uses: actions/cache@v1
with:
path: "**/node_modules"
path: '**/node_modules'
key: ${{ runner.os }}-mysql-node_modules-${{ hashFiles('**/package-lock.json') }}
- name: npm install
run: npm ci
Expand Down Expand Up @@ -178,7 +178,7 @@ jobs:
- name: Cache node_modules
uses: actions/cache@v1
with:
path: "**/node_modules"
path: '**/node_modules'
key: ${{ runner.os }}-sqlite-node_modules-${{ hashFiles('**/package-lock.json') }}
- name: npm install
run: npm ci
Expand All @@ -197,7 +197,7 @@ jobs:
strategy:
matrix:
node-version: [20.6.0]
mongo-version: [ 4.0 ]
mongo-version: [4.0]
services:
# this is used for the simple-auth test
mongo:
Expand All @@ -224,7 +224,7 @@ jobs:
- name: Cache node_modules
uses: actions/cache@v1
with:
path: "**/node_modules"
path: '**/node_modules'
key: ${{ runner.os }}-mongo-node_modules-${{ hashFiles('**/package-lock.json') }}
- name: npm install
run: npm ci
Expand Down
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
legacy-peer-deps=true
19 changes: 19 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"plugins": ["@trivago/prettier-plugin-sort-imports"],
"trailingComma": "all",
"bracketSpacing": true,
"tabWidth": 2,
"singleQuote": true,
"arrowParens": "avoid",
"endOfLine": "lf",
"importOrderSeparation": true,
"importOrderSortSpecifiers": true,
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"options": {
"tabWidth": 4
}
}
]
}
44 changes: 44 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,50 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.0.1-alpha.113](https://github.com/deepkit/deepkit-framework/compare/v1.0.1-alpha.112...v1.0.1-alpha.113) (2024-01-17)


### Bug Fixes

* **framework:** make sure profiler is only activated when debug/profile is true. ([c1d9357](https://github.com/deepkit/deepkit-framework/commit/c1d9357dba3b0a5568592fd5d61c8853bfe9b25e))


### Features

* **orm:** remove rxjs dependency ([0d9dfe1](https://github.com/deepkit/deepkit-framework/commit/0d9dfe1f80bfc34bfa12a4ffaa2fd203865d942b))





## [1.0.1-alpha.112](https://github.com/deepkit/deepkit-framework/compare/v1.0.1-alpha.111...v1.0.1-alpha.112) (2024-01-16)


### Bug Fixes

* **framework:** make sure configured var/debug folder is created when ([3383504](https://github.com/deepkit/deepkit-framework/commit/3383504b3375d03d9f0f421e19f16e0ebc6721ae))


### Features

* **app:** improve CLI outputs/parsing by removing [@oclif](https://github.com/oclif) ([e38bbd1](https://github.com/deepkit/deepkit-framework/commit/e38bbd143daa2c856c57eca07a4fd29e884fe97e))
* **rpc:** make kernel connection available in kernel security ([#536](https://github.com/deepkit/deepkit-framework/issues/536)) ([32252b0](https://github.com/deepkit/deepkit-framework/commit/32252b0c1327ec093215602c936d287c20f0a66e))





## [1.0.1-alpha.111](https://github.com/deepkit/deepkit-framework/compare/v1.0.1-alpha.110...v1.0.1-alpha.111) (2024-01-15)


### Features

* **type:** add new fast path to resolveReceiveType and made it 5x faster on average use case. ([45d656c](https://github.com/deepkit/deepkit-framework/commit/45d656ccc0e4ba36fe362784e60ca58c6b2da31d))





## [1.0.1-alpha.110](https://github.com/deepkit/deepkit-framework/compare/v1.0.1-alpha.109...v1.0.1-alpha.110) (2024-01-11)


Expand Down
24 changes: 24 additions & 0 deletions commitlint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
const {
utils: { getPackages },
} = require('@commitlint/config-lerna-scopes');

const customScopes = ['deps'];

module.exports = {
extends: ['@commitlint/config-conventional', '@commitlint/config-lerna-scopes'],
ignores: [
message =>
message.startsWith('Merge') ||
message.startsWith('Revert'),
],
rules: {
'header-max-length': [0, 'always', 125],
'footer-max-line-length': [0, 'always', Infinity],
'body-max-line-length': [0, 'always', Infinity],
'scope-enum': async ctx => [
2,
'always',
[...customScopes, ...(await getPackages(ctx))],
],
},
};
14 changes: 14 additions & 0 deletions lefthook.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# https://github.com/evilmartians/lefthook/blob/master/docs/configuration.md
commit-msg:
commands:
commitlint:
run: npx commitlint --edit {1}
pre-commit:
commands:
github-actions:
glob: '*.{yaml,yml}'
root: '.github'
run: echo {staged_files} && actionlint
prettier:
glob: '[*.{json,yml,yaml,html,ts,tsx,js,jsx},!./package-lock.json]'
run: npx prettier --write {staged_files} && git add {staged_files}
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
"conventionalCommits": true
}
},
"version": "1.0.1-alpha.110"
"version": "1.0.1-alpha.113"
}
Loading

0 comments on commit c926db5

Please sign in to comment.