Skip to content

Commit

Permalink
fix(es6 features): use object.assign package in place of native Objec…
Browse files Browse the repository at this point in the history
…t.assign for karma compatabilit
  • Loading branch information
effervescentia committed Jun 18, 2017
1 parent d94157a commit 726d00b
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 3 deletions.
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,11 @@
"@types/chai": "^3.5.0",
"@types/sinon": "^2.1.2",
"chai": "^3.5.0",
"object.assign": "^4.0.4",
"semantic-release": "^6.3.2",
"sinon": "^2.1.0",
"start-simple-cli": "^4.1.1",
"tkstr-devtools": "^1.2.2",
"semantic-release": "^6.3.2"
"tkstr-devtools": "^1.2.2"
},
"dependencies": {
"@types/mocha": "^2.2.40"
Expand Down
3 changes: 2 additions & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// tslint:disable max-line-length
import * as mocha from 'mocha';
import * as assign from 'object.assign';

declare const describe: mocha.IContextDefinition;

Expand Down Expand Up @@ -30,7 +31,7 @@ namespace Suite {
}

export const build: BuildDescription = (builder) =>
Object.assign(builder(), { only: builder(Modifier.ONLY), skip: builder(Modifier.SKIP) });
assign(builder(), { only: builder(Modifier.ONLY), skip: builder(Modifier.SKIP) });

// tslint:disable-next-line variable-name
export const run = (modifier: Suite.Modifier, _describe: mocha.IContextDefinition, description: string, suite: () => void) =>
Expand Down
27 changes: 27 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1051,6 +1051,13 @@ default-require-extensions@^1.0.0:
dependencies:
strip-bom "^2.0.0"

define-properties@^1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
dependencies:
foreach "^2.0.5"
object-keys "^1.0.8"

del@^2.0.2:
version "2.2.2"
resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
Expand Down Expand Up @@ -1385,6 +1392,10 @@ for-own@^0.1.4:
dependencies:
for-in "^1.0.1"

foreach@^2.0.5:
version "2.0.5"
resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"

foreachasync@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/foreachasync/-/foreachasync-3.0.0.tgz#5502987dc8714be3392097f32e0071c9dee07cf6"
Expand Down Expand Up @@ -1447,6 +1458,10 @@ fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
mkdirp ">=0.5 0"
rimraf "2"

function-bind@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771"

gauge@~1.2.0:
version "1.2.7"
resolved "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz#e9cec5483d3d4ee0ef44b60a7d99e4935e136d93"
Expand Down Expand Up @@ -2423,6 +2438,18 @@ object-assign@^4.0.1, object-assign@^4.1.0:
version "4.1.1"
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"

object-keys@^1.0.10, object-keys@^1.0.8:
version "1.0.11"
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"

object.assign@^4.0.4:
version "4.0.4"
resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.0.4.tgz#b1c9cc044ef1b9fe63606fc141abbb32e14730cc"
dependencies:
define-properties "^1.1.2"
function-bind "^1.1.0"
object-keys "^1.0.10"

object.omit@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
Expand Down

0 comments on commit 726d00b

Please sign in to comment.