Commit 5072eee3 authored by Yannis Barlas's avatar Yannis Barlas
Browse files

Merge branch 'upgrades' into 'master'

Upgrades

See merge request !705
parents 1308cbc2 fee6ed03
Pipeline #17992 canceled with stages
......@@ -17,7 +17,7 @@
"prop-types": "^15.5.10",
"react-router-dom": "^5.0.0",
"recompose": "^0.30.0",
"styled-components": "^4.1.3"
"styled-components": "^5.2.3"
},
"peerDependencies": {
"@apollo/client": "^3.2.7",
......@@ -25,7 +25,7 @@
"config": ">=3.0.1",
"lodash": ">=4.17.11",
"react": ">=16.9",
"styled-components": ">=4.1.3"
"styled-components": "^5.2.3"
},
"gitHead": "6b100b76f21785e5e50fca082a2743d3d0b1c88a"
}
......@@ -16,7 +16,7 @@
"@pubsweet/client": ">=11.0.0",
"react": ">=16.9",
"react-router-dom": "^5.0.0",
"styled-components": "^4.1.1"
"styled-components": "^5.2.3"
},
"publishConfig": {
"access": "public"
......
......@@ -14,7 +14,7 @@
"peerDependencies": {
"@pubsweet/client": ">=11.0.0",
"react": ">=16.9",
"styled-components": ">=4.1.3"
"styled-components": ">=5.2.3"
},
"repository": {
"type": "git",
......
......@@ -20,7 +20,7 @@
"@apollo/client": "^3.2.7",
"@pubsweet/client": ">=11.0.0",
"react": ">=16.9",
"styled-components": ">=4.1.3"
"styled-components": "^5.2.3"
},
"publishConfig": {
"access": "public"
......
......@@ -11,7 +11,7 @@
"peerDependencies": {
"lodash": "^4.17.11",
"react": ">=16.9",
"react-dom": "^16.9.0"
"react-dom": ">=16.9"
},
"devDependencies": {
"react-dnd-test-backend": "^7.0.0"
......
import Enzyme from 'enzyme'
import Adapter from 'enzyme-adapter-react-16'
import Adapter from '@wojtekmaj/enzyme-adapter-react-17'
import path from 'path'
Enzyme.configure({ adapter: new Adapter() })
......
......@@ -28,7 +28,7 @@
"lodash": ">=4.17.11",
"prop-types": ">=15.6.2",
"react": ">=16.9",
"styled-components": ">=4.1.3"
"styled-components": "^5.2.3"
},
"gitHead": "6b100b76f21785e5e50fca082a2743d3d0b1c88a"
}
......@@ -21,22 +21,22 @@
"@hapi/joi": "^14.3.1",
"@pubsweet/client": "^11.0.0",
"@pubsweet/default-theme": "^4.0.12",
"@pubsweet/ui": "^10.0.4",
"@pubsweet/ui-toolkit": "^2.1.4",
"@pubsweet/ui": "^12.6.10",
"@pubsweet/ui-toolkit": "^2.3.12",
"config": "^3.0.1",
"faker": "^4.1.0",
"fs-extra": "^8.1.0",
"joi-browser": "^13.4.0",
"lodash": "^4.17.5",
"react": "^16.9.0",
"react": "^17.0.2",
"react-dnd": "^10.0.2",
"react-dnd-html5-backend": "^10.0.2",
"react-dom": "^16.9.0",
"react-dom": "^17.0.2",
"react-router-dom": "^5.0.0",
"react-styleguidist": "^11.0.5",
"recompose": "^0.26.0",
"regenerator-runtime": "^0.13.1",
"styled-components": "^4.1.1",
"styled-components": "^5.2.3",
"styled-normalize": "^8.0.6",
"webpack": "^4.29.5",
"xpub-journal": "^0.0.3"
......
module.exports = {
collectCoverageFrom: [
'**/*.{js,jsx}',
'!**/*test.{js,jsx}',
'!**/test/**',
'!**/node_modules/**',
'!**/config/**',
'!**/coverage/**',
'!**/dist/**',
],
coverageDirectory: '<rootDir>/coverage',
projects: [
{
rootDir: '<rootDir>/packages/server',
displayName: 'server',
testEnvironment: 'jest-environment-db',
testRegex: '/test/.*_test.js$',
setupFilesAfterEnv: ['<rootDir>/test/helpers/jest-setup.js'],
},
{
rootDir: '<rootDir>/packages/client',
displayName: 'client',
testRegex: '/test/.+test.jsx?$',
setupFilesAfterEnv: ['<rootDir>/test/jest-setup.js'],
globals: {
window: {},
},
},
{
rootDir: '<rootDir>/packages/db-manager',
displayName: 'db-manager',
testMatch: ['**/test/**/*.test.js'],
setupFilesAfterEnv: ['<rootDir>/test/jest-setup.js'],
testEnvironment: 'jest-environment-db',
},
{
rootDir: '<rootDir>/components/client',
displayName: 'components',
moduleNameMapper: {
'\\.s?css$': 'identity-obj-proxy',
},
transformIgnorePatterns: ['/node_modules/(?!@?pubsweet)'],
testPathIgnorePatterns: [
'/node_modules',
'config/test',
'model-*',
'-server',
],
globals: {
fetch: true,
},
setupFilesAfterEnv: ['<rootDir>/test/jest-setup.js'],
},
{
rootDir: '<rootDir>/packages/cli',
displayName: 'cli',
testMatch: ['<rootDir>/test/*.test.js', '<rootDir>/test/cli/*.test.js'],
testPathIgnorePatterns: ['<rootDir>/build/'],
modulePaths: ['<rootDir>/node_modules'],
testEnvironment: 'jest-environment-db',
unmockedModulePathPatterns: ['/src/models'],
setupFilesAfterEnv: ['<rootDir>/test/helpers/jest-setup.js'],
verbose: true,
},
{
rootDir: '<rootDir>/packages/logger',
displayName: 'logger',
testMatch: ['**/test/**/*test.js'],
modulePaths: ['<rootDir>/node_modules'],
testEnvironment: 'node',
verbose: true,
setupFilesAfterEnv: ['<rootDir>/test/jest-setup.js'],
},
{
rootDir: '<rootDir>/packages/ui',
testPathIgnorePatterns: ['/dist'],
displayName: 'ui',
moduleNameMapper: {
'\\.s?css$': 'identity-obj-proxy',
},
setupFilesAfterEnv: ['<rootDir>/test/setup/enzyme.js'],
snapshotSerializers: ['enzyme-to-json/serializer'],
},
{
rootDir: '<rootDir>/packages/base-model',
displayName: 'base-model',
testRegex: '/test/.*_test.js$',
setupFilesAfterEnv: ['<rootDir>/test/jest-setup.js'],
testEnvironment: 'jest-environment-db',
},
{
rootDir: '<rootDir>/packages/sse',
displayName: 'sse',
testRegex: '/test/.*_test.js$',
testEnvironment: 'node',
},
{
rootDir: '<rootDir>/components/server/model-team',
displayName: 'model-team',
testRegex: '/test/.*_test.js$',
setupFilesAfterEnv: ['<rootDir>/test/jest-setup.js'],
testEnvironment: 'jest-environment-db',
},
{
rootDir: '<rootDir>/components/server/model-user',
displayName: 'model-user',
testRegex: '/test/.*_test.js$',
setupFilesAfterEnv: ['<rootDir>/test/jest-setup.js'],
testEnvironment: 'jest-environment-db',
},
{
rootDir: '<rootDir>/components/server/model-fragment',
displayName: 'model-fragment',
testRegex: '/test/.*_test.js$',
setupFilesAfterEnv: ['<rootDir>/test/jest-setup.js'],
testEnvironment: 'jest-environment-db',
},
{
rootDir: '<rootDir>/components/server/component-password-reset-server',
displayName: 'component-password-reset-server',
testRegex: '/test/.*_test.js$',
setupFilesAfterEnv: ['<rootDir>/test/jest-setup.js'],
testEnvironment: 'jest-environment-db',
},
{
rootDir: '<rootDir>/components/server/job-xsweet',
displayName: 'job-xsweet',
testRegex: '/test/.*_test.js$',
setupFilesAfterEnv: ['<rootDir>/test/jest-setup.js'],
testEnvironment: 'node',
},
{
rootDir: '<rootDir>/components/server/component-email-templating',
displayName: 'component-email-templating',
testRegex: '/test/.*.test.js$',
setupFilesAfterEnv: ['<rootDir>/test/jest-setup.js'],
testEnvironment: 'node',
},
{
rootDir: '<rootDir>/components/server/component-aws-s3',
displayName: 'component-aws-s3',
testRegex: '/test/.*.test.js$',
setupFilesAfterEnv: ['<rootDir>/test/jest-setup.js'],
testEnvironment: 'node',
},
],
}
......@@ -2,7 +2,36 @@
"name": "pubsweet-monorepo",
"version": "0.0.0",
"private": true,
"repository": {
"type": "git",
"url": "https://gitlab.coko.foundation/pubsweet/pubsweet"
},
"license": "MIT",
"workspaces": [
"packages/*",
"components/server/*",
"components/client/*",
"docs"
],
"scripts": {
"clean": "lerna clean",
"styleguide": "yarn --cwd docs styleguide",
"styleguide:build": "yarn --cwd docs styleguide:build",
"test": "jest --no-cache --coverage --detectOpenHandles",
"lint": "yarn lint:js && yarn lint:style && yarn lint:json",
"lint:js": "eslint '**/*.{js,jsx}'",
"lint:style": "stylelint '**/*.{js,jsx}'",
"lint:json": "prettier --list-different '**/*.json'",
"precommit": "lint-staged",
"cz": "git-cz",
"commitmsg": "commitlint -e $GIT_PARAMS",
"build": "lerna run build"
},
"config": {
"commitizen": {
"path": "./node_modules/cz-conventional-changelog"
}
},
"devDependencies": {
"@babel/cli": "^7.0.0",
"@babel/core": "^7.0.0",
......@@ -12,15 +41,15 @@
"@babel/preset-react": "^7.0.0",
"@commitlint/cli": "^6.0.5",
"@commitlint/config-conventional": "^6.0.4",
"@testing-library/jest-dom": "^4.0.0",
"@testing-library/react": "^9.0.0",
"@testing-library/jest-dom": "^5.11.10",
"@testing-library/react": "^11.2.6",
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.0",
"apollo-link-http": "^1.5.16",
"babel-eslint": "^10.0.1",
"commitizen": "^2.9.6",
"cz-conventional-changelog": "^2.1.0",
"enzyme": "^3.7.0",
"enzyme-adapter-react-16": "^1.12.1",
"enzyme-to-json": "^3.4.3",
"enzyme": "^3.11.0",
"enzyme-to-json": "^3.6.1",
"eslint": "^4.13.1",
"eslint-config-pubsweet": "^0.0.6",
"eslint-plugin-import": "^2.8.0",
......@@ -39,7 +68,7 @@
"isomorphic-form-data": "^1.0.0",
"jest": "^24.7.1",
"jest-cli": "^24.7.1",
"jest-styled-components": "^6.3.1",
"jest-styled-components": "^7.0.3",
"lerna": "^3.13.2",
"lint-staged": "^8.1.5",
"nock": "^9.0.14",
......@@ -52,232 +81,5 @@
"stylelint-processor-styled-components": "^1.8.0",
"supertest": "^3.1.0",
"waait": "^1.0.2"
},
"scripts": {
"clean": "lerna clean",
"styleguide": "yarn --cwd docs styleguide",
"styleguide:build": "yarn --cwd docs styleguide:build",
"test": "jest --no-cache --coverage --detectOpenHandles",
"lint": "yarn lint:js && yarn lint:style && yarn lint:json",
"lint:js": "eslint '**/*.{js,jsx}'",
"lint:style": "stylelint '**/*.{js,jsx}'",
"lint:json": "prettier --list-different '**/*.json'",
"precommit": "lint-staged",
"cz": "git-cz",
"commitmsg": "commitlint -e $GIT_PARAMS",
"build": "lerna run build"
},
"jest": {
"collectCoverageFrom": [
"**/*.{js,jsx}",
"!**/*test.{js,jsx}",
"!**/test/**",
"!**/node_modules/**",
"!**/config/**",
"!**/coverage/**",
"!**/dist/**"
],
"coverageDirectory": "<rootDir>/coverage",
"projects": [
{
"rootDir": "<rootDir>/packages/server",
"displayName": "server",
"testEnvironment": "jest-environment-db",
"testRegex": "/test/.*_test.js$",
"setupFilesAfterEnv": [
"<rootDir>/test/helpers/jest-setup.js"
]
},
{
"rootDir": "<rootDir>/packages/client",
"displayName": "client",
"testRegex": "/test/.+test.jsx?$",
"setupFilesAfterEnv": [
"<rootDir>/test/jest-setup.js"
],
"globals": {
"window": {}
}
},
{
"rootDir": "<rootDir>/packages/db-manager",
"displayName": "db-manager",
"testMatch": [
"**/test/**/*.test.js"
],
"setupFilesAfterEnv": [
"<rootDir>/test/jest-setup.js"
],
"testEnvironment": "jest-environment-db"
},
{
"rootDir": "<rootDir>/components/client",
"displayName": "components",
"moduleNameMapper": {
"\\.s?css$": "identity-obj-proxy"
},
"transformIgnorePatterns": [
"/node_modules/(?!@?pubsweet)"
],
"testPathIgnorePatterns": [
"/node_modules",
"config/test",
"model-*",
"-server"
],
"globals": {
"fetch": true
},
"setupFilesAfterEnv": [
"<rootDir>/test/jest-setup.js"
]
},
{
"rootDir": "<rootDir>/packages/cli",
"displayName": "cli",
"testMatch": [
"<rootDir>/test/*.test.js",
"<rootDir>/test/cli/*.test.js"
],
"testPathIgnorePatterns": [
"<rootDir>/build/"
],
"modulePaths": [
"<rootDir>/node_modules"
],
"testEnvironment": "jest-environment-db",
"unmockedModulePathPatterns": [
"/src/models"
],
"setupFilesAfterEnv": [
"<rootDir>/test/helpers/jest-setup.js"
],
"verbose": true
},
{
"rootDir": "<rootDir>/packages/logger",
"displayName": "logger",
"testMatch": [
"**/test/**/*test.js"
],
"modulePaths": [
"<rootDir>/node_modules"
],
"testEnvironment": "node",
"verbose": true,
"setupFilesAfterEnv": [
"<rootDir>/test/jest-setup.js"
]
},
{
"rootDir": "<rootDir>/packages/ui",
"testPathIgnorePatterns": [
"/dist"
],
"displayName": "ui",
"moduleNameMapper": {
"\\.s?css$": "identity-obj-proxy"
},
"setupFilesAfterEnv": [
"<rootDir>/test/setup/enzyme.js"
],
"snapshotSerializers": [
"enzyme-to-json/serializer"
]
},
{
"rootDir": "<rootDir>/packages/base-model",
"displayName": "base-model",
"testRegex": "/test/.*_test.js$",
"setupFilesAfterEnv": [
"<rootDir>/test/jest-setup.js"
],
"testEnvironment": "jest-environment-db"
},
{
"rootDir": "<rootDir>/packages/sse",
"displayName": "sse",
"testRegex": "/test/.*_test.js$",
"testEnvironment": "node"
},
{
"rootDir": "<rootDir>/components/server/model-team",
"displayName": "model-team",
"testRegex": "/test/.*_test.js$",
"setupFilesAfterEnv": [
"<rootDir>/test/jest-setup.js"
],
"testEnvironment": "jest-environment-db"
},
{
"rootDir": "<rootDir>/components/server/model-user",
"displayName": "model-user",
"testRegex": "/test/.*_test.js$",
"setupFilesAfterEnv": [
"<rootDir>/test/jest-setup.js"
],
"testEnvironment": "jest-environment-db"
},
{
"rootDir": "<rootDir>/components/server/model-fragment",
"displayName": "model-fragment",
"testRegex": "/test/.*_test.js$",
"setupFilesAfterEnv": [
"<rootDir>/test/jest-setup.js"
],
"testEnvironment": "jest-environment-db"
},
{
"rootDir": "<rootDir>/components/server/component-password-reset-server",
"displayName": "component-password-reset-server",
"testRegex": "/test/.*_test.js$",
"setupFilesAfterEnv": [
"<rootDir>/test/jest-setup.js"
],
"testEnvironment": "jest-environment-db"
},
{
"rootDir": "<rootDir>/components/server/job-xsweet",
"displayName": "job-xsweet",
"testRegex": "/test/.*_test.js$",
"setupFilesAfterEnv": [
"<rootDir>/test/jest-setup.js"
],
"testEnvironment": "node"
},
{
"rootDir": "<rootDir>/components/server/component-email-templating",
"displayName": "component-email-templating",
"testRegex": "/test/.*.test.js$",
"setupFilesAfterEnv": [
"<rootDir>/test/jest-setup.js"
],
"testEnvironment": "node"
},
{
"rootDir": "<rootDir>/components/server/component-aws-s3",
"displayName": "component-aws-s3",
"testRegex": "/test/.*.test.js$",
"setupFilesAfterEnv": [
"<rootDir>/test/jest-setup.js"
],
"testEnvironment": "node"
}
]
},
"workspaces": [
"packages/*",
"components/server/*",
"components/client/*",
"docs"
],
"repository": {
"type": "git",
"url": "https://gitlab.coko.foundation/pubsweet/pubsweet"
},
"config": {
"commitizen": {
"path": "./node_modules/cz-conventional-changelog"
}
}
}
......@@ -23,25 +23,22 @@
"graphql": "^14.2.1",
"isomorphic-fetch": "^2.1.1",
"prop-types": "^15.5.8",
"react": "^16.9.0",
"react": "^17.0.2",
"react-router-dom": "^5.0.0",
"styled-components": "^4.1.1",
"styled-components": "^5.2.3",
"styled-normalize": "^8.0.6"
},
"devDependencies": {
"@wojtekmaj/enzyme-adapter-react-17": "0.6.0",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.5",
"history": "^5.0.0",
"html-webpack-plugin": "^4.5.0",
"react-dom": "^17.0.1",
"react-dom": "^17.0.2",
"uuid": "^8.3.1",
"waait": "^1.0.5",
"webpack": "^5.5.0",
"webpack-cli": "^4.2.0"
},
"peerDependencies": {
"pubsweet-server": ">=13.0.0"
},
"publishConfig": {
"access": "public"
},
......
import Enzyme from 'enzyme'
import Adapter from 'enzyme-adapter-react-16'
import Adapter from '@wojtekmaj/enzyme-adapter-react-17'
import path from 'path'
Enzyme.configure({ adapter: new Adapter() })
......
......@@ -17,7 +17,7 @@
"dependencies": {
"color": "^3.0.0",
"lodash": "^4.17.4",
"styled-components": "^4.1.1"
"styled-components": "^5.2.3"
},
"author": "Adam Hyde",
"license": "MIT",
......
......@@ -8,23 +8,23 @@
"url": "https://gitlab.coko.foundation/pubsweet/pubsweet"
},
"dependencies": {
"@wojtekmaj/enzyme-adapter-react-17": "0.6.0",
"@pubsweet/ui-toolkit": "^2.3.12",
"enzyme": "^3.7.0",
"enzyme-adapter-react-16": "^1.12.1",
"formik": "^1.4.2",