microsoft · munozemilio · Oct 8, 2020 · Sep 30, 2020 · Oct 1, 2020 · Oct 1, 2020
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/packages/chatdown/package.json b/packages/chatdown/package.json
@@ -30,6 +30,7 @@
     "@oclif/test": "^1.2.4",
     "@oclif/tslint": "^3.1.1",
     "@types/chai": "^4.1.7",
+    "@types/fs-extra": "^5.0.5",
     "@types/mocha": "^5.2.6",
     "@types/node": "^10.14.6",
     "@types/rimraf": "^2.0.2",
@@ -38,9 +39,9 @@
     "mocha": "^6.2.2",
     "nyc": "^14.1.1",
     "rimraf": "^2.6.3",
-    "ts-node": "^8.1.0",
+    "ts-node": "^9.0.0",
     "tslint": "^5.16.0",
-    "typescript": "3.5.3"
+    "typescript": "^4.0.3"
   },
   "engines": {
     "node": ">=8.0.0"

diff --git a/packages/chatdown/test/commands/chatdown/convert.test.ts b/packages/chatdown/test/commands/chatdown/convert.test.ts
@@ -1,9 +1,10 @@
-import {expect, test} from '@oclif/test'
 import * as cp from 'child_process';
-import * as rimraf from 'rimraf';
-let pkg = require('../../../package.json');
-let assert = require('assert');
-const fs = require('fs-extra')
+import assert from 'assert';
+import fs from 'fs-extra';
+import rimraf from 'rimraf';
+import {expect, test} from '@oclif/test'
+
+const pkg = require('../../../package.json');
 
 describe('chatdown:convert', function() {
 

diff --git a/packages/chatdown/test/hook.js b/packages/chatdown/test/hook.js
diff --git a/packages/chatdown/test/mocha.opts b/packages/chatdown/test/mocha.opts
@@ -1,5 +1,5 @@
---require test/hook.js
+--require ../../test/hook.js
 --require source-map-support/register
 --recursive
 --timeout 10000
-**/*.test.{ts,js}
+**/*.test.{ts,js}
diff --git a/packages/chatdown/test/tsconfig.json b/packages/chatdown/test/tsconfig.json
@@ -1,9 +1,5 @@
 {
-  "extends": "../tsconfig",
-  "compilerOptions": {
-    "noEmit": true,
-    "noImplicitAny": false
-  },
+  "extends": "../tsconfig.json",
   "references": [
     {"path": ".."}
   ]

diff --git a/packages/chatdown/tsconfig.json b/packages/chatdown/tsconfig.json
@@ -1,13 +1,8 @@
 {
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "declaration": true,
-    "importHelpers": true,
-    "module": "commonjs",
     "outDir": "lib",
-    "rootDir": "src",
-    "strict": true,
-    "target": "es2017",
-    "composite": true
+    "rootDir": "src"
   },
   "include": [
     "src/**/*"

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -89,8 +89,8 @@
     "nock": "^11.7.0",
     "nyc": "^14.1.1",
     "rimraf": "^2.6.3",
-    "ts-node": "^8.1.0",
+    "ts-node": "^9.0.0",
     "tslint": "^5.16.0",
-    "typescript": "^3.5.3"
+    "typescript": "^4.0.3"
   }
 }
diff --git a/packages/cli/test/hook.js b/packages/cli/test/hook.js
diff --git a/packages/cli/test/mocha.opts b/packages/cli/test/mocha.opts
@@ -1,5 +1,5 @@
---require test/hook.js
+--require ../../test/hook.js
 --require source-map-support/register
 --recursive
 --timeout 60000
-**/*.test.{ts,js}
+**/*.test.{ts,js}
diff --git a/packages/cli/test/tsconfig.json b/packages/cli/test/tsconfig.json
@@ -1,7 +1,6 @@
 {
-  "extends": "../tsconfig",
+  "extends": "../tsconfig.json",
   "compilerOptions": {
-    "noEmit": true,
     "noImplicitAny": false
   },
   "references": [

diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
@@ -1,14 +1,8 @@
 {
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "declaration": true,
-    "importHelpers": true,
-    "module": "commonjs",
     "outDir": "lib",
-    "rootDir": "src",
-    "sourceMap": true,
-    "strict": true,
-    "target": "es2017",
-    "composite": true
+    "rootDir": "src"
   },
   "include": [
     "src/**/*"

diff --git a/packages/command/package.json b/packages/command/package.json
@@ -60,8 +60,8 @@
     "rimraf": "^2.6.3",
     "source-map-support": "~0.5.16",
     "testdouble": "^3.11.0",
-    "ts-node": "^8.1.0",
+    "ts-node": "^9.0.0",
     "tslint": "^5.16.0",
-    "typescript": "^3.5.3"
+    "typescript": "^4.0.3"
   }
 }
diff --git a/packages/command/test/hook.js b/packages/command/test/hook.js
diff --git a/packages/command/test/mocha.opts b/packages/command/test/mocha.opts
@@ -1,5 +1,5 @@
---require test/hook.js
+--require ../../test/hook.js
 --require source-map-support/register
 --recursive
 --timeout 60000
-**/*.test.{ts,js}
+**/*.test.{ts,js}
diff --git a/packages/command/test/tsconfig.json b/packages/command/test/tsconfig.json
@@ -1,9 +1,5 @@
 {
-  "extends": "../tsconfig",
-  "compilerOptions": {
-    "noEmit": true,
-    "noImplicitAny": false
-  },
+  "extends": "../tsconfig.json",
   "references": [
     {"path": ".."}
   ]

diff --git a/packages/command/tsconfig.json b/packages/command/tsconfig.json
@@ -1,21 +1,12 @@
 {
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "declaration": true,
-    "forceConsistentCasingInFileNames": true,
-    "esModuleInterop": true,
-    "resolveJsonModule": true,
-    "importHelpers": true,
-    "sourceMap": true,
-    "module": "commonjs",
-    "outDir": "./lib",
+    "outDir": "lib",
     "pretty": true,
-    "rootDirs": [
-      "./src"
-    ],
-    "strict": true,
-    "target": "es2017"
+    "resolveJsonModule": true,
+    "rootDir": "src"
   },
   "include": [
-    "./src/**/*"
+    "src/**/*"
   ]
 }
diff --git a/packages/config/package.json b/packages/config/package.json
@@ -58,8 +58,8 @@
     "mocha": "^6.2.2",
     "nyc": "^14.1.1",
     "rimraf": "^2.6.3",
-    "ts-node": "^8.3.0",
+    "ts-node": "^9.0.0",
     "tslint": "^5.18.0",
-    "typescript": "^3.5.3"
+    "typescript": "^4.0.3"
   }
 }
diff --git a/packages/config/test/hook.js b/packages/config/test/hook.js
diff --git a/packages/config/test/mocha.opts b/packages/config/test/mocha.opts
@@ -1,5 +1,5 @@
---require test/hook.js
+--require ../../test/hook.js
 --require source-map-support/register
 --recursive
 --timeout 10000
-**/*.test.{ts,js}
+**/*.test.{ts,js}
diff --git a/packages/config/test/tsconfig.json b/packages/config/test/tsconfig.json
@@ -1,9 +1,5 @@
 {
-  "extends": "../tsconfig",
-  "compilerOptions": {
-    "noEmit": true,
-    "noImplicitAny": false
-  },
+  "extends": "../tsconfig.json",
   "references": [
     {"path": ".."}
   ]

diff --git a/packages/config/tsconfig.json b/packages/config/tsconfig.json
@@ -1,12 +1,8 @@
 {
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "declaration": true,
-    "importHelpers": true,
-    "module": "commonjs",
     "outDir": "lib",
-    "rootDir": "src",
-    "strict": true,
-    "target": "es2017"
+    "rootDir": "src"
   },
   "include": [
     "src/**/*"

diff --git a/packages/dialog/package.json b/packages/dialog/package.json
@@ -73,8 +73,8 @@
     "mocha": "^6.2.2",
     "nyc": "^14.1.1",
     "rimraf": "^2.6.3",
-    "ts-node": "^8.3.0",
+    "ts-node": "^9.0.0",
     "tslint": "^5.18.0",
-    "typescript": "^3.5.3"
+    "typescript": "^4.0.3"
   }
 }
diff --git a/packages/dialog/src/library/dialogTracker.ts b/packages/dialog/src/library/dialogTracker.ts
@@ -1,16 +1,14 @@
-#!/usr/bin/env node
-
 /*!
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
 
 export * from './schemaTracker';
 import * as fs from 'fs-extra';
-import * as glob from 'globby';
-import * as parser from '@apidevtools/json-schema-ref-parser'
 import * as path from 'path';
 import * as st from './schemaTracker';
+import glob from 'globby';
+import parser from '@apidevtools/json-schema-ref-parser'
 
 let clone = require('clone')
 

diff --git a/packages/dialog/src/library/schemaMerger.ts b/packages/dialog/src/library/schemaMerger.ts
@@ -3,16 +3,17 @@
  * Licensed under the MIT License.
  */
 
-import * as Validator from 'ajv'
 import * as fs from 'fs-extra'
-import * as glob from 'globby'
 import * as hash from './hash'
+import * as nuget from '@snyk/nuget-semver'
 import * as os from 'os'
-import * as parser from '@apidevtools/json-schema-ref-parser'
 import * as ppath from 'path'
-import {JsonPointer as ptr} from 'json-ptr'
-import * as nuget from '@snyk/nuget-semver'
 import * as xp from 'xml2js'
+import Validator from 'ajv'
+import glob from 'globby'
+import parser from '@apidevtools/json-schema-ref-parser'
+import {JsonPointer as ptr} from 'json-ptr'
+
 let allof: any = require('json-schema-merge-allof')
 let clone: any = require('clone')
 let getUri: any = require('get-uri')

diff --git a/packages/dialog/src/library/schemaTracker.ts b/packages/dialog/src/library/schemaTracker.ts
@@ -1,12 +1,11 @@
-#!/usr/bin/env node
-
 /*!
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
 
-import * as ajv from 'ajv';
-import * as parser from '@apidevtools/json-schema-ref-parser'
+import ajv from 'ajv';
+import parser from '@apidevtools/json-schema-ref-parser'
+
 let getUri: any = require('get-uri')
 
 // Get JSON from a URI.

diff --git a/packages/dialog/test/commands/dialog/verify.test.ts b/packages/dialog/test/commands/dialog/verify.test.ts
@@ -25,15 +25,14 @@ describe('dialog:verify', () => {
         .stderr()
         .command(["dialog:verify", `${path.join(__dirname, './examples/root/*.dialog')}`, '--verbose'])
         .it('verify all', ctx => {
-            expect(ctx.stderr.match(/DLG001/).length == 7, 'Wrong number of schema errors')
-            expect(ctx.stderr.match(/DLG002/).length == 3, 'Wrong number of multiple definitions')
-            expect(ctx.stderr.match(/DLG003/).length == 1, 'Wrong number of mising definitions')
-            expect(ctx.stderr.match(/DLG004/).length == 1, 'Wrong number of type mismatches')
-            expect(ctx.stderr.match(/DLG005/).length == 6, 'Wrong number of unsued ids')
+            expect(ctx.stderr.match(/DLG001/)!.length == 7, 'Wrong number of schema errors')
+            expect(ctx.stderr.match(/DLG002/)!.length == 3, 'Wrong number of multiple definitions')
+            expect(ctx.stderr.match(/DLG003/)!.length == 1, 'Wrong number of mising definitions')
+            expect(ctx.stderr.match(/DLG004/)!.length == 1, 'Wrong number of type mismatches')
+            expect(ctx.stderr.match(/DLG005/)!.length == 6, 'Wrong number of unsued ids')
             expect(ctx.stdout).to.contain('4 files')
             expect(ctx.stderr)
                 .to.contain('Warnings: 2')
                 .to.contain('Errors: 12')
         })
 })
-
diff --git a/packages/dialog/test/hook.js b/packages/dialog/test/hook.js
diff --git a/packages/dialog/test/mocha.opts b/packages/dialog/test/mocha.opts
@@ -1,6 +1,6 @@
---require test/hook.js
+--require ../../test/hook.js
 --require source-map-support/register
 --recursive
 --timeout 60000
 --slow 10000
-**/*.test.{ts,js}
+**/*.test.{ts,js}
diff --git a/packages/dialog/test/tsconfig.json b/packages/dialog/test/tsconfig.json
@@ -1,11 +1,6 @@
 {
-    "extends": "../tsconfig",
-    "compilerOptions": {
-      "noEmit": true,
-      "noImplicitAny": false
-    },
-    "references": [
-      {"path": ".."}
-    ]
-  }
-
+  "extends": "../tsconfig.json",
+  "references": [
+    {"path": ".."}
+  ]
+}
diff --git a/packages/dialog/tsconfig.json b/packages/dialog/tsconfig.json
@@ -1,17 +1,11 @@
 {
-    "compilerOptions": {
-        "composite": true,
-        "declaration": true,
-        "importHelpers": true,
-        "module": "commonjs",
-        "outDir": "lib",
-        "rootDir": "src",
-        "sourceMap": true,
-        "strict": true,
-        "target": "es2017",
-        "noImplicitAny": false
-    },
-    "include": [
-        "src/**/*"
-    ]
-}
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "lib",
+    "rootDir": "src",
+    "noImplicitAny": false
+  },
+  "include": [
+    "src/**/*"
+  ]
+}
diff --git a/packages/lg/package.json b/packages/lg/package.json
@@ -35,8 +35,8 @@
     "globby": "^10.0.2",
     "mocha": "^5.2.0",
     "nyc": "^14.1.1",
-    "ts-node": "^8.6.2",
-    "typescript": "^3.7.5",
+    "ts-node": "^9.0.0",
+    "typescript": "^4.0.3",
     "rimraf": "^2.6.3"
   },
   "engines": {