Skip to content

Commit bf567b1

Browse files
committed
enable prefer-template
1 parent dde9448 commit bf567b1

File tree

7 files changed

+11
-16
lines changed

7 files changed

+11
-16
lines changed

object-parser.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ class objectParser {
229229
nodes: [],
230230
});
231231

232-
defineRaws(atRule, 'name', key.prefix + '@', params ? '' : key.suffix, {
232+
defineRaws(atRule, 'name', `${key.prefix}@`, params ? '' : key.suffix, {
233233
raw: 'camel',
234234
});
235235

object-stringifier.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ class ObjectStringifier extends Stringifier {
8787
if (node.raws.inline) {
8888
const text = node.raws.text || node.text;
8989

90-
this.builder('//' + left + text + right, node);
90+
this.builder(`//${left}${text}${right}`, node);
9191
} else {
92-
this.builder('/*' + left + node.text + right + '*/', node);
92+
this.builder(`/*${left}${node.text}${right}*/`, node);
9393
}
9494
}
9595
raw(node, own, detect) {
@@ -99,7 +99,7 @@ class ObjectStringifier extends Stringifier {
9999
(own === 'between' || (own === 'afterName' && node.type === 'atrule' && !node.nodes)) &&
100100
!/:/.test(value)
101101
) {
102-
value = ':' + value;
102+
value = `:${value}`;
103103
} else if (own === 'before' && /^(decl|rule)$/.test(node.type)) {
104104
value = value.replace(/\S+$/, '');
105105
}
@@ -133,7 +133,7 @@ class ObjectStringifier extends Stringifier {
133133
}
134134
} else if (node.type === 'atrule') {
135135
if (prop === 'name') {
136-
value = '@' + value;
136+
value = `@${value}`;
137137
} else if (node.nodes) {
138138
return;
139139
}

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,9 @@
5555
"rules": {
5656
"array-callback-return": "off",
5757
"no-confusing-arrow": "off",
58-
"prefer--template": "off",
5958
"prefer-object-spread": "off",
6059
"prefer-rest-params": "off",
6160
"prefer-spread": "off",
62-
"prefer-template": "off",
6361
"jest/expect-expect": "off",
6462
"jest/valid-expect": "off"
6563
}

template-parser-helper.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,7 @@ class LocalFixer {
172172
if (error && error.name === 'CssSyntaxError') {
173173
this.object(error);
174174
this.object(error.input);
175-
error.message = error.message.replace(
176-
/:\d+:\d+:/,
177-
':' + error.line + ':' + error.column + ':',
178-
);
175+
error.message = error.message.replace(/:\d+:\d+:/, `:${error.line}:${error.column}:`);
179176
}
180177

181178
return error;

test/css-in-js.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,10 @@ describe('CSS in JS', () => {
173173

174174
if (name === 'custom-properties.css') return;
175175

176-
it('objectStringifier ' + name, () => {
176+
it(`objectStringifier ${name}`, () => {
177177
const root = postcss.parse(css);
178178
const jsSource = root.toString(objectStringify).trim();
179-
const jsonSource = '{\n' + jsSource.replace(/,$/, '').replace(/[\s;]+$/gm, '') + '\n}';
179+
const jsonSource = `{\n${jsSource.replace(/,$/, '').replace(/[\s;]+$/gm, '')}\n}`;
180180

181181
expect(JSON5.parse(jsonSource)).toBeTruthy();
182182
});

test/supports.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ describe('should support for each CSS in JS package', () => {
5757
'material-ui.jsx',
5858
].forEach((file) => {
5959
it(`${file}`, () => {
60-
file = require.resolve('./fixtures/' + file);
60+
file = require.resolve(`./fixtures/${file}`);
6161
const code = fs.readFileSync(file);
6262
const document = syntax.parse(code, {
6363
from: file,
@@ -69,7 +69,7 @@ describe('should support for each CSS in JS package', () => {
6969
const parsed = JSON.stringify(clean(document), 0, '\t');
7070

7171
// fs.writeFileSync(file + ".json", parsed + "\n");
72-
expect(parsed).toBe(fs.readFileSync(file + '.json', 'utf8').trim());
72+
expect(parsed).toBe(fs.readFileSync(`${file}.json`, 'utf8').trim());
7373
});
7474
});
7575
});

un-camel-case.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ function unCamelCase(str) {
44
return str.replace(/[\w-]+/g, (s) =>
55
/^[A-Z]?[a-z]*(?:[A-Z][a-z]*)+$/.test(s)
66
? s
7-
.replace(/[A-Z]/g, (casedStr) => '-' + casedStr.toLowerCase())
7+
.replace(/[A-Z]/g, (casedStr) => `-${casedStr.toLowerCase()}`)
88
.replace(/^(o|ms|moz|khtml|epub|(\w+-?)*webkit)(?=-)/i, '-$1')
99
: s,
1010
);

0 commit comments

Comments
 (0)