diff --git a/.gitignore b/.gitignore index 24c853d..2882970 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /node_modules/ /coverage/ /syncd/ +*.lock diff --git a/examples/bus.mjs b/examples/bus.js similarity index 100% rename from examples/bus.mjs rename to examples/bus.js diff --git a/examples/ipc-relay.mjs b/examples/ipc-relay.js similarity index 100% rename from examples/ipc-relay.mjs rename to examples/ipc-relay.js diff --git a/examples/ipc-scan.mjs b/examples/ipc-scan.js similarity index 100% rename from examples/ipc-scan.mjs rename to examples/ipc-scan.js diff --git a/examples/tcp-scan.mjs b/examples/tcp-scan.js similarity index 100% rename from examples/tcp-scan.mjs rename to examples/tcp-scan.js diff --git a/package.json b/package.json index dfed2cf..a84178d 100644 --- a/package.json +++ b/package.json @@ -1,16 +1,16 @@ { "name": "@uci/i2c-bus", - "version": "0.1.2", + "version": "0.1.5", "description": "I2c Bus Classes for Communication to I2C bus via socket or direct call", - "main": "src/bus-packet.mjs", + "main": "src/bus-packet", "scripts": { - "irelay": "node --require @std/esm examples/ipc-relay", - "iscan": "node --require @std/esm examples/ipc-scan || true", - "tscan": "node --require @std/esm examples/tcp-scan || true", - "bus": "node --require @std/esm examples/bus", - "busl": "DEBUG=true node --require @std/esm examples/bus", - "test": "mocha -r @std/esm test/*.test.mjs", - "testw": "mocha -r @std/esm test/*.test.mjs --watch --recurse --watch-extensions mjs", + "irelay": "node --require esm examples/ipc-relay", + "iscan": "node --require esm examples/ipc-scan || true", + "tscan": "node --require esm examples/tcp-scan || true", + "bus": "node --require esm examples/bus", + "busl": "DEBUG=true node --require esm examples/bus", + "test": "mocha -r esm test/*.test.js", + "testw": "mocha -r esm test/*.test.js --watch --recurse", "testci": "istanbul cover ./node_modules/.bin/_mocha test/ --report lcovonly -- -R spec --recursive && codecov || true" }, "author": "David Kebler", @@ -29,21 +29,20 @@ "url": "https://github.com/uCOMmandIt/i2c/issues" }, "homepage": "https://github.com/uCOMmandIt/i2c#readme", - "@std/esm": "cjs", "optionalDependencies": { "i2c-bus": "^1.x" }, "dependencies": { "@uci/base": "^0.1.0", - "@uci/logger": "0.0.1", + "@uci/logger": "^0.0.2", "better-try-catch": "^0.6.2", "pify": "^3.0.0" }, "devDependencies": { - "@std/esm": "^0.18.0", "chai": "^3.5.0", "chai-as-promised": "^6.0.0", "codecov": "^1.0.1", + "esm": "^3.0.21", "istanbul": "^0.4.5", "mocha": "^3.2.0", "nodemon": "^1.14.12" diff --git a/src/bus-packet.mjs b/src/bus-packet.js similarity index 94% rename from src/bus-packet.mjs rename to src/bus-packet.js index 43c8ef7..a30167e 100644 --- a/src/bus-packet.mjs +++ b/src/bus-packet.js @@ -6,18 +6,10 @@ import Base from '@uci/base' import logger from '@uci/logger' let log = {} -const LOG_OPTS = { - repo:'uci-i2c-bus', - npm:'@uci/i2c-bus', - file:'src/bus-packet.mjs', - class:'Bus', - id:this.id, - instance_created:new Date().getTime() -} export default class Bus extends Base { constructor(opts) { - log = logger.child(LOG_OPTS) + log = logger({name:'i2c-bus',id:opts.id,file:'src/bus-packet.js',class:'Bus'}) if (opts.path) opts.ns ={path:opts.path} if(!opts.ns) opts.ns = {path:'i2c-bus'} opts.sockets = (opts.sockets ? (opts.sockets+',') : '') + 'ns#s>n' diff --git a/src/bus.mjs b/src/bus.js similarity index 100% rename from src/bus.mjs rename to src/bus.js diff --git a/test/bus.test.mjs b/test/bus.test.js similarity index 100% rename from test/bus.test.mjs rename to test/bus.test.js