Skip to content

Commit 4c60685

Browse files
authored
use karma-webpack@next (#873)
* use karma-webpack@next * fix compilation errors in tests
1 parent 9334237 commit 4c60685

File tree

9 files changed

+78
-45
lines changed

9 files changed

+78
-45
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@
7474
"jasmine-core": "^3.0.0",
7575
"karma": "^3.0.0",
7676
"karma-chrome-launcher": "^2.2.0",
77-
"karma-jasmine": "^1.0.0",
77+
"karma-jasmine": "^2.0.0",
7878
"karma-mocha-reporter": "^2.0.0",
7979
"karma-sourcemap-loader": "^0.3.6",
80-
"karma-webpack": "2.0.6",
80+
"karma-webpack": "next",
8181
"lint-staged": "^7.0.0",
8282
"mkdirp": "^0.5.1",
8383
"mocha": "^5.0.0",

test/execution-tests/option-context/src/components/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from 'react';
1+
import * as React from 'react';
22
import enhanceWithClickOutside from 'react-click-outside';
33

44
const App: React.SFC<{ name: string }> = ({ name }) =>

test/execution-tests/option-context/src/components/deep/DeepApp.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from 'react';
1+
import * as React from 'react';
22
import enhanceWithClickOutside from 'react-click-outside';
33

44
const DeepApp: React.SFC<{ name: string }> = ({ name }) =>

test/execution-tests/option-context/src/components/deep/deeper/DeeperApp.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from 'react';
1+
import * as React from 'react';
22
import enhanceWithClickOutside from 'react-click-outside';
33

44
const DeeperApp: React.SFC<{ name: string }> = ({ name }) =>

test/execution-tests/option-context/src/main.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'babel-polyfill';
2-
import React from 'react';
3-
import ReactDOM from 'react-dom';
2+
import * as React from 'react';
3+
import * as ReactDOM from 'react-dom';
44

55
import App from './components/App';
66

test/execution-tests/option-context/test/components/App.tests.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from 'react';
1+
import * as React from 'react';
22
import { createRenderer } from 'react-test-renderer/shallow';
33

44
import App, { COApp } from '../../src/components/App';

test/execution-tests/simpleDependency/test/app.tests.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/// <reference path="../typings/index.d.ts" />
2-
31
import dep = require('../src/dep');
42

53
describe("app", () => {

test/tslint.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"extends": ["tslint:latest", "tslint-config-prettier"],
3+
"rules": {
4+
"ban-types": false,
5+
"forin": false,
6+
"interface-over-type-literal": false,
7+
"interface-name": [true, "never-prefix"],
8+
"max-line-length": [false, 140],
9+
"member-ordering": false,
10+
"no-implicit-dependencies": false,
11+
"no-object-literal-type-assertion": false,
12+
"no-var-requires": false,
13+
"object-literal-sort-keys": false,
14+
"prefer-object-spread": false,
15+
"strict-boolean-expressions": false,
16+
"trailing-comma": [false],
17+
"triple-equals": [true],
18+
"variable-name": [
19+
true,
20+
"ban-keywords",
21+
"check-format",
22+
"allow-leading-underscore",
23+
"allow-pascal-case"
24+
]
25+
}
26+
}

yarn.lock

Lines changed: 44 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,10 @@ ajv@^6.1.0:
197197
json-schema-traverse "^0.4.1"
198198
uri-js "^4.2.2"
199199

200+
ansi-colors@^3.0.0:
201+
version "3.2.1"
202+
resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.1.tgz#9638047e4213f3428a11944a7d4b31cba0a3ff95"
203+
200204
ansi-escapes@^1.0.0:
201205
version "1.4.0"
202206
resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
@@ -301,9 +305,11 @@ async-limiter@~1.0.0:
301305
version "1.0.0"
302306
resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
303307

304-
async@~0.9.0:
305-
version "0.9.2"
306-
resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
308+
async@^2.0.0:
309+
version "2.6.1"
310+
resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
311+
dependencies:
312+
lodash "^4.17.10"
307313

308314
atob@^2.1.1:
309315
version "2.1.2"
@@ -2519,6 +2525,10 @@ jasmine-core@^3.0.0:
25192525
version "3.2.1"
25202526
resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.2.1.tgz#8e4ff5b861603ee83343f2b49eee6a0ffe9650ce"
25212527

2528+
jasmine-core@^3.3:
2529+
version "3.3.0"
2530+
resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.3.0.tgz#dea1cdc634bc93c7e0d4ad27185df30fa971b10e"
2531+
25222532
jest-get-type@^22.1.0:
25232533
version "22.4.3"
25242534
resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4"
@@ -2576,9 +2586,11 @@ karma-chrome-launcher@^2.2.0:
25762586
fs-access "^1.0.0"
25772587
which "^1.2.1"
25782588

2579-
karma-jasmine@^1.0.0:
2580-
version "1.1.2"
2581-
resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.2.tgz#394f2b25ffb4a644b9ada6f22d443e2fd08886c3"
2589+
karma-jasmine@^2.0.0:
2590+
version "2.0.1"
2591+
resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-2.0.1.tgz#26e3e31f2faf272dd80ebb0e1898914cc3a19763"
2592+
dependencies:
2593+
jasmine-core "^3.3"
25822594

25832595
karma-mocha-reporter@^2.0.0:
25842596
version "2.2.5"
@@ -2594,15 +2606,14 @@ karma-sourcemap-loader@^0.3.6:
25942606
dependencies:
25952607
graceful-fs "^4.1.2"
25962608

2597-
karma-webpack@2.0.6:
2598-
version "2.0.6"
2599-
resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.6.tgz#967918e59750ebe0f40829263435fde7ac81bdb4"
2609+
karma-webpack@next:
2610+
version "4.0.0-rc.4"
2611+
resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-4.0.0-rc.4.tgz#d443b6efc669ec618449c026281edd90fc97dd7b"
26002612
dependencies:
2601-
async "~0.9.0"
2602-
loader-utils "^0.2.5"
2603-
lodash "^3.8.0"
2613+
async "^2.0.0"
2614+
loader-utils "^1.1.0"
26042615
source-map "^0.5.6"
2605-
webpack-dev-middleware "^1.12.0"
2616+
webpack-dev-middleware "^3.2.0"
26062617

26072618
karma@^3.0.0:
26082619
version "3.0.0"
@@ -2737,7 +2748,7 @@ loader-runner@^2.3.0:
27372748
version "2.3.1"
27382749
resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.1.tgz#026f12fe7c3115992896ac02ba022ba92971b979"
27392750

2740-
loader-utils@^0.2.16, loader-utils@^0.2.5:
2751+
loader-utils@^0.2.16:
27412752
version "0.2.17"
27422753
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
27432754
dependencies:
@@ -2772,9 +2783,9 @@ lodash.debounce@^4.0.8:
27722783
version "4.0.8"
27732784
resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
27742785

2775-
lodash@^3.8.0:
2776-
version "3.10.1"
2777-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
2786+
lodash@^4.17.10, lodash@^4.17.5:
2787+
version "4.17.11"
2788+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
27782789

27792790
lodash@^4.17.3, lodash@^4.5.0:
27802791
version "4.17.5"
@@ -2784,10 +2795,6 @@ lodash@^4.17.4:
27842795
version "4.17.10"
27852796
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
27862797

2787-
lodash@^4.17.5:
2788-
version "4.17.11"
2789-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
2790-
27912798
log-symbols@^1.0.2:
27922799
version "1.0.2"
27932800
resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
@@ -2931,10 +2938,6 @@ mime-types@~2.1.18:
29312938
dependencies:
29322939
mime-db "~1.36.0"
29332940

2934-
mime@^1.5.0:
2935-
version "1.6.0"
2936-
resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
2937-
29382941
mime@^2.3.1:
29392942
version "2.3.1"
29402943
resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
@@ -4217,10 +4220,6 @@ through2@^2.0.0:
42174220
readable-stream "^2.1.5"
42184221
xtend "~4.0.1"
42194222

4220-
time-stamp@^2.0.0:
4221-
version "2.0.0"
4222-
resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357"
4223-
42244223
timers-browserify@^2.0.4:
42254224
version "2.0.10"
42264225
resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
@@ -4463,6 +4462,10 @@ [email protected]:
44634462
version "1.0.1"
44644463
resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
44654464

4465+
uuid@^3.3.2:
4466+
version "3.3.2"
4467+
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
4468+
44664469
v8-compile-cache@^2.0.2:
44674470
version "2.0.2"
44684471
resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz#a428b28bb26790734c4fc8bc9fa106fccebf6a6c"
@@ -4507,15 +4510,21 @@ webpack-cli@^3.1.1:
45074510
v8-compile-cache "^2.0.2"
45084511
yargs "^12.0.2"
45094512

4510-
webpack-dev-middleware@^1.12.0:
4511-
version "1.12.2"
4512-
resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz#f8fc1120ce3b4fc5680ceecb43d777966b21105e"
4513+
webpack-dev-middleware@^3.2.0:
4514+
version "3.4.0"
4515+
resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz#1132fecc9026fd90f0ecedac5cbff75d1fb45890"
45134516
dependencies:
45144517
memory-fs "~0.4.1"
4515-
mime "^1.5.0"
4516-
path-is-absolute "^1.0.0"
4518+
mime "^2.3.1"
45174519
range-parser "^1.0.3"
4518-
time-stamp "^2.0.0"
4520+
webpack-log "^2.0.0"
4521+
4522+
webpack-log@^2.0.0:
4523+
version "2.0.0"
4524+
resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
4525+
dependencies:
4526+
ansi-colors "^3.0.0"
4527+
uuid "^3.3.2"
45194528

45204529
webpack-sources@^1.1.0, webpack-sources@^1.3.0:
45214530
version "1.3.0"

0 commit comments

Comments
 (0)