# HG changeset patch # User cin # Date 2020-02-06 00:28:52 # Node ID 6d80d7901b4c8ffe8728e4a7bf5f4b7e7a669bb5 # Parent d14fb562b89647abc8e68fdc0cbe23003c908905 sync diff --git a/build.gradle b/build.gradle --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.implab.gradle-typescript" version "1.3.2" + id "org.implab.gradle-typescript" version "1.3.3" id "ivy-publish" } @@ -36,6 +36,17 @@ configureTsMain { } } +configureTsTest { + compilerOptions { + baseUrl = "." + paths = [ + "@implab/djx" : [ sources.main.output.typingsDir.get().toString() ], + "@implab/djx/*" : [ "${sources.main.output.typingsDir.get().toString()}/*" ] + ] + types = ["requirejs", sources.main.output.typingsDir.get().toString()] + } +} + npmPackMeta { meta { name = "@$npmScope/$project.name" diff --git a/src/test/ts/TestTraits.ts b/src/test/ts/TestTraits.ts --- a/src/test/ts/TestTraits.ts +++ b/src/test/ts/TestTraits.ts @@ -51,8 +51,6 @@ export class TapeWriter implements IDest type TestCallback = (ok: (msg: string) => void, fail: (msg: string) => void, trace: TraceSource) => void; type AsyncTestCallback = (trace: TraceSource) => PromiseLike; -export function test(name: string, cb: TestCallback ): void; -export function test(name: string, cb: AsyncTestCallback): void; export function test(name: string, cb: TestCallback | AsyncTestCallback) { } diff --git a/src/test/ts/dummy.ts b/src/test/ts/dummy.ts --- a/src/test/ts/dummy.ts +++ b/src/test/ts/dummy.ts @@ -1,8 +1,8 @@ import { test } from "./TestTraits"; import { delay } from "@implab/core-amd/safe"; import { assert } from "chai"; -import "@implab/djx"; import css = require("@implab/djx/css!my,css"); +import {} from "@implab/djx/i18n"; test("simple", (ok, fail, log) => { setTimeout(() => { diff --git a/src/test/ts/index.ts b/src/test/ts/index.ts new file mode 100644 diff --git a/src/test/tsconfig.json b/src/test/tsconfig.json --- a/src/test/tsconfig.json +++ b/src/test/tsconfig.json @@ -10,9 +10,9 @@ "../main/typings" ], "paths": { - "@implab/djx" : ["../main/ts", "../main/typings"] - //"@implab/djx/*" : ["../main/ts/*", "../main/typings/*" ] + "@implab/djx" : ["../main/ts", "../main/typings"], + "@implab/djx/*" : ["../main/ts/*", "../main/typings/*" ] }, - "types": ["requirejs"] + "types": ["requirejs", "../main/typings"] } } \ No newline at end of file