Merge branch 'develop'

Author: FoxxMD

.dockerignore

@@ -15,3 +15,8 @@ config/*.bak
 .flatpak-builder
 flatpak/generated-sources.json
 flatpak/.flatpak-builder
+docsite/build
+docsite/node_modules
+docsite/.docusaurus
+docsite/.cache-loader
+build

.gitignore

@@ -1,7 +1,7 @@
 # Created by .ignore support plugin (hsz.mobi)
 ### Node template
 # Logs
-logs
+/logs
 *.log
 npm-debug.log*
 yarn-debug.log*
@@ -127,3 +127,6 @@ src/**/**.js.map
 *.bak
 .flatpak-builder
 flatpak/generated-sources.json
+
+build
+!setupProxy.js

.mocharc.json

@@ -0,0 +1,4 @@
+{
+  "require": ["./register.js", "source-map-support/register"],
+  "reporter": "dot"
+}

.nvmrc

@@ -1 +1 @@
-lts/hydrogen
+v18.16.0

.nycrc.json

@@ -0,0 +1,24 @@
+{
+  "extends": "@istanbuljs/nyc-config-typescript",
+  "exclude": [
+    "node_modules/",
+    "**/src/backend/common/schema/**",
+    "**/src/backend/tests/**",
+    "register.js",
+    "**/src/server/**/*.d.ts",
+    "**/src/client/**"
+  ],
+  "include": [
+    "**/src/backend/**/*.ts",
+    "**/src/**/backend/*.js",
+    "**/src/**/backend/*.js.map"
+  ],
+  "extension": [
+    ".ts"
+  ],
+  "reporter": [
+    "text-summary",
+    "html"
+  ],
+  "report-dir": "./coverage"
+}

Dockerfile

@@ -9,6 +9,7 @@ RUN \
     git \
     nodejs \
     npm \
+    #yarn \
     openssh && \
   echo "**** cleanup ****" && \
   rm -rf \
@@ -23,31 +24,58 @@ ENV CONFIG_DIR=$data_dir
 
 COPY docker/root/ /
 
+RUN npm install -g patch-package
+
 WORKDIR /app
 
 FROM base as build
 
-# copy NPM dependencies and install
-COPY --chown=abc:abc package*.json ./
-COPY --chown=abc:abc tsconfig.json .
+# would very much like to use YARN for dependency management but its got show-stopping bad design for prod dependencies
+# https://github.com/yarnpkg/yarn/issues/6323 -- always downloads devDependencies -- and im not about to migrate to v2 since alpine doesn't support it yet
+
+# copy dep/TS config and install dev dependencies
+#COPY --chown=abc:abc package.json tsconfig.json yarn.lock ./
+COPY --chown=abc:abc package*.json tsconfig.json ./
+COPY --chown=abc:abc patches ./patches
+
 
 RUN npm install
+#RUN yarn install
 
 COPY --chown=abc:abc . /app
 
+# need to set before build so server/client build is optimized and has constants (if needed)
+ENV NODE_ENV=production
+
 RUN npm run build && rm -rf node_modules
+#RUN yarn run build && rm -rf node_modules
 
 FROM base as app
 
-COPY --from=build --chown=abc:abc /app /app
-
-ENV NODE_ENV="production"
+#COPY --chown=abc:abc package.json yarn.lock ./
+COPY --chown=abc:abc package*.json ./
+COPY --chown=abc:abc patches ./patches
+COPY --from=build --chown=abc:abc /app/build /app/build
+COPY --from=base /usr/local/bin /usr/local/bin
+COPY --from=base /usr/local/lib /usr/local/lib
+
+ENV NODE_ENV=production
+ENV IS_DOCKER=true
+#
+#RUN yarn global add patch-package \
+#    && yarn install --production=true \
+#    && yarn global remove patch-package \
+#    && yarn cache clean --mirror \
+#    && chown abc:abc node_modules \
+#    && rm -rf node_modules/ts-node \
+#    && rm -rf node_modules/typescript
 
 RUN npm install --omit=dev \
     && npm cache clean --force \
     && chown abc:abc node_modules \
     && rm -rf node_modules/ts-node \
-    && rm -rf node_modules/typescript
+    && rm -rf node_modules/typescript \
+    && rm -rf node_modules/@types
 
 ARG webPort=9078
 ENV PORT=$webPort