Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-29 12:55:21 +01:00
Code Issues Projects Releases Wiki Activity

Use webfonts from jslib instead of downloading them using gulp

Browse Source
This commit is contained in:
Hinton 2021-09-24 13:00:58 +02:00
parent f1dcbdb6de
commit ee1af34e2e
6 changed files with 1456 additions and 1706 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gulpfile.js
View File

@ -2,7 +2,6 @@ const gulp = require('gulp'),
gulpif = require('gulp-if'), gulpif = require('gulp-if'),
filter = require('gulp-filter'), filter = require('gulp-filter'),
replace = require('gulp-replace'), replace = require('gulp-replace'),
googleWebFonts = require('gulp-google-webfonts'),
jeditor = require("gulp-json-editor"), jeditor = require("gulp-json-editor"),
child = require('child_process'), child = require('child_process'),
zip = require('gulp-zip'), zip = require('gulp-zip'),
@ -204,15 +203,6 @@ function stdOutProc(proc) {
proc.stderr.on('data', (data) => console.error(data.toString())); proc.stderr.on('data', (data) => console.error(data.toString()));
} }
function webfonts() {
return gulp.src('./webfonts.list')
.pipe(googleWebFonts({
fontsDir: 'webfonts',
cssFilename: 'webfonts.css'
}))
.pipe(gulp.dest(paths.cssDir));
}
function ciCoverage(cb) { function ciCoverage(cb) {
return gulp.src(paths.coverage + '**/*') return gulp.src(paths.coverage + '**/*')
.pipe(filter(['**', '!coverage/coverage*.zip'])) .pipe(filter(['**', '!coverage/coverage*.zip']))
@ -231,5 +221,3 @@ exports['dist:safari:dmg'] = distSafariDmg;
exports.dist = gulp.parallel(distFirefox, distChrome, distOpera, distEdge); exports.dist = gulp.parallel(distFirefox, distChrome, distOpera, distEdge);
exports['ci:coverage'] = ciCoverage; exports['ci:coverage'] = ciCoverage;
exports.ci = ciCoverage; exports.ci = ciCoverage;
exports.webfonts = webfonts;
exports.build = webfonts;

2
jslib

@ -1 +1 @@
Subproject commit b7429b0c0cdca8783fd9fa304918ee91f23c6f76 Subproject commit b2b7b34955368680c24f970d297a97618a1f229f

3134
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

9
package.json
View File

@ -9,10 +9,10 @@
"symlink:win": "rmdir /S /Q .\\jslib && cmd /c mklink /J .\\jslib ..\\jslib", "symlink:win": "rmdir /S /Q .\\jslib && cmd /c mklink /J .\\jslib ..\\jslib",
"symlink:mac": "npm run symlink:lin", "symlink:mac": "npm run symlink:lin",
"symlink:lin": "rm -rf ./jslib && ln -s ../jslib ./jslib", "symlink:lin": "rm -rf ./jslib && ln -s ../jslib ./jslib",
"build": "gulp build && webpack", "build": "webpack",
"build:watch": "gulp build && webpack --watch", "build:watch": "webpack --watch",
"build:prod": "gulp build && cross-env NODE_ENV=production webpack", "build:prod": "cross-env NODE_ENV=production webpack",
"build:prod:watch": "gulp build && cross-env NODE_ENV=production webpack --watch", "build:prod:watch": "cross-env NODE_ENV=production webpack --watch",
"clean:l10n": "git push origin --delete l10n_master", "clean:l10n": "git push origin --delete l10n_master",
"dist": "npm run build:prod && gulp dist", "dist": "npm run build:prod && gulp dist",
"dist:firefox": "npm run build:prod && gulp dist:firefox", "dist:firefox": "npm run build:prod && gulp dist:firefox",
@ -42,7 +42,6 @@
"file-loader": "^6.2.0", "file-loader": "^6.2.0",
"gulp": "^4.0.2", "gulp": "^4.0.2",
"gulp-filter": "^7.0.0", "gulp-filter": "^7.0.0",
"gulp-google-webfonts": "^4.0.0",
"gulp-if": "^3.0.0", "gulp-if": "^3.0.0",
"gulp-json-editor": "^2.5.5", "gulp-json-editor": "^2.5.5",
"gulp-replace": "^1.1.0", "gulp-replace": "^1.1.0",

2
src/popup/scss/popup.scss
View File

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

1
webfonts.list
View File

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