diff --git a/.env b/.env index 287ea18..2d9ff85 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ -PHP_BASE_IMAGE=php:7.2-cli +PHP_BASE_IMAGE=php:7.3-rc-cli PHP_IMAGE=homepage-php NODE_IMAGE=node:10 diff --git a/Makefile b/Makefile index 7394c3b..ddd02aa 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ build-docker: - ./tools/build + ./tools/build-docker build-assets: ./tools/npm run build diff --git a/webpack.config.js b/webpack.config.js index 885b40c..18c7965 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -51,7 +51,7 @@ module.exports = (env = {}) => { MINI_CSS_LOADER, //'vue-style-loader', CSS_LOADER, POSTCSS_LOADER, - 'sass-loader', + SCSS_LOADER, ], }, }, @@ -79,18 +79,12 @@ module.exports = (env = {}) => { }, { test: /\.css$/, - use: [ - MINI_CSS_LOADER, - // STYLE_LOADER, - CSS_LOADER, - POSTCSS_LOADER, - ], + use: [MINI_CSS_LOADER, CSS_LOADER, POSTCSS_LOADER], }, { test: /\.scss$/, use: [ MINI_CSS_LOADER, - // STYLE_LOADER, CSS_LOADER, POSTCSS_LOADER, SCSS_LOADER,