mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Prettier: Format JSON configuration files

Browse source
This commit is contained in:
Daniel Gasienica 2018-05-04 16:08:26 -04:00
parent 557693e14c
commit 84f69f482f
2 changed files with 45 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
tsconfig.json
View file

@ -1,20 +1,25 @@
{ {
"compilerOptions": { "compilerOptions": {
/* Basic Options */ /* Basic Options */
"target": "es2016", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */ "target":
"module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */ "es2016" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */,
"lib": [ /* Specify library files to be included in the compilation. */ "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` "dom", // Required to access `window`
"es2017", // Required by `@sindresorhus/is` "es2017" // Required by `@sindresorhus/is`
], ],
// "allowJs": true, /* Allow javascript files to be compiled. */ // "allowJs": true, /* Allow javascript files to be compiled. */
// "checkJs": true, /* Report errors in .js files. */ // "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. */ // "declaration": true, /* Generates corresponding '.d.ts' file. */
// "sourceMap": true, /* Generates corresponding '.map' file. */ // "sourceMap": true, /* Generates corresponding '.map' file. */
// "outFile": "./", /* Concatenate and emit output to single file. */ // "outFile": "./", /* Concatenate and emit output to single file. */
// "outDir": "./", /* Redirect output structure to the directory. */ // "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. */ // "removeComments": true, /* Do not emit comments to output. */
// "noEmit": true, /* Do not emit outputs. */ // "noEmit": true, /* Do not emit outputs. */
// "importHelpers": true, /* Import emit helpers from 'tslib'. */ // "importHelpers": true, /* Import emit helpers from 'tslib'. */
@ -22,16 +27,17 @@
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */ // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
/* Strict Type-Checking Options */ /* Strict Type-Checking Options */
"strict": true, /* Enable all strict type-checking options. */ "strict": true /* Enable all strict type-checking options. */,
/* Additional Checks */ /* Additional Checks */
"noUnusedLocals": true, /* Report errors on unused locals. */ "noUnusedLocals": true /* Report errors on unused locals. */,
"noUnusedParameters": true, /* Report errors on unused parameters. */ "noUnusedParameters": true /* Report errors on unused parameters. */,
"noImplicitReturns": true, /* Report error when not all code paths in function return a value. */ "noImplicitReturns": true /* Report error when not all code paths in function return a value. */,
"noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */ "noFallthroughCasesInSwitch": true /* Report errors for fallthrough cases in switch statement. */,
/* Module Resolution Options */ /* 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. */ // "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'. */ // "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. */ // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */

35
tslint.json
View file

@ -1,12 +1,16 @@
{ {
"defaultSeverity": "error", "defaultSeverity": "error",
"extends": [ "extends": ["tslint:recommended", "tslint-react"],
"tslint:recommended",
"tslint-react"
],
"jsRules": {}, "jsRules": {},
"rules": { "rules": {
"align": [true, "arguments", "elements", "members", "parameters", "statements"], "align": [
true,
"arguments",
"elements",
"members",
"parameters",
"statements"
],
"array-type": [true, "generic"], "array-type": [true, "generic"],
// Preferred by Prettier: // Preferred by Prettier:
@ -23,7 +27,7 @@
"linebreak-style": [true, "LF"], "linebreak-style": [true, "LF"],
// Ignore `import`s to allow Prettier formatting: // 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, "mocha-avoid-only": true,
// Disabled until we can allow dynamically generated tests: // Disabled until we can allow dynamically generated tests:
@ -37,12 +41,21 @@
// Ignore import sources order until we can specify that we want ordering // Ignore import sources order until we can specify that we want ordering
// based on import name vs module name: // based on import name vs module name:
"ordered-imports": [true, { "ordered-imports": [
true,
{
"import-sources-order": "any", "import-sources-order": "any",
"named-imports-order": "case-insensitive" "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: // Preferred by Prettier:
"semicolon": [true, "always", "ignore-bound-class-methods"], "semicolon": [true, "always", "ignore-bound-class-methods"],
@ -62,7 +75,5 @@
} }
] ]
}, },
"rulesDirectory": [ "rulesDirectory": ["node_modules/tslint-microsoft-contrib"]
"node_modules/tslint-microsoft-contrib"
]
} }