Commit dcbe71e9 authored by Jure's avatar Jure

Merge branch 'maintenance' into 'master'

ci: use node:12 as base

See merge request !56
parents 58d43944 8efc6ab3
Pipeline #13316 passed with stages
in 9 minutes and 28 seconds
......@@ -92,3 +92,4 @@ coverage/
yarn-error.log
package-lock.json
config/local*.*
_build
......@@ -7,7 +7,9 @@ stages:
- test
build:
image: docker:stable
image: docker:19.03.1
services:
- docker:19.03.1-dind
stage: build
script:
- docker version
......
FROM pubsweet/pubsweet:base
FROM node:12
ENV HOME "/home/pubsweet"
RUN mkdir -p ${HOME}
WORKDIR ${HOME}
# Install chrome and firefox
RUN curl -sL http://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
......
import React from 'react'
import { Query, ApolloConsumer } from 'react-apollo'
import { Query, ApolloConsumer } from '@apollo/react-components'
import gql from 'graphql-tag'
import Navigation from './Navigation'
......
import React from 'react'
import PropTypes from 'prop-types'
import { Query } from 'react-apollo'
import { Query } from '@apollo/react-components'
import gql from 'graphql-tag'
const CURRENT_USER = gql`
......
const Joi = require('joi')
module.exports = {
fragment: {
// TODO remove these once pubsweet-component-posts-manager is upgraded
fragmentType: Joi.string(),
kind: Joi.string(),
title: Joi.string(),
published: Joi.bool(),
published_at: Joi.string(),
source: Joi.any(),
presentation: Joi.string(),
authors: Joi.array().items(Joi.string()),
},
collection: {
title: Joi.string(),
},
}
......@@ -10,23 +10,25 @@
],
"main": "app.js",
"dependencies": {
"@apollo/react-common": "^3.1.3",
"@apollo/react-hoc": "^3.1.3",
"@pubsweet/coko-theme": "^5.1.13",
"@pubsweet/component-password-reset-client": "^3.1.12",
"@pubsweet/component-password-reset-server": "^2.1.12",
"@pubsweet/db-manager": "3.0.17",
"@pubsweet/default-theme": "4.1.10",
"@pubsweet/job-xsweet": "^1.2.7",
"@pubsweet/db-manager": "3.1.0",
"@pubsweet/default-theme": "4.1.14",
"@pubsweet/job-xsweet": "^2.1.0",
"@pubsweet/logger": "^0.2.31",
"@pubsweet/model-blog": "^0.0.24",
"@pubsweet/model-blogpost": "^0.0.24",
"@pubsweet/model-blog": "^0.0.28",
"@pubsweet/model-blogpost": "^0.0.28",
"@pubsweet/model-team": "^2.1.1",
"@pubsweet/model-user": "^5.1.0",
"@pubsweet/models": "0.2.18",
"@pubsweet/ui": "^10.3.10",
"@pubsweet/models": "0.3.0",
"@pubsweet/ui": "^12.1.0",
"authsome": "^0.1.0",
"mini-css-extract-plugin": "^0.8.0",
"pubsweet": "^5.0.1",
"pubsweet-client": "^9.2.13",
"pubsweet-client": "^10.1.0",
"pubsweet-component-login": "^3.0.13",
"pubsweet-component-signup": "^2.1.7",
"pubsweet-server": "^13.6.1",
......@@ -98,5 +100,8 @@
"test": "NODE_ENV=test NODE_PRESERVE_SYMLINKS=1 testcafe chrome 'test/**/*.test.js'"
},
"repository": "https://gitlab.coko.foundation/pubsweet/pubsweet-starter",
"license": "MIT"
"license": "MIT",
"resolutions": {
"bcrypt": "3.0.6"
}
}
This source diff could not be displayed because it is too large. You can view the blob instead.
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