Skip to content

Commit 9069a92

Browse files
authored
style: apply prettier (#51)
* style: apply prettier * refactor(option): use template string * chore: use variable
1 parent abba0cf commit 9069a92

17 files changed

+277
-443
lines changed

.eslintrc.js

Lines changed: 13 additions & 218 deletions
Original file line numberDiff line numberDiff line change
@@ -6,228 +6,23 @@ module.exports = {
66
"es6": true,
77
"mocha": true
88
},
9-
"extends": "eslint:recommended",
9+
"plugins": [
10+
"prettier"
11+
],
12+
"extends": [
13+
"eslint:recommended"
14+
],
1015
"parserOptions": {
1116
"sourceType": "module"
1217
},
1318
"rules": {
14-
"accessor-pairs": "error",
15-
"array-bracket-spacing": [
16-
"error",
17-
"never"
18-
],
19-
"array-callback-return": "error",
20-
"arrow-body-style": "off",
21-
"arrow-parens": "off",
22-
"arrow-spacing": [
23-
"error",
24-
{
25-
"after": true,
26-
"before": true
27-
}
28-
],
29-
"block-scoped-var": "error",
30-
"block-spacing": "error",
31-
"brace-style": [
32-
"error",
33-
"1tbs"
34-
],
35-
"callback-return": "off",
36-
"camelcase": "error",
37-
"comma-spacing": "off",
38-
"comma-style": [
39-
"error",
40-
"last"
41-
],
42-
"complexity": "error",
43-
"computed-property-spacing": [
44-
"error",
45-
"never"
46-
],
47-
"consistent-return": "off",
48-
"consistent-this": "error",
49-
"curly": "error",
50-
"default-case": "error",
51-
"dot-location": [
52-
"error",
53-
"property"
54-
],
55-
"dot-notation": "error",
56-
"eol-last": "off",
57-
"func-names": "off",
58-
"func-style": [
59-
"error",
60-
"declaration",
61-
{
62-
"allowArrowFunctions": true
63-
}
64-
],
65-
"generator-star-spacing": "error",
66-
"global-require": "off",
67-
"guard-for-in": "error",
68-
"handle-callback-err": "error",
69-
"id-blacklist": "error",
70-
"id-length": "off",
71-
"id-match": "error",
72-
"indent": ["error", 4],
73-
"init-declarations": "off",
74-
"jsx-quotes": "error",
75-
"key-spacing": "off",
76-
"keyword-spacing": "off",
77-
"linebreak-style": [
78-
"error",
79-
"unix"
80-
],
81-
"lines-around-comment": "off",
82-
"max-depth": "error",
83-
"max-len": "off",
84-
"max-nested-callbacks": "error",
85-
"max-params": "off",
86-
"max-statements": "off",
87-
"new-parens": "error",
88-
"newline-after-var": "off",
89-
"newline-before-return": "off",
90-
"newline-per-chained-call": "off",
91-
"no-alert": "error",
92-
"no-array-constructor": "error",
93-
"no-bitwise": "error",
94-
"no-caller": "error",
95-
"no-catch-shadow": "error",
96-
"no-confusing-arrow": "error",
97-
"no-continue": "error",
98-
"no-console": "off",
99-
"no-div-regex": "error",
100-
"no-else-return": "off",
101-
"no-empty-function": "error",
102-
"no-eq-null": "off",
103-
"no-eval": "error",
104-
"no-extend-native": "error",
105-
"no-extra-bind": "error",
106-
"no-extra-label": "error",
107-
"no-extra-parens": "off",
108-
"no-floating-decimal": "error",
109-
"no-implicit-coercion": "error",
110-
"no-implicit-globals": "error",
111-
"no-implied-eval": "error",
112-
"no-inline-comments": "off",
113-
"no-inner-declarations": [
114-
"error",
115-
"functions"
116-
],
117-
"no-invalid-this": "error",
118-
"no-iterator": "error",
119-
"no-label-var": "error",
120-
"no-labels": "error",
121-
"no-lone-blocks": "error",
122-
"no-lonely-if": "off",
123-
"no-loop-func": "error",
124-
"no-magic-numbers": "off",
125-
"no-mixed-requires": "error",
126-
"no-multi-spaces": "error",
127-
"no-multi-str": "error",
128-
"no-multiple-empty-lines": "off",
129-
"no-native-reassign": "error",
130-
"no-negated-condition": "off",
131-
"no-nested-ternary": "error",
132-
"no-new": "error",
133-
"no-new-func": "error",
134-
"no-new-object": "error",
135-
"no-new-require": "error",
136-
"no-new-wrappers": "error",
137-
"no-octal-escape": "error",
138-
"no-param-reassign": "off",
139-
"no-path-concat": "error",
140-
"no-plusplus": "off",
141-
"no-process-env": "off",
142-
"no-process-exit": "error",
143-
"no-proto": "error",
144-
"no-restricted-globals": "error",
145-
"no-restricted-imports": "error",
146-
"no-restricted-modules": "error",
147-
"no-restricted-syntax": "error",
148-
"no-return-assign": "error",
149-
"no-script-url": "error",
150-
"no-self-compare": "error",
151-
"no-sequences": "error",
152-
"no-shadow": "off",
153-
"no-shadow-restricted-names": "error",
154-
"no-spaced-func": "error",
155-
"no-sync": "off",
156-
"no-ternary": "off",
157-
"no-throw-literal": "error",
158-
"no-trailing-spaces": "off",
159-
"no-undef-init": "error",
160-
"no-undefined": "off",
161-
"no-underscore-dangle": "off",
162-
"no-unmodified-loop-condition": "error",
163-
"no-unneeded-ternary": "error",
164-
"no-unused-expressions": "error",
165-
"no-unused-vars" : "warn",
166-
"no-use-before-define": "error",
167-
"no-useless-call": "error",
168-
"no-useless-concat": "error",
169-
"no-useless-constructor": "error",
170-
"no-var": "off",
171-
"no-void": "error",
172-
"no-warning-comments": "off",
173-
"no-whitespace-before-property": "error",
174-
"no-with": "error",
175-
"object-curly-spacing": "off",
176-
"object-shorthand": "off",
177-
"one-var": "off",
178-
"one-var-declaration-per-line": "error",
179-
"operator-assignment": [
180-
"error",
181-
"always"
182-
],
183-
"operator-linebreak": "error",
184-
"padded-blocks": "off",
185-
"prefer-arrow-callback": "off",
19+
"prettier/prettier": ["error", {
20+
"printWidth": 100,
21+
"tabWidth": 4
22+
}],
18623
"prefer-const": "error",
187-
"prefer-reflect": "off",
188-
"prefer-rest-params": "off",
189-
"prefer-spread": "off",
190-
"prefer-template": "off",
191-
"quote-props": "off",
192-
"quotes": [
193-
"error",
194-
"double"
195-
],
196-
"radix": "error",
197-
"require-jsdoc": "off",
198-
"require-yield": "error",
199-
"semi": "error",
200-
"semi-spacing": [
201-
"error",
202-
{
203-
"after": true,
204-
"before": false
205-
}
206-
],
207-
"sort-imports": "off",
208-
"sort-vars": "error",
209-
"space-before-blocks": "off",
210-
"space-before-function-paren": "off",
211-
"space-in-parens": [
212-
"error",
213-
"never"
214-
],
215-
"space-infix-ops": "error",
216-
"space-unary-ops": "error",
217-
"spaced-comment": [
218-
"error",
219-
"always"
220-
],
221-
"strict": "off",
222-
"template-curly-spacing": "off",
223-
"valid-jsdoc": "off",
224-
"vars-on-top": "off",
225-
"wrap-iife": "error",
226-
"wrap-regex": "error",
227-
"yield-star-spacing": "error",
228-
"yoda": [
229-
"error",
230-
"never"
231-
]
24+
"no-console": "warn",
25+
"no-extra-semi": 0,
26+
"no-mixed-spaces-and-tabs": 0
23227
}
23328
};

