Andrey Titovskiy 3 vuotta sitten
vanhempi
commit
8a57934474
8 muutettua tiedostoa jossa 1965 lisäystä ja 16584 poistoa
  1. 0 1
      build/assets/css/main.85d05490.css.map
  2. 7 14858
      build/index.js
  3. 1 1
      build/index.js.map
  4. 1129 925
      build/assets/css/main.85d05490.css
  5. 1 0
      build/style.css.map
  6. 12 13
      package.json
  7. 16 37
      webpack.config.js
  8. 799 749
      yarn.lock

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 1
build/assets/css/main.85d05490.css.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 7 - 14858
build/index.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
build/index.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1129 - 925
build/assets/css/main.85d05490.css


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 0
build/style.css.map


+ 12 - 13
package.json

@@ -8,7 +8,7 @@
   },
   "author": "Unicraft TEAM",
   "devDependencies": {
-    "autoprefixer": "^9.5.1",
+    "autoprefixer": "^9.8.8",
     "babel-cli": "^6.16.0",
     "babel-core": "^6.26.0",
     "babel-loader": "^7.1.5",
@@ -20,21 +20,20 @@
     "clean-webpack-plugin": "^0.1.19",
     "css-loader": "^1.0.1",
     "css-raw-loader": "^0.1.2",
-    "extract-text-webpack-plugin": "^3.0.2",
-    "file-loader": "^0.11.1",
-    "html-webpack-plugin": "^2.30.1",
-    "moment": "^2.24.0",
-    "node-sass": "^4.9.3",
+    "file-loader": "^0.11.2",
+    "node-sass": "^4.14.1",
     "postcss-loader": "^3.0.0",
     "prop-types": "^15.6.2",
-    "react": "^16.4.2",
-    "react-dom": "^16.4.2",
+    "react": "^16.14.0",
+    "react-dom": "^16.14.0",
     "react-router-dom": "^4.3.1",
-    "sass-loader": "^6.0.6",
-    "style-loader": "^0.19.0",
-    "webpack": "^3.8.1"
+    "sass-loader": "^6.0.7",
+    "style-loader": "^0.19.1",
+    "webpack": "^4.46.0",
+    "webpack-cli": "^4.10.0"
   },
   "dependencies": {
-    "classnames": "^2.2.6"
+    "classnames": "^2.3.1",
+    "mini-css-extract-plugin": "^1.6.2"
   }
-}
+}

+ 16 - 37
webpack.config.js

@@ -1,7 +1,6 @@
 const path = require('path');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
 const CleanWebpackPlugin = require("clean-webpack-plugin");
-const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 const autoprefixer = require('autoprefixer');
 
 const outputDirectory = "build";
@@ -30,39 +29,18 @@ module.exports = {
 			},
 			{
 				test: /\.(sa|sc|c)ss$/,
-				use: ExtractTextPlugin.extract({
-					fallback: 'style-loader',
-					use: [
-						{
-							loader: "css-loader",
-							options: {
-								sourceMap: true
-							}
-						},
-						{
-							loader: 'postcss-loader',
-							options: {
-								plugins: [
-									autoprefixer({
-										Browserslist: [
-											'>1%',
-											'last 4 versions',
-											'Firefox ESR',
-											'not ie < 9', // React doesn't support IE8 anyway
-										]
-									})
-								],
-								sourceMap: true
-							}
-						},
-						{
-							loader: "sass-loader",
-							options: {
-								sourceMap: true
-							}
+				use: [
+					MiniCssExtractPlugin.loader,
+					{
+						loader: "css-loader",
+						options: {
+							modules: true,
+							sourceMap: true,
+							importLoader: 2
 						}
-					]
-				})
+					},
+					"sass-loader"
+				]
 			},
 			{
 				test: /\.(cur|ico|jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2)(\?.*)?$/,
@@ -91,8 +69,9 @@ module.exports = {
 	},
 	plugins: [
 		new CleanWebpackPlugin([outputDirectory]),
-		new ExtractTextPlugin({
-			filename: 'assets/css/[name].[contenthash:8].css'
-		}),
+		new MiniCssExtractPlugin({
+			filename: "style.css",
+			chunkFilename: "[name].css"
+		})
 	]
 };

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 799 - 749
yarn.lock