Skip to content
This repository was archived by the owner on Jun 10, 2025. It is now read-only.

Commit c98e9c2

Browse files
sgurinsgurin
authored
Merge pull request #100 from Kassaila/feature/master_global-update
master global update
2 parents d9b8e3f + b057b3a commit c98e9c2

24 files changed

+178
-199
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,6 @@ tmp
3838
# wordpress configs and uploads
3939
/wp-config.php
4040
/wp-content/uploads/*
41+
42+
#npm dependencies
43+
package-lock.json

‎.travis.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ branches:
44
only:
55
- master
66
node_js:
7+
- '12'
78
- '11'
89
- '10'
910
- '9'
10-
- '8'
11-
- '7'
12-
- '6'
11+
- '8'

‎gulp-config.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ module.exports = {
6666
'!package.json',
6767
'!package-lock.json',
6868
'!README.md',
69-
'!readme.txt'
69+
'!readme.txt',
70+
'!{sys_icon,sys_icon/**}'
7071
];
7172
},
7273
getPathesToCopy: function() {

‎gulpfile.js‎

Lines changed: 9 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,11 @@
2626
(() => {
2727
'use strict';
2828

29-
const cfg = require('./gulp-config.js'),
30-
gulp = require('gulp'),
31-
del = require('del'),
32-
path = require('path'),
33-
notifier = require('node-notifier'),
34-
gutil = require('gulp-util'),
35-
browserSync = require('browser-sync').create();
29+
const cfg = require('./gulp-config.js');
30+
const gulp = require('gulp');
31+
const del = require('del');
32+
const path = require('path');
33+
const browserSync = require('browser-sync').create();
3634

3735
/**
3836
* Require gulp task from file
@@ -86,20 +84,6 @@
8684
}
8785
}
8886

89-
/**
90-
* Show error in console
91-
* @param {String} preffix Title of the error
92-
* @param {String} err Error message
93-
*/
94-
function showError(preffix, err) {
95-
gutil.log(gutil.colors.white.bgRed(' ' + preffix + ' '), gutil.colors.white.bgBlue(' ' + err.message + ' '));
96-
notifier.notify({
97-
title: preffix,
98-
message: err.message
99-
});
100-
this.emit('end');
101-
}
102-
10387
/**
10488
* template HTML
10589
*/
@@ -127,8 +111,7 @@
127111
src: cfg.folder.src,
128112
dest: cfg.folder.build,
129113
mainJs: cfg.file.mainJs,
130-
checkProduction: true,
131-
showError: showError
114+
checkProduction: true
132115
});
133116

134117
/**
@@ -149,19 +132,15 @@
149132
dest: cfg.folder.build,
150133
mainScss: cfg.file.mainScss,
151134
mainScssMin: cfg.file.mainScssMin,
152-
versions: cfg.autoprefixer.versions,
153-
checkProduction: true,
154-
showError: showError
135+
checkProduction: true
155136
});
156137

157138
/**
158139
* Compile scss files listed in the config
159140
*/
160141
requireTask(`${cfg.task.buildSassFiles}`, `./${cfg.folder.tasks}/`, {
161142
sassFilesInfo: cfg.getPathesForSassCompiling(),
162-
dest: cfg.folder.build,
163-
versions: cfg.autoprefixer.versions,
164-
showError: showError
143+
dest: cfg.folder.build
165144
});
166145

