Merge remote-tracking branch 'origin/master' into ab/add-err-require-…

…esm-error
TypeStrong · May 17, 2020 · da76779 · da76779
2 parents 5e8090a + 4ce5846
commit da76779
Show file tree

Hide file tree

Showing 7 changed files with 1,108 additions and 228 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -42,7 +42,7 @@ jobs:
         flavor: [1, 2, 3, 4, 5, 6, 7, 8, 9]
         include:
           - flavor: 1
-            node: 6
+            node: 10
             typescript: typescript@latest
           - flavor: 2
             node: 12.15

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 node_modules/
+.nyc_output/
 coverage/
 .DS_Store
 npm-debug.log

diff --git a/nyc.config.js b/nyc.config.js
@@ -0,0 +1,12 @@
+module.exports = {
+  all: true,
+  include: [
+    'tests/node_modules/ts-node/**',
+  ],
+  exclude: [
+    '**/*.d.ts',
+    'tests/node_modules/ts-node/node_modules/**',
+  ],
+  excludeNodeModules: false,
+  excludeAfterRemap: false
+};