diff --git a/Dockerfile b/Dockerfile index ffda090..c2dc6c7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ ADD frontend/package.json frontend/package-lock.json /opt/obs/frontend/ RUN echo update-notifier=false >> ~/.npmrc RUN npm ci -ADD frontend/tsconfig.json frontend/craco.config.js /opt/obs/frontend/ +ADD frontend/tsconfig.json frontend/index.html frontend/webpack.config.js /opt/obs/frontend/ ADD frontend/src /opt/obs/frontend/src/ ADD frontend/public /opt/obs/frontend/public/ diff --git a/frontend/Dockerfile b/frontend/Dockerfile index cc3a330..9cba699 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -5,6 +5,6 @@ ADD package.json package-lock.json /opt/obs/frontend/ RUN echo update-notifier=false >> ~/.npmrc RUN npm ci -ADD tsconfig.json craco.config.js /opt/obs/frontend/ +ADD tsconfig.json index.html webpack.config.js /opt/obs/frontend/ ADD public/ /opt/obs/frontend/public/ ADD src/ /opt/obs/frontend/src/ diff --git a/frontend/Dockerfile-prod b/frontend/Dockerfile-prod index 805ee9b..878bbe3 100644 --- a/frontend/Dockerfile-prod +++ b/frontend/Dockerfile-prod @@ -9,7 +9,7 @@ ADD package.json package-lock.json /opt/obs/frontend/ RUN echo update-notifier=false >> ~/.npmrc RUN npm ci -ADD tsconfig.json craco.config.js /opt/obs/frontend/ +ADD tsconfig.json index.html webpack.config.js /opt/obs/frontend/ ADD public/ /opt/obs/frontend/public/ ADD src/ /opt/obs/frontend/src/ diff --git a/frontend/craco.config.js b/frontend/craco.config.js deleted file mode 100644 index 235f963..0000000 --- a/frontend/craco.config.js +++ /dev/null @@ -1,18 +0,0 @@ -module.exports = { - plugins: [ - {plugin: require('@semantic-ui-react/craco-less')}, - { - plugin: { - overrideWebpackConfig: ({webpackConfig, cracoConfig, pluginOptions, context: {env, paths}}) => { - webpackConfig.resolve.alias = { - ...webpackConfig.resolve.alias, - 'mapbox-gl': 'maplibre-gl', - } - - return webpackConfig - }, - options: {}, - }, - }, - ], -} diff --git a/frontend/public/index.html b/frontend/index.html similarity index 72% rename from frontend/public/index.html rename to frontend/index.html index 5eb5a6d..6b5efab 100644 --- a/frontend/public/index.html +++ b/frontend/index.html @@ -3,19 +3,20 @@