Merge branch 'master' into ensure-correct-commitlint-config

chriskrycho · web-flow · commit f50a5945e834 · 2019-12-05T20:49:17.000-07:00
diff --git a/package.json b/package.json
@@ -58,6 +58,7 @@
     "@commitlint/config-conventional": "8.2.0",
     "@ember/optional-features": "1.1.0",
     "@typed-ember/renovate-config": "1.2.1",
+    "@types/capture-console": "1.0.0",
     "@types/chai": "4.2.6",
     "@types/chai-as-promised": "7.1.2",
     "@types/console-ui": "2.2.3",
@@ -78,6 +79,7 @@
     "@typescript-eslint/eslint-plugin": "2.10.0",
     "@typescript-eslint/parser": "2.10.0",
     "broccoli-asset-rev": "3.0.0",
+    "capture-console": "1.0.1",
     "co": "4.6.0",
     "commitlint-azure-pipelines-cli": "1.0.2",
     "conventional-changelog-cli": "2.0.28",
@@ -92,21 +94,21 @@
     "ember-cli-deploy-build": "2.0.0",
     "ember-cli-deploy-git": "1.3.4",
     "ember-cli-deploy-git-ci": "1.0.1",
-    "ember-cli-htmlbars": "4.0.8",
+    "ember-cli-htmlbars": "4.0.9",
     "ember-cli-htmlbars-inline-precompile": "3.0.1",
     "ember-cli-inject-live-reload": "2.0.2",
     "ember-cli-release": "0.2.9",
     "ember-cli-sri": "2.1.1",
     "ember-cli-typescript-blueprints": "3.0.0",
     "ember-cli-uglify": "3.0.0",
-    "ember-cli-update": "0.46.5",
+    "ember-cli-update": "0.46.6",
     "ember-disable-prototype-extensions": "1.1.3",
     "ember-export-application-global": "2.0.1",
     "ember-load-initializers": "2.1.1",
     "ember-maybe-import-regenerator": "0.1.6",
     "ember-qunit": "4.6.0",
     "ember-resolver": "6.0.0",
-    "ember-source": "3.14.2",
+    "ember-source": "3.14.3",
     "ember-try": "1.3.0",
     "eslint": "6.7.2",
     "eslint-plugin-ember": "7.7.1",
@@ -126,7 +128,7 @@
     "testdouble": "3.12.4",
     "tmp": "0.1.0",
     "ts-node": "8.5.4",
