Skip to content

Commit d4a3b21

Browse files
committed
Merge remote-tracking branch 'origin/master' into dot-ts
2 parents 6c60d31 + f3039c2 commit d4a3b21

File tree

5 files changed

+53
-23
lines changed

5 files changed

+53
-23
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Change Log
22

3+
## [v3.5.2](https://github.com/testdouble/testdouble.js/tree/v3.5.2) (2018-02-26)
4+
[Full Changelog](https://github.com/testdouble/testdouble.js/compare/v3.5.1...v3.5.2)
5+
6+
**Merged pull requests:**
7+
8+
- replace quibble.browser.js with ES5 version [\#347](https://github.com/testdouble/testdouble.js/pull/347) ([davemo](https://github.com/davemo))
9+
- Fixed broken npm install on Windows [\#345](https://github.com/testdouble/testdouble.js/pull/345) ([duluca](https://github.com/duluca))
10+
- Speed up the build [\#344](https://github.com/testdouble/testdouble.js/pull/344) ([searls](https://github.com/searls))
11+
312
## [v3.5.1](https://github.com/testdouble/testdouble.js/tree/v3.5.1) (2018-02-25)
413
[Full Changelog](https://github.com/testdouble/testdouble.js/compare/v3.5.0...v3.5.1)
514

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 39 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "testdouble",
3-
"version": "3.5.1",
3+
"version": "3.5.2",
44
"description": "A minimal test double library for TDD with JavaScript",
55
"homepage": "https://github.com/testdouble/testdouble.js",
66
"author": {
@@ -9,61 +9,74 @@
99
"url": "http://testdouble.com"
1010
},
1111
"main": "lib/index.js",
12-
"files": ["src", "lib", "dist", "index.d.ts"],
12+
"files": [
13+
"src",
14+
"lib",
15+
"dist",
16+
"index.d.ts"
17+
],
1318
"config": {
1419
"build_file": "dist/testdouble.js"
1520
},
1621
"scripts": {
1722
"clean": "rimraf dist lib coverage",
1823
"postclean": "mkdirp dist",
19-
"compile:browser":
20-
"cross-conf-env browserify src/index.js --standalone td --outfile $npm_package_config_build_file -p tsify -p headerify",
24+
"compile:browser": "cross-conf-env browserify src/index.js --standalone td --outfile $npm_package_config_build_file -p tsify -p headerify",
2125
"compile:node": "tsc",
2226
"precompile": "npm run clean",
2327
"compile": "run-s compile:node compile:browser",
2428
"cover": "nyc --reporter=lcov --reporter=text-summary --reporter=html npm test",
2529
"cover:report": "codeclimate-test-reporter < coverage/lcov.info",
2630
"style": "run-p style:js style:ts",
2731
"style:js": "standard --fix",
28-
"style:ts":
29-
"standard --fix --parser typescript-eslint-parser --plugin typescript \"**/*.ts\"",
32+
"style:ts": "standard --fix --parser typescript-eslint-parser --plugin typescript \"**/*.ts\"",
3033
"test": "teenytest --helper test/helper.js \"test/**/*.test.{js,ts}\"",
3134
"test:all": "run-s test test:example",
3235
"test:unit": "teenytest --helper test/helper.js \"test/unit/**/*.test.{js,ts}\"",
3336
"test:safe": "teenytest --helper test/helper.js \"test/safe/**/*.test.{js,ts}\"",
3437
"test:ci": "npm run compile && run-p style test:all && echo \"All done!\"",
35-
"test:example":
36-
"npm link && run-p test:example:babel test:example:jest test:example:jest-broken test:example:plain-html test:example:node test:example:webpack",
38+
"test:example": "npm link && run-p test:example:babel test:example:jest test:example:jest-broken test:example:plain-html test:example:node test:example:webpack",
3739
"test:example:babel": "./script/run-examples babel",
3840
"test:example:jest": "./script/run-examples jest",
3941
"test:example:jest-broken": "./script/run-examples jest-broken",
4042
"test:example:plain-html": "./script/run-examples plain-html",
4143
"test:example:node": "./script/run-examples node",
4244
"test:example:webpack": "./script/run-examples webpack",
4345
"version:write": "echo \"export default '$npm_package_version'\" > src/version.js",
44-
"version:changelog":
45-
"if command -v github_changelog_generator &>/dev/null; then github_changelog_generator; git commit -m \"Changelog for $npm_package_version\" CHANGELOG.md; else echo Versioning requires you first run 'gem install github_changelog_generator' >&2; fi",
46+
"version:changelog": "if command -v github_changelog_generator &>/dev/null; then github_changelog_generator; git commit -m \"Changelog for $npm_package_version\" CHANGELOG.md; else echo Versioning requires you first run 'gem install github_changelog_generator' >&2; fi",
4647
"preversion": "git pull --rebase && npm run test:ci",
4748
"version": "npm run version:write && npm run compile && git add src/version.js",
48-
"postversion":
49-
"git push --tags && npm run version:changelog && git push && npm publish",
49+
"postversion": "git push --tags && npm run version:changelog && git push && npm publish",
5050
"prepare": "npm run compile"
5151
},
5252
"browser": {
5353
"./src/replace/module.js": "./src/replace/module.browser.js",
5454
"quibble": "./src/quibble.browser.js"
5555
},
5656
"standard": {
57-
"globals": ["td", "assert", "ES_SUPPORT"],
58-
"ignore": ["index.d.ts", "examples/**"]
57+
"globals": [
58+
"td",
59+
"assert",
60+
"ES_SUPPORT"
61+
],
62+
"ignore": [
63+
"index.d.ts",
64+
"examples/**"
65+
]
5966
},
6067
"nyc": {
61-
"include": ["src/**/*.js"],
62-
"exclude": ["examples"],
68+
"include": [
69+
"src/**/*.js"
70+
],
71+
"exclude": [
72+
"examples"
73+
],
6374
"all": true
6475
},
6576
"teenytest": {
66-
"plugins": ["test/support/tdify-plugin.js"]
77+
"plugins": [
78+
"test/support/tdify-plugin.js"
79+
]
6780
},
6881
"dependencies": {
6982
"es6-map": "^0.1.5",
@@ -98,7 +111,15 @@
98111
"src": "./src"
99112
},
100113
"typings": "./index.d.ts",
101-
"keywords": ["tdd", "bdd", "mock", "stub", "spy", "test double", "double"],
114+
"keywords": [
115+
"tdd",
116+
"bdd",
117+
"mock",
118+
"stub",
119+
"spy",
120+
"test double",
121+
"double"
122+
],
102123
"bugs": {
103124
"url": "https://github.com/testdouble/testdouble.js/issues"
104125
},

src/quibble.browser.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module.exports = {
2-
absolutify () {},
3-
ignoreCallsFromThisFile () {},
4-
reset () {}
2+
absolutify: function absolutify() {},
3+
ignoreCallsFromThisFile: function ignoreCallsFromThisFile() {},
4+
reset: function reset() {}
55
}

src/version.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export default '3.5.1'
1+
export default '3.5.2'

0 commit comments

Comments
 (0)