update node, remove unused packages, update jquery

Author: paskal

frontend/.gitignore

@@ -1,3 +1,4 @@
 dev/_blocks/
 node_modules/
-public/
+public/
+package-lock.json

frontend/dev/blocks/footer/footer.html

@@ -1,3 +1,3 @@
 <div class="footer wrapper page__footer">
-	<a href="#" class="link footer__copyright">uReadability</a>, <script>document.write((new Date()).getFullYear());</script>
+	<a href="#" class="link footer__copyright">uReadability</a>, <script>document.write((new Date()).getFullYear().toString());</script>
 </div>

frontend/dev/includes/head.html

@@ -10,7 +10,7 @@
 
 	<link rel="stylesheet" href="/css/main.css">
 
-	<script src="//yastatic.net/jquery/2.1.4/jquery.min.js"></script>
+	<script src="https://code.jquery.com/jquery-4.0.0-beta.min.js"></script>
 
 	<script src="/js/main.js"></script>
 </head>

frontend/dev/includes/head_admin.html

@@ -19,7 +19,7 @@
 
 	<link rel="stylesheet" href="/css/main.css">
 
-	<script src="//yastatic.net/jquery/2.1.4/jquery.min.js"></script>
+	<script src="https://code.jquery.com/jquery-4.0.0-beta.min.js"></script>
 
 	<script src="/js/main.js"></script>
 </head>

frontend/gulpfile.js

@@ -1,22 +1,20 @@
 /* requires */
 
-import url from "gulp-css-url-adjuster";
-import uglify from "gulp-uglify";
 import fileinclude from "gulp-file-include";
 import concat from "gulp-concat";
 import cache from "gulp-cached";
 import browserSync from "browser-sync";
-import ifelse from "gulp-if";
-import util from "gulp-util";
 import rename from "gulp-rename";
 import {deleteAsync} from 'del';
-import addsrc from "gulp-add-src";
+import log from "fancy-log";
 import importOnce from "node-sass-import-once";
 import autoprefixer from "autoprefixer";
 import postcss from "gulp-postcss";
 import gulp from "gulp";
 import gulpSass from 'gulp-sass';
-import sassCompiler from 'sass';
+import * as sassCompiler from 'sass';
+import merge from "merge-stream";
+
 const sass = gulpSass(sassCompiler);
 
 /* paths */
@@ -44,14 +42,12 @@ const mask = {
 		images: 'public/images',
 		files: 'public/files',
 		fonts: 'public/fonts'
-	},
-	isProduction = (util.env.type === 'production'),
-	isDeploy = (util.env.type === 'deploy');
+	};
 
 gulp.task('html', function(cb) {
 	gulp.src(input.html)
 		.pipe(fileinclude())
-		.on('error', util.log)
+		.on('error', log)
 		.pipe(cache('htmling'))
 		.pipe(gulp.dest(output.main))
 		.pipe(browserSync.stream());
@@ -60,17 +56,15 @@ gulp.task('html', function(cb) {
 
 gulp.task('scss', function(cb) {
 	gulp.src(input.scss)
-		.pipe(sass({importer: importOnce}, false).on('error', util.log))
+		.pipe(sass({importer: importOnce}, false).on('error', log))
 		.pipe(gulp.dest(input.css))
 	cb();
 });
 
 gulp.task('css', function(cb) {
 	gulp.src(mask.css)
 		.pipe(cache('cssing'))
-		.pipe(postcss([autoprefixer({browsers: ["> 1%"]})]))
-		.pipe(url({replace: [/^i-/, '../images/i-']}))
-		.pipe(url({replace: [/^f-/, '../fonts/f-']}))
+		.pipe(postcss([autoprefixer()]))
 		.pipe(gulp.dest(output.css))
 		.pipe(browserSync.stream());
 	cb();
@@ -93,12 +87,12 @@ gulp.task('files', function(cb) {
 });
 
 gulp.task('js', function(cb) {
-	gulp.src(mask.js_f)
-		.pipe(concat('main.js'))
-		.pipe(addsrc(mask.js_b))
+	const js_f = gulp.src(mask.js_f).pipe(concat('main.js'));
+	const js_b = gulp.src(mask.js_b).pipe(concat('main.js'));
+
+	merge(js_f, js_b)
 		.pipe(concat('main.js'))
 		.pipe(cache('jsing'))
-		.pipe(ifelse(isProduction || isDeploy, uglify()))
 		.pipe(gulp.dest(output.js))
 		.pipe(browserSync.stream());
 	cb();

frontend/package.json

@@ -9,23 +9,23 @@
     "url": "git+https://github.com/igoradamenko/ureadability-ui.git"
   },
   "devDependencies": {
-    "autoprefixer": "^8.6.5",
+    "autoprefixer": "^10.4.19",
     "browser-sync": "^3.0.2",
     "del": "^7.1.0",
+    "fancy-log": "^2.0.0",
     "gulp": "^5.0.0",
-    "gulp-add-src": "^1.0.0",
-    "gulp-cached": "^1.1.0",
-    "gulp-concat": "^2.6.0",
-    "gulp-css-url-adjuster": "^0.2.3",
+    "gulp-cached": "^1.1.1",
+    "gulp-concat": "^2.6.1",
     "gulp-file-include": "^2.3.0",
-    "gulp-if": "^3.0.0",
     "gulp-postcss": "^10.0.0",
     "gulp-rename": "^2.0.0",
     "gulp-sass": "^5.1.0",
-    "gulp-uglify": "^3.0.2",
-    "gulp-util": "^3.0.5",
+    "merge-stream": "^2.0.0",
     "node-sass-import-once": "^1.2.0",
     "sass": "^1.77.4"
   },
+  "browserslist": [
+    "> 1%"
+  ],
   "scripts": {}
 }