Skip to content

Commit cf24572

Browse files
piotr-olespiotr-oles
authored
Merge pull request #522 from TypeStrong/update-alpha
Merge master into alpha
2 parents fb22e47 + cb71ca9 commit cf24572

File tree

75 files changed

+196046
-1370
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+196046
-1370
lines changed

‎.github/workflows/main.yml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,18 @@ jobs:
1111
with:
1212
node-version: 12
1313

14-
- name: Get yarn cache
14+
- name: Yarn cache directory
1515
id: yarn-cache
1616
run: echo "::set-output name=dir::$(yarn cache dir)"
1717

18-
- uses: actions/cache@v1
18+
- name: Yarn cache
19+
uses: actions/cache@v2
1920
with:
2021
path: ${{ steps.yarn-cache.outputs.dir }}
2122
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
2223
restore-keys: |
2324
${{ runner.os }}-yarn-
24-
25+
2526
- name: Install dependencies
2627
run: yarn install --frozen-lockfile
2728

@@ -49,16 +50,17 @@ jobs:
4950
with:
5051
node-version: ${{ matrix.node }}
5152

52-
- name: Get yarn cache
53+
- name: Yarn cache directory
5354
id: yarn-cache
5455
run: echo "::set-output name=dir::$(yarn cache dir)"
5556

56-
- uses: actions/cache@v1
57+
- name: Yarn cache
58+
uses: actions/cache@v2
5759
with:
5860
path: ${{ steps.yarn-cache.outputs.dir }}
59-
key: ${{ runner.os }}-node-${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
61+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
6062
restore-keys: |
61-
${{ runner.os }}-node-${{ matrix.node }}-yarn-
63+
${{ runner.os }}-yarn-
6264
6365
- name: Install dependencies
6466
run: yarn install --frozen-lockfile

‎package.json‎

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
"build": "cross-env rimraf lib && cross-env tsc --version && cross-env tsc",
3535
"lint": "cross-env eslint ./src ./test --ext .ts",
3636
"test": "yarn build && yarn test:unit && yarn test:e2e",
37-
"test:unit": "cross-env jest unit",
38-
"test:e2e": "npm pack && cross-env jest e2e --ci --runInBand --bail --verbose",
37+
"test:unit": "cross-env jest --config=test/unit/jest.config.js",
38+
"test:e2e": "npm pack && cross-env jest --config=test/e2e/jest.config.js --ci -i -b",
3939
"precommit": "cross-env lint-staged && yarn build && yarn test:unit",
4040
"commit": "cross-env git-cz",
4141
"semantic-release": "semantic-release"
@@ -74,43 +74,45 @@
7474
"tapable": "^1.0.0"
7575
},
7676
"devDependencies": {
77-
"@commitlint/config-conventional": "^8.3.4",
77+
"@commitlint/config-conventional": "^11.0.0",
7878
"@semantic-release/commit-analyzer": "^8.0.1",
7979
"@semantic-release/exec": "^5.0.0",
80-
"@semantic-release/github": "^7.0.7",
81-
"@semantic-release/npm": "^7.0.5",
80+
"@semantic-release/github": "^7.1.1",
81+
"@semantic-release/npm": "^7.0.6",
8282
"@semantic-release/release-notes-generator": "^9.0.1",
83-
"@types/babel__code-frame": "^7.0.1",
83+
"@types/babel__code-frame": "^7.0.2",
8484
"@types/cross-spawn": "^6.0.2",
85-
"@types/eslint": "^6.8.0",
86-
"@types/fs-extra": "^8.1.0",
87-
"@types/jest": "^25.2.1",
85+
"@types/eslint": "^7.2.4",
86+
"@types/fs-extra": "^9.0.2",
87+
"@types/jest": "^26.0.14",
8888
"@types/minimatch": "^3.0.1",
89-
"@types/mock-fs": "^4.10.0",
90-
"@types/node": "^13.11.1",
89+
"@types/mock-fs": "^4.13.0",
90+
"@types/node": "^14.11.10",
9191
"@types/rimraf": "^3.0.0",
92-
"@types/semver": "^7.1.0",
93-
"@types/webpack": "^4.41.11",
92+
"@types/semver": "^7.3.4",
93+
"@types/webpack": "^4.41.22",
9494
"@typescript-eslint/eslint-plugin": "^2.27.0",
9595
"@typescript-eslint/parser": "^2.27.0",
96-
"commitlint": "^8.3.5",
96+
"commitlint": "^11.0.0",
9797
"cross-env": "^7.0.2",
98-
"cross-spawn": "^7.0.2",
98+
"cross-spawn": "^7.0.3",
9999
"eslint": "^6.8.0",
100-
"eslint-config-prettier": "^6.10.1",
100+
"eslint-config-prettier": "^6.13.0",
101101
"eslint-plugin-node": "^11.1.0",
102-
"eslint-plugin-prettier": "^3.1.3",
103-
"git-cz": "^4.3.1",
104-
"husky": "^4.2.5",
105-
"jest": "^25.3.0",
106-
"lint-staged": "^10.1.3",
107-
"mock-fs": "^4.11.0",
108-
"prettier": "^2.0.4",
102+
"eslint-plugin-prettier": "^3.1.4",
103+
"git-cz": "^4.7.1",
104+
"husky": "^4.3.0",
105+
"jest": "^26.5.3",
106+
"jest-circus": "^26.5.3",
107+
"jest-environment-node": "^26.5.2",
108+
"lint-staged": "^10.4.2",
109+
"mock-fs": "^4.13.0",
110+
"prettier": "^2.1.2",
109111
"rimraf": "^3.0.2",
110-
"semantic-release": "^17.0.0",
112+
"semantic-release": "^17.2.1",
111113
"strip-ansi": "^6.0.0",
112114
"tree-kill": "^1.2.2",
113-
"ts-jest": "^25.3.1",
115+
"ts-jest": "^26.4.1",
114116
"typescript": "^3.8.3",
115117
"webpack": "^4.42.1"
116118
},

