From 84f69f482fd034fd00f105a5d6c2812beb555061 Mon Sep 17 00:00:00 2001 From: Daniel Gasienica Date: Fri, 4 May 2018 16:08:26 -0400 Subject: [PATCH] Prettier: Format JSON configuration files --- tsconfig.json | 34 ++++++++++++++++++++-------------- tslint.json | 39 +++++++++++++++++++++++++-------------- 2 files changed, 45 insertions(+), 28 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index 472eb885b..72afa7f23 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,20 +1,25 @@ { "compilerOptions": { /* Basic Options */ - "target": "es2016", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */ - "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */ - "lib": [ /* Specify library files to be included in the compilation. */ - "dom", // Required to access `window` - "es2017", // Required by `@sindresorhus/is` + "target": + "es2016" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */, + "module": + "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */, + "lib": [ + /* Specify library files to be included in the compilation. */ + "dom", // Required to access `window` + "es2017" // Required by `@sindresorhus/is` ], // "allowJs": true, /* Allow javascript files to be compiled. */ // "checkJs": true, /* Report errors in .js files. */ - "jsx": "react", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */ + "jsx": + "react" /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */, // "declaration": true, /* Generates corresponding '.d.ts' file. */ // "sourceMap": true, /* Generates corresponding '.map' file. */ // "outFile": "./", /* Concatenate and emit output to single file. */ // "outDir": "./", /* Redirect output structure to the directory. */ - "rootDir": "./ts", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */ + "rootDir": + "./ts" /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */, // "removeComments": true, /* Do not emit comments to output. */ // "noEmit": true, /* Do not emit outputs. */ // "importHelpers": true, /* Import emit helpers from 'tslib'. */ @@ -22,23 +27,24 @@ // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */ /* Strict Type-Checking Options */ - "strict": true, /* Enable all strict type-checking options. */ + "strict": true /* Enable all strict type-checking options. */, /* Additional Checks */ - "noUnusedLocals": true, /* Report errors on unused locals. */ - "noUnusedParameters": true, /* Report errors on unused parameters. */ - "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */ - "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */ + "noUnusedLocals": true /* Report errors on unused locals. */, + "noUnusedParameters": true /* Report errors on unused parameters. */, + "noImplicitReturns": true /* Report error when not all code paths in function return a value. */, + "noFallthroughCasesInSwitch": true /* Report errors for fallthrough cases in switch statement. */, /* Module Resolution Options */ - "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ + "moduleResolution": + "node" /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */, // "baseUrl": "./", /* Base directory to resolve non-absolute module names. */ // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */ // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ // "typeRoots": [], /* List of folders to include type definitions from. */ // "types": [], /* Type declaration files to be included in compilation. */ // "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */ - "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */ + "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */ // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */ /* Source Map Options */ diff --git a/tslint.json b/tslint.json index e6a8920b4..01efd4298 100644 --- a/tslint.json +++ b/tslint.json @@ -1,12 +1,16 @@ { "defaultSeverity": "error", - "extends": [ - "tslint:recommended", - "tslint-react" - ], + "extends": ["tslint:recommended", "tslint-react"], "jsRules": {}, "rules": { - "align": [true, "arguments", "elements", "members", "parameters", "statements"], + "align": [ + true, + "arguments", + "elements", + "members", + "parameters", + "statements" + ], "array-type": [true, "generic"], // Preferred by Prettier: @@ -23,7 +27,7 @@ "linebreak-style": [true, "LF"], // Ignore `import`s to allow Prettier formatting: - "max-line-length": [true, {"limit": 90, "ignore-pattern": "^import"}], + "max-line-length": [true, { "limit": 90, "ignore-pattern": "^import" }], "mocha-avoid-only": true, // Disabled until we can allow dynamically generated tests: @@ -37,12 +41,21 @@ // Ignore import sources order until we can specify that we want ordering // based on import name vs module name: - "ordered-imports": [true, { - "import-sources-order": "any", - "named-imports-order": "case-insensitive" - }], + "ordered-imports": [ + true, + { + "import-sources-order": "any", + "named-imports-order": "case-insensitive" + } + ], - "quotemark": [true, "single", "jsx-double", "avoid-template", "avoid-escape"], + "quotemark": [ + true, + "single", + "jsx-double", + "avoid-template", + "avoid-escape" + ], // Preferred by Prettier: "semicolon": [true, "always", "ignore-bound-class-methods"], @@ -62,7 +75,5 @@ } ] }, - "rulesDirectory": [ - "node_modules/tslint-microsoft-contrib" - ] + "rulesDirectory": ["node_modules/tslint-microsoft-contrib"] }