From 656834fa0ba06afc8c943abbe0e3e0c0747f3399 Mon Sep 17 00:00:00 2001 From: roschaefer Date: Mon, 9 Sep 2019 00:42:41 +0200 Subject: [PATCH 1/3] Remove nodemon, use `nuxt` cli tools @appinteractive can you tell me why we had the custom code in `server/index.js`? --- webapp/package.json | 7 +++---- webapp/yarn.lock | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index b633a0743..6ac82e2dd 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -10,11 +10,11 @@ "author": "Human Connection gGmbH", "private": false, "scripts": { - "dev": "cross-env NODE_ENV=development nodemon server/index.js --watch server", - "dev:styleguide": "cross-env STYLEGUIDE_DEV=true yarn dev", + "dev": "nuxt", + "dev:styleguide": "cross-env STYLEGUIDE_DEV=true yarn run dev", "storybook": "start-storybook -p 3002 -c storybook/", "build": "nuxt build", - "start": "cross-env node server/index.js", + "start": "nuxt start", "generate": "nuxt generate", "lint": "eslint --ext .js,.vue .", "precommit": "yarn lint", @@ -118,7 +118,6 @@ "jest": "~24.9.0", "mutation-observer": "^1.0.3", "node-sass": "~4.12.0", - "nodemon": "~1.19.2", "prettier": "~1.18.2", "sass-loader": "~8.0.0", "style-loader": "~0.23.1", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 3d754153b..d01d6521c 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -10558,7 +10558,7 @@ node-sass@^4.12.0, node-sass@~4.12.0: stdout-stream "^1.4.0" "true-case-path" "^1.0.2" -nodemon@^1.19.1, nodemon@~1.19.2: +nodemon@^1.19.1: version "1.19.2" resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.19.2.tgz#b0975147dc99b3761ceb595b3f9277084931dcc0" integrity sha512-hRLYaw5Ihyw9zK7NF+9EUzVyS6Cvgc14yh8CAYr38tPxJa6UrOxwAQ351GwrgoanHCF0FalQFn6w5eoX/LGdJw== From 8bf11b18aae02390bc2b2538eb7d55d72ecf8b1d Mon Sep 17 00:00:00 2001 From: roschaefer Date: Mon, 9 Sep 2019 00:48:26 +0200 Subject: [PATCH 2/3] Remove dead code --- webapp/server/index.js | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 webapp/server/index.js diff --git a/webapp/server/index.js b/webapp/server/index.js deleted file mode 100644 index d06bb1f6d..000000000 --- a/webapp/server/index.js +++ /dev/null @@ -1,36 +0,0 @@ -const express = require('express') -const consola = require('consola') -const { Nuxt, Builder } = require('nuxt') -const app = express() - -require('dotenv').config() - -const host = process.env.HOST || '127.0.0.1' -const port = process.env.PORT || 3000 -app.set('port', port) - -// Import and Set Nuxt.js options -let config = require('../nuxt.config.js') -config.dev = !(process.env.NODE_ENV === 'production') - -async function start() { - // Init Nuxt.js - const nuxt = new Nuxt(config) - - // Build only in dev mode - if (config.dev) { - const builder = new Builder(nuxt) - await builder.build() - } - - // Give nuxt middleware to express - app.use(nuxt.render) - - // Listen the server - app.listen(port, host) - consola.ready({ - message: `Server listening on http://${host}:${port}`, - badge: true, - }) -} -start() From 5cf82d5e1829e52b0accf6df5362e3ca4380ef7f Mon Sep 17 00:00:00 2001 From: roschaefer Date: Tue, 10 Sep 2019 23:56:10 +0200 Subject: [PATCH 3/3] Fix build Here are the issues * webapp was built with `NODE_ENV=production` but started with `NODE_ENV=development` * using the provided `docker-compose.travis.yml` the command `yarn run start` would look in the wrong folder * removed duplicate environment definition --- backend/Dockerfile | 4 ++-- docker-compose.override.yml | 3 ++- docker-compose.travis.yml | 2 -- docker-compose.yml | 1 - webapp/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 250ee845b..75f5a762f 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -15,10 +15,10 @@ COPY .env.template .env CMD ["yarn", "run", "start"] FROM base as builder -RUN yarn install --frozen-lockfile --non-interactive +RUN yarn install --production=false --frozen-lockfile --non-interactive COPY . . RUN cp .env.template .env -RUN yarn run build +RUN NODE_ENV=production yarn run build # reduce image size with a multistage build FROM base as production diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 32ed3ab92..d4b06fc7a 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -15,7 +15,8 @@ services: - ./webapp:/nitro-web - webapp_node_modules:/nitro-web/node_modules command: yarn run dev - user: root + environment: + - NUXT_BUILD=.nuxt-dist # avoid file ownership issues with shared folders factories: image: humanconnection/nitro-backend:builder build: diff --git a/docker-compose.travis.yml b/docker-compose.travis.yml index 0c6576ca7..4a1acb96a 100644 --- a/docker-compose.travis.yml +++ b/docker-compose.travis.yml @@ -14,8 +14,6 @@ services: volumes: #/nitro-web - ./webapp/coverage:/nitro-web/coverage - environment: - - GRAPHQL_URI=http://backend:4000 backend: image: humanconnection/nitro-backend:builder build: diff --git a/docker-compose.yml b/docker-compose.yml index 3b147c631..45e2cdfdf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,6 @@ services: networks: - hc-network environment: - - NUXT_BUILD=.nuxt-dist - HOST=0.0.0.0 - GRAPHQL_URI=http://backend:4000 - MAPBOX_TOKEN="pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.bZ8KK9l70omjXbEkkbHGsQ" diff --git a/webapp/Dockerfile b/webapp/Dockerfile index cf9c4c698..2fb807501 100644 --- a/webapp/Dockerfile +++ b/webapp/Dockerfile @@ -19,7 +19,7 @@ COPY . . FROM base as build-and-test RUN cp .env.template .env RUN yarn install --production=false --frozen-lockfile --non-interactive -RUN yarn run build +RUN NODE_ENV=production yarn run build FROM base as production ENV NODE_ENV=production