Skip to content
This repository was archived by the owner on Dec 7, 2023. It is now read-only.

Commit 1f728e8

Browse files
authored
Merge pull request #12 from webtime-studio/feature/add-preload-and-svg-sprites
Добавляет PreloadWebpackPlugin, SpriteLoaderPlugin обновляет зависимости
2 parents c538527 + d7cfce8 commit 1f728e8

File tree

9 files changed

+14581
-24
lines changed

9 files changed

+14581
-24
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<h1 align="center">Create HTML boilerplate</h1>
22
<p>
3-
<img alt="Version" src="https://img.shields.io/badge/version-1.0.0-green.svg?cacheSeconds=2592000" />
3+
<img alt="Version" src="https://img.shields.io/badge/version-1.2.0-green.svg?cacheSeconds=2592000" />
44
<img src="https://img.shields.io/badge/node-%5E10.18-green.svg" />
55
</p>
66

package-lock.json

Lines changed: 14554 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "create-html-boilerplate",
3-
"version": "1.0.1",
3+
"version": "1.2.0",
44
"description": "create-html-boilerplate",
55
"scripts": {
66
"stylelint": "stylelint \"source/scss/**/*.(scss|css)\"",
@@ -10,15 +10,12 @@
1010
"prettier": "prettier --write \"source/(scss|js)/**/*.(scss|css|js|json)\"",
1111
"start": "webpack-dev-server --open"
1212
},
13-
"engines": {
14-
"node": "^10.16"
15-
},
1613
"dependencies": {
1714
"concurrently": "^5.3.0",
1815
"picturefill": "^3.0.3"
1916
},
2017
"devDependencies": {
21-
"autoprefixer": "9.8.6",
18+
"autoprefixer": "10.0.0",
2219
"babel-loader": "8.1.0",
2320
"clean-webpack-plugin": "^3.0.0",
2421
"copy-webpack-plugin": "6.0.3",
@@ -35,17 +32,21 @@
3532
"node-sass": "4.14.1",
3633
"optimize-css-assets-webpack-plugin": "5.0.3",
3734
"postcss-loader": "3.0.0",
35+
"preload-webpack-plugin": "^3.0.0-beta.3",
3836
"prettier": "^2.0.5",
3937
"raw-loader": "4.0.1",
40-
"sass-loader": "9.0.3",
41-
"stylelint": "13.6.1",
38+
"sass-loader": "10.0.2",
39+
"stylelint": "13.7.1",
4240
"stylelint-config-prettier": "^8.0.2",
4341
"stylelint-config-recommended-scss": "^4.2.0",
4442
"stylelint-config-standard": "^20.0.0",
4543
"stylelint-prettier": "^1.1.2",
4644
"stylelint-scss": "^3.18.0",
47-
"terser-webpack-plugin": "4.1.0",
48-
"webpack": "^4.44.1",
45+
"svg-sprite-loader": "^5.0.0",
46+
"svgo": "^1.3.2",
47+
"svgo-loader": "^2.2.1",
48+
"terser-webpack-plugin": "4.2.2",
49+
"webpack": "^4.44.2",
4950
"webpack-cli": "3.3.12",
5051
"webpack-dev-server": "3.11.0"
5152
}

postcss.config.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

source/html/views/index.html

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44
<meta charset="UTF-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
66
<meta name="format-detection" content="telephone=no" />
7-
<meta
8-
name="description"
9-
content="HTML5 webpack boilerplate"
10-
/>
7+
<meta name="description" content="HTML5 webpack boilerplate" />
118
<title>HTML5 webpack boilerplate</title>
129
<link rel="stylesheet" href="/vendors/normalize-css/normalize.min.css" />
1310
<script>

source/js/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// Это - ваша точка входа для скриптов страницы. Импортируйте сюда нужные вам файлы.
22

3-
import "./script";
3+
import './script';

source/scss/blocks/nav.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
display: flex;
33
justify-content: center;
44
padding: 20px 0;
5-
65
}
76

87
.nav__logo {

source/scss/font-face.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
@font-face {
44
font-family: "Roboto";
5-
src:
6-
url("../fonts/Roboto-Regular.woff2") format("woff2"),
5+
src: url("../fonts/Roboto-Regular.woff2") format("woff2"),
76
url("../fonts/Roboto-Regular.woff") format("woff");
87
font-weight: normal;
98
font-style: normal;

webpack.config.js

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ const ImageminPlugin = require('imagemin-webpack-plugin').default;
1010
const ImageminWebpWebpackPlugin = require('imagemin-webp-webpack-plugin');
1111
const TerserPlugin = require('terser-webpack-plugin');
1212
const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
13+
const PreloadWebpackPlugin = require('preload-webpack-plugin');
14+
const SpriteLoaderPlugin = require('svg-sprite-loader/plugin');
1315

1416
const isProd = process.argv.indexOf('-p') !== -1;
1517

@@ -40,7 +42,7 @@ module.exports = {
4042
entry: {
4143
bundle: './source/js/index.js',
4244
libs: ['picturefill'],
43-
style: './source/scss/style.scss'
45+
style: './source/scss/style.scss',
4446
},
4547
devtool: 'inline-source-map',
4648
devServer: {
@@ -72,6 +74,11 @@ module.exports = {
7274
},
7375
{
7476
loader: 'postcss-loader',
77+
options: {
78+
postcssOptions: {
79+
plugins: [['autoprefixer']],
80+
},
81+
},
7582
},
7683
{
7784
loader: 'sass-loader',
@@ -88,12 +95,17 @@ module.exports = {
8895
plugins: [
8996
new webpack.ProgressPlugin(),
9097
new CleanWebpackPlugin(),
98+
new SpriteLoaderPlugin(),
9199
new MiniCssExtractPlugin({
92100
filename: 'css/[name].min.css',
93101
}),
94102
new HtmlWebpackPlugin({
95103
template: 'source/html/views/index.html',
96104
}),
105+
new PreloadWebpackPlugin({
106+
rel: 'preload',
107+
include: 'allChunks', // or 'initial', or 'allAssets'
108+
}),
97109
new CopyWebpackPlugin({
98110
patterns: [
99111
{

0 commit comments

Comments
 (0)