diff --git a/Dockerfile b/Dockerfile index 88b5a40e2e356674b3875599e610feece9c8c5cc..d4c54e7bc25a8d80fbf948e73db3523cd524c7b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,6 @@ RUN [ "rm", "-rf", "/npm-packages-offline-cache"] WORKDIR ${HOME}/packages/xpub-faraday ENV NODE_ENV "production" -RUN echo $NODE_ENV RUN [ "npx", "pubsweet", "build"] diff --git a/docker-compose.yml b/docker-compose.yml index b4aa1dc1be2196cb8b1290417b8af9e915fac345..fd007f79c56accb3f01b7c7d21839d5ffdd12903 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,11 +5,11 @@ services: build: context: . dockerfile: ./Dockerfile-development - command: sh -c "cd packages/xpub-faraday && yarn install --frozen-lockfile && ./scripts/wait-for-it.sh postgres:5432 -s -t 40 -- npx pubsweet server" + command: sh -c "./scripts/wait-for-it.sh postgres:5432 -s -t 40 -- npx pubsweet server" ports: - ${PORT:-3000}:3000 volumes: - - ./:/home/xpub + - /home/xpub/node_modules depends_on: - postgres environment: diff --git a/packages/component-email-templating/package.json b/packages/component-email-templating/package.json index 4fee496276eb29c32a0a3399c91fc3b7cdc195fc..6213511389e1790492814e3306657251f4dc4209 100644 --- a/packages/component-email-templating/package.json +++ b/packages/component-email-templating/package.json @@ -15,11 +15,6 @@ "peerDependencies": { "@pubsweet/logger": "^0.0.1" }, - "repository": { - "type": "git", - "url": "https://gitlab.coko.foundation/pubsweet/pubsweet", - "path": "SendEmail" - }, "jest": { "verbose": true, "testRegex": "/tests/.*.test.js$" diff --git a/packages/xpub-faraday/package.json b/packages/xpub-faraday/package.json index b764cfc8cf4f6be99e1b433106621f44f04e4f6b..3f7c75d27236aafd60a30c2d22b6ce2fbfbc3760 100644 --- a/packages/xpub-faraday/package.json +++ b/packages/xpub-faraday/package.json @@ -10,6 +10,7 @@ "dependencies": { "@pubsweet/component-aws-s3": "^1.2.0", "@pubsweet/component-send-email": "0.2.4", + "@pubsweet/component-email-templating": "0.0.1", "@pubsweet/styleguide": "3.1.4", "@pubsweet/ui": "^8.6.0", "@pubsweet/ui-toolkit": "latest", @@ -29,7 +30,7 @@ "pubsweet": "3.0.6", "pubsweet-client": "^4.0.4", "pubsweet-component-login": "^1.2.0", - "pubsweet-component-signup": "^1.0.0", + "pubsweet-component-signup": "^1.0.33", "pubsweet-server": "10.0.1", "react": "^16.4.2", "react-dnd": "^2.5.4", @@ -81,7 +82,8 @@ "start": "pubsweet start", "start:services": "docker-compose up postgres", "server": "pubsweet server", - "start-now": "echo $secret > config/local-development.json && npm run server", + "start-now": + "echo $secret > config/local-development.json && npm run server", "build": "NODE_ENV=production pubsweet build", "clean": "rm -rf node_modules", "debug": "pgrep -f startup/start.js | xargs kill -sigusr1",