Skip to content

Commit

Permalink
Merge pull request #136 from reactioncommerce/fix-nnnnat-update-deps
Browse files Browse the repository at this point in the history
(fix): update deps
  • Loading branch information
aldeed authored Jul 17, 2018
2 parents 03aace2 + 6e20ed6 commit 81bdad7
Show file tree
Hide file tree
Showing 7 changed files with 431 additions and 689 deletions.
179 changes: 56 additions & 123 deletions .snyk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
version: v1.10.2
version: v1.12.0
# ignores vulnerabilities until expiry date; change duration by modifying expiry date
ignore:
'npm:braces:20180219':
Expand Down Expand Up @@ -92,120 +92,53 @@ ignore:
reason: None given
expires: '2018-04-05T20:56:49.878Z'
'npm:hoek:20180212':
- react-scripts > fsevents > node-pre-gyp > hawk > hoek:
reason: None given
expires: '2018-04-05T20:56:49.878Z'
boom > hoek:
reason: None given
expires: '2018-07-15T03:19:00.834Z'
- react-scripts > webpack-dev-server > chokidar > fsevents > node-pre-gyp > hawk > hoek:
reason: None given
expires: '2018-04-05T20:56:49.878Z'
cryptiles > boom > hoek:
reason: None given
expires: '2018-07-15T03:19:00.834Z'
- react-scripts > webpack > watchpack > chokidar > fsevents > node-pre-gyp > hawk > hoek:
reason: None given
expires: '2018-04-05T20:56:49.878Z'
hawk > hoek:
reason: None given
expires: '2018-07-15T03:19:00.834Z'
- react-scripts > fsevents > node-pre-gyp > hawk > boom > hoek:
reason: None given
expires: '2018-04-05T20:56:49.878Z'
hawk > boom > hoek:
reason: None given
expires: '2018-07-15T03:19:00.834Z'
- react-scripts > webpack-dev-server > chokidar > fsevents > node-pre-gyp > hawk > boom > hoek:
reason: None given
expires: '2018-04-05T20:56:49.878Z'
hawk > sntp > hoek:
reason: None given
expires: '2018-07-15T03:19:00.834Z'
- react-scripts > webpack > watchpack > chokidar > fsevents > node-pre-gyp > hawk > boom > hoek:
reason: None given
expires: '2018-04-05T20:56:49.879Z'
hawk > cryptiles > boom > hoek:
reason: None given
expires: '2018-07-15T03:19:00.834Z'
- react-scripts > fsevents > node-pre-gyp > hawk > cryptiles > boom > hoek:
reason: None given
expires: '2018-04-05T20:56:49.879Z'
node-pre-gyp > hawk > hoek:
reason: None given
expires: '2018-07-15T03:19:00.834Z'
- react-scripts > webpack-dev-server > chokidar > fsevents > node-pre-gyp > hawk > cryptiles > boom > hoek:
reason: None given
expires: '2018-04-05T20:56:49.879Z'
node-pre-gyp > hawk > boom > hoek:
reason: None given
expires: '2018-07-15T03:19:00.834Z'
- react-scripts > webpack > watchpack > chokidar > fsevents > node-pre-gyp > hawk > cryptiles > boom > hoek:
reason: None given
expires: '2018-04-05T20:56:49.879Z'
node-pre-gyp > hawk > sntp > hoek:
reason: None given
expires: '2018-07-15T03:19:00.834Z'
- react-scripts > fsevents > node-pre-gyp > request > hawk > cryptiles > boom > hoek:
reason: None given
expires: '2018-04-05T20:56:49.879Z'
node-pre-gyp > hawk > cryptiles > boom > hoek:
reason: None given
expires: '2018-07-15T03:19:00.834Z'
- react-scripts > webpack-dev-server > chokidar > fsevents > node-pre-gyp > request > hawk > cryptiles > boom > hoek:
reason: None given
expires: '2018-04-05T20:56:49.879Z'
node-pre-gyp > request > hawk > hoek:
reason: None given
expires: '2018-07-15T03:19:00.834Z'
- react-scripts > webpack > watchpack > chokidar > fsevents > node-pre-gyp > request > hawk > cryptiles > boom > hoek:
reason: None given
expires: '2018-04-05T20:56:49.879Z'
node-pre-gyp > request > hawk > boom > hoek:
reason: None given
expires: '2018-07-15T03:19:00.834Z'
- react-scripts > fsevents > node-pre-gyp > request > hawk > boom > hoek:
reason: None given
expires: '2018-04-05T20:56:49.879Z'
node-pre-gyp > request > hawk > sntp > hoek:
reason: None given
expires: '2018-07-15T03:19:00.834Z'
- react-scripts > webpack-dev-server > chokidar > fsevents > node-pre-gyp > request > hawk > boom > hoek:
reason: None given
expires: '2018-04-05T20:56:49.879Z'
node-pre-gyp > request > hawk > cryptiles > boom > hoek:
reason: None given
expires: '2018-07-15T03:19:00.834Z'
- react-scripts > webpack > watchpack > chokidar > fsevents > node-pre-gyp > request > hawk > boom > hoek:
reason: None given
expires: '2018-04-05T20:56:49.879Z'
- react-scripts > fsevents > node-pre-gyp > hawk > sntp > hoek:
reason: None given
expires: '2018-04-05T20:56:49.879Z'
- react-scripts > webpack-dev-server > chokidar > fsevents > node-pre-gyp > hawk > sntp > hoek:
reason: None given
expires: '2018-04-05T20:56:49.879Z'
- react-scripts > webpack > watchpack > chokidar > fsevents > node-pre-gyp > hawk > sntp > hoek:
reason: None given
expires: '2018-04-05T20:56:49.879Z'
- react-scripts > fsevents > node-pre-gyp > request > hawk > sntp > hoek:
reason: None given
expires: '2018-04-05T20:56:49.880Z'
- react-scripts > webpack-dev-server > chokidar > fsevents > node-pre-gyp > request > hawk > sntp > hoek:
reason: None given
expires: '2018-04-05T20:56:49.880Z'
- react-scripts > webpack > watchpack > chokidar > fsevents > node-pre-gyp > request > hawk > sntp > hoek:
reason: None given
expires: '2018-04-05T20:56:49.880Z'
- react-scripts > fsevents > node-pre-gyp > request > hawk > hoek:
reason: None given
expires: '2018-04-05T20:56:49.880Z'
- react-scripts > webpack-dev-server > chokidar > fsevents > node-pre-gyp > request > hawk > hoek:
reason: None given
expires: '2018-04-05T20:56:49.880Z'
- react-scripts > webpack > watchpack > chokidar > fsevents > node-pre-gyp > request > hawk > hoek:
reason: None given
expires: '2018-04-05T20:56:49.880Z'
- '*': null
- reason: >-
No direct dependency upgrade available. Issue filed here:
https://github.com/tus/tus-node-server/issues/119
- expires: '2018-08-26T20:23:03.274Z'
- hawk > boom > hoek:
reason: No direct dependency upgrade available
expires: '2018-08-16T20:17:03.057Z'
- hawk > sntp > hoek:
reason: No direct dependency upgrade available
expires: '2018-08-16T20:17:03.057Z'
- hawk > cryptiles > boom > hoek:
reason: No direct dependency upgrade available
expires: '2018-08-16T20:17:03.057Z'
- node-pre-gyp > hawk > hoek:
reason: No direct dependency upgrade available
expires: '2018-08-16T20:17:03.057Z'
- boom > hoek:
reason: No direct dependency upgrade available
expires: '2018-08-16T20:17:03.057Z'
- node-pre-gyp > hawk > sntp > hoek:
reason: No direct dependency upgrade available
expires: '2018-08-16T20:17:03.057Z'
- node-pre-gyp > hawk > cryptiles > boom > hoek:
reason: No direct dependency upgrade available
expires: '2018-08-16T20:17:03.057Z'
- node-pre-gyp > request > hawk > hoek:
reason: No direct dependency upgrade available
expires: '2018-08-16T20:17:03.057Z'
- node-pre-gyp > request > hawk > boom > hoek:
reason: No direct dependency upgrade available
expires: '2018-08-16T20:17:03.057Z'
- node-pre-gyp > request > hawk > sntp > hoek:
reason: No direct dependency upgrade available
expires: '2018-08-16T20:17:03.057Z'
- node-pre-gyp > request > hawk > cryptiles > boom > hoek:
reason: No direct dependency upgrade available
expires: '2018-08-16T20:17:03.057Z'
- node-pre-gyp > hawk > boom > hoek:
reason: No direct dependency upgrade available
expires: '2018-08-16T20:17:03.056Z'
- cryptiles > boom > hoek:
reason: No direct dependency upgrade available
expires: '2018-08-16T20:17:03.057Z'
- hawk > hoek:
reason: No direct dependency upgrade available
expires: '2018-08-16T20:17:03.057Z'
'npm:node-forge:20180226':
- react-scripts > webpack-dev-server > selfsigned > node-forge:
reason: None given
Expand All @@ -226,18 +159,18 @@ ignore:
expires: '2018-04-26T14:37:00.839Z'
'npm:deep-extend:20180409':
- node-pre-gyp > rc > deep-extend:
reason: None given
expires: '2018-07-15T03:19:00.834Z'
reason: No direct dependency upgrade available
expires: '2018-08-16T20:17:03.057Z'
'npm:sshpk:20180409':
- node-pre-gyp > request > http-signature > sshpk:
reason: None given
expires: '2018-07-15T03:19:00.834Z'
reason: No direct dependency upgrade available
expires: '2018-08-16T20:17:03.057Z'
'npm:stringstream:20180511':
- node-pre-gyp > request > stringstream:
reason: None given
expires: '2018-07-15T03:19:00.834Z'
reason: No direct dependency upgrade available
expires: '2018-08-16T20:17:03.057Z'
'npm:ua-parser-js:20180227':
- '*':
reason: Waiting on deps to update to the latest fbjs version
expires: 2018-07-15T00:00:00.000Z
reason: No direct dependency upgrade available
expires: '2018-08-16T20:22:21.238Z'
patch: {}
6 changes: 6 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,12 @@ COPY --chown=node ./.reaction/yarnrc-docker.template /home/node/.yarnrc
WORKDIR $APP_SOURCE_DIR
COPY --chown=node . $APP_SOURCE_DIR

