Skip to content

Commit

Permalink
refactor(mableassert): resolve compiler issues
Browse files Browse the repository at this point in the history
  • Loading branch information
kwonoj committed Jun 23, 2019
1 parent ccb5b62 commit bf02d6e
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 deletions.
6 changes: 6 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"scripts": {
"prepublishOnly": "npm run build",
"test": "jest --config jest.json --coverage",
"lint": "tslint --type-check -c tslint.json -p tsconfig.json \"src/**/*.ts\" \"spec/**/*.ts\"",
"lint": "tslint -c tslint.json -p tsconfig.json \"src/**/*.ts\" \"spec/**/*.ts\"",
"lint:staged": "lint-staged",
"build": "npm-run-all build:clean && tsc",
"build:clean": "shx rm -rf ./dist",
Expand Down Expand Up @@ -57,6 +57,7 @@
"@commitlint/config-angular": "^8.0.0",
"@types/chai": "^4.1.7",
"@types/jest": "^24.0.15",
"@types/node": "^12.0.10",
"chai": "^4.2.0",
"commitizen": "^3.1.1",
"conventional-changelog-cli": "^2.0.21",
Expand Down
1 change: 0 additions & 1 deletion src/ambient.d.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
declare module 'jest-matcher-utils';
declare module 'jest-matchers/*';
2 changes: 1 addition & 1 deletion src/assert/marbleAssert.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { matcherHint, printExpected, printReceived } from 'jest-matcher-utils';
import { toEqual } from 'jest-matchers/build/matchers';
import { SubscriptionLog } from 'rxjs/internal/testing/SubscriptionLog';
import { TestMessage } from '../message/TestMessage';
import { constructObservableMarble } from './constructObservableMarble';
import { constructSubscriptionMarble } from './constructSubscriptionMarble';
const { matcherHint, printExpected, printReceived } = require('jest-matcher-utils'); //tslint:disable-line:no-require-imports no-var-requires

const toEqualAssert = toEqual.bind({ expand: false });

Expand Down

0 comments on commit bf02d6e

Please sign in to comment.