-    "typescript": "3.7.2"
+    "typescript": "3.7.3"
   },
   "resolutions": {
     "@types/ember": "3.1.1",
diff --git a/ts/lib/commands/precompile.ts b/ts/lib/commands/precompile.ts
@@ -25,18 +25,27 @@ export default command({
       return;
     }
 
-    // prettier-ignore
-    await execa('tsc', [
-      '--allowJs', 'false',
-      '--noEmit', 'false',
-      '--rootDir', rootDir || this.project.root,
-      '--isolatedModules', 'false',
-      '--declaration',
-      '--declarationDir', outDir,
-      '--emitDeclarationOnly',
-    ], {
-      preferLocal: true
-    });
+    try {
+      // prettier-ignore
+      await execa('tsc', [
+        '--allowJs', 'false',
+        '--noEmit', 'false',
+        '--rootDir', rootDir || this.project.root,
+        '--isolatedModules', 'false',
+        '--declaration',
+        '--declarationDir', outDir,
+        '--emitDeclarationOnly',
+        '--pretty', 'true',
+      ], {
+        preferLocal: true,
+
+        // Capture a string with stdout and stderr interleaved for error reporting
+        all: true,
+      });
+    } catch (e) {
+      console.error(`\n${e.all}\n`);
+      throw e;
+    }
 
     let manifestPath = options.manifestPath;
     let packageName = this.project.pkg.name;
diff --git a/ts/tests/commands/precompile-test.ts b/ts/tests/commands/precompile-test.ts
@@ -1,5 +1,5 @@
 import * as fs from 'fs-extra';
-
+import { hook } from 'capture-console';
 import ember from 'ember-cli-blueprint-test-helpers/lib/helpers/ember';
 import blueprintHelpers from 'ember-cli-blueprint-test-helpers/helpers';
 const setupTestHooks = blueprintHelpers.setupTestHooks;
@@ -38,6 +38,24 @@ describe('Acceptance: ts:precompile command', function() {
     expect(declaration).not.to.exist;
   });
 
+  it('emits errors to the console when precompilation fails', async () => {
+    fs.ensureDirSync('app');
+    fs.writeFileSync('app/test-file.ts', `export const testString: string = 123;`);
+
+    let output = '';
+    let unhookStdout = hook(process.stdout, { quiet: true }, chunk => (output += chunk));
+    let unhookStderr = hook(process.stderr, { quiet: true }, chunk => (output += chunk));
+    try {
+      await ember(['ts:precompile']);
+      expect.fail('Precompilation should have failed');
+    } catch {
+      expect(output).to.include(`Type '123' is not assignable to type 'string'.`);
+    } finally {
+      unhookStdout();
+      unhookStderr();
+    }
+  });
+
   describe('custom project layout', function() {
     it('generates .d.ts files from the specified source tree', async () => {
       fs.ensureDirSync('src');
diff --git a/yarn.lock b/yarn.lock
@@ -1503,6 +1503,13 @@
     "@types/connect" "*"
     "@types/node" "*"
 
+"@types/capture-console@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@types/capture-console/-/capture-console-1.0.0.tgz#8730d90248d862c4ccdaf5a623bfee0272d9a934"
+  integrity sha512-v6XDGk++qgUNmL5oqjmrK/tYIRmekq9FO8vgVv4xAx9frJYTwWUI+iOa+2z48zw+ZHfVVTNxL1qT9wuZZUrDVg==
+  dependencies:
+    "@types/node" "*"
+
 "@types/chai-as-promised@7.1.2":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/@types/chai-as-promised/-/chai-as-promised-7.1.2.tgz#2f564420e81eaf8650169e5a3a6b93e096e5068b"
@@ -2414,6 +2421,14 @@ arg@^4.1.0:
   resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.0.tgz#583c518199419e0037abb74062c37f8519e575f0"
   integrity sha512-ZWc51jO3qegGkVh8Hwpv636EkbesNV5ZNQPCtRa+0qytRYPEs9IYT9qITY9buezqUH5uqyzlWLcufrzU2rffdg==
 
+argle@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/argle/-/argle-1.1.1.tgz#0cfe3bc032c36b2f48ba42b9c17f89f70607e994"
+  integrity sha1-DP47wDLDay9IukK5wX+J9wYH6ZQ=
+  dependencies:
+    lodash.isfunction "^3.0.8"
+    lodash.isnumber "^3.0.3"
+
 argparse@^1.0.7, argparse@~1.0.2:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -2475,6 +2490,11 @@ array-union@^1.0.1:
   dependencies:
     array-uniq "^1.0.1"
 
+array-uniq@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.2.tgz#5fcc373920775723cfd64d65c64bef53bf9eba6d"
+  integrity sha1-X8w3OSB3VyPP1k1lxkvvU7+eum0=
+
 array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
@@ -3471,18 +3491,18 @@ body@^5.1.0:
     raw-body "~1.1.0"
     safe-json-parse "~1.0.1"
 
-boilerplate-update@0.29.3:
-  version "0.29.3"
-  resolved "https://registry.yarnpkg.com/boilerplate-update/-/boilerplate-update-0.29.3.tgz#455f44715808d3664c4e1e3aeeac5ecae14a3376"
-  integrity sha512-nEvzxVreUloSRVMsP9kH6GRG3uCR4T+/25wq+FThl+lB1AELotidF+KF13uSfex86of9wfRo44CkX5wpCG95Ew==
+boilerplate-update@0.29.5:
+  version "0.29.5"
+  resolved "https://registry.yarnpkg.com/boilerplate-update/-/boilerplate-update-0.29.5.tgz#862ba9ddfc049fae1ca21118fe029c96cb7da0dc"
+  integrity sha512-V/DrfG7b2cU7gC4XbUqKf6AKPm2Oo0rSYqJ1DZIzpVuMbc9qsBahe1DZpNwZmO/vWbvXE0A79VUAagXTmzh72w==
   dependencies:
     cpr "^3.0.1"
     debug "^4.1.1"
     execa "^3.0.0"
     git-diff-apply "0.19.7"
     https-proxy-agent "^3.0.0"
     inquirer "^7.0.0"
-    merge-package.json "^3.0.0"
+    merge-package.json "^3.1.1"
     npx "^10.2.0"
     open "^7.0.0"
     p-reduce "^2.0.0"
@@ -4646,6 +4666,15 @@ caniuse-lite@^1.0.30001010:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001011.tgz#0d6c4549c78c4a800bb043a83ca0cbe0aee6c6e1"
   integrity sha512-h+Eqyn/YA6o6ZTqpS86PyRmNWOs1r54EBDcd2NTwwfsXQ8re1B38SnB+p2RKF8OUsyEIjeDU8XGec1RGO/wYCg==
 
+capture-console@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/capture-console/-/capture-console-1.0.1.tgz#db63c39ac73239019badd7fbb10143eda380ff71"
+  integrity sha1-22PDmscyOQGbrdf7sQFD7aOA/3E=
+  dependencies:
+    argle "~1.1.1"
+    lodash.isfunction "~3.0.8"
+    randomstring "~1.1.5"
+
 capture-exit@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
@@ -6607,10 +6636,10 @@ ember-cli-htmlbars-inline-precompile@^2.1.0:
     heimdalljs-logger "^0.1.9"
     silent-error "^1.1.0"
 
-ember-cli-htmlbars@4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-4.0.8.tgz#e87b62e7040bd478a2d007053bdb1644dd1685b0"
-  integrity sha512-B6fzlqmv2E2dl8P6UIYu3bY8nZU2kKfl1VkEIgxFAINfsu9fP65kX/bKzHqGhHF8nAtWBoXZWw6tomHKfUT/Jg==
+ember-cli-htmlbars@4.0.9:
+  version "4.0.9"
+  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-4.0.9.tgz#a4f56f2f91ee4bf3ef4d1b3ec1d653800d05251b"
+  integrity sha512-6WJXN/XX3ylczGMVxpPIFWjieS0MDUGPQaW0nTqo/gT91WaH+DX5/4tySDKtjM5e32oFN0OXFOk8AhePzuw3Aw==
   dependencies:
     "@ember/edition-utils" "^1.1.1"
     babel-plugin-htmlbars-inline-precompile "^3.0.0"
@@ -6848,13 +6877,14 @@ ember-cli-uglify@3.0.0:
     broccoli-uglify-sourcemap "^3.1.0"
     lodash.defaultsdeep "^4.6.0"
 
-ember-cli-update@0.46.5:
-  version "0.46.5"
-  resolved "https://registry.yarnpkg.com/ember-cli-update/-/ember-cli-update-0.46.5.tgz#b8bdbcf1a70f9016193ce7850c295f07d25401ba"
-  integrity sha512-NhzLvEq6YLLVDeQYQe6pFXqr6PZzVE1xDJ2H+bjlm0k/3Bad/t2ppaiYLVF3kwZplL0jeJOTISigh9KCAcWxZQ==
+ember-cli-update@0.46.6:
+  version "0.46.6"
+  resolved "https://registry.yarnpkg.com/ember-cli-update/-/ember-cli-update-0.46.6.tgz#a6bff959432ef52e70a1ace3762edde876370643"
+  integrity sha512-KtV5Fe+EEm7V9eWasmg8pDmm76SilVRLkGMgcPUA/ccHREJvjlpafD/fnZzZTlJRvGP1xXPdVynq+NhKw6p8GA==
   dependencies:
-    boilerplate-update "0.29.3"
+    boilerplate-update "0.29.5"
     debug "^4.1.1"
+    execa "^3.4.0"
     fs-extra "^8.0.0"
     inquirer "^7.0.0"
     npm-package-arg "^7.0.0"
@@ -7275,10 +7305,10 @@ ember-source-channel-url@^2.0.1:
   dependencies:
     got "^8.0.1"
 
-ember-source@3.14.2:
-  version "3.14.2"
-  resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.14.2.tgz#5cb5c84004192e2288300deb644b412fb389fc81"
-  integrity sha512-Yi99+K0C95gJR9kqGGyak2dZX2moBn4e+UmA5G3ZiJxDbWdvVGkef4u+8P261VRLvP9xsQiIruhkPqjHcs46XA==
+ember-source@3.14.3:
+  version "3.14.3"
+  resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.14.3.tgz#ae764f49d1db5a1327056d469ce07dbd53cbeaab"
+  integrity sha512-w4vOvUEk6qnRs61bLkgnebSzlOKwo7X+OdklFoR4gJltsahzZa6SLR8VzvyrrGc/jypu2STK923txBAQ0YG9bA==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/plugin-transform-block-scoping" "^7.6.0"
@@ -7866,6 +7896,22 @@ execa@^3.0.0:
     signal-exit "^3.0.2"
     strip-final-newline "^2.0.0"
 
+execa@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-3.4.0.tgz#c08ed4550ef65d858fac269ffc8572446f37eb89"
+  integrity sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==
+  dependencies:
+    cross-spawn "^7.0.0"
+    get-stream "^5.0.0"
+    human-signals "^1.1.1"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.0"
+    onetime "^5.1.0"
+    p-finally "^2.0.0"
+    signal-exit "^3.0.2"
+    strip-final-newline "^2.0.0"
+
 exists-sync@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/exists-sync/-/exists-sync-0.0.3.tgz#b910000bedbb113b378b82f5f5a7638107622dcf"
@@ -10911,6 +10957,11 @@ lodash.isarray@^3.0.0:
   resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
   integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=
 
+lodash.isfunction@^3.0.8, lodash.isfunction@~3.0.8:
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051"
+  integrity sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==
+
 lodash.isfunction@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-2.3.0.tgz#6b2973e47a647cf12e70d676aea13643706e5267"
@@ -10921,6 +10972,11 @@ lodash.ismatch@^4.4.0:
   resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
   integrity sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=
 
+lodash.isnumber@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc"
+  integrity sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=
+
 lodash.isobject@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-2.3.0.tgz#2e16d3fc583da9831968953f2d8e6d73434f6799"
@@ -11430,13 +11486,14 @@ merge-descriptors@1.0.1:
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
   integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
 
-merge-package.json@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/merge-package.json/-/merge-package.json-3.0.0.tgz#5db57e6294360893aed6a40ef8cc08b85e3c435f"
-  integrity sha512-VwkGGj5oYZe6do4hCPPbtzdG5GeY1V5IM5MI/Uo88kCY5BWarZx77I6qgchTSGFHTV1ptWTPWWB7RAbV7omkTw==
+merge-package.json@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/merge-package.json/-/merge-package.json-3.1.1.tgz#b9f44a0bd5336e725464ada7c92156ef9d2e8f92"
+  integrity sha512-alMr5cC645T46eupNJ+q9lO8MHpPOa5vr5jtrpGp2sZCJqCOP8aLnsmUskeq9+olQgQIX8tgvdA9b/eUFxWRHg==
   dependencies:
-    rfc6902-ordered "^3.1.1"
-    three-way-merger "^0.5.7"
+    rfc6902-ordered "^4.0.0"
+    semver "^6.3.0"
+    three-way-merger "0.5.7"
 
 merge-stream@^2.0.0:
   version "2.0.0"
@@ -13406,6 +13463,13 @@ randomfill@^1.0.3:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
 
+randomstring@~1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/randomstring/-/randomstring-1.1.5.tgz#6df0628f75cbd5932930d9fe3ab4e956a18518c3"
+  integrity sha1-bfBij3XL1ZMpMNn+OrTpVqGFGMM=
+  dependencies:
+    array-uniq "1.0.2"
+
 range-parser@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
@@ -14066,10 +14130,10 @@ retry@^0.10.0, retry@~0.10.1:
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
   integrity sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=
 
-rfc6902-ordered@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/rfc6902-ordered/-/rfc6902-ordered-3.1.1.tgz#f7c08c0b88c0066fa7f643457fca4031eff2fff3"
-  integrity sha512-rGZPbM9R3opWp0n1kSTmRQd4QPmcl7EZFx2k6UdcJqomo29D1VhA2IOCUlU6oMgzg/NGL1WLXH5OZiI1lBcxRw==
+rfc6902-ordered@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/rfc6902-ordered/-/rfc6902-ordered-4.0.0.tgz#a3d07e8c402edbeacfe9afa6d639aedfc3f19048"
+  integrity sha512-uGpjTewv2UxexoQPtYDpAZKt3WX/ujxkw3TqJAZOUu3WkwCNsu67Dlk+KPn/RY851+U3PvSTNOKs58d9YBubeQ==
   dependencies:
     debug "^4.0.0"
     rfc6902 "^3.0.1"
@@ -15368,7 +15432,7 @@ theredoc@^1.0.0:
   resolved "https://registry.yarnpkg.com/theredoc/-/theredoc-1.0.0.tgz#bcace376af6feb1873efbdd0f91ed026570ff062"
   integrity sha512-KU3SA3TjRRM932jpNfD3u4Ec3bSvedyo5ITPI7zgWYnKep7BwQQaxlhI9qbO+lKJoRnoAbEVfMcAHRuKVYikDA==
 
-three-way-merger@^0.5.7:
+three-way-merger@0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/three-way-merger/-/three-way-merger-0.5.7.tgz#00d8ee4a74076fad391479838e4c9e3340487e5d"
   integrity sha512-aD2nvGowCgJxoH49Izou5uR4PLCuH2yiw6+BJPg0H7RCLzpLy/4J9onM9sPXetmsq/AVfZ8fEyf8lbGKxKPrcA==
@@ -15750,10 +15814,10 @@ typescript-memoize@^1.0.0-alpha.3:
   dependencies:
     core-js "2.4.1"
 
-typescript@3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.2.tgz#27e489b95fa5909445e9fef5ee48d81697ad18fb"
-  integrity sha512-ml7V7JfiN2Xwvcer+XAf2csGO1bPBdRbFCkYBczNZggrBZ9c7G3riSUeJmqEU5uOtXNPMhE3n+R4FA/3YOAWOQ==
+typescript@3.7.3:
+  version "3.7.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.3.tgz#b36840668a16458a7025b9eabfad11b66ab85c69"
+  integrity sha512-Mcr/Qk7hXqFBXMN7p7Lusj1ktCBydylfQM/FZCk5glCNQJrCUKPkMHdo9R0MTFWsC/4kPFvDS0fDPvukfCkFsw==
 
 uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
