Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
2,
"always"
],
"no-console": 0
"no-console": 0,
"no-var": 2
},
"env": {
"es6": true,
Expand Down
10 changes: 5 additions & 5 deletions ja/ESLint/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,22 +148,22 @@ import {EventEmitter} from "events";

function lint(code){
// コードをパースしてASTにする
var ast = parse(code);
let ast = parse(code);
// イベントの登録場所
var emitter = new EventEmitter();
var results = [];
let emitter = new EventEmitter();
let results = [];
emitter.on("report", message => {
// 3. のためのreportされた内容を集める
results.push(message);
});
// 利用するルール一覧
var ruleList = getAllRules();
let ruleList = getAllRules();
// 1. ルール毎に使っている`Node.type`をイベント登録する
ruleList.forEach(rule => {
// それぞれのルールに定義されているメソッド一覧を取得
// e.g) MemberExpression(node){}
// => {"MemberExpression" : function(node){}, ... } というオブジェクト
var methodObject = getDefinedMethod(rule);
let methodObject = getDefinedMethod(rule);
Object.keys(methodObject).forEach(nodeType => {
emitter.on(nodeType, methodList[nodeType]);
});
Expand Down
4 changes: 2 additions & 2 deletions src/ESLint/MyLinter-example.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import noConsole from "./no-console";

let linter = new MyLinter();
linter.loadRule(noConsole);
var code = `
const code = `
function add(x, y){
console.log(x, y);
return x + y;
}
add(1, 3);
`;
var results = linter.lint(code);
let results = linter.lint(code);
assert(results.length > 0);
assert.equal(results[0], "Unexpected console statement.");
8 changes: 4 additions & 4 deletions src/ESLint/MyLinter.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default class MyLinter {
}

loadRule(rule) {
var ruleExports = rule(this._ruleContext);
let ruleExports = rule(this._ruleContext);
// on(nodeType, nodeTypeCallback);
Object.keys(ruleExports).forEach(nodeType => {
this._emitter.on(nodeType, ruleExports[nodeType]);
Expand All @@ -23,12 +23,12 @@ export default class MyLinter {


lint(code) {
var messages = [];
var addMessage = (message)=> {
let messages = [];
let addMessage = (message)=> {
messages.push(message);
};
this._ruleContext.on("report", addMessage);
var ast = parse(code);
let ast = parse(code);
traverse(ast, {
enter: (node) => {
this._emitter.emit(node.type, node);
Expand Down
8 changes: 4 additions & 4 deletions src/connect/connect-echo-example.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import connect from "connect";
import http from "http";
import fetch from "node-fetch";
import assert from "assert";
var app = connect();
let app = connect();
// add Error handling
app.use(function (err, req, res, next) {
console.error(err.stack);
Expand All @@ -15,12 +15,12 @@ app.use(function (req, res) {
req.pipe(res);
});
//create node.js http server and listen on port
var server = http.createServer(app).listen(3000, request);
let server = http.createServer(app).listen(3000, request);

// request => response
function request() {
var closeServer = server.close.bind(server);
var requestBody = {
let closeServer = server.close.bind(server);
const requestBody = {
"key": "value"
};
fetch("http://localhost:3000", {
Expand Down
6 changes: 3 additions & 3 deletions src/connect/connect-example.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ import connect from "connect";
import http from "http";
import fetch from "node-fetch";
const responseText = "response text";
var app = connect();
let app = connect();
// add Error handling
app.use(errorHandler());
// add "X-Content-Type-Options" to response
app.use(nosniff());
// respond to all requests
app.use(hello(responseText));
//create node.js http server and listen on port
var server = http.createServer(app).listen(3000, request);
let server = http.createServer(app).listen(3000, request);

function request() {
var closeServer = server.close.bind(server);
let closeServer = server.close.bind(server);
fetch("http://localhost:3000")
.then(res => res.text())
.then(text => {
Expand Down
2 changes: 1 addition & 1 deletion src/jQuery/calculator-example.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ import assert from "assert";
import calculator from "./calculator";
import "./calculator-plugin"; // Extend

var resultValue = calculator(0).add(10).multi(10).value;
let resultValue = calculator(0).add(10).multi(10).value;
assert.equal(resultValue, 10 * 10);
2 changes: 1 addition & 1 deletion test/ESLint/MyLinter-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ describe("MyLint", function () {
it("should load and lint", function () {
let linter = new MyLinter();
linter.loadRule(noConsole);
var results = linter.lint(`console.log("test")`);
let results = linter.lint(`console.log("test")`);
assert(results.length > 0);
assert.equal(results[0], "Unexpected console statement.");
});
Expand Down
16 changes: 8 additions & 8 deletions test/connect/hello-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import echo from "../../src/connect/echo";
import http from "http";
import fetch from "node-fetch";
describe("connect", function () {
var responseText = "test";
var server;
const responseText = "test";
let server;
describe("errorHandler", function () {
beforeEach(function (done) {
var app = connect();
let app = connect();
app.use(errorHandler());
app.use((req, res, next) => {
next(new Error("wrong"));
Expand All @@ -34,7 +34,7 @@ describe("connect", function () {
});
describe("hello", function () {
beforeEach(function (done) {
var app = connect();
let app = connect();
app.use(errorHandler());
app.use(hello(responseText));
server = http.createServer(app).listen(3000, done);
Expand All @@ -52,7 +52,7 @@ describe("connect", function () {
});
describe("sniff", function () {
beforeEach(function (done) {
var app = connect();
let app = connect();
app.use(nosniff());
app.use(hello(responseText));
server = http.createServer(app).listen(3000, done);
Expand All @@ -69,17 +69,17 @@ describe("connect", function () {
});
describe("echo", function () {
beforeEach(function (done) {
var app = connect();
let app = connect();
app.use(echo());
server = http.createServer(app).listen(3000, done);
});
afterEach(function () {
server && server.close();
});
it("should return request as response", function () {
var requestBody = {
const requestBody = Object.freeze({
key: "value"
};
});
return fetch("http://localhost:3000", {
method: "POST",
headers: {
Expand Down
2 changes: 1 addition & 1 deletion test/jQuery/greenify-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const testbed = fs.readFileSync(__dirname + "/fixtures/testbed.html", "utf-8");
const jquery = fs.readFileSync(__dirname + "/../../node_modules/jquery/dist/jquery.js", "utf-8");
const greenify = fs.readFileSync(__dirname + "/../../src/jQuery/greenify.js", "utf-8");
describe("greenify", function () {
var $, document;
let $, document;
before(done => {
jsdom.env({
html: testbed,
Expand Down