fix docker + typescript shenanigans

Dockerfile

@@ -16,7 +16,7 @@ RUN \
   apt-get clean
 
 # nvm environment variables
-ENV NODE_VERSION 15.2.0
+ENV NODE_VERSION 15.2.1
 ENV NVM_DIR /root/.nvm
 
 # NODE & NPM
@@ -33,14 +33,14 @@ ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules
 ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
 
 RUN mkdir -p /srv
-ADD billing-api /srv/billing-api
-ADD billing-ui /srv/billing-ui
+COPY billing-api /srv/billing-api
+COPY billing-ui /srv/billing-ui
 
 # UI
 WORKDIR /srv/billing-ui
 RUN \
   yarn install && \
-  # yarn add node-sass --force && \
+  ls -a && ls config -a && \
   yarn run build
 
 # API

billing-invoice/Dockerfile

@@ -2,8 +2,6 @@
 
 FROM node AS prebuilder
 
-RUN npm install -g typescript
-
 WORKDIR /app
 COPY src/ /app/src/
 COPY \
@@ -15,7 +13,7 @@ COPY \
 # Build JS
 RUN \
   yarn install && \
-  tsc -p .
+  npx tsc -p .
 
 ##
 # Jetison the prebuilder to keep the image compact

billing-ui/config/webpack.config.dev.js → billing-ui/config/webpack.dev.js

@@ -3,7 +3,7 @@ const { merge } = require('webpack-merge');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const CaseSensitivePathsPlugin = require('case-sensitive-paths-webpack-plugin');
 
-const baseConfig = require('./webpack.config.base');
+const baseConfig = require('./webpack.base');
 const paths = require('./paths');
 const { target: targetEndpoint } = require('../config');
 

billing-ui/config/webpack.config.prod.js → billing-ui/config/webpack.prod.js

@@ -5,7 +5,7 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const url = require('url');
 
-const baseConfig = require('./webpack.config.base');
+const baseConfig = require('./webpack.base');
 const paths = require('./paths');
 
 const homepagePath = require(paths.appPackageJson).homepage;

billing-ui/package.json

@@ -102,8 +102,8 @@
         "serialize-javascript": "^5.0.1"
     },
     "scripts": {
-        "build": "webpack --config ./config/webpack.config.prod.js --progress",
-        "dev": "node --trace-deprecation node_modules/webpack/bin/webpack serve --config ./config/webpack.config.dev.js"
+        "build": "webpack --config ./config/webpack.prod.js --progress",
+        "dev": "node --trace-deprecation node_modules/webpack/bin/webpack serve --config ./config/webpack.dev.js"
     },
     "eslintConfig": {
         "extends": [

invoice-api/Dockerfile

@@ -2,8 +2,6 @@
 
 FROM node AS prebuilder
 
-RUN npm install -g typescript
-
 WORKDIR /app
 COPY src/ /app/src/
 COPY \
@@ -15,7 +13,7 @@ COPY \
 # Build JS
 RUN \
   yarn install && \
-  tsc -p .
+  npx tsc -p .
 
 
 ##