Use webfonts from jslib instead of downloading them using gulp (#1089)

* Use webfonts from jslib instead of downloading them using gulp

* Remove accidental command for disabling certificates

* Bump jslib

gulpfile.js

@@ -1,28 +0,0 @@
-const gulp = require('gulp');
-const googleWebFonts = require('gulp-google-webfonts');
-const del = require('del');
-
-const paths = {
-    cssDir: './src/css/',
-    node_modules: './node_modules/',
-    dist: './dist/',
-    resources: './resources/',
-};
-
-function clean() {
-    return del([paths.cssDir]);
-}
-
-function webfonts() {
-    return gulp.src('./webfonts.list')
-        .pipe(googleWebFonts({
-            fontsDir: 'webfonts',
-            cssFilename: 'webfonts.css',
-            format: 'woff',
-        }))
-        .pipe(gulp.dest(paths.cssDir));
-}
-
-exports.clean = clean;
-exports.webfonts = gulp.series(clean, webfonts);
-exports['prebuild:renderer'] = webfonts;

jslib

@@ -1 +1 @@
-Subproject commit ed8d39ed85fee7e00520618f0bb831a87438b610
+Subproject commit 2c892eb3a2a9aff1e238146b037e6f3eb5dacf9a

package.json

@@ -33,9 +33,9 @@
     "build:dev": "concurrently -n Main,Rend -c yellow,cyan \"npm run build:main:dev\" \"npm run build:renderer:dev\"",
     "build:main": "cross-env NODE_ENV=production webpack --config webpack.main.js",
     "build:main:dev": "cross-env NODE_ENV=development webpack --config webpack.main.js",
-    "build:renderer": "gulp prebuild:renderer && cross-env NODE_ENV=production webpack --config webpack.renderer.js",
+    "build:renderer": "cross-env NODE_ENV=production webpack --config webpack.renderer.js",
-    "build:renderer:dev": "gulp prebuild:renderer && cross-env NODE_ENV=development webpack --config webpack.renderer.js",
+    "build:renderer:dev": "cross-env NODE_ENV=development webpack --config webpack.renderer.js",
-    "build:renderer:watch": "gulp prebuild:renderer && cross-env NODE_ENV=development webpack --config webpack.renderer.js --watch",
+    "build:renderer:watch": "cross-env NODE_ENV=development webpack --config webpack.renderer.js --watch",
     "electron": "npm run build:main:dev && concurrently -k -n Main,Rend -c yellow,cyan \"electron --inspect=5858 ./build --watch\" \"npm run build:renderer:watch\"",
     "clean:dist": "rimraf ./dist/*",
     "clean:l10n": "git push origin --delete l10n_master",
@@ -266,8 +266,6 @@
     "electron-reload": "^1.5.0",
     "file-loader": "^6.2.0",
     "font-awesome": "4.7.0",
-    "gulp": "^4.0.2",
-    "gulp-google-webfonts": "^4.0.0",
     "html-loader": "^1.3.2",
     "html-webpack-plugin": "^4.5.1",
     "mini-css-extract-plugin": "^1.5.0",

src/scss/styles.scss

@@ -1,4 +1,4 @@
-@import "../css/webfonts.css";
+@import "../../jslib/angular/src/scss/webfonts.css";
 @import "variables.scss";
 @import "base.scss";
 @import "grid.scss";

webfonts.list

@@ -1 +0,0 @@
-Open+Sans:300,300i,400,400i,600,600i,700,700i,800,800i&subset=cyrillic,cyrillic-ext,greek,greek-ext,latin-ext