diff --git a/.gitignore b/.gitignore index aa61f944a03a..68f339b4945a 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,5 @@ npm-debug.log npm-debug.log* yarn-error.log* junit.xml + +*.tsbuildinfo diff --git a/CHANGELOG.md b/CHANGELOG.md index d2ac5ce1d9a3..e0345f59eb55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,8 +16,9 @@ - `[*]` Use property initializer syntax in Jest codebase ([#8117](https://github.com/facebook/jest/pull/8117)) - `[docs]` Improve description of optional arguments in ExpectAPI.md ([#8126](https://github.com/facebook/jest/pull/8126) - `[*]` Move @types/node to the root package.json [#8129](https://github.com/facebook/jest/pull/8129)) -- `[*]` Add documentation and tests related to auto-mocking ([#8086](https://github.com/facebook/jest/pull/8099)) +- `[*]` Add documentation and tests related to auto-mocking ([#8099](https://github.com/facebook/jest/pull/8099)) - `[*]` Add `jest-watch-typeahead` as a devDependency ([#6449](https://github.com/facebook/jest/pull/6449/files)) +- `[*]` upgrade TS to 3.4.0-dev\* for inceremental builds ([#8149](https://github.com/facebook/jest/pull/8149)) ### Performance diff --git a/package.json b/package.json index 280ba9e07aa2..f51140b47a51 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "slash": "^2.0.0", "string-length": "^2.0.0", "strip-ansi": "^5.0.0", - "typescript": "^3.3.3", + "typescript": "next", "webpack": "^4.28.4" }, "scripts": { diff --git a/scripts/buildTs.js b/scripts/buildTs.js index ec5479be5c4b..563cd3275e6b 100644 --- a/scripts/buildTs.js +++ b/scripts/buildTs.js @@ -20,13 +20,19 @@ const packagesWithTs = packages.filter(p => fs.existsSync(path.resolve(p, 'tsconfig.json')) ); -const args = ['-b', ...packagesWithTs, ...process.argv.slice(2)]; +const args = [ + '--max-old-space-size=4096', + 'node_modules/.bin/tsc', + '-b', + ...packagesWithTs, + ...process.argv.slice(2), +]; console.log(chalk.inverse('Building TypeScript definition files')); process.stdout.write(adjustToTerminalWidth('Building\n')); try { - execa.sync('tsc', args, {stdio: 'inherit'}); + execa.sync('node', args, {stdio: 'inherit'}); process.stdout.write(`${OK}\n`); } catch (e) { process.stdout.write('\n'); diff --git a/yarn.lock b/yarn.lock index fabe3a658795..70b149121275 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12841,11 +12841,16 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@*, typescript@^3.3.3: +typescript@*: version "3.3.3333" resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.3333.tgz#171b2c5af66c59e9431199117a3bcadc66fdcfd6" integrity sha512-JjSKsAfuHBE/fB2oZ8NxtRTk5iGcg6hkYXMnZ3Wc+b2RSqejEqTaem11mHASMnFilHrax3sLK0GDzcJrekZYLw== +typescript@next: + version "3.4.0-dev.20190319" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.0-dev.20190319.tgz#7b57c2e975aea2216e172993dbd51bf9f749a4e5" + integrity sha512-07xlAz0ntyntHs8sDMqy3JMjTV/yfWhOuPcmJWCQCQehDWBD/YyrBDOOvHgACTBuiE+bIjkTaT7J14nz32dkZw== + ua-parser-js@^0.7.18: version "0.7.19" resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.19.tgz#94151be4c0a7fb1d001af7022fdaca4642659e4b"