Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ts-deepmerge #477

Merged
merged 51 commits into from
Feb 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
db4b8bc
Move default METRICS_ENABLED resolution into TS code
kibertoad May 18, 2023
33924f7
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad May 19, 2023
b875e05
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad May 22, 2023
b75fe41
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Jun 1, 2023
c43a080
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Jun 9, 2023
d794b30
Upgrade to latest and greatest node-core, remove shared code
kibertoad Jun 9, 2023
7546234
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Jun 9, 2023
e43d7c4
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Jun 10, 2023
9b48abf
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Jun 10, 2023
5493046
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Jun 13, 2023
c2d56e2
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Jun 14, 2023
50be67a
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Jun 15, 2023
28f82be
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Jun 15, 2023
854ef00
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Jun 20, 2023
1af9ae7
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Jun 21, 2023
31e4a67
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Jun 26, 2023
82f0a1d
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Jun 26, 2023
dcff20a
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Jun 27, 2023
815cbe8
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Jun 28, 2023
f6f0406
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Jun 28, 2023
857ebad
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Jun 28, 2023
b51470a
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Jun 29, 2023
c9301a7
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Jul 1, 2023
2d8f052
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Jul 4, 2023
a62303e
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Jul 7, 2023
a180bed
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Jul 12, 2023
71500be
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Jul 27, 2023
c6defb4
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Aug 6, 2023
44586dc
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Aug 10, 2023
4a96aa4
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Aug 15, 2023
ee24dbf
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Aug 21, 2023
30b8e85
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Aug 30, 2023
69aba05
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Aug 31, 2023
6999b74
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Sep 4, 2023
a4de417
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Sep 5, 2023
64ec541
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Sep 14, 2023
9b71247
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Sep 19, 2023
8167974
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Sep 19, 2023
bf19db5
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Sep 25, 2023
13a3058
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Oct 30, 2023
4d29064
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Nov 22, 2023
8e690d8
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Nov 29, 2023
d8de22d
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Dec 11, 2023
3958e74
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Dec 12, 2023
4f46987
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Dec 13, 2023
6659461
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Dec 27, 2023
ec26740
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Jan 6, 2024
0da60fb
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Jan 24, 2024
f1c5278
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Feb 1, 2024
82d8936
Merge branch 'main' of https://github.com/lokalise/node-service-template
kibertoad Feb 1, 2024
e7f741c
Update ts-deepmerge
kibertoad Feb 1, 2024
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
8 changes: 4 additions & 4 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"prettier": "^3.2.4",
"prisma": "^5.8.1",
"prisma-lint": "^0.1.0",
"ts-deepmerge": "^6.2.0",
"ts-deepmerge": "^7.0.0",
"ts-node": "^10.9.2",
"ts-node-dev": "^2.0.0",
"typescript": "5.3.3",
Expand Down
2 changes: 1 addition & 1 deletion test/TestContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type { AwilixContainer } from 'awilix'
import { asFunction, createContainer } from 'awilix'
import { AwilixManager } from 'awilix-manager'
import type { FastifyInstance } from 'fastify'
import merge from 'ts-deepmerge'
import { merge } from 'ts-deepmerge'

import type { DIOptions } from '../src/infrastructure/commonDiConfig'
import type { Config } from '../src/infrastructure/config'
Expand Down
Loading