You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@annotator.apache.org by ra...@apache.org on 2020/08/21 03:36:37 UTC

[incubator-annotator] 02/03: Include all the tests in the root project

This is an automated email from the ASF dual-hosted git repository.

randall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-annotator.git

commit fd7c72cc60ca1ffc881603073ceecd89224fc946
Author: Randall Leeds <ra...@apache.org>
AuthorDate: Sun Aug 9 20:25:37 2020 -0700

    Include all the tests in the root project
    
    In order not to emit the test declarations into the lib directory,
    simply include all the tests in the root project so that the
    declerations emit alongside the sources. The "tsc --clean" command
    cleans these.
    
    Standardize on the form of paths in tsconfig.json files.
---
 packages/dom/tsconfig.json      | 11 ++++-------
 packages/selector/tsconfig.json |  7 +++----
 tsconfig.base.json              |  6 +++++-
 tsconfig.json                   | 23 ++++++++++-------------
 4 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/packages/dom/tsconfig.json b/packages/dom/tsconfig.json
index b8cb08f..02e0fcf 100644
--- a/packages/dom/tsconfig.json
+++ b/packages/dom/tsconfig.json
@@ -1,14 +1,11 @@
 {
   "extends": "../../tsconfig.base.json",
-  "include": ["./src/**/*"],
+  "include": ["src"],
   "compilerOptions": {
-    "rootDir": "./src",
-    "declarationDir": "./lib",
-    "lib": ["dom", "dom.iterable", "esnext"]
+    "outDir": "lib",
+    "rootDir": "src"
   },
   "references": [
-    {
-      "path": "../selector/tsconfig.json"
-    }
+    { "path": "../selector" }
   ]
 }
diff --git a/packages/selector/tsconfig.json b/packages/selector/tsconfig.json
index e3b9d4e..653b0a5 100644
--- a/packages/selector/tsconfig.json
+++ b/packages/selector/tsconfig.json
@@ -1,9 +1,8 @@
 {
   "extends": "../../tsconfig.base.json",
-  "include": ["./src/**/*"],
+  "include": ["src"],
   "compilerOptions": {
-    "rootDir": "./src",
-    "declarationDir": "./lib",
-    "lib": ["dom", "dom.iterable", "esnext"]
+    "outDir": "lib",
+    "rootDir": "src"
   }
 }
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 0f07efa..e9f79ca 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -7,7 +7,11 @@
     "downlevelIteration": true,
     "emitDeclarationOnly": true,
     "isolatedModules": true,
-    "lib": ["es2020"],
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "es2020"
+    ],
     "moduleResolution": "node",
     "strict": true,
     "target": "es2017"
diff --git a/tsconfig.json b/tsconfig.json
index 07873ec..7685922 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,17 +1,14 @@
 {
   "extends": "./tsconfig.base.json",
-  "include": ["./test"],
-  "compilerOptions": {
-    "composite": false,
-    "emitDeclarationOnly": false,
-    "noEmit": true
-  },
+  "include": [
+    "test/**/*",
+    "packages/*/test/**/*",
+  ],
   "references": [
-    {
-      "path": "./packages/dom/tsconfig.json"
-    },
-    {
-      "path": "./packages/selector/tsconfig.json"
-    }
-  ]
+    { "path": "packages/dom" },
+    { "path": "packages/selector" }
+  ],
+  "compilerOptions": {
+    "lib": ["dom", "dom.iterable", "es2018"]
+  }
 }