From 4035d3190c85aee4aec55e0b06e66dfa130c25a8 Mon Sep 17 00:00:00 2001 From: Arthur de Moulins Date: Tue, 12 Dec 2023 16:41:15 +0100 Subject: [PATCH] WIP --- databox/client/Dockerfile | 2 -- databox/client/config-compiler.js | 2 +- uploader/client/config-compiler.js | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/databox/client/Dockerfile b/databox/client/Dockerfile index 32fbc17fe..0c92977ff 100644 --- a/databox/client/Dockerfile +++ b/databox/client/Dockerfile @@ -10,8 +10,6 @@ USER node WORKDIR /srv/workspace/databox/client -ENV NODE_ENV=development - RUN pnpm install \ && mv index.tpl.html index.html diff --git a/databox/client/config-compiler.js b/databox/client/config-compiler.js index 101519556..7ee65d121 100644 --- a/databox/client/config-compiler.js +++ b/databox/client/config-compiler.js @@ -56,7 +56,7 @@ return {}; } - const types = [...v.matchAll(/([\w*]+\/[\w*+.-]+)(\([\w,]*\))?/g)]; + const types = [...v.matchAll(/([\w*]+\/[\w*+.-]+)(\([.\w,]*\))?/g)]; const struct = {}; for (const t of types) { struct[t[1]] = t[2] diff --git a/uploader/client/config-compiler.js b/uploader/client/config-compiler.js index 3fcb694d3..bcf25e9a2 100644 --- a/uploader/client/config-compiler.js +++ b/uploader/client/config-compiler.js @@ -9,7 +9,7 @@ return {}; } - const types = [...v.matchAll(/([\w*]+\/[\w*+.-]+)(\([\w,]*\))?/g)]; + const types = [...v.matchAll(/([\w*]+\/[\w*+.-]+)(\([.\w,]*\))?/g)]; const struct = {}; for (const t of types) { struct[t[1]] = t[2]