From 54a874c9d7cb9d9dfe2055605d4cf0f4ad76319d Mon Sep 17 00:00:00 2001 From: Thomas Heck Date: Thu, 25 Jun 2015 11:46:18 +0200 Subject: [PATCH 1/2] replace require-all with static require --- lib/protocol/packets/index.js | 26 ++++++++++++++++++++++---- lib/protocol/sequences/index.js | 13 +++++++++---- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/lib/protocol/packets/index.js b/lib/protocol/packets/index.js index a13d4697d..278b9b79f 100644 --- a/lib/protocol/packets/index.js +++ b/lib/protocol/packets/index.js @@ -1,4 +1,22 @@ -var Elements = module.exports = require('require-all')({ - dirname : __dirname, - filter : /([A-Z].+)\.js$/, -}); +module.exports = { + ClientAuthenticationPacket: require('./ClientAuthenticationPacket'), + ComChangeUserPacket: require('./ComChangeUserPacket'), + ComPingPacket: require('./ComPingPacket'), + ComQueryPacket: require('./ComQueryPacket'), + ComQuitPacket: require('./ComQuitPacket'), + ComStatisticsPacket: require('./ComStatisticsPacket'), + EmptyPacket: require('./EmptyPacket'), + EofPacket: require('./EofPacket'), + ErrorPacket: require('./ErrorPacket'), + Field: require('./Field'), + FieldPacket: require('./FieldPacket'), + HandshakeInitializationPacket: require('./HandshakeInitializationPacket'), + LocalDataFilePacket: require('./LocalDataFilePacket'), + OkPacket: require('./OkPacket'), + OldPasswordPacket: require('./OldPasswordPacket'), + ResultSetHeaderPacket: require('./ResultSetHeaderPacket'), + RowDataPacket: require('./RowDataPacket'), + SSLRequestPacket: require('./SSLRequestPacket'), + StatisticsPacket: require('./StatisticsPacket'), + UseOldPasswordPacket: require('./UseOldPasswordPacket'), +}; diff --git a/lib/protocol/sequences/index.js b/lib/protocol/sequences/index.js index a13d4697d..7c5c3d6b5 100644 --- a/lib/protocol/sequences/index.js +++ b/lib/protocol/sequences/index.js @@ -1,4 +1,9 @@ -var Elements = module.exports = require('require-all')({ - dirname : __dirname, - filter : /([A-Z].+)\.js$/, -}); +module.exports = { + ChangeUser: require('./ChangeUser'), + Handshake: require('./Handshake'), + Ping: require('./Ping'), + Query: require('./Query'), + Quit: require('./Quit'), + Sequence: require('./Sequence'), + Statistics: require('./Statistics'), +}; From e8e9b007894ac648f446c75a27c27e0c1e920371 Mon Sep 17 00:00:00 2001 From: Thomas Heck Date: Fri, 26 Jun 2015 11:38:04 +0200 Subject: [PATCH 2/2] move require-all to devDeps --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 49ded9c79..139dd9bff 100644 --- a/package.json +++ b/package.json @@ -13,13 +13,13 @@ "repository": "felixge/node-mysql", "dependencies": { "bignumber.js": "2.0.7", - "readable-stream": "~1.1.13", - "require-all": "~1.0.0" + "readable-stream": "~1.1.13" }, "devDependencies": { "istanbul": "0.3.9", - "rimraf": "2.2.8", "mkdirp": "0.5.0", + "require-all": "~1.0.0", + "rimraf": "2.2.8", "urun": "0.0.8", "utest": "0.0.8" },