Skip to content

Commit

Permalink
chore: move to yarn 2 #56
Browse files Browse the repository at this point in the history
  • Loading branch information
regevbr committed Apr 15, 2020
1 parent c3c8db7 commit d28585a
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 13 deletions.
25 changes: 16 additions & 9 deletions .pnp.js

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

Binary file not shown.
Binary file added .yarn/cache/typescript-patch-1c362703ff-2.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
"ts-jest": "~25.3.1",
"ts-node": "~8.8.2",
"ts-toolbelt": "~6.4.2",
"typescript": "~3.8.3"
"typescript": "next"
},
"dependencies": {
"array-flat-polyfill": "~1.0.1",
Expand Down
1 change: 1 addition & 0 deletions test/common/testers/repositoryProviderTester.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export const testRepositoryProvider = <E extends IEntity, P extends IRepositoryP
describe(`${Entity} repository provider`, () => {
const repositoryMock = mock<Repository<E>>();
const connectionMock = mock<Connection>();
// @ts-ignore
connectionMock.getRepository.mockReturnValue(repositoryMock);
const connectionProviderMock = mock<IConnectionProvider>();
connectionProviderMock.getConnection.mockResolvedValue(connectionMock);
Expand Down
1 change: 1 addition & 0 deletions test/src/db/impl/connectionProvider.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ describe(`connection provider`, () => {
let tmpDir: string;
const connectionMock = mock<Connection>();
const typeOrmMock = mock<TypeOrm>();
// @ts-ignore
typeOrmMock.createConnection.mockResolvedValue(connectionMock);

beforeEach(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { mock, mockReset } from 'jest-mock-extended';
describe(`cache resolver`, () => {
const repositoryMock = mock<Repository<Dependency>>();
const dependencyRepositoryProviderMock = mock<IDependencyRepositoryProvider>();
// @ts-ignore
dependencyRepositoryProviderMock.getRepository.mockResolvedValue(repositoryMock);
const cacheResolver = new CacheResolver(dependencyRepositoryProviderMock, loggerFactory);

Expand Down
26 changes: 23 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7180,7 +7180,7 @@ fsevents@^2.1.2:
ts-toolbelt: ~6.4.2
ts-type-guards: ~0.6.1
typeorm: ~0.2.24
typescript: ~3.8.3
typescript: next
yaml: ~1.8.3
yargs-parser: ~18.1.2
bin:
Expand Down Expand Up @@ -9691,7 +9691,7 @@ [email protected]:
languageName: node
linkType: hard

"typescript@^3.6.3, typescript@~3.8.3":
typescript@^3.6.3:
version: 3.8.3
resolution: "typescript@npm:3.8.3"
bin:
Expand All @@ -9701,7 +9701,17 @@ [email protected]:
languageName: node
linkType: hard

"typescript@patch:typescript@^3.6.3#builtin<compat/typescript>, typescript@patch:typescript@~3.8.3#builtin<compat/typescript>":
typescript@next:
version: 3.9.0-dev.20200415
resolution: "typescript@npm:3.9.0-dev.20200415"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 2/9973b0c706b38eee0ac2738fbdf871507751545a21be864b160344dbbb5860275c6ff75fd15cb1cf184d227dec81626182ebbd0de334721aafd22e4e5c706813
languageName: node
linkType: hard

"typescript@patch:typescript@^3.6.3#builtin<compat/typescript>":
version: 3.8.3
resolution: "typescript@patch:typescript@npm%3A3.8.3#builtin<compat/typescript>::version=3.8.3&hash=c79188"
bin:
Expand All @@ -9711,6 +9721,16 @@ [email protected]:
languageName: node
linkType: hard

"typescript@patch:typescript@next#builtin<compat/typescript>":
version: 3.9.0-dev.20200415
resolution: "typescript@patch:typescript@npm%3A3.9.0-dev.20200415#builtin<compat/typescript>::version=3.9.0-dev.20200415&hash=c79188"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 2/027c594d74500a6fe66997c2d3ab3b9677509fc5d64c057233908054bd93cf5e1a7ef34560c2039d1b04c8273d0bc3fedb48d462397ccc816fe581501d1b6cbe
languageName: node
linkType: hard

"underscore@npm:1.8.3":
version: 1.8.3
resolution: "underscore@npm:1.8.3"
Expand Down

0 comments on commit d28585a

Please sign in to comment.