Skip to content

Commit

Permalink
Merge pull request #70 from inversify/dependencies
Browse files Browse the repository at this point in the history
Upgraded dependencies
  • Loading branch information
remojansen authored Nov 4, 2017
2 parents 8782985 + d819e2c commit 91d7b1d
Show file tree
Hide file tree
Showing 10 changed files with 52 additions and 39 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,4 @@ type_definitions/**/*.js
type_definitions/*.js

.typingsrc
package-lock.json
3 changes: 2 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ wallaby.js
.travis.yml
.gitignore
.vscode
type_definitions
type_definitions
package-lock.json
8 changes: 2 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
language: node_js
node_js:
- stable
- 5.4.1
- 5.4.0
- 5.3.0
- 5.2.0
- 5.1.1
- 4.4.6
- 8.8.1
- 7.10.1
before_install:
- npm install -g codeclimate-test-reporter
after_success:
Expand Down
19 changes: 14 additions & 5 deletions PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,36 +1,45 @@
# PR Details

<!--- Provide a general summary of your changes in the Title above -->

## Description

<!--- Describe your changes in detail -->

## Related Issue

<!--- This project only accepts pull requests related to open issues -->
<!--- If suggesting a new feature or change, please discuss it in an issue first -->
<!--- If fixing a bug, there should be an issue describing it with steps to reproduce -->
<!--- Please link to the issue here: -->

## Motivation and Context

<!--- Why is this change required? What problem does it solve? -->

## How Has This Been Tested?
## How Has This Been Tested

<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran to -->
<!--- see how your change affects other areas of the code, etc. -->

## Types of changes

<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->

- [ ] Docs change / refactoring / dependency upgrade
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)

## Checklist:
## Checklist

<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->

- [ ] My code follows the code style of this project.
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] My change requires a change to the type definitions.
- [ ] I have updated the type definitions accordingly.
- [ ] I have read the **CONTRIBUTING** document.
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
- [ ] All new and existing tests passed.
42 changes: 21 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "inversify-logger-middleware",
"version": "3.0.0",
"version": "3.1.0",
"description": "A basic logger middleware for InversifyJS",
"main": "lib/index.js",
"typings": "./dts/index.d.ts",
Expand Down Expand Up @@ -29,27 +29,27 @@
},
"homepage": "https://github.com/inversify/inversify-logger-middleware#readme",
"dependencies": {
"chalk": "^2.0.0"
"chalk": "2.3.0"
},
"devDependencies": {
"@types/chai": "^4.0.0",
"@types/chalk": "^0.4.28",
"@types/mocha": "^2.2.35",
"@types/sinon": "^2.1.0",
"chai": "^4.0.0",
"gulp": "^3.9.1",
"gulp-istanbul": "^1.0.0",
"gulp-mocha": "^4.0.1",
"gulp-tslint": "^7.1.0",
"gulp-typescript": "^3.1.4",
"harmonize": "^2.0.0",
"inversify": "^4.0.0",
"mocha": "^4.0.0",
"publish-please": "^2.1.4",
"reflect-metadata": "^0.1.9",
"run-sequence": "^1.2.0",
"sinon": "^3.0.0",
"tslint": "^5.0.0",
"typescript": "^2.2.0"
"@types/chai": "4.0.4",
"@types/chalk": "2.2.0",
"@types/mocha": "2.2.44",
"@types/sinon": "2.3.7",
"chai": "4.1.2",
"gulp": "3.9.1",
"gulp-istanbul": "1.1.2",
"gulp-mocha": "3.0.1",
"gulp-tslint": "8.1.2",
"gulp-typescript": "3.2.3",
"harmonize": "2.0.0",
"inversify": "4.5.1",
"mocha": "4.0.1",
"publish-please": "2.3.1",
"reflect-metadata": "0.1.10",
"run-sequence": "2.2.0",
"sinon": "4.1.1",
"tslint": "5.8.0",
"typescript": "2.6.1"
}
}
4 changes: 2 additions & 2 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ function makeLoggerMiddleware(
next: inversify.interfaces.Next
): inversify.interfaces.Next {

if (settings === undefined || settings === null) { settings = deatultOptions; };
if (renderer === undefined || renderer === null) { renderer = consoleRenderer; };
if (settings === undefined || settings === null) { settings = deatultOptions; }
if (renderer === undefined || renderer === null) { renderer = consoleRenderer; }

return (args: inversify.interfaces.NextArgs) => {

Expand Down
7 changes: 7 additions & 0 deletions src/serializers/text/colors.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import * as Chalk from "chalk";

const yellow = Chalk.default.yellow;
const green = Chalk.default.green;
const red = Chalk.default.red;

export { yellow, green, red, Chalk };
2 changes: 1 addition & 1 deletion src/serializers/text/text_serializer.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import serializeRequest from "./request_serializer";
import { green, red } from "./text_serializer_utils";
import { green, red } from "./colors";
import interfaces from "../../interfaces/interfaces";

function textSerializer(entry: interfaces.LogEntry) {
Expand Down
4 changes: 2 additions & 2 deletions src/serializers/text/text_serializer_utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { yellow, green, red } from "chalk";
import { yellow } from "./colors";

let tree = {
item: "└──"
Expand Down Expand Up @@ -38,4 +38,4 @@ function makePropertyLogger(indentationForDepth: string) {
};
}

export { getIndentationForDepth, makePropertyLogger, yellow, green, red };
export { getIndentationForDepth, makePropertyLogger };
1 change: 0 additions & 1 deletion tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
"no-switch-case-fall-through": false,
"no-trailing-whitespace": true,
"no-unused-expression": true,
"no-use-before-declare": true,
"no-var-keyword": true,
"object-literal-sort-keys": true,
"one-line": [true,
Expand Down

0 comments on commit 91d7b1d

Please sign in to comment.