diff --git a/react/package.json b/react/package.json index fab8aec..9dd3a2f 100644 --- a/react/package.json +++ b/react/package.json @@ -5,8 +5,7 @@ "main": "src/index.js", "scripts": { "start": "webpack-dashboard -t 'EDEX-ReactJS' -- webpack-dev-server --colors --no-info", - "build": "rm -rf ./build && NODE_ENV=\"production\" webpack", - "build_dist": " webpack -p --config ./webpack.config.js", + "build": "rm -rf ./build && mkdir build && mkdir build/assets && cp -R src/assets build/ && NODE_ENV=\"production\" webpack", "lint-break-on-errors": "eslint ./src ./webpack.config.js -f table --ext .js --ext .jsx", "lint": "eslint ./src ./webpack.config.js -f table --ext .js --ext .jsx || true", "preview": "NODE_ENV=\"production\" ./node_modules/webpack-dashboard/bin/webpack-dashboard.js -t 'Preview Mode - EDEX' -- ./node_modules/webpack-dev-server/bin/webpack-dev-server.js", diff --git a/react/src/styles/index.scss b/react/src/styles/index.scss index 34f7b71..7eceb0c 100644 --- a/react/src/styles/index.scss +++ b/react/src/styles/index.scss @@ -1,7 +1,3 @@ -@import '../components/addcoin/addcoin.scss'; -@import '../components/dashboard/dashboard.scss'; -@import '../components/login/login.scss'; - @import '../assets/global/css/bootstrap.min.css'; @import '../assets/global/css/bootstrap-extend.min.css'; @import '../assets/global/css/alertify.css'; @@ -34,6 +30,9 @@ @import '../assets/global/fonts/brand-icons/brand-icons.min.css'; @import '../assets/skins/orange.min.css'; @import '../../node_modules/rc-tree/assets/index.css'; +@import '../components/addcoin/addcoin.scss'; +@import '../components/dashboard/dashboard.scss'; +@import '../components/login/login.scss'; #app > div { height: 100%; diff --git a/react/webpack.config.js b/react/webpack.config.js index ca28b7f..2d761cf 100644 --- a/react/webpack.config.js +++ b/react/webpack.config.js @@ -122,7 +122,13 @@ if (isProduction) { test: /\.scss$/, loader: ExtractTextPlugin.extract({ fallback: 'style-loader', - use: 'css-loader!postcss-loader!sass-loader!file-loader!url-loader', + use: [ + 'css-loader', + 'postcss-loader', + 'sass-loader' + //'file-loader', + //'url-loader' + ] }), } );