Merge pull request #521 from webkom/build-fix

Update to node 16 & fix some build errors

.drone.yml

@@ -5,15 +5,15 @@ name: default
 
 steps:
   - name: setup
-    image: node:14
+    image: node:16-alpine
     when:
       event:
         - push
     commands:
       - yarn install --frozen-lockfile --ignore-scripts
 
   - name: lint
-    image: node:14
+    image: node:16-alpine
     when:
       event:
         - push
@@ -23,7 +23,7 @@ steps:
       - yarn lint
 
   - name: test
-    image: node:14
+    image: node:16-alpine
     when:
       event:
         - push
@@ -33,7 +33,7 @@ steps:
       - MONGO_URL=mongodb://mongodb:27017/vote-test REDIS_URL=redis yarn mocha
 
   - name: coverage
-    image: node:14
+    image: node:16-alpine
     when:
       event:
         - push
@@ -49,7 +49,7 @@ steps:
       COVERALLS_SERVICE_NUMBER: ${DRONE_BUILD_NUMBER}
 
   - name: build
-    image: node:14
+    image: node:16-alpine
     when:
       event:
         - push
@@ -137,4 +137,4 @@ services:
 
 ---
 kind: signature
-hmac: 21eea9888fa631a87ec5a02ee2d6f8f5c2b41767ecbe7f9fe0ee4d66e03325c6
+hmac: 1ec26cb4fae5d5b6f779d65ff5bd4dd4063ec3770e5527ef8c3447e0c700c9f8

Dockerfile

@@ -1,5 +1,5 @@
-FROM node:14-slim
-MAINTAINER Abakus Webkom <webkom@abakus.no>
+FROM node:16-alpine as builder
+LABEL org.opencontainers.image.authors="Abakus Webkom <webkom@abakus.no>"
 
 # Create app directory
 RUN mkdir -p /app
@@ -11,7 +11,19 @@ EXPOSE 3000
 COPY . /app
 
 # Build image
-RUN yarn --production
+RUN yarn --ignore-scripts
+ENV NODE_ENV production
+RUN yarn build
+
+FROM node:16-alpine
+
+WORKDIR /app
+
+COPY --from=builder /app/bin bin
+COPY --from=builder /app/public public
+COPY --from=builder /app/dist dist
+COPY --from=builder /app/package.json .
+COPY --from=builder /app/node_modules node_modules
 
 ARG RELEASE
 ENV RELEASE ${RELEASE}

app/digital/template.html

@@ -218,7 +218,7 @@ <h2>{{title}}</h2>
           {{/if}}
           {{#unless new}}
           <hr/>
-          <p>Du har allerede motatt en bruker, og vi har registrert at du har klart å logge inn. Det vil si at du ikke vi få tilsendt en nytt brukernavn og passord. Ta kontakt med webkom dersom du mener dette er feil.
+          <p>Du har allerede motatt en bruker, og vi har registrert at du har klart å logge inn. Det vil si at du ikke vil få tilsendt et nytt brukernavn og passord. Ta kontakt med webkom dersom du mener dette er feil.
           <hr/>
           {{/unless}}
         </center>

app/errors/index.ts

@@ -287,6 +287,9 @@ export const handleError = (
   status?: number
 ): Response => {
   const statusCode = status || err.status || 500;
+  if (statusCode >= 500) {
+    console.error(err);
+  }
   return res.status(statusCode).json(
     err.payload || {
       name: err.name,

global.d.ts

@@ -3,3 +3,8 @@ declare module '*.yml' {
   const data: any;
   export default data;
 }
+
+declare module '*.html' {
+  const content: string;
+  export default content;
+}

webpack.config.js

@@ -4,7 +4,7 @@ const path = require('path');
 module.exports = {
   mode: 'none',
   output: {
-    path: path.resolve(__dirname, '../', 'public'),
+    path: path.resolve(__dirname, 'dist', 'public'),
     filename: '[name].js',
     publicPath: '/static/',
   },

webpack.server.js

@@ -41,6 +41,7 @@ module.exports = {
       patterns: [
         { from: 'app/views', to: 'app/views' },
         { from: 'public', to: 'public' },
+        { from: 'app/digital/template.html', to: './template.html' },
       ],
     }),
   ],