Skip to content

Commit 341648d

Browse files
committed
Fix lint issues
1 parent ffd8190 commit 341648d

File tree

4 files changed

+23
-30
lines changed

4 files changed

+23
-30
lines changed

.eslintrc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
extends: "eslint:recommended"
22
env:
33
node: true
4-
shelljs: true
54
es6: true
5+
parserOptions:
6+
ecmaVersion: 2019
67
rules:
8+
no-console: [0]
79
no-warning-comments: 0
810
no-empty:
911
- "error"
1012
- allowEmptyCatch: true
13+
no-var: [2]
14+
prefer-const: [2]
15+

lib/utils.js

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
const fs = require("fs");
22
const path = require("path");
3-
const ejs = require("ejs");
4-
const gitUrlParse = require("git-url-parse");
53
const { execSync } = require('child_process');
64

5+
const ejs = require("ejs");
6+
const gitUrlParse = require("git-url-parse");
7+
const chalk = require('chalk');
8+
const yaml = require("js-yaml");
79
const mkdirp = require("mkdirp");
810

911
function provisionPaths(file) {
@@ -16,8 +18,9 @@ exports.validateSpecFileName = fileName => {
1618
if (!fs.existsSync(fileName)) {
1719
return chalk.red(`File ${chalk.blue(fileName)} does not exist`);
1820
}
21+
let file;
1922
try {
20-
const file = yaml.safeLoad(fs.readFileSync(fileName, "utf8"));
23+
file = yaml.safeLoad(fs.readFileSync(fileName, "utf8"));
2124
} catch (e) {
2225
return chalk.red(e.message);
2326
}
@@ -30,8 +33,8 @@ exports.validateSpecFileName = fileName => {
3033

3134
exports.getCurrentGitHubRepo = () => {
3235
try {
33-
var remoteUrl = execSync("git config --get remote.origin.url").toString();
34-
var parsedUrl = gitUrlParse(remoteUrl.trim());
36+
const remoteUrl = execSync("git config --get remote.origin.url").toString();
37+
const parsedUrl = gitUrlParse(remoteUrl.trim());
3538
if (parsedUrl.owner && parsedUrl.name) {
3639
return parsedUrl.owner + "/" + parsedUrl.name;
3740
}
@@ -42,8 +45,8 @@ exports.getCurrentGitHubRepo = () => {
4245
exports.copy = async file => {
4346
const { src, target } = provisionPaths(file);
4447
mkdirp.sync(path.dirname(target));
45-
var rd = fs.createReadStream(src);
46-
var wr = fs.createWriteStream(target);
48+
const rd = fs.createReadStream(src);
49+
const wr = fs.createWriteStream(target);
4750

4851
try {
4952
return await new Promise(function(resolve, reject) {
@@ -68,7 +71,7 @@ exports.render = async (file, data) => {
6871
exports.getGhPagesBaseUrl = repo => {
6972
const [user, name] = repo.split("/");
7073
// TODO: support CNAME
71-
var url = user.toLowerCase() + ".github.io";
74+
let url = user.toLowerCase() + ".github.io";
7275
if (name !== url) {
7376
url += "/" + name;
7477
}
@@ -78,9 +81,9 @@ exports.getGhPagesBaseUrl = repo => {
7881
function copyDirSync(srcDir, targetDir) {
7982
const list = fs.readdirSync(srcDir);
8083
list.forEach(file => {
81-
let src = srcDir + "/" + file;
82-
let dst = targetDir + "/" + file;
83-
var stat = fs.statSync(src);
84+
const src = srcDir + "/" + file;
85+
const dst = targetDir + "/" + file;
86+
const stat = fs.statSync(src);
8487
if (stat && stat.isDirectory()) {
8588
try {
8689
fs.mkdirSync(dst);

package-lock.json

Lines changed: 1 addition & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
},
3333
"devDependencies": {
3434
"eslint": "^5.9.0",
35-
"eslint-config-xo-space": "^0.20.0",
3635
"prettier": "^1.15.3"
3736
},
3837
"eslintConfig": {
39-
"extends": "xo-space"
38+
"extends": "xo-space",
39+
"prettier": "prettier --write lib/**/*.js cli.js"
4040
},
4141
"repository": "Rebilly/generator-openapi-repo",
4242
"scripts": {

0 commit comments

Comments
 (0)