From 2da05f32cd72b677ccfebb159ecad285f181d1d3 Mon Sep 17 00:00:00 2001 From: Constantin Bergatt Date: Thu, 5 Sep 2024 13:18:42 +0200 Subject: [PATCH] DMED-119 - fix handling of web component files --- Dockerfile | 3 --- config/webpack/webpack.common.js | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index d436e20a76..8036526997 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,9 +17,6 @@ ARG SC_THEME=default ENV SC_THEME ${SC_THEME} RUN NODE_ENV=production npm run build -# we need to copy the public/content folder after the build step, because the build step will add the web component files to the public folder -COPY public/content ./public/content - COPY .git ./.git RUN echo "{\"sha\": \"$(git rev-parse HEAD)\", \"version\": \"$(git describe --tags --abbrev=0)\", \"commitDate\": \"$(git log -1 --format=%cd --date=format:'%Y-%m-%dT%H:%M:%SZ')\", \"birthdate\": \"$(date +%Y-%m-%dT%H:%M:%SZ)\"}" > ./dist/nuxtversion diff --git a/config/webpack/webpack.common.js b/config/webpack/webpack.common.js index 7bf5e480e8..738d787bd6 100644 --- a/config/webpack/webpack.common.js +++ b/config/webpack/webpack.common.js @@ -96,6 +96,7 @@ module.exports = { "**/.DS_Store", path.resolve(__base, "public/index.html"), path.resolve(__base, "public/themes/**/*"), + path.resolve(__base, "public/content/**/*"), ], }, info: { @@ -107,7 +108,7 @@ module.exports = { __base, "node_modules/ngx-edu-sharing-app-as-web-component" ), - to: path.resolve(__base, "public/content/vendor/edu-sharing"), + to: path.resolve(__base, "dist/content/vendor/edu-sharing"), }, ], }),