Skip to content

Commit

Permalink
Merge branch 'master' of github.com:mike-works/pwa-fundamentals
Browse files Browse the repository at this point in the history
  • Loading branch information
mike-north committed Sep 14, 2018
2 parents 10d9962 + ef51f3a commit bb72c7b
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 19 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"eslint": "^5.5.0",
"eslint-loader": "^2.1.0",
"eslint-plugin-babel": "^5.1.0",
"eslint-plugin-jest": "^21.21.0",
"eslint-plugin-jest": "^21.22.0",
"eslint-plugin-react": "^7.11.1",
"extract-text-webpack-plugin": "^3.0.0",
"file-loader": "^2.0.0",
Expand All @@ -57,7 +57,7 @@
"nodemon": "^1.18.3",
"qrcode-reader": "^1.0.4",
"react": "^16.4.2",
"react-dom": "^16.4.2",
"react-dom": "^16.5.0",
"react-hot-loader": "^4.3.4",
"react-router-dom": "^4.3.1",
"react-test-renderer": "^16.4.2",
Expand All @@ -74,7 +74,7 @@
"worker-loader": "^2.0.0"
},
"optionalDependencies": {
"semantic-release": "^15.9.12",
"semantic-release": "^15.9.14",
"@mike-works/workshop-semantic-release-config": "^1.0.0"
},
"dependencies": {
Expand Down
38 changes: 22 additions & 16 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3572,11 +3572,11 @@ entities@~1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"

env-ci@^2.0.0:
version "2.1.1"
resolved "https://registry.yarnpkg.com/env-ci/-/env-ci-2.1.1.tgz#73c42c0f3ee4813457210a8440a2ee1bbea0102a"
env-ci@^2.4.0:
version "2.4.0"
resolved "https://registry.yarnpkg.com/env-ci/-/env-ci-2.4.0.tgz#1ceacee17a6860fffa04436cea586d15534b4c4d"
dependencies:
execa "^0.10.0"
execa "^1.0.0"
java-properties "^0.2.9"

eol@^0.8.1:
Expand Down Expand Up @@ -3734,9 +3734,9 @@ eslint-plugin-babel@^5.1.0:
dependencies:
eslint-rule-composer "^0.3.0"

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

eslint-plugin-react@^7.11.1:
version "7.11.1"
Expand Down Expand Up @@ -8230,14 +8230,14 @@ react-addons-shallow-compare@^15.6.2:
fbjs "^0.8.4"
object-assign "^4.1.0"

react-dom@^16.4.2:
version "16.4.2"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.4.2.tgz#4afed569689f2c561d2b8da0b819669c38a0bda4"
react-dom@^16.5.0:
version "16.5.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.5.0.tgz#57704e5718669374b182a17ea79a6d24922cb27d"
dependencies:
fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.0"
prop-types "^15.6.2"
schedule "^0.3.0"

react-hot-loader@^4.3.4:
version "4.3.4"
Expand Down Expand Up @@ -8963,6 +8963,12 @@ sax@^1.2.4:
version "1.2.4"
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"

schedule@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/schedule/-/schedule-0.3.0.tgz#1be2ab2fc2e768536269ce7326efb478d6c045e8"
dependencies:
object-assign "^4.1.1"

schema-utils@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
Expand Down Expand Up @@ -9001,9 +9007,9 @@ selfsigned@^1.9.1:
dependencies:
node-forge "0.7.5"

semantic-release@^15.9.12:
version "15.9.12"
resolved "https://registry.yarnpkg.com/semantic-release/-/semantic-release-15.9.12.tgz#7a6321ac2765a804165d05e3a5b1cdc2628aef59"
semantic-release@^15.9.14:
version "15.9.14"
resolved "https://registry.yarnpkg.com/semantic-release/-/semantic-release-15.9.14.tgz#108fa88649e318b85f728adc9375b12d68075726"
dependencies:
"@semantic-release/commit-analyzer" "^6.0.0"
"@semantic-release/error" "^2.2.0"
Expand All @@ -9013,7 +9019,7 @@ semantic-release@^15.9.12:
aggregate-error "^1.0.0"
cosmiconfig "^5.0.1"
debug "^3.1.0"
env-ci "^2.0.0"
env-ci "^2.4.0"
execa "^1.0.0"
figures "^2.0.0"
find-versions "^2.0.0"
Expand Down

0 comments on commit bb72c7b

Please sign in to comment.