diff --git a/package.json b/package.json index 442bd57c..4a044acf 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "@types/inline-css": "^3.0.1", "@types/jest": "^29.2.6", "@types/mocha": "^10.0.1", - "@types/node": "18.15.5", + "@types/node": "^18.15.5", "@types/nodemailer": "^6.4.4", "@types/pug": "^2.0.6", "@types/supertest": "^2.0.11", @@ -132,10 +132,10 @@ "supertest": "^6.2.2", "testcontainers": "^9.1.1", "ts-jest": "^29.0.5", - "ts-loader": "9.2.6", - "ts-node": "10.4.0", + "ts-loader": "^9.2.6", + "ts-node": "^10.4.0", "tsconfig-paths": "^4.1.2", "turbo": "^1.8.5", - "typescript": "4.5.5" + "typescript": "^4.5.5" } } diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 1b487593..4ce91c19 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -60,7 +60,7 @@ "@pika/pack": { "pipeline": [ [ - "@pika/plugin-standard-pkg", + "@pika/plugin-ts-standard-pkg", { "exclude": [ "**/__test__/*" @@ -74,14 +74,6 @@ "**/__test__/*" ] } - ], - [ - "@pika/plugin-build-types", - { - "exclude": [ - "**/__test__/*" - ] - } ] ] } diff --git a/packages/test-utils/src/__mocks__/jest.mocks.ts b/packages/test-utils/src/__mocks__/jest.mocks.ts index 895285e5..bf4b01e8 100644 --- a/packages/test-utils/src/__mocks__/jest.mocks.ts +++ b/packages/test-utils/src/__mocks__/jest.mocks.ts @@ -1,4 +1,4 @@ -import { appConfigBase } from '../fixtures'; +import { appConfigBase } from '../fixtures/appConfigBase'; export const config = jest.fn().mockImplementation(() => appConfigBase); diff --git a/packages/test-utils/src/__test__/testcontainer.spec.ts b/packages/test-utils/src/__test__/testcontainer.spec.ts index 5c5c5823..61fab01c 100644 --- a/packages/test-utils/src/__test__/testcontainer.spec.ts +++ b/packages/test-utils/src/__test__/testcontainer.spec.ts @@ -1,5 +1,5 @@ import { testContainers } from '../testcontainers'; -import { StartedGenericContainer } from 'testcontainers/dist/generic-container/started-generic-container'; +import { StartedGenericContainer } from 'testcontainers/dist/src/generic-container/started-generic-container'; import { TCRedisOptions, diff --git a/packages/test-utils/src/config/configuration.ts b/packages/test-utils/src/config/configuration.ts index 2261a972..08344420 100644 --- a/packages/test-utils/src/config/configuration.ts +++ b/packages/test-utils/src/config/configuration.ts @@ -1,6 +1,6 @@ import { Typings } from '@tresdoce-nestjs-toolkit/core'; import { registerAs } from '@nestjs/config'; -import { appConfigBase } from '../fixtures'; +import { appConfigBase } from '../fixtures/appConfigBase'; export default registerAs('config', (): Typings.AppConfig => appConfigBase); diff --git a/packages/test-utils/src/config/dynamic-configuration.ts b/packages/test-utils/src/config/dynamic-configuration.ts index 0b42d274..6971f500 100644 --- a/packages/test-utils/src/config/dynamic-configuration.ts +++ b/packages/test-utils/src/config/dynamic-configuration.ts @@ -1,7 +1,7 @@ import { Typings } from '@tresdoce-nestjs-toolkit/core'; import { registerAs } from '@nestjs/config'; -import { appConfigBase } from '../fixtures'; +import { appConfigBase } from '../fixtures/appConfigBase'; export const dynamicConfig = ({ ...args } = {}) => registerAs('config', (): Typings.AppConfig => ({ ...appConfigBase, ...args })); diff --git a/packages/test-utils/src/testcontainers/testContainersTD.ts b/packages/test-utils/src/testcontainers/testContainersTD.ts index 190f5ae2..a43772cc 100644 --- a/packages/test-utils/src/testcontainers/testContainersTD.ts +++ b/packages/test-utils/src/testcontainers/testContainersTD.ts @@ -1,6 +1,6 @@ import { GenericContainer, StartedTestContainer, TestContainer, Wait } from 'testcontainers'; -import { RandomUuid } from 'testcontainers/dist/uuid'; -import { StopOptions } from 'testcontainers/dist/test-container'; +import { RandomUuid } from 'testcontainers/dist/src/uuid'; +import { StopOptions } from 'testcontainers/dist/src/test-container'; import * as _ from 'lodash'; import { ITestContainerOptions, Env } from './types'; diff --git a/packages/test-utils/src/testcontainers/types.ts b/packages/test-utils/src/testcontainers/types.ts index ed0a6d72..f87e4a00 100644 --- a/packages/test-utils/src/testcontainers/types.ts +++ b/packages/test-utils/src/testcontainers/types.ts @@ -1,4 +1,4 @@ -import { PortWithOptionalBinding } from 'testcontainers/dist/port'; +import { PortWithOptionalBinding } from 'testcontainers/dist/src/port'; export declare type EnvKey = string; export declare type Env = { diff --git a/packages/test-utils/tsconfig.json b/packages/test-utils/tsconfig.json index a4a905b2..6ae507e5 100644 --- a/packages/test-utils/tsconfig.json +++ b/packages/test-utils/tsconfig.json @@ -1,8 +1,7 @@ { "extends": "@tresdoce-nestjs-toolkit/config", "compilerOptions": { - "rootDir": "./src", - "types": ["tresdoce-nestjs-toolkit", "jest"] + "rootDir": "./src" }, "include": ["src/**/*"], "exclude": [