Commit 94938ccd authored by Jure's avatar Jure

chore: upgrade dependencies

parent 129ba14a
Pipeline #10096 failed with stages
in 4 minutes and 41 seconds
......@@ -6,6 +6,7 @@ variables:
stages:
- build
- audit
- test
- review
- staging
......@@ -25,6 +26,17 @@ build:
- echo "Ignore warning! Cannot perform an interactive login from a non TTY device"
- docker push $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA
audit:
image: $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA
stage: test
except:
- tags
variables:
GIT_STRATEGY: none
script:
- cd ${HOME}
- yarn audit
lint:style:
image: $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA
stage: test
......@@ -34,7 +46,7 @@ lint:style:
GIT_STRATEGY: none
script:
- cd ${HOME}
- npm run lint:style
- yarn lint:style
lint:js:
image: $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA
......@@ -45,7 +57,7 @@ lint:js:
GIT_STRATEGY: none
script:
- cd ${HOME}
- npm run lint:js
- yarn lint:js
lint:json:
image: $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA
......@@ -56,7 +68,7 @@ lint:json:
GIT_STRATEGY: none
script:
- cd ${HOME}
- npm run lint:json
- yarn lint:json
lint:commits:
image: $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA
......
......@@ -30,7 +30,7 @@
"@pubsweet/logger": "^0.2.7",
"fs-extra": "^4.0.2",
"isomorphic-fetch": "^2.2.1",
"joi": "^13.6.0",
"joi": "^14.3.0",
"pg": "^7.4.1",
"pubsweet-server": "^10.1.0",
"tmp": "^0.0.33",
......
......@@ -28,7 +28,7 @@
},
"dependencies": {
"config": "^2.0.1",
"joi": "^13.6.0",
"joi": "^14.3.0",
"lodash": "^4.17.4"
}
}
......@@ -29,8 +29,8 @@
"graphql-tools": "^4.0.0",
"helmet": "^3.8.1",
"http-status-codes": "^1.0.6",
"joi": "^13.6.0",
"jsonwebtoken": "^7.1.7",
"joi": "^14.3.0",
"jsonwebtoken": "^8.4.0",
"knex": "^0.15.2",
"lodash": "^4.0.0",
"minimist": "^1.2.0",
......
......@@ -8,4 +8,7 @@ module.exports = {
'pubsweet-server': {
baseUrl: 'http://example.com',
},
'pubsweet-client': {
API_ENDPOINT: 'http://example.com',
},
}
......@@ -18,7 +18,7 @@
"react-dom": "^16.2.0",
"react-redux": "^5.0.2",
"react-router-dom": "^4.2.2",
"react-styleguidist": "^7.0.10",
"react-styleguidist": "^8.0.6",
"recompose": "^0.26.0",
"redux": "^3.6.0",
"redux-form": "^7.0.3",
......@@ -36,7 +36,7 @@
"rimraf": "^2.6.1",
"sass-loader": "^6.0.6",
"style-loader": "^0.19.0",
"webpack": "^3.8.1",
"webpack": "4.19.0",
"webpack-node-externals": "^1.6.0"
},
"scripts": {
......
......@@ -39,6 +39,12 @@ module.exports = dir => {
rules: [
{
oneOf: [
// Todo: revisit https://github.com/apollographql/react-apollo/issues/1737
{
test: /\.mjs$/,
include: /node_modules/,
type: 'javascript/auto',
},
// ES6 modules
{
test: /\.jsx?$/,
......
......@@ -26,7 +26,7 @@ module.exports = {
},
{
name: 'Core-components',
components: '../components/!(xpub-*)/**/*.{jsx,js}',
components: '../components/!(xpub-*|model-*)/**/*.{jsx,js}',
},
{
name: 'Xpub-components',
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment