diff --git a/packages/cli/tsconfig.build.json b/packages/cli/tsconfig.build.json index cb5413a..248a214 100644 --- a/packages/cli/tsconfig.build.json +++ b/packages/cli/tsconfig.build.json @@ -1,7 +1,8 @@ { - "extends": "./tsconfig.json", + "extends": "../../tsconfig.json", "compilerOptions": { - "rootDir": "src" + "outDir": "dist", + "rootDir": "src", }, "include": [ "src" diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json index acac148..b8bdb11 100644 --- a/packages/cli/tsconfig.json +++ b/packages/cli/tsconfig.json @@ -1,11 +1,12 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "dist" - }, - "references": [ - { - "path": "../sds" + "outDir": "dist", + "baseUrl": "../", + "paths": { + "@microsoft/sds": [ + "sds/src" + ] } - ] + }, } diff --git a/packages/sds/tsconfig.build.json b/packages/sds/tsconfig.build.json index cb5413a..248a214 100644 --- a/packages/sds/tsconfig.build.json +++ b/packages/sds/tsconfig.build.json @@ -1,7 +1,8 @@ { - "extends": "./tsconfig.json", + "extends": "../../tsconfig.json", "compilerOptions": { - "rootDir": "src" + "outDir": "dist", + "rootDir": "src", }, "include": [ "src" diff --git a/packages/sds/tsconfig.json b/packages/sds/tsconfig.json index fb89feb..f76311a 100644 --- a/packages/sds/tsconfig.json +++ b/packages/sds/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "composite": true, "experimentalDecorators": true, "outDir": "dist" }, diff --git a/packages/server/tsconfig.build.json b/packages/server/tsconfig.build.json index cb5413a..248a214 100644 --- a/packages/server/tsconfig.build.json +++ b/packages/server/tsconfig.build.json @@ -1,7 +1,8 @@ { - "extends": "./tsconfig.json", + "extends": "../../tsconfig.json", "compilerOptions": { - "rootDir": "src" + "outDir": "dist", + "rootDir": "src", }, "include": [ "src" diff --git a/packages/server/tsconfig.json b/packages/server/tsconfig.json index acac148..6f0d5d8 100644 --- a/packages/server/tsconfig.json +++ b/packages/server/tsconfig.json @@ -1,11 +1,12 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "dist" - }, - "references": [ - { - "path": "../sds" + "outDir": "dist", + "baseUrl": "../", + "paths": { + "@microsoft/sds": [ + "sds/src" + ] } - ] + } } diff --git a/packages/worker/test/functional/app.test.ts b/packages/worker/test/functional/app.test.ts index e34afd8..69053ca 100644 --- a/packages/worker/test/functional/app.test.ts +++ b/packages/worker/test/functional/app.test.ts @@ -3,8 +3,9 @@ import * as Dockerode from 'dockerode'; import * as fs from 'fs'; import * as sinon from 'sinon'; import { v1 } from 'uuid'; -import { configuration, PipelineRun } from '@microsoft/sds'; +import { PipelineRun } from '@microsoft/sds'; import { PipelineWorker } from '../../src/pipelineWorker'; +import * as configuration from '../../../sds/test/functional/configuration'; describe('functional.worker', () => { const { queue } = configuration.getQueueConfiguration(); diff --git a/packages/worker/tsconfig.build.json b/packages/worker/tsconfig.build.json index 13f351e..248a214 100644 --- a/packages/worker/tsconfig.build.json +++ b/packages/worker/tsconfig.build.json @@ -1,9 +1,10 @@ { - "extends": "./tsconfig.json", + "extends": "../../tsconfig.json", "compilerOptions": { - "rootDir": "src" + "outDir": "dist", + "rootDir": "src", }, "include": [ - "src/" + "src" ] } diff --git a/packages/worker/tsconfig.json b/packages/worker/tsconfig.json index acac148..6f0d5d8 100644 --- a/packages/worker/tsconfig.json +++ b/packages/worker/tsconfig.json @@ -1,11 +1,12 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "dist" - }, - "references": [ - { - "path": "../sds" + "outDir": "dist", + "baseUrl": "../", + "paths": { + "@microsoft/sds": [ + "sds/src" + ] } - ] + } }