Skip to content

Commit 17867d6

Browse files
author
David Narbutovich
committed
fix broken test
1 parent d12ca27 commit 17867d6

File tree

7 files changed

+21
-110
lines changed

7 files changed

+21
-110
lines changed

.babelrc

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"presets": [
3+
[
4+
"env",
5+
{
6+
"targets": {
7+
"node": ["6.11.0"]
8+
}
9+
}
10+
]
11+
],
12+
"plugins": ["babel-plugin-add-module-exports"]
13+
}

.babelrc.js

Lines changed: 0 additions & 13 deletions
This file was deleted.

.eslintrc.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
module.exports = {
22
root: true,
33
parser: "babel-eslint",
4-
plugins: ["import", "prettier"],
5-
extends: [
6-
"webpack",
7-
"plugin:import/errors",
8-
"plugin:import/warnings",
9-
"eslint:recommended",
10-
"plugin:prettier/recommended"
11-
],
4+
plugins: ["prettier"],
5+
extends: ["webpack", "eslint:recommended", "plugin:prettier/recommended"],
126
env: {
137
node: true,
148
es6: true,

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"e2e": "yarn force-clean ; yarn install-sub",
1717
"prebuild": "rimraf ./lib",
1818
"build": "babel src --out-dir lib",
19-
"format": "prettier \"test/unit/*.js\" \"src/*.js\" \"./*.js\" --write",
19+
"format": "prettier \".babelrc\" \"test/unit/*.js\" \"src/*.js\" \"./*.js\" --write",
2020
"pretest": "yarn build",
2121
"test": "jest",
2222
"coverage": "rimraf ./coverage; yarn test --coverage",
@@ -35,7 +35,7 @@
3535
"lib"
3636
],
3737
"engines": {
38-
"node": ">=6.0.0"
38+
"node": ">=6.11.0"
3939
},
4040
"devDependencies": {
4141
"babel-cli": "^6.26.0",
@@ -46,7 +46,6 @@
4646
"eslint": "^4.19.1",
4747
"eslint-config-prettier": "^2.9.0",
4848
"eslint-config-webpack": "^1.2.5",
49-
"eslint-plugin-import": "^2.11.0",
5049
"eslint-plugin-prettier": "^2.6.0",
5150
"husky": "0.14.3",
5251
"jest": "^22.4.3",

test/e2e/webpack1/tests/app/app.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
/* 0 */
4545
/***/ (function(module, exports, __webpack_require__) {
4646

47-
/* eslint-disable no-useless-escape, import/no-webpack-loader-syntax, import/no-unresolved */
47+
/* eslint-disable no-useless-escape */
4848

4949
const expectOutput = (output, result) =>
5050
expect(output.replace(/\r\n/g, "\n")).toEqual(result);

test/e2e/webpack1/tests/app/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* eslint-disable no-useless-escape, import/no-webpack-loader-syntax, import/no-unresolved */
1+
/* eslint-disable no-useless-escape */
22

33
const expectOutput = (output, result) =>
44
expect(output.replace(/\r\n/g, "\n")).toEqual(result);

yarn.lock

Lines changed: 2 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1180,10 +1180,6 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0:
11801180
version "1.1.0"
11811181
resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
11821182

1183-
contains-path@^0.1.0:
1184-
version "0.1.0"
1185-
resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
1186-
11871183
convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1:
11881184
version "1.5.1"
11891185
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
@@ -1353,13 +1349,6 @@ diff@^3.2.0:
13531349
version "3.5.0"
13541350
resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
13551351

1356-
doctrine@1.5.0:
1357-
version "1.5.0"
1358-
resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
1359-
dependencies:
1360-
esutils "^2.0.2"
1361-
isarray "^1.0.0"
1362-
13631352
doctrine@^2.1.0:
13641353
version "2.1.0"
13651354
resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
@@ -1443,35 +1432,6 @@ eslint-config-webpack@^1.2.5:
14431432
version "1.2.5"
14441433
resolved "https://registry.yarnpkg.com/eslint-config-webpack/-/eslint-config-webpack-1.2.5.tgz#1705686433ebc1a80030cb307d1c53e3e8146e76"
14451434

1446-
eslint-import-resolver-node@^0.3.1:
1447-
version "0.3.2"
1448-
resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a"
1449-
dependencies:
1450-
debug "^2.6.9"
1451-
resolve "^1.5.0"
1452-
1453-
eslint-module-utils@^2.2.0:
1454-
version "2.2.0"
1455-
resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.2.0.tgz#b270362cd88b1a48ad308976ce7fa54e98411746"
1456-
dependencies:
1457-
debug "^2.6.8"
1458-
pkg-dir "^1.0.0"
1459-
1460-
eslint-plugin-import@^2.11.0:
1461-
version "2.11.0"
1462-
resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.11.0.tgz#15aeea37a67499d848e8e981806d4627b5503816"
1463-
dependencies:
1464-
contains-path "^0.1.0"
1465-
debug "^2.6.8"
1466-
doctrine "1.5.0"
1467-
eslint-import-resolver-node "^0.3.1"
1468-
eslint-module-utils "^2.2.0"
1469-
has "^1.0.1"
1470-
lodash "^4.17.4"
1471-
minimatch "^3.0.3"
1472-
read-pkg-up "^2.0.0"
1473-
resolve "^1.6.0"
1474-
14751435
eslint-plugin-prettier@^2.6.0:
14761436
version "2.6.0"
14771437
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-2.6.0.tgz#33e4e228bdb06142d03c560ce04ec23f6c767dd7"
@@ -1788,7 +1748,7 @@ find-up@^1.0.0:
17881748
path-exists "^2.0.0"
17891749
pinkie-promise "^2.0.0"
17901750

1791-
find-up@^2.0.0, find-up@^2.1.0:
1751+
find-up@^2.1.0:
17921752
version "2.1.0"
17931753
resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
17941754
dependencies:
@@ -2399,7 +2359,7 @@ is-windows@^1.0.2:
23992359
version "1.0.2"
24002360
resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
24012361

2402-
isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
2362+
isarray@1.0.0, isarray@~1.0.0:
24032363
version "1.0.0"
24042364
resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
24052365

@@ -2989,15 +2949,6 @@ load-json-file@^1.0.0:
29892949
pinkie-promise "^2.0.0"
29902950
strip-bom "^2.0.0"
29912951

2992-
load-json-file@^2.0.0:
2993-
version "2.0.0"
2994-
resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
2995-
dependencies:
2996-
graceful-fs "^4.1.2"
2997-
parse-json "^2.2.0"
2998-
pify "^2.0.0"
2999-
strip-bom "^3.0.0"
3000-
30012952
load-json-file@^4.0.0:
30022953
version "4.0.0"
30032954
resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
@@ -3565,12 +3516,6 @@ path-type@^1.0.0:
35653516
pify "^2.0.0"
35663517
pinkie-promise "^2.0.0"
35673518

3568-
path-type@^2.0.0:
3569-
version "2.0.0"
3570-
resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
3571-
dependencies:
3572-
pify "^2.0.0"
3573-
35743519
path-type@^3.0.0:
35753520
version "3.0.0"
35763521
resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
@@ -3605,12 +3550,6 @@ pinkie@^2.0.0:
36053550
version "2.0.4"
36063551
resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
36073552

3608-
pkg-dir@^1.0.0:
3609-
version "1.0.0"
3610-
resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
3611-
dependencies:
3612-
find-up "^1.0.0"
3613-
36143553
pkg-dir@^2.0.0:
36153554
version "2.0.0"
36163555
resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
@@ -3711,13 +3650,6 @@ read-pkg-up@^1.0.1:
37113650
find-up "^1.0.0"
37123651
read-pkg "^1.0.0"
37133652

3714-
read-pkg-up@^2.0.0:
3715-
version "2.0.0"
3716-
resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
3717-
dependencies:
3718-
find-up "^2.0.0"
3719-
read-pkg "^2.0.0"
3720-
37213653
read-pkg@^1.0.0:
37223654
version "1.1.0"
37233655
resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
@@ -3726,14 +3658,6 @@ read-pkg@^1.0.0:
37263658
normalize-package-data "^2.3.2"
37273659
path-type "^1.0.0"
37283660

3729-
read-pkg@^2.0.0:
3730-
version "2.0.0"
3731-
resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
3732-
dependencies:
3733-
load-json-file "^2.0.0"
3734-
normalize-package-data "^2.3.2"
3735-
path-type "^2.0.0"
3736-
37373661
read-pkg@^3.0.0:
37383662
version "3.0.0"
37393663
resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
@@ -3924,12 +3848,6 @@ resolve@1.1.7:
39243848
version "1.1.7"
39253849
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
39263850

3927-
resolve@^1.5.0, resolve@^1.6.0:
3928-
version "1.7.1"
3929-
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
3930-
dependencies:
3931-
path-parse "^1.0.5"
3932-
39333851
restore-cursor@^1.0.1:
39343852
version "1.0.1"
39353853
resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"

0 commit comments

Comments
 (0)