167146
/**
@@ -171,8 +150,7 @@
171150
src: cfg.folder.src,
172151
dest: cfg.folder.build,
173152
vendorScss: cfg.file.vendorScss,
174-
vendorScssMin: cfg.file.vendorScssMin,
175-
showError: showError
153+
vendorScssMin: cfg.file.vendorScssMin
176154
});
177155

178156
/**

‎index.html‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<!DOCTYPE html>
22
<html lang="en">
33

4-
<head>
5-
<meta charset="utf-8">
6-
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7-
<title>Web Starter Kit</title>
8-
<link media="all" rel="stylesheet" href="assets/css/vendor.min.css">
9-
<link media="all" rel="stylesheet" href="assets/css/styles.min.css">
10-
</head>
4+
<head>
5+
<meta charset="utf-8">
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7+
<title>Web Starter Kit</title>
8+
<link media="all" rel="stylesheet" href="assets/css/vendor.min.css">
9+
<link media="all" rel="stylesheet" href="assets/css/styles.min.css">
10+
</head>
1111

1212
<body>
1313
<div class="wrapper">
@@ -23,4 +23,5 @@ <h1>JustCoded</h1>
2323
<script src="assets/js/vendor.min.js" defer></script>
2424
<script src="assets/js/app.js" defer></script>
2525
</body>
26+
2627
</html>

‎package.json‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,35 +19,34 @@
1919
},
2020
"homepage": "https://github.com/justcoded/web-starter-kit",
2121
"devDependencies": {
22-
"@babel/core": "^7.5.5",
23-
"@babel/preset-env": "^7.5.5",
22+
"@babel/core": "^7.7.2",
23+
"@babel/preset-env": "^7.7.1",
2424
"babelify": "^10.0.0",
25-
"browser-sync": "^2.18.0",
25+
"browser-sync": "^2.26.7",
2626
"browserify": "^16.5.0",
27-
"del": "^3.0.0",
27+
"del": "^5.1.0",
2828
"eslint-config-airbnb-base": "^14.0.0",
29-
"eslint-plugin-import": "^2.14.0",
29+
"eslint-plugin-import": "^2.18.2",
3030
"files-exist": "^1.1.0",
31-
"gulp": "^4.0.0",
32-
"gulp-autoprefixer": "^4.0.0",
31+
"gulp": "^4.0.2",
32+
"gulp-autoprefixer": "^7.0.1",
3333
"gulp-concat": "^2.6.1",
34-
"gulp-cssimport": "^5.0.0",
35-
"gulp-cssnano": "^2.1.2",
36-
"gulp-debug": "^3.1.0",
37-
"gulp-eslint": "^5.0.0",
38-
"gulp-file-include": "^2.0.1",
39-
"gulp-group-css-media-queries": "^1.2.0",
40-
"gulp-htmlhint": "^0.3.1",
41-
"gulp-if": "^2.0.2",
42-
"gulp-imagemin": "^4.1.0",
43-
"gulp-newer": "^1.3.0",
44-
"gulp-notify": "^3.0.0",
45-
"gulp-rename": "^1.2.2",
34+
"gulp-cssimport": "^7.0.0",
35+
"gulp-cssnano": "^2.1.3",
36+
"gulp-debug": "^4.0.0",
37+
"gulp-eslint": "^6.0.0",
38+
"gulp-file-include": "^2.1.1",
39+
"gulp-group-css-media-queries": "^1.2.2",
40+
"gulp-htmlhint": "^2.2.1",
41+
"gulp-if": "^3.0.0",
42+
"gulp-imagemin": "^6.1.1",
43+
"gulp-newer": "^1.4.0",
44+
"gulp-notify": "^3.2.0",
45+
"gulp-rename": "^1.4.0",
4646
"gulp-sass": "^4.0.2",
47-
"gulp-sourcemaps": "^2.4.1",
48-
"gulp-uglify": "^3.0.0",
47+
"gulp-sourcemaps": "^2.6.5",
48+
"gulp-uglify": "^3.0.2",
4949
"htmlhint-stylish": "^1.0.3",
50-
"node-notifier": "^5.0.2",
5150
"path": "^0.12.7",
5251
"vinyl-source-stream": "^2.0.0"
5352
},
@@ -61,7 +60,7 @@
6160
},
6261
"dependencies": {
6362
"include-media": "^1.4.9",
64-
"jquery": "^3.3.1",
65-
"normalize.css": "^5.0.0"
63+
"jquery": "^3.4.1",
64+
"normalize.css": "^8.0.1"
6665
}
6766
}

‎src/html/partials/scripts/common.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<script src="assets/js/vendor.min.js" defer></script>
2+
<script src="assets/js/app.js" defer></script>

‎src/html/templates/index.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<!DOCTYPE html>
22
<html lang="en">
33

4-
@@include('../partials/head/head.html')
4+
@@include('../partials/head/head.html')
55

66
<body>
77
<div class="wrapper">
88
@@include('../partials/components/entry-section.html')
9-
@@include('../partials/components/starter-box.html', {
10-
"title": "JustCoded",
11-
"intro-text": "Web Starter Kit"
9+
@@include('../partials/components/starter-box.html', {
10+
"title": "JustCoded",
11+
"intro-text": "Web Starter Kit"
1212
})
1313
</div>
1414

15-
<script src="assets/js/vendor.min.js" defer></script>
16-
<script src="assets/js/app.js" defer></script>
15+
@@include('../partials/scripts/common.html')
1716
</body>
17+
1818
</html>

‎sys_icon/error_icon.png‎

9.41 KB
Loading

‎tasks/browser-sync-server.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
*/
44
'use strict';
55

6-
const fs = require('fs');
6+
const fs = require('fs');
77

8-
module.exports = function(options) {
8+
module.exports = function (options) {
99

1010
return () => {
1111
// If index.html exist - open it, else show folder
@@ -27,5 +27,4 @@ module.exports = function(options) {
2727
port: 8080
2828
});
2929
};
30-
3130
};

0 commit comments

Comments
 (0)