Skip to content

Commit 2f73e23

Browse files
committed
Merge branch 'master' into react
2 parents a0657a0 + 6570946 commit 2f73e23

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,19 @@
4848
"babel-polyfill": "6.20.0",
4949
"babel-preset-env": "1.1.4",
5050
"babel-preset-latest": "6.16.0",
51-
"babel-preset-react": "^6.16.0",
51+
"babel-preset-react": "6.16.0",
5252
"babel-preset-stage-3": "6.17.0",
5353
"babel-register": "6.18.0",
5454
"codecov": "1.0.1",
55-
"cross-env": "3.1.3",
56-
"enzyme": "^2.7.0",
57-
"enzyme-to-json": "^1.4.5",
55+
"cross-env": "3.1.4",
56+
"enzyme": "2.7.0",
57+
"enzyme-to-json": "1.4.5",
5858
"eslint": "3.12.2",
5959
"eslint-config-airbnb": "13.0.0",
6060
"eslint-plugin-flowtype": "2.29.2",
6161
"eslint-plugin-import": "2.2.0",
6262
"eslint-plugin-jsx-a11y": "2.2.3",
63-
"eslint-plugin-react": "^6.8.0",
63+
"eslint-plugin-react": "6.8.0",
6464
"flow-bin": "0.37.4",
6565
"flow-coverage-report": "0.2.0",
6666
"flow-typed": "2.0.0",
@@ -70,12 +70,12 @@
7070
"jest": "18.1.0",
7171
"pretty-bytes": "4.0.2",
7272
"ramda": "0.23.0",
73-
"react": "^15.4.1",
74-
"react-addons-test-utils": "^15.4.1",
75-
"react-dom": "^15.4.1",
73+
"react": "15.4.1",
74+
"react-addons-test-utils": "15.4.1",
75+
"react-dom": "15.4.1",
7676
"readline-sync": "1.4.5",
7777
"rimraf": "2.5.4",
78-
"sinon": "^1.17.7",
78+
"sinon": "1.17.7",
7979
"webpack": "2.2.0-rc.3",
8080
"webpack-dev-middleware": "1.9.0",
8181
"webpack-hot-middleware": "2.14.0"

yarn.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@ babel-preset-latest@6.16.0:
818818
babel-preset-es2016 "^6.16.0"
819819
babel-preset-es2017 "^6.16.0"
820820

821-
babel-preset-react@^6.16.0:
821+
babel-preset-react@6.16.0:
822822
version "6.16.0"
823823
resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.16.0.tgz#aa117d60de0928607e343c4828906e4661824316"
824824
dependencies:
@@ -1330,9 +1330,9 @@ create-hmac@^1.1.0, create-hmac@^1.1.2:
13301330
create-hash "^1.1.0"
13311331
inherits "^2.0.1"
13321332

1333-
cross-env@3.1.3:
1334-
version "3.1.3"
1335-
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-3.1.3.tgz#58cd8231808f50089708b091f7dd37275a8e8154"
1333+
cross-env@3.1.4:
1334+
version "3.1.4"
1335+
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-3.1.4.tgz#56e8bca96f17908a6eb1bc2012ca126f92842130"
13361336
dependencies:
13371337
cross-spawn "^3.0.1"
13381338

@@ -1579,7 +1579,7 @@ entities@^1.1.1, entities@~1.1.1:
15791579
version "1.1.1"
15801580
resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
15811581

1582-
enzyme-to-json@^1.4.5:
1582+
enzyme-to-json@1.4.5:
15831583
version "1.4.5"
15841584
resolved "https://registry.yarnpkg.com/enzyme-to-json/-/enzyme-to-json-1.4.5.tgz#698d6c209b54527aa3e28658e34b5d9f976f8016"
15851585
dependencies:
@@ -1589,7 +1589,7 @@ enzyme-to-json@^1.4.5:
15891589
object-values "^1.0.0"
15901590
object.entries "^1.0.3"
15911591

1592-
enzyme@^2.7.0:
1592+
enzyme@2.7.0:
15931593
version "2.7.0"
15941594
resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-2.7.0.tgz#772477800547ca2514cc0af258e647c166aee899"
15951595
dependencies:
@@ -1762,7 +1762,7 @@ eslint-plugin-jsx-a11y@2.2.3:
17621762
jsx-ast-utils "^1.0.0"
17631763
object-assign "^4.0.1"
17641764

1765-
eslint-plugin-react@^6.8.0:
1765+
eslint-plugin-react@6.8.0:
17661766
version "6.8.0"
17671767
resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-6.8.0.tgz#741ab5438a094532e5ce1bbb935d6832356f492d"
17681768
dependencies:
@@ -3747,15 +3747,15 @@ rc@~1.1.6:
37473747
minimist "^1.2.0"
37483748
strip-json-comments "~1.0.4"
37493749

3750-
react-addons-test-utils@^15.4.1:
3750+
react-addons-test-utils@15.4.1:
37513751
version "15.4.1"
37523752
resolved "https://registry.yarnpkg.com/react-addons-test-utils/-/react-addons-test-utils-15.4.1.tgz#1e4caab151bf27cce26df5f9cb714f4fd8359ae1"
37533753

37543754
react-dom@15.3.1:
37553755
version "15.3.1"
37563756
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.3.1.tgz#6d42cd2b64c8c5e0b693f3ffaec301e6e627e24e"
37573757

3758-
react-dom@^15.4.1:
3758+
react-dom@15.4.1:
37593759
version "15.4.1"
37603760
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.4.1.tgz#d54c913261aaedb17adc20410d029dcc18a1344a"
37613761
dependencies:
@@ -3771,7 +3771,7 @@ react@15.3.1:
37713771
loose-envify "^1.1.0"
37723772
object-assign "^4.1.0"
37733773

3774-
react@^15.4.1:
3774+
react@15.4.1:
37753775
version "15.4.1"
37763776
resolved "https://registry.yarnpkg.com/react/-/react-15.4.1.tgz#498e918602677a3983cd0fd206dfe700389a0dd6"
37773777
dependencies:
@@ -4066,7 +4066,7 @@ signal-exit@^3.0.0:
40664066
version "3.0.2"
40674067
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
40684068

4069-
sinon@^1.17.7:
4069+
sinon@1.17.7:
40704070
version "1.17.7"
40714071
resolved "https://registry.yarnpkg.com/sinon/-/sinon-1.17.7.tgz#4542a4f49ba0c45c05eb2e9dd9d203e2b8efe0bf"
40724072
dependencies:

0 commit comments

Comments
 (0)