From f2ae5264f23e7a25cd35447f72ba9a9ce70ba64c Mon Sep 17 00:00:00 2001 From: Anton Gilgur Date: Mon, 3 Feb 2020 23:24:53 -0500 Subject: [PATCH] (fix): parse tsconfig extends, trailing commas, and comments - use ts.readConfigFile to properly parse a commas and comments from tsconfig instead of just trying to readJSON - use ts.parseJsonConfigFileContent to properly parse `extends` and get recursive compilerOptions - add tests for all of the above use cases - add them to build-withTsconfig which changes declarationDir; should only work if TSDX properly parses the tsconfig NOTE: this is only necessary for internal, TSDX-specific parsing of tsconfig.json. rollup-plugin-typescript2 already handles these options, but internal options like esModuleInterop etc are also used & parsed independently of rpts2 --- src/createRollupConfig.ts | 24 ++++++++------- src/utils.ts | 1 + .../build-withTsconfig/tsconfig.base.json | 30 +++++++++++++++++++ .../fixtures/build-withTsconfig/tsconfig.json | 30 ++----------------- 4 files changed, 47 insertions(+), 38 deletions(-) create mode 100644 test/fixtures/build-withTsconfig/tsconfig.base.json diff --git a/src/createRollupConfig.ts b/src/createRollupConfig.ts index b8255c881..940308c89 100644 --- a/src/createRollupConfig.ts +++ b/src/createRollupConfig.ts @@ -10,10 +10,11 @@ import replace from '@rollup/plugin-replace'; import resolve from '@rollup/plugin-node-resolve'; import sourceMaps from 'rollup-plugin-sourcemaps'; import typescript from 'rollup-plugin-typescript2'; +import ts from 'typescript'; + import { extractErrors } from './errors/extractErrors'; import { babelPluginTsdx } from './babelPluginTsdx'; import { TsdxOptions } from './types'; -import * as fs from 'fs-extra'; const errorCodeOpts = { errorMapFilePath: paths.appErrorsJson, @@ -43,10 +44,15 @@ export async function createRollupConfig( .filter(Boolean) .join('.'); - let tsconfigJSON; - try { - tsconfigJSON = await fs.readJSON(opts.tsconfig || paths.tsconfigJson); - } catch (e) {} + const tsconfigPath = opts.tsconfig || paths.tsconfigJson; + // borrowed from https://github.com/facebook/create-react-app/pull/7248 + const tsconfigJSON = ts.readConfigFile(tsconfigPath, ts.sys.readFile).config; + // borrowed from https://github.com/ezolenko/rollup-plugin-typescript2/blob/42173460541b0c444326bf14f2c8c27269c4cb11/src/parse-tsconfig.ts#L48 + const tsCompilerOptions = ts.parseJsonConfigFileContent( + tsconfigJSON, + ts.sys, + './' + ).options; return { // Tell Rollup the entry point to the package @@ -89,7 +95,7 @@ export async function createRollupConfig( // (i.e. import * as namespaceImportObject from...) that are accessed dynamically. freeze: false, // Respect tsconfig esModuleInterop when setting __esModule. - esModule: tsconfigJSON ? tsconfigJSON.esModuleInterop : false, + esModule: tsCompilerOptions ? tsCompilerOptions.esModuleInterop : false, name: opts.name || safeVariableName(opts.name), sourcemap: true, globals: { react: 'React', 'react-native': 'ReactNative' }, @@ -136,7 +142,7 @@ export async function createRollupConfig( }, }, typescript({ - typescript: require('typescript'), + typescript: ts, cacheRoot: `./node_modules/.cache/tsdx/${opts.format}/`, tsconfig: opts.tsconfig, tsconfigDefaults: { @@ -165,9 +171,7 @@ export async function createRollupConfig( }, }, check: !opts.transpileOnly, - useTsconfigDeclarationDir: Boolean( - tsconfigJSON?.compilerOptions?.declarationDir - ), + useTsconfigDeclarationDir: Boolean(tsCompilerOptions?.declarationDir), }), babelPluginTsdx({ exclude: 'node_modules/**', diff --git a/src/utils.ts b/src/utils.ts index dcedff21f..a6cbd6da2 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,6 +1,7 @@ import fs from 'fs-extra'; import path from 'path'; import camelCase from 'camelcase'; + import { PackageJson } from './types'; // Remove the package name scope if it exists diff --git a/test/fixtures/build-withTsconfig/tsconfig.base.json b/test/fixtures/build-withTsconfig/tsconfig.base.json new file mode 100644 index 000000000..2d7419369 --- /dev/null +++ b/test/fixtures/build-withTsconfig/tsconfig.base.json @@ -0,0 +1,30 @@ +{ + "compilerOptions": { + "module": "ESNext", + "lib": ["dom", "esnext"], + "declaration": true, + "declarationDir": "typings", + "declarationMap": true, + "sourceMap": true, + "rootDir": "./src", + "strict": true, + "noImplicitAny": true, + "strictNullChecks": true, + "strictFunctionTypes": true, + "strictPropertyInitialization": true, + "noImplicitThis": true, + "alwaysStrict": true, + "noUnusedLocals": true, + "noUnusedParameters": true, + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": true, + "moduleResolution": "node", + "baseUrl": "./", + "paths": { + "*": ["src/*", "node_modules/*"] + }, + "jsx": "react", + "esModuleInterop": true + }, + "include": ["src", "types"], // test parsing of trailing comma & comment +} diff --git a/test/fixtures/build-withTsconfig/tsconfig.json b/test/fixtures/build-withTsconfig/tsconfig.json index db72d3a9d..c87c0de33 100644 --- a/test/fixtures/build-withTsconfig/tsconfig.json +++ b/test/fixtures/build-withTsconfig/tsconfig.json @@ -1,30 +1,4 @@ { - "compilerOptions": { - "module": "ESNext", - "lib": ["dom", "esnext"], - "declaration": true, - "declarationDir": "typings", - "declarationMap": true, - "sourceMap": true, - "rootDir": "./src", - "strict": true, - "noImplicitAny": true, - "strictNullChecks": true, - "strictFunctionTypes": true, - "strictPropertyInitialization": true, - "noImplicitThis": true, - "alwaysStrict": true, - "noUnusedLocals": true, - "noUnusedParameters": true, - "noImplicitReturns": true, - "noFallthroughCasesInSwitch": true, - "moduleResolution": "node", - "baseUrl": "./", - "paths": { - "*": ["src/*", "node_modules/*"] - }, - "jsx": "react", - "esModuleInterop": true - }, - "include": ["src", "types"] + // ensure that extends works (trailing comma & comment too) + "extends": "./tsconfig.base.json", }