Skip to content

Commit

Permalink
Merge branch 'develop' into PWA-186-fix-unit-tests-suite
Browse files Browse the repository at this point in the history
# Conflicts:
#	themes/gmd
  • Loading branch information
devbucket committed Mar 27, 2018
2 parents 066364f + dedcc22 commit b21dc70
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 3 deletions.
2 changes: 0 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
coverage
dist
extensions
themes
node_modules
InlineTransitionGroup
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const loadHostedComponent = (route) => {
class Route extends Component {
static propTypes = {
path: PropTypes.string.isRequired,
component: PropTypes.oneOfType([ // eslint-disable-line react/no-unused-prop-types
component: PropTypes.oneOfType([
PropTypes.func,
PropTypes.string,
]),
Expand Down
85 changes: 85 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,97 @@
lodash "^4.2.0"
to-fast-properties "^2.0.0"

"@shopgate/eslint-config@^4.12.0-beta.12":
version "4.12.0-beta.18"
resolved "https://registry.yarnpkg.com/@shopgate/eslint-config/-/eslint-config-4.12.0-beta.18.tgz#747bc00e61c81ad280c5a9ece1a75d414a1acea3"
dependencies:
babel-eslint "^8.2.1"
eslint-config-airbnb "^16.1.0"
eslint-plugin-eslint-comments "^1.1.0"
eslint-plugin-extra-rules "0.8.1"
eslint-plugin-import "^2.8.0"
eslint-plugin-jsx-a11y "^6.0.3"
eslint-plugin-react "^7.6.1"
react-hot-loader "3.1.3"

"@shopgate/pwa-common-commerce@^4.12.0-beta.12":
version "4.12.0-beta.18"
resolved "https://registry.yarnpkg.com/@shopgate/pwa-common-commerce/-/pwa-common-commerce-4.12.0-beta.18.tgz#2d796e29e19db9b2e271f684be9ce2ea805eac7a"
dependencies:
recompose "^0.26.0"
reselect "^3.0.1"

"@shopgate/pwa-common@^4.12.0-beta.12":
version "4.12.0-beta.18"
resolved "https://registry.yarnpkg.com/@shopgate/pwa-common/-/pwa-common-4.12.0-beta.18.tgz#a70cf70d9c4dde7bfa816a7c776ad2dfb2180214"
dependencies:
classnames "^2.2.5"
crypto-js "3.1.9-1"
glamor "^2.20.40"
gsap "^1.20.2"
history "^4.7.2"
intl-messageformat "^2.1.0"
jsdom "11.1.0"
path-match "^1.2.4"
react-dotdotdot "^1.1.0"
react-id-swiper "1.4.0"
react-inline-transition-group "^2.1.7"
react-portal "^3.1.0"
react-redux "^5.0.6"
react-tap-event-plugin "^3.0.2"
recompose "^0.26.0"
redux "^3.7.2"
redux-logger "^3.0.6"
redux-thunk "^2.2.0"
remote-redux-devtools "^0.5.12"
reselect "^3.0.1"
rxjs "^5.4.3"
url-search-params "^0.10.0"

"@shopgate/pwa-core@^4.12.0-beta.12":
version "4.12.0-beta.18"
resolved "https://registry.yarnpkg.com/@shopgate/pwa-core/-/pwa-core-4.12.0-beta.18.tgz#419224829cdbf47bf9e486e11128458f6afc58ff"
dependencies:
crypto-js "3.1.9-1"
isomorphic-fetch "^2.2.1"

"@shopgate/pwa-tracking@^4.12.0-beta.12":
version "4.12.0-beta.18"
resolved "https://registry.yarnpkg.com/@shopgate/pwa-tracking/-/pwa-tracking-4.12.0-beta.18.tgz#ab377230dd11902ad53f86f1cc93419f49585234"

"@shopgate/pwa-unit-test@^4.12.0-beta.12":
version "4.12.0-beta.18"
resolved "https://registry.yarnpkg.com/@shopgate/pwa-unit-test/-/pwa-unit-test-4.12.0-beta.18.tgz#942d5a6720973468ff441100f23f55c8de52152c"
dependencies:
babel-core "^6.26.0"
babel-jest "^22.0.3"
babel-preset-es2015 "^6.24.1"
cheerio "^1.0.0-rc.2"
enzyme "^3.2.0"
enzyme-adapter-react-16 "^1.1.1"
enzyme-to-json "^3.3.0"
identity-obj-proxy "^3.0.0"
jest-enzyme "^4.0.1"
js-yaml "^3.10.0"
react-hot-loader "3.1.3"
react-tap-event-plugin "^3.0.2"
react-test-renderer "^16.2.0"
strip-json-comments "^2.0.1"

"@shopgate/pwa-webcheckout-shopify@^4.12.0-beta.12":
version "4.12.0-beta.18"
resolved "https://registry.yarnpkg.com/@shopgate/pwa-webcheckout-shopify/-/pwa-webcheckout-shopify-4.12.0-beta.18.tgz#a67d42603b357f35409670a2efd33a89cdab8326"

"@shopgate/react-hammerjs@0.5.3", "@shopgate/react-hammerjs@^0.5.3":
version "0.5.3"
resolved "https://registry.yarnpkg.com/@shopgate/react-hammerjs/-/react-hammerjs-0.5.3.tgz#53ee13c39a2a78ed2c9187052820767cbd0c930e"
dependencies:
hammerjs "^2.0.8"

"@shopgate/tracking-core@^4.12.0-beta.12":
version "4.12.0-beta.18"
resolved "https://registry.yarnpkg.com/@shopgate/tracking-core/-/tracking-core-4.12.0-beta.18.tgz#d3c8176e975748d0dc893c38dbb953fafcee1a1b"

"@sourceallies/coveralls-merge@^1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@sourceallies/coveralls-merge/-/coveralls-merge-1.0.0.tgz#1db94b41c21c5d3c8ab341a17ecc538e4d1d5539"
Expand Down

0 comments on commit b21dc70

Please sign in to comment.