‎src/typescript-reporter/TypeScriptReporterConfiguration.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import webpack from 'webpack';
22
import path from 'path';
3-
import * as ts from 'typescript';
43
import semver from 'semver';
54
import { TypeScriptDiagnosticsOptions } from './TypeScriptDiagnosticsOptions';
65
import { TypeScriptReporterOptions } from './TypeScriptReporterOptions';

‎src/typescript-reporter/file-system/RealFileSystem.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,10 @@ function createRealFileSystem(caseSensitive = false): FileSystem {
5151
const stats = readStats(normalizedPath);
5252

5353
if (stats && stats.isFile()) {
54-
readFileCache.set(normalizedPath, fs.readFileSync(normalizedPath, { encoding }).toString());
54+
readFileCache.set(
55+
normalizedPath,
56+
fs.readFileSync(normalizedPath, { encoding: encoding as BufferEncoding }).toString()
57+
);
5558
} else {
5659
readFileCache.set(normalizedPath, undefined);
5760
}

‎test/e2e/EsLint.spec.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import { join } from 'path';
22
import { readFixture } from './sandbox/Fixture';
3-
import { Sandbox, createSandbox, FORK_TS_CHECKER_WEBPACK_PLUGIN_VERSION } from './sandbox/Sandbox';
3+
import { Sandbox, createSandbox } from './sandbox/Sandbox';
44
import {
55
createWebpackDevServerDriver,
66
WEBPACK_CLI_VERSION,
77
WEBPACK_DEV_SERVER_VERSION,
88
} from './sandbox/WebpackDevServerDriver';
9+
import { FORK_TS_CHECKER_WEBPACK_PLUGIN_VERSION } from './sandbox/Plugin';
910

1011
describe('EsLint', () => {
1112
let sandbox: Sandbox;

‎test/e2e/OutOfMemoryAndCosmiconfig.spec.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { join } from 'path';
2-
import { createSandbox, FORK_TS_CHECKER_WEBPACK_PLUGIN_VERSION, Sandbox } from './sandbox/Sandbox';
2+
import { createSandbox, Sandbox } from './sandbox/Sandbox';
33
import { readFixture } from './sandbox/Fixture';
44
import { createGenericProcessDriver } from './sandbox/GenericProcessDriver';
5+
import { FORK_TS_CHECKER_WEBPACK_PLUGIN_VERSION } from './sandbox/Plugin';
56

67
describe('ForkTsCheckerWebpackPlugin Out Of Memory and Cosmiconfig', () => {
78
let sandbox: Sandbox;

‎test/e2e/TypeDefinitions.spec.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import { createSandbox, FORK_TS_CHECKER_WEBPACK_PLUGIN_VERSION, Sandbox } from './sandbox/Sandbox';
2-
import { readFixture } from './sandbox/Fixture';
31
import { join } from 'path';
2+
import { createSandbox, Sandbox } from './sandbox/Sandbox';
3+
import { readFixture } from './sandbox/Fixture';
4+
import { FORK_TS_CHECKER_WEBPACK_PLUGIN_VERSION } from './sandbox/Plugin';
45

56
describe('Type Definitions', () => {
67
let sandbox: Sandbox;

‎test/e2e/TypeScriptConfigurationChange.spec.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
import { createSandbox, FORK_TS_CHECKER_WEBPACK_PLUGIN_VERSION, Sandbox } from './sandbox/Sandbox';
2-
import { readFixture } from './sandbox/Fixture';
31
import { join } from 'path';
2+
import { createSandbox, Sandbox } from './sandbox/Sandbox';
3+
import { readFixture } from './sandbox/Fixture';
44
import {
55
createWebpackDevServerDriver,
66
WEBPACK_CLI_VERSION,
77
WEBPACK_DEV_SERVER_VERSION,
88
} from './sandbox/WebpackDevServerDriver';
9+
import { FORK_TS_CHECKER_WEBPACK_PLUGIN_VERSION } from './sandbox/Plugin';
910

1011
describe('TypeScript Configuration Change', () => {
1112
let sandbox: Sandbox;

‎test/e2e/TypeScriptConfigurationOverwrite.spec.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
import { createSandbox, FORK_TS_CHECKER_WEBPACK_PLUGIN_VERSION, Sandbox } from './sandbox/Sandbox';
2-
import { readFixture } from './sandbox/Fixture';
31
import { join } from 'path';
2+
import { createSandbox, Sandbox } from './sandbox/Sandbox';
3+
import { readFixture } from './sandbox/Fixture';
44
import {
55
createWebpackDevServerDriver,
66
WEBPACK_CLI_VERSION,
77
WEBPACK_DEV_SERVER_VERSION,
88
WebpackDevServerDriver,
99
} from './sandbox/WebpackDevServerDriver';
10+
import { FORK_TS_CHECKER_WEBPACK_PLUGIN_VERSION } from './sandbox/Plugin';
1011

1112
describe('TypeScript Compiler Options parsing', () => {
1213
let sandbox: Sandbox;

‎test/e2e/TypeScriptContextOption.spec.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import { readFixture } from './sandbox/Fixture';
22
import { join } from 'path';
3-
import { createSandbox, FORK_TS_CHECKER_WEBPACK_PLUGIN_VERSION, Sandbox } from './sandbox/Sandbox';
3+
import { createSandbox, Sandbox } from './sandbox/Sandbox';
44
import {
55
createWebpackDevServerDriver,
66
WEBPACK_CLI_VERSION,
77
WEBPACK_DEV_SERVER_VERSION,
88
} from './sandbox/WebpackDevServerDriver';
9+
import { FORK_TS_CHECKER_WEBPACK_PLUGIN_VERSION } from './sandbox/Plugin';
910

1011
describe('TypeScript Context Option', () => {
1112
let sandbox: Sandbox;

0 commit comments

Comments
 (0)