package.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
"test": "npm run lint && mocha",
3232
"test:example-default": "cd examples/default && npm i && npm run build",
3333
"test:example-ace": "cd examples/ace && npm i && npm run build",
34-
"test:example-custom": "cd examples/custom && npm i && npm run build"
34+
"test:example-custom": "cd examples/custom && npm i && npm run build",
35+
"eslint-check": "eslint --print-config .eslintrc.js | eslint-config-prettier-check"
3536
},
3637
"keywords": [
3738
"gitbook",
@@ -98,8 +99,11 @@
9899
"babel-preset-jsdoc-to-assert": "^1.0.1",
99100
"babel-preset-power-assert": "^1.0.0",
100101
"babel-register": "^6.8.0",
102+
"eslint": "^3.14.1",
103+
"eslint-config-prettier": "^2.3.0",
104+
"eslint-plugin-prettier": "^2.1.2",
101105
"mocha": "^2.4.5",
102106
"power-assert": "^1.3.1",
103-
"eslint": "^3.14.1"
107+
"prettier": "^1.5.2"
104108
}
105109
}

src/ace-check.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
const logger = require("winston-color");
2+
/* eslint-disable */
23
// Check that ace plugin is loaded after include-codeblock
34
export function aceCheck() {
45
// Check ace is used.
@@ -7,13 +8,16 @@ export function aceCheck() {
78

89
// Check is not currently loaded.
910
const aceLoaded = Boolean(require("module")._cache[require.resolve("gitbook-plugin-ace")]);
10-
if(aceLoaded) {
11+
if (aceLoaded) {
1112
console.log(""); // flush
12-
logger.error("`gitbook-plugin-include-codeblock` plugin must be loaded before `gitbook-plugin-ace`!");
13+
logger.error(
14+
"`gitbook-plugin-include-codeblock` plugin must be loaded before `gitbook-plugin-ace`!"
15+
);
1316
}
14-
} catch(e) {
17+
} catch (e) {
1518
console.log(""); // flush
1619
logger.warn("ace features disabled (`gitbook-plugin-ace` required)");
17-
1820
}
1921
}
22+
23+
/* eslint-enable */

src/include-codeblock.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// LICENSE : MIT
22
"use strict";
33
var path = require("path");
4-
import {parse} from "./parser";
5-
import {aceCheck} from "./ace-check";
4+
import { parse } from "./parser";
5+
import { aceCheck } from "./ace-check";
66

77
aceCheck();
88

@@ -13,7 +13,7 @@ module.exports = {
1313
var pageDir = path.dirname(page.rawPath);
1414
var results = parse(page.content, pageDir, options);
1515
results.forEach(result => {
16-
var {target, replaced} = result;
16+
var { target, replaced } = result;
1717
page.content = page.content.replace(target, replaced);
1818
});
1919
return page;

src/language-detection.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
const path = require("path");
44
const languageMap = require("language-map");
55
const logger = require("winston-color");
6-
import {defaultKeyValueMap} from "./options.js";
6+
import { defaultKeyValueMap } from "./options.js";
77

88
// Workaround for not working languages.
99
// Redefine aceMode locally.
@@ -46,7 +46,7 @@ export function lookupLanguageByExtension(kvMap, filePath) {
4646
const lang = kvMap.lang;
4747
let ext;
4848
// Check first if map `lang` is an extension string.
49-
const matchext = (/(.+)/g).exec(lang);
49+
const matchext = /(.+)/g.exec(lang);
5050
if (matchext != null) {
5151
ext = matchext[1];
5252
} else {
@@ -66,7 +66,7 @@ export function lookupLanguageByExtension(kvMap, filePath) {
6666
return false;
6767
});
6868
});
69-
return aceMode;
69+
return aceMode;
7070
}
7171

7272
/**
@@ -78,7 +78,7 @@ export function lookupLanguageByExtension(kvMap, filePath) {
7878
export function getLang(kvMap, filePath) {
7979
let aceMode;
8080
// Retrieve ace mode from lang.
81-
if(kvMap.lang !== defaultKeyValueMap.lang) {
81+
if (kvMap.lang !== defaultKeyValueMap.lang) {
8282
aceMode = lookupLanguageByAceMode(kvMap);
8383
}
8484
// Retrieve ace mode from file ext or lang ext.
@@ -90,10 +90,10 @@ export function getLang(kvMap, filePath) {
9090
logger.warn("include-codeblock: unknown language `" + kvMap.lang + "`, use default");
9191
return kvMap;
9292
}
93-
if(kvMap.fixlang) {
93+
if (kvMap.fixlang) {
9494
aceMode = languageAceModeFix(aceMode);
9595
}
96-
const kvm = Object.assign({},kvMap);
96+
const kvm = Object.assign({}, kvMap);
9797
kvm.lang = aceMode;
9898
return Object.freeze(kvm);
9999
}

0 commit comments

Comments
 (0)