Skip to content
This repository has been archived by the owner on Jan 23, 2021. It is now read-only.

Commit

Permalink
Merge pull request #73 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu committed Aug 4, 2019
2 parents a2cfd1f + 430083c commit 4806e79
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 14 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
"balanced": true
}
}
]
],
"@blackflux/rules/prevent-typeof-object": 1
},
"env": {"es6": true, "node": true, "jasmine": true, "mocha": true},
"globals": {"logger": true, "log4js": true},
Expand Down
43 changes: 34 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,27 @@
"type": "git",
"url": "https://github.com/blackflux/object-align.git"
},
"keywords": ["object", "sort", "order", "align", "keys", "recursive"],
"keywords": [
"object",
"sort",
"order",
"align",
"keys",
"recursive"
],
"author": "Lukas Siemon",
"license": "MIT",
"bugs": {"url": "https://github.com/blackflux/object-align/issues"},
"bugs": {
"url": "https://github.com/blackflux/object-align/issues"
},
"homepage": "https://github.com/blackflux/object-align#readme",
"devDependencies": {
"@babel/cli": "7.5.5",
"@babel/core": "7.5.5",
"@babel/plugin-proposal-object-rest-spread": "7.5.5",
"@babel/register": "7.5.5",
"@blackflux/eslint-plugin-rules": "1.1.0",
"@blackflux/robo-config-plugin": "2.2.3",
"@blackflux/robo-config-plugin": "2.3.0",
"babel-eslint": "10.0.2",
"chai": "4.2.0",
"coveralls": "3.0.5",
Expand All @@ -49,23 +58,39 @@
"url": "https://github.com/blackflux/object-align/blob/master/LICENSE"
}
],
"engines": {"node": ">= 8.10"},
"files": ["lib"],
"engines": {
"node": ">= 8.10"
},
"files": [
"lib"
],
"nyc": {
"exclude": ["gardener.js", "node_modules/*", "coverage/*", "lib/*"],
"exclude": [
"gardener.js",
"node_modules/*",
"coverage/*",
"lib/*"
],
"all": true,
"babel": true,
"branches": 100,
"cache": true,
"check-coverage": true,
"extension": [],
"functions": 100,
"include": ["**/*.js"],
"include": [
"**/*.js"
],
"lines": 100,
"per-file": false,
"report-dir": "./coverage",
"reporter": ["lcov", "text-summary"],
"require": ["@babel/register"],
"reporter": [
"lcov",
"text-summary"
],
"require": [
"@babel/register"
],
"statements": 100,
"tempDir": "./coverage/.nyc_output"
}
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,10 @@
dependencies:
smart-fs "1.9.2"

"@blackflux/robo-config-plugin@2.2.3":
version "2.2.3"
resolved "https://registry.yarnpkg.com/@blackflux/robo-config-plugin/-/robo-config-plugin-2.2.3.tgz#4631bbb52fc3c99546271eb5ed260193a3ef4bc1"
integrity sha512-GtKRclbd5nwI0jtfNryKmTw4jPTh9py2DfoMYZszQlM+yjhR0sNryRH00oZ7VSaKN52Y4Bw6nQZAXRKpVRKHhA==
"@blackflux/robo-config-plugin@2.3.0":
version "2.3.0"
resolved "https://registry.yarnpkg.com/@blackflux/robo-config-plugin/-/robo-config-plugin-2.3.0.tgz#f3b587fd5b338f5ba83d5e75a5e0e0a36414f356"
integrity sha512-7Qj+93cqxM7tSIozk5jLwEEEoFvDYiQ86jqcTLpJInOQTuxxq/hP8WZKu0dqQ2HBUAencdQRddQjf7h1FAgTdA==

"@hapi/address@2.x.x":
version "2.0.0"
Expand Down

0 comments on commit 4806e79

Please sign in to comment.