Skip to content

Commit bb72c7b

Browse files
committed
Merge branch 'master' of github.com:mike-works/pwa-fundamentals
2 parents 10d9962 + ef51f3a commit bb72c7b

File tree

2 files changed

+25
-19
lines changed

2 files changed

+25
-19
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"eslint": "^5.5.0",
4646
"eslint-loader": "^2.1.0",
4747
"eslint-plugin-babel": "^5.1.0",
48-
"eslint-plugin-jest": "^21.21.0",
48+
"eslint-plugin-jest": "^21.22.0",
4949
"eslint-plugin-react": "^7.11.1",
5050
"extract-text-webpack-plugin": "^3.0.0",
5151
"file-loader": "^2.0.0",
@@ -57,7 +57,7 @@
5757
"nodemon": "^1.18.3",
5858
"qrcode-reader": "^1.0.4",
5959
"react": "^16.4.2",
60-
"react-dom": "^16.4.2",
60+
"react-dom": "^16.5.0",
6161
"react-hot-loader": "^4.3.4",
6262
"react-router-dom": "^4.3.1",
6363
"react-test-renderer": "^16.4.2",
@@ -74,7 +74,7 @@
7474
"worker-loader": "^2.0.0"
7575
},
7676
"optionalDependencies": {
77-
"semantic-release": "^15.9.12",
77+
"semantic-release": "^15.9.14",
7878
"@mike-works/workshop-semantic-release-config": "^1.0.0"
7979
},
8080
"dependencies": {

yarn.lock

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3572,11 +3572,11 @@ entities@~1.1.1:
35723572
version "1.1.1"
35733573
resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
35743574

3575-
env-ci@^2.0.0:
3576-
version "2.1.1"
3577-
resolved "https://registry.yarnpkg.com/env-ci/-/env-ci-2.1.1.tgz#73c42c0f3ee4813457210a8440a2ee1bbea0102a"
3575+
env-ci@^2.4.0:
3576+
version "2.4.0"
3577+
resolved "https://registry.yarnpkg.com/env-ci/-/env-ci-2.4.0.tgz#1ceacee17a6860fffa04436cea586d15534b4c4d"
35783578
dependencies:
3579-
execa "^0.10.0"
3579+
execa "^1.0.0"
35803580
java-properties "^0.2.9"
35813581

35823582
eol@^0.8.1:
@@ -3734,9 +3734,9 @@ eslint-plugin-babel@^5.1.0:
37343734
dependencies:
37353735
eslint-rule-composer "^0.3.0"
37363736

3737-
eslint-plugin-jest@^21.21.0:
3738-
version "21.21.0"
3739-
resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-21.21.0.tgz#f0afd138c4acb5f0cd7698318fb49c7d49f3bf45"
3737+
eslint-plugin-jest@^21.22.0:
3738+
version "21.22.0"
3739+
resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-21.22.0.tgz#1b9e49b3e5ce9a3d0a51af4579991d517f33726e"
37403740

37413741
eslint-plugin-react@^7.11.1:
37423742
version "7.11.1"
@@ -8230,14 +8230,14 @@ react-addons-shallow-compare@^15.6.2:
82308230
fbjs "^0.8.4"
82318231
object-assign "^4.1.0"
82328232

8233-
react-dom@^16.4.2:
8234-
version "16.4.2"
8235-
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.4.2.tgz#4afed569689f2c561d2b8da0b819669c38a0bda4"
8233+
react-dom@^16.5.0:
8234+
version "16.5.0"
8235+
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.5.0.tgz#57704e5718669374b182a17ea79a6d24922cb27d"
82368236
dependencies:
8237-
fbjs "^0.8.16"
82388237
loose-envify "^1.1.0"
82398238
object-assign "^4.1.1"
8240-
prop-types "^15.6.0"
8239+
prop-types "^15.6.2"
8240+
schedule "^0.3.0"
82418241

82428242
react-hot-loader@^4.3.4:
82438243
version "4.3.4"
@@ -8963,6 +8963,12 @@ sax@^1.2.4:
89638963
version "1.2.4"
89648964
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
89658965

8966+
schedule@^0.3.0:
8967+
version "0.3.0"
8968+
resolved "https://registry.yarnpkg.com/schedule/-/schedule-0.3.0.tgz#1be2ab2fc2e768536269ce7326efb478d6c045e8"
8969+
dependencies:
8970+
object-assign "^4.1.1"
8971+
89668972
schema-utils@^0.3.0:
89678973
version "0.3.0"
89688974
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
@@ -9001,9 +9007,9 @@ selfsigned@^1.9.1:
90019007
dependencies:
90029008
node-forge "0.7.5"
90039009

9004-
semantic-release@^15.9.12:
9005-
version "15.9.12"
9006-
resolved "https://registry.yarnpkg.com/semantic-release/-/semantic-release-15.9.12.tgz#7a6321ac2765a804165d05e3a5b1cdc2628aef59"
9010+
semantic-release@^15.9.14:
9011+
version "15.9.14"
9012+
resolved "https://registry.yarnpkg.com/semantic-release/-/semantic-release-15.9.14.tgz#108fa88649e318b85f728adc9375b12d68075726"
90079013
dependencies:
90089014
"@semantic-release/commit-analyzer" "^6.0.0"
90099015
"@semantic-release/error" "^2.2.0"
@@ -9013,7 +9019,7 @@ semantic-release@^15.9.12:
90139019
aggregate-error "^1.0.0"
90149020
cosmiconfig "^5.0.1"
90159021
debug "^3.1.0"
9016-
env-ci "^2.0.0"
9022+
env-ci "^2.4.0"
90179023
execa "^1.0.0"
90189024
figures "^2.0.0"
90199025
find-versions "^2.0.0"

0 commit comments

Comments
 (0)