From 6bd101ccde60e263352de5bee4a6bd38987eb0ca Mon Sep 17 00:00:00 2001 From: Ahn Date: Wed, 11 Nov 2020 09:22:03 +0100 Subject: [PATCH] build(devs-infra): build package with target `es2015` (#2130) BREAKING CHANGE: `ts-jest` no longer ships with `es5` build but now with `es2015` --- src/__helpers__/fakers.ts | 10 +--------- .../__snapshots__/language-service.spec.ts.snap | 12 ++++++------ src/compiler/__snapshots__/transpiler.spec.ts.snap | 12 ++++++------ src/config/config-set.ts | 4 +--- tsconfig.json | 9 +++------ 5 files changed, 17 insertions(+), 30 deletions(-) diff --git a/src/__helpers__/fakers.ts b/src/__helpers__/fakers.ts index 0c0e43c996..6aa068be96 100644 --- a/src/__helpers__/fakers.ts +++ b/src/__helpers__/fakers.ts @@ -4,7 +4,7 @@ import { resolve } from 'path' import { createCompilerInstance } from '../compiler/instance' import { ConfigSet } from '../config/config-set' -import type { BabelConfig, TsCompiler, TsJestGlobalOptions } from '../types' +import type { TsCompiler, TsJestGlobalOptions } from '../types' import type { ImportReasons } from '../utils/messages' export function filePath(relPath: string): string { @@ -28,14 +28,6 @@ function getJestConfig( return res } -export function babelConfig(options?: BabelConfig): T { - return { - ...options, - presets: [...(options && options.presets)], - plugins: [...(options && options.plugins)], - } as any -} - export function importReason(text = '[[BECAUSE]]'): ImportReasons { return text as any } diff --git a/src/compiler/__snapshots__/language-service.spec.ts.snap b/src/compiler/__snapshots__/language-service.spec.ts.snap index a8721b9545..50a15fb5f3 100644 --- a/src/compiler/__snapshots__/language-service.spec.ts.snap +++ b/src/compiler/__snapshots__/language-service.spec.ts.snap @@ -133,13 +133,13 @@ Array [ exports[`Language service jsx option should compile tsx file for jsx preserve 1`] = ` ===[ FILE: test-jsx.tsx ]======================================================= "use strict"; - var App = function () { + const App = () => { return <>Test; }; - //# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJmaWxlIjoidGVzdC1qc3gudHN4IiwibWFwcGluZ3MiOiI7QUFDUSxJQUFNLEdBQUcsR0FBRztJQUNWLE9BQU8sRUFBRSxJQUFJLEdBQUcsQ0FBQTtBQUNsQixDQUFDLENBQUEiLCJuYW1lcyI6W10sInNvdXJjZXMiOlsidGVzdC1qc3gudHN4Il0sInNvdXJjZXNDb250ZW50IjpbIlxuICAgICAgICBjb25zdCBBcHAgPSAoKSA9PiB7XG4gICAgICAgICAgcmV0dXJuIDw+VGVzdDwvPlxuICAgICAgICB9XG4gICAgICAiXSwidmVyc2lvbiI6M30= + //# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJmaWxlIjoidGVzdC1qc3gudHN4IiwibWFwcGluZ3MiOiI7QUFDUSxNQUFNLEdBQUcsR0FBRyxHQUFHLEVBQUU7SUFDZixPQUFPLEVBQUUsSUFBSSxHQUFHLENBQUE7QUFDbEIsQ0FBQyxDQUFBIiwibmFtZXMiOltdLCJzb3VyY2VzIjpbInRlc3QtanN4LnRzeCJdLCJzb3VyY2VzQ29udGVudCI6WyJcbiAgICAgICAgY29uc3QgQXBwID0gKCkgPT4ge1xuICAgICAgICAgIHJldHVybiA8PlRlc3Q8Lz5cbiAgICAgICAgfVxuICAgICAgIl0sInZlcnNpb24iOjN9 ===[ INLINE SOURCE MAPS ]======================================================= file: test-jsx.tsx - mappings: ';AACQ,IAAM,GAAG,GAAG;IACV,OAAO,EAAE,IAAI,GAAG,CAAA;AAClB,CAAC,CAAA' + mappings: ';AACQ,MAAM,GAAG,GAAG,GAAG,EAAE;IACf,OAAO,EAAE,IAAI,GAAG,CAAA;AAClB,CAAC,CAAA' names: [] sources: - test-jsx.tsx @@ -157,13 +157,13 @@ exports[`Language service jsx option should compile tsx file for jsx preserve 1` exports[`Language service jsx option should compile tsx file for other jsx options 1`] = ` ===[ FILE: test-jsx.tsx ]======================================================= "use strict"; - var App = function () { + const App = () => { return React.createElement(React.Fragment, null, "Test"); }; - //# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJmaWxlIjoidGVzdC1qc3gudHN4IiwibWFwcGluZ3MiOiI7QUFDUSxJQUFNLEdBQUcsR0FBRztJQUNWLE9BQU8saURBQVMsQ0FBQTtBQUNsQixDQUFDLENBQUEiLCJuYW1lcyI6W10sInNvdXJjZXMiOlsidGVzdC1qc3gudHN4Il0sInNvdXJjZXNDb250ZW50IjpbIlxuICAgICAgICBjb25zdCBBcHAgPSAoKSA9PiB7XG4gICAgICAgICAgcmV0dXJuIDw+VGVzdDwvPlxuICAgICAgICB9XG4gICAgICAiXSwidmVyc2lvbiI6M30= + //# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJmaWxlIjoidGVzdC1qc3gudHN4IiwibWFwcGluZ3MiOiI7QUFDUSxNQUFNLEdBQUcsR0FBRyxHQUFHLEVBQUU7SUFDZixPQUFPLGlEQUFTLENBQUE7QUFDbEIsQ0FBQyxDQUFBIiwibmFtZXMiOltdLCJzb3VyY2VzIjpbInRlc3QtanN4LnRzeCJdLCJzb3VyY2VzQ29udGVudCI6WyJcbiAgICAgICAgY29uc3QgQXBwID0gKCkgPT4ge1xuICAgICAgICAgIHJldHVybiA8PlRlc3Q8Lz5cbiAgICAgICAgfVxuICAgICAgIl0sInZlcnNpb24iOjN9 ===[ INLINE SOURCE MAPS ]======================================================= file: test-jsx.tsx - mappings: ';AACQ,IAAM,GAAG,GAAG;IACV,OAAO,iDAAS,CAAA;AAClB,CAAC,CAAA' + mappings: ';AACQ,MAAM,GAAG,GAAG,GAAG,EAAE;IACf,OAAO,iDAAS,CAAA;AAClB,CAAC,CAAA' names: [] sources: - test-jsx.tsx diff --git a/src/compiler/__snapshots__/transpiler.spec.ts.snap b/src/compiler/__snapshots__/transpiler.spec.ts.snap index 34340c79bf..da133af496 100644 --- a/src/compiler/__snapshots__/transpiler.spec.ts.snap +++ b/src/compiler/__snapshots__/transpiler.spec.ts.snap @@ -7,13 +7,13 @@ exports[`Transpiler diagnostics should report diagnostics related to codes with exports[`Transpiler jsx option should compile tsx file for jsx preserve 1`] = ` ===[ FILE: foo.tsx ]============================================================ "use strict"; - var App = function () { + const App = () => { return <>Test; }; - //# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJmaWxlIjoiZm9vLnRzeCIsIm1hcHBpbmdzIjoiO0FBQ1EsSUFBTSxHQUFHLEdBQUc7SUFDVixPQUFPLEVBQUUsSUFBSSxHQUFHLENBQUE7QUFDbEIsQ0FBQyxDQUFBIiwibmFtZXMiOltdLCJzb3VyY2VzIjpbImZvby50c3giXSwic291cmNlc0NvbnRlbnQiOlsiXG4gICAgICAgIGNvbnN0IEFwcCA9ICgpID0+IHtcbiAgICAgICAgICByZXR1cm4gPD5UZXN0PC8+XG4gICAgICAgIH1cbiAgICAgICJdLCJ2ZXJzaW9uIjozfQ== + //# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJmaWxlIjoiZm9vLnRzeCIsIm1hcHBpbmdzIjoiO0FBQ1EsTUFBTSxHQUFHLEdBQUcsR0FBRyxFQUFFO0lBQ2YsT0FBTyxFQUFFLElBQUksR0FBRyxDQUFBO0FBQ2xCLENBQUMsQ0FBQSIsIm5hbWVzIjpbXSwic291cmNlcyI6WyJmb28udHN4Il0sInNvdXJjZXNDb250ZW50IjpbIlxuICAgICAgICBjb25zdCBBcHAgPSAoKSA9PiB7XG4gICAgICAgICAgcmV0dXJuIDw+VGVzdDwvPlxuICAgICAgICB9XG4gICAgICAiXSwidmVyc2lvbiI6M30= ===[ INLINE SOURCE MAPS ]======================================================= file: foo.tsx - mappings: ';AACQ,IAAM,GAAG,GAAG;IACV,OAAO,EAAE,IAAI,GAAG,CAAA;AAClB,CAAC,CAAA' + mappings: ';AACQ,MAAM,GAAG,GAAG,GAAG,EAAE;IACf,OAAO,EAAE,IAAI,GAAG,CAAA;AAClB,CAAC,CAAA' names: [] sources: - foo.tsx @@ -31,13 +31,13 @@ exports[`Transpiler jsx option should compile tsx file for jsx preserve 1`] = ` exports[`Transpiler jsx option should compile tsx file for other jsx options 1`] = ` ===[ FILE: foo.tsx ]============================================================ "use strict"; - var App = function () { + const App = () => { return React.createElement(React.Fragment, null, "Test"); }; - //# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJmaWxlIjoiZm9vLnRzeCIsIm1hcHBpbmdzIjoiO0FBQ1EsSUFBTSxHQUFHLEdBQUc7SUFDVixPQUFPLGlEQUFTLENBQUE7QUFDbEIsQ0FBQyxDQUFBIiwibmFtZXMiOltdLCJzb3VyY2VzIjpbImZvby50c3giXSwic291cmNlc0NvbnRlbnQiOlsiXG4gICAgICAgIGNvbnN0IEFwcCA9ICgpID0+IHtcbiAgICAgICAgICByZXR1cm4gPD5UZXN0PC8+XG4gICAgICAgIH1cbiAgICAgICJdLCJ2ZXJzaW9uIjozfQ== + //# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJmaWxlIjoiZm9vLnRzeCIsIm1hcHBpbmdzIjoiO0FBQ1EsTUFBTSxHQUFHLEdBQUcsR0FBRyxFQUFFO0lBQ2YsT0FBTyxpREFBUyxDQUFBO0FBQ2xCLENBQUMsQ0FBQSIsIm5hbWVzIjpbXSwic291cmNlcyI6WyJmb28udHN4Il0sInNvdXJjZXNDb250ZW50IjpbIlxuICAgICAgICBjb25zdCBBcHAgPSAoKSA9PiB7XG4gICAgICAgICAgcmV0dXJuIDw+VGVzdDwvPlxuICAgICAgICB9XG4gICAgICAiXSwidmVyc2lvbiI6M30= ===[ INLINE SOURCE MAPS ]======================================================= file: foo.tsx - mappings: ';AACQ,IAAM,GAAG,GAAG;IACV,OAAO,iDAAS,CAAA;AAClB,CAAC,CAAA' + mappings: ';AACQ,MAAM,GAAG,GAAG,GAAG,EAAE;IACf,OAAO,iDAAS,CAAA;AAClB,CAAC,CAAA' names: [] sources: - foo.tsx diff --git a/src/config/config-set.ts b/src/config/config-set.ts index 4c4a7e64e7..27833fe4cc 100644 --- a/src/config/config-set.ts +++ b/src/config/config-set.ts @@ -305,9 +305,7 @@ export class ConfigSet { } }) if (astTransformers.before) { - this.customTransformers = { - before: [...this.customTransformers.before, ...resolveTransformers(astTransformers.before)], - } + this.customTransformers.before?.push(...resolveTransformers(astTransformers.before)) } if (astTransformers.after) { this.customTransformers = { diff --git a/tsconfig.json b/tsconfig.json index 28b7acffd0..5af7e7004a 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,17 +1,14 @@ { "compilerOptions": { - "target": "es5", - "module": "commonjs", + "target": "ES2015", + "module": "CommonJS", "declaration": false, "noEmit": true, "downlevelIteration": true, "esModuleInterop": true, "experimentalDecorators": true, "inlineSourceMap": true, - "lib": [ - "es2015", - "es2016.array.include" - ], + "lib": ["esnext"], "moduleResolution": "node", "resolveJsonModule": true, "noEmitOnError": true,