RUN set -ex; \
cd package && yarn install \
--frozen-lockfile \
--ignore-scripts \
--no-cache;

# Important: Make sure we're the "node" user before we begin doing things because
# our tools use "/home/node" as the HOME dir.
USER node
Expand Down
16 changes: 4 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,18 +94,10 @@
"suiteName": "jest-tests"
},
"dependencies": {
"@material-ui/core": "^1.2.3",
"lodash.debounce": "^4.0.8",
"lodash.get": "^4.4.2",
"lodash.isempty": "^4.4.0",
"lodash.isequal": "^4.5.0",
"mdi-material-ui": "^5.1.1",
"polished": "^1.9.2",
"react": "16.4.0",
"react-dom": "16.4.0",
"react-select": "2.0.0-alpha.8",
"reacto-form": "0.0.2",
"styled-components": "3.1.6"
"prop-types": "15.6.2",
"react": "16.4.1",
"react-dom": "16.4.1",
"styled-components": "3.3.3"
},
"devDependencies": {
"@commitlint/cli": "7.0.0",
Expand Down
13 changes: 8 additions & 5 deletions package/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,13 @@
]
},
"dependencies": {
"@material-ui/core": "^1.4.0",
"lodash.debounce": "^4.0.8",
"lodash.get": "^4.4.2",
"lodash.isempty": "^4.4.0",
"lodash.isequal": "^4.5.0",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react-select": "2.0.0-alpha.8",
"reacto-form": "^0.0.2",
"styled-components": "^3.1.6"
"mdi-material-ui": "^5.2.0",
"react-select": "2.0.0-alpha.8"
},
"devDependencies": {
"@reactioncommerce/eslint-config": "^1.0.1",
Expand Down Expand Up @@ -72,5 +70,10 @@
},
"publishConfig": {
"access": "public"
},
"peerDependencies": {
"prop-types": "^15.6.2",
"react": "^16.4.1",
"styled-components": "^3.3.3"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,12 @@ exports[`basic snapshot 1`] = `
</g>
</svg>
<span
className="MuiTouchRipple-root-33"
className="MuiTouchRipple-root-34"
/>
</button>
</div>
<input
aria-invalid={false}
aria-required={false}
autoComplete={undefined}
autoFocus={undefined}
className="MuiInput-input-16 QuantityInput-quantityInput-3"
Expand Down Expand Up @@ -116,7 +115,7 @@ exports[`basic snapshot 1`] = `
</g>
</svg>
<span
className="MuiTouchRipple-root-33"
className="MuiTouchRipple-root-34"
/>
</button>
</div>
Expand Down
Loading

0 comments on commit 81bdad7

Please sign in to comment.