diff --git a/Dockerfile b/Dockerfile index b013b6c..28a57ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:10-slim AS builder +FROM node:12-slim AS builder WORKDIR / @@ -14,7 +14,7 @@ ADD src /src RUN yarn build -FROM nginx:1.17-alpine +FROM nginx:1.18-alpine # move this file, as /etc/nginx/ will be masked by a volume RUN cp /etc/nginx/mime.types /mime.types diff --git a/config/webpack.config.dev.js b/config/webpack.config.dev.js index 07f22d3..55871d4 100644 --- a/config/webpack.config.dev.js +++ b/config/webpack.config.dev.js @@ -167,22 +167,8 @@ module.exports = { { loader: require.resolve('postcss-loader'), options: { - // Necessary for external CSS imports to work - // https://github.com/facebookincubator/create-react-app/issues/2677 - ident: 'postcss', - plugins: () => [ - require('postcss-flexbugs-fixes'), - autoprefixer({ - browsers: [ - '>1%', - 'last 4 versions', - 'Firefox ESR', - 'not ie < 9', // React doesn't support IE8 anyway - ], - flexbox: 'no-2009', - }), - ], - }, + options: {} + } }, ], }, diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js index b7ec2cd..00ffad0 100644 --- a/config/webpack.config.prod.js +++ b/config/webpack.config.prod.js @@ -187,22 +187,8 @@ module.exports = { { loader: require.resolve('postcss-loader'), options: { - // Necessary for external CSS imports to work - // https://github.com/facebookincubator/create-react-app/issues/2677 - ident: 'postcss', - plugins: () => [ - require('postcss-flexbugs-fixes'), - autoprefixer({ - browsers: [ - '>1%', - 'last 4 versions', - 'Firefox ESR', - 'not ie < 9', // React doesn't support IE8 anyway - ], - flexbox: 'no-2009', - }), - ], - }, + options: {} + } }, ], }, diff --git a/package.json b/package.json index 5fab3b9..bc77732 100644 --- a/package.json +++ b/package.json @@ -4,20 +4,20 @@ "private": true, "homepage": "https://green-spider.netzbegruenung.de", "dependencies": { - "axios": "^0.19.2", + "axios": "^0.21.1", "bootstrap": ">=4.4.1", - "chalk": "^3.0.0", + "chalk": "^4.1.0", "chroma-js": "^2.1.0", "css-loader": "0.28.11", "dotenv": "^8.2.0", "dotenv-expand": "^5.1.0", - "fs-extra": "8.1.0", + "fs-extra": "9.0.1", "history": "^4.10.1", - "jest": "25.5.4", - "lodash": "^4.17.13", + "jest": "26.6.3", + "lodash": "^4.17.20", "merge": "1.2.1", "object-assign": "4.1.1", - "promise": "^8.0.3", + "promise": "^8.1.0", "prop-types": "^15.7.2", "punycode": "^2.1.1", "raf": "^3.4.1", @@ -27,14 +27,14 @@ "react-infinite-scroller": "^1.2.4", "react-router-dom": "^5.1.2", "react-transition-group": "^4.3.0", - "resolve": "^1.15.1", + "resolve": "^1.19.0", "style-loader": "^0.23.1", "sw-precache-webpack-plugin": "^0.11.5", "underscore": "^1.10.2", "whatwg-fetch": "3.0.0" }, "devDependencies": { - "autoprefixer": "^9.7.5", + "autoprefixer": "^10.1.0", "babel-core": "^6.26.3", "babel-eslint": "9.0.0", "babel-jest": "23.6.0", @@ -53,7 +53,6 @@ "file-loader": "2.0.0", "html-webpack-plugin": "3.2.0", "js-yaml": "^3.13.1", - "postcss-flexbugs-fixes": "4.2.0", "postcss-loader": "3.0.0", "url-loader": "1.1.2", "webpack": "3.8.1", @@ -106,5 +105,11 @@ }, "eslintConfig": { "extends": "react-app" - } + }, + "browserslist": [ + ">1%", + "last 4 versions", + "Firefox ESR", + "not ie < 9" + ] } diff --git a/public/index.html b/public/index.html index bd8d24f..459bb94 100644 --- a/public/index.html +++ b/public/index.html @@ -19,14 +19,5 @@
- - -