Merge branch 'master' into blueprint-style

Author: chriskrycho

commitlint.config.js

@@ -0,0 +1,9 @@
+/* eslint-env node */
+'use strict';
+
+module.exports = {
+  extends: ['@commitlint/config-conventional'],
+  rules: {
+    'header-max-length': [0, 'always', 288],
+  },
+};

package.json

@@ -58,7 +58,8 @@
     "@commitlint/config-conventional": "8.2.0",
     "@ember/optional-features": "1.1.0",
     "@typed-ember/renovate-config": "1.2.1",
-    "@types/chai": "4.2.5",
+    "@types/capture-console": "1.0.0",
+    "@types/chai": "4.2.6",
     "@types/chai-as-promised": "7.1.2",
     "@types/console-ui": "2.2.3",
     "@types/core-object": "3.0.1",
@@ -75,9 +76,10 @@
     "@types/resolve": "0.0.8",
     "@types/semver": "6.2.0",
     "@types/tmp": "0.1.0",
-    "@typescript-eslint/eslint-plugin": "2.9.0",
-    "@typescript-eslint/parser": "2.9.0",
+    "@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",
@@ -148,18 +150,6 @@
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
   },
-  "commitlint": {
-    "extends": [
-      "@commitlint/config-conventional"
-    ],
-    "rules": {
-      "header-max-length": [
-        0,
-        "always",
-        288
-      ]
-    }
-  },
   "prettier": {
     "printWidth": 100,
     "semi": true,

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;

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');