Skip to content

Commit d06cc7b

Browse files
authored
Merge pull request TypeStrong#120 from Realytics/johnnyreilly-patch-1
Thanks @piotr-oles!
2 parents 84021db + 911ebf9 commit d06cc7b

File tree

7 files changed

+24
-24
lines changed

7 files changed

+24
-24
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ install:
66
- yarn build
77
- yarn add $WEBPACK $TSLOADER $VUELOADER -D
88
env:
9-
- WEBPACK=webpack@^4.0.0 TSLOADER=ts-loader@^4.0.0 VUELOADER=vue-loader@^14.1.0
9+
- WEBPACK=webpack@^4.0.0 TSLOADER=ts-loader@4.3.0 VUELOADER=vue-loader@^14.1.0
1010
- WEBPACK=webpack@^3.10.0 TSLOADER=ts-loader@^3.4.0 VUELOADER=vue-loader@^13.5.0
1111
- WEBPACK=webpack@^2.7.0 TSLOADER=ts-loader@^3.4.0 VUELOADER=vue-loader@^13.5.0
1212
deploy:

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## v0.4.2
2+
* Format messages when `async` is false
3+
14
## v0.4.1
25
* Fix webpack 4 hooks bug
36

DEPLOYING.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# How To Deploy
2+
3+
The deployment process is easy - you have to:
4+
5+
- update version in package.json to `0.4.2` (or different package number)
6+
- update [`CHANGELOG.md`](CHANGELOG.md)
7+
- go to [Releases](https://github.com/Realytics/fork-ts-checker-webpack-plugin/releases) and Draft new release with tag name `v0.4.2` and a description as in the CHANGELOG.md
8+
9+
Travis will detect the new tag name and release a new version to npm.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Fork TS Checker Webpack Plugin
22
[![Npm version](https://img.shields.io/npm/v/fork-ts-checker-webpack-plugin.svg?style=flat-square)](https://www.npmjs.com/package/fork-ts-checker-webpack-plugin)
3-
[![Build Status](https://travis-ci.org/Realytics/fork-ts-checker-webpack-plugin.svg?branch=master)](https://travis-ci.org/realytics/fork-ts-checker-webpack-plugin)
3+
[![Build Status](https://travis-ci.org/Realytics/fork-ts-checker-webpack-plugin.svg?branch=master)](https://travis-ci.org/Realytics/fork-ts-checker-webpack-plugin)
44

55
Webpack plugin that runs typescript type checker on a separate process.
66

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fork-ts-checker-webpack-plugin",
3-
"version": "0.4.1",
3+
"version": "0.4.2",
44
"description": "Runs typescript type checker and linter on separate process.",
55
"main": "lib/index.js",
66
"files": [
@@ -68,7 +68,7 @@
6868
"mock-require": "^2.0.2",
6969
"rimraf": "^2.5.4",
7070
"sinon": "^2.3.1",
71-
"ts-loader": "^4.0.0-beta.0",
71+
"ts-loader": "4.3.0",
7272
"tslint": "^5.0.0",
7373
"typescript": "^2.6.2",
7474
"vue": "^2.5.9",

test/integration/vue.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ var webpackMajorVersion = require('./webpackVersion')();
1212

1313
describe('[INTEGRATION] vue', function () {
1414
this.timeout(60000);
15-
process.setMaxListeners(20);
15+
process.setMaxListeners(0);
1616
var plugin;
1717
var files;
1818
var compiler;
@@ -164,7 +164,7 @@ describe('[INTEGRATION] vue', function () {
164164
var source = checker.program.getSourceFile(sourceFilePath);
165165
expect(source).to.not.be.undefined;
166166
// remove padding lines
167-
var text = source.text.replace(/^\s*\/\/.*$\n/gm, '');
167+
var text = source.text.replace(/^\s*\/\/.*$\r*\n/gm, '');
168168
expect(text.startsWith('/* OK */')).to.be.true;
169169
});
170170
});

yarn.lock

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,14 +1159,6 @@ enhanced-resolve@^4.0.0:
11591159
memory-fs "^0.4.0"
11601160
tapable "^1.0.0"
11611161

1162-
enhanced-resolve@^4.0.0-beta.4:
1163-
version "4.0.0-beta.4"
1164-
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.0.0-beta.4.tgz#17e14aea8ded4d6daa4a6bff67f2d38fcca76452"
1165-
dependencies:
1166-
graceful-fs "^4.1.2"
1167-
memory-fs "^0.4.0"
1168-
tapable "^1.0.0-beta.4"
1169-
11701162
errno@^0.1.3, errno@^0.1.4:
11711163
version "0.1.6"
11721164
resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.6.tgz#c386ce8a6283f14fc09563b71560908c9bf53026"
@@ -3892,10 +3884,6 @@ tapable@^1.0.0:
38923884
version "1.0.0"
38933885
resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2"
38943886

3895-
tapable@^1.0.0-beta.4:
3896-
version "1.0.0-beta.5"
3897-
resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0-beta.5.tgz#9bc844b856487e03345b7d3361288aefd97f8303"
3898-
38993887
tar-pack@^3.4.0:
39003888
version "3.4.1"
39013889
resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f"
@@ -3973,12 +3961,12 @@ tough-cookie@~2.3.0:
39733961
dependencies:
39743962
punycode "^1.4.1"
39753963

3976-
ts-loader@^4.0.0-beta.0:
3977-
version "4.0.0-beta.0"
3978-
resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-4.0.0-beta.0.tgz#971c0097b4392094c0ad946937183c8a930669c1"
3964+
ts-loader@4.3.0:
3965+
version "4.3.0"
3966+
resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-4.3.0.tgz#4e3ba172783d1256d3a23bdfadde011a795fae9e"
39793967
dependencies:
39803968
chalk "^2.3.0"
3981-
enhanced-resolve "^4.0.0-beta.4"
3969+
enhanced-resolve "^4.0.0"
39823970
loader-utils "^1.0.2"
39833971
micromatch "^3.1.4"
39843972
semver "^5.0.1"
@@ -4195,8 +4183,8 @@ vue-hot-reload-api@^2.2.0:
41954183
resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.2.4.tgz#683bd1d026c0d3b3c937d5875679e9a87ec6cd8f"
41964184

41974185
vue-loader@^14.1.0:
4198-
version "14.1.1"
4199-
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-14.1.1.tgz#331f197fcea790d6b8662c29b850806e7eb29342"
4186+
version "14.2.3"
4187+
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-14.2.3.tgz#3b39645c322d956e287d8d36eb77475f78c9b8e0"
42004188
dependencies:
42014189
consolidate "^0.14.0"
42024190
hash-sum "^1.0.2"

0 commit comments

Comments
 (0)