Merge pull request #34 from htanjo/woff2

Support WOFF 2.0
backflip · Mar 10, 2016 · 04494b8 · 04494b8
2 parents 025dc66 + ef5c823
commit 04494b8
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 .DS_Store
 node_modules
-test/results
+test/results*
 npm-debug.log
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ gulp.task('iconfont', function(){
 });
 ```
 
-`gulp-iconfont-css` works well with `gulp-iconfont` but you can use it in a more modular fashion by directly using `gulp-svgicons2svgfont`, `gulp-svg2tff`, `gulp-ttf2eot` and/or `gulp-ttf2woff`.
+`gulp-iconfont-css` works well with `gulp-iconfont` but you can use it in a more modular fashion by directly using `gulp-svgicons2svgfont`, `gulp-svg2tff`, `gulp-ttf2eot`, `gulp-ttf2woff` and/or `gulp-ttf2woff2`.
 
 ## API
 

diff --git a/templates/_icons.css b/templates/_icons.css
@@ -2,6 +2,7 @@
 	font-family: "<%= fontName %>";
 	src: url('<%= fontPath %><%= fontName %>.eot');
 	src: url('<%= fontPath %><%= fontName %>.eot?#iefix') format('eot'),
+		url('<%= fontPath %><%= fontName %>.woff2') format('woff2'),
 		url('<%= fontPath %><%= fontName %>.woff') format('woff'),
 		url('<%= fontPath %><%= fontName %>.ttf') format('truetype'),
 		url('<%= fontPath %><%= fontName %>.svg#<%= fontName %>') format('svg');

diff --git a/templates/_icons.less b/templates/_icons.less
@@ -2,6 +2,7 @@
 	font-family: "<%= fontName %>";
 	src: url('<%= fontPath %><%= fontName %>.eot');
 	src: url('<%= fontPath %><%= fontName %>.eot?#iefix') format('eot'),
+		url('<%= fontPath %><%= fontName %>.woff2') format('woff2'),
 		url('<%= fontPath %><%= fontName %>.woff') format('woff'),
 		url('<%= fontPath %><%= fontName %>.ttf') format('truetype'),
 		url('<%= fontPath %><%= fontName %>.svg#<%= fontName %>') format('svg');

diff --git a/templates/_icons.scss b/templates/_icons.scss
@@ -2,6 +2,7 @@
 	font-family: "<%= fontName %>";
 	src: url('<%= fontPath %><%= fontName %>.eot');
 	src: url('<%= fontPath %><%= fontName %>.eot?#iefix') format('eot'),
+		url('<%= fontPath %><%= fontName %>.woff2') format('woff2'),
 		url('<%= fontPath %><%= fontName %>.woff') format('woff'),
 		url('<%= fontPath %><%= fontName %>.ttf') format('truetype'),
 		url('<%= fontPath %><%= fontName %>.svg#<%= fontName %>') format('svg');

diff --git a/test/expected/css/_icons.css b/test/expected/css/_icons.css
@@ -2,6 +2,7 @@
 	font-family: "Icons";
 	src: url('../fonts/Icons.eot');
 	src: url('../fonts/Icons.eot?#iefix') format('eot'),
+		url('../fonts/Icons.woff2') format('woff2'),
 		url('../fonts/Icons.woff') format('woff'),
 		url('../fonts/Icons.ttf') format('truetype'),
 		url('../fonts/Icons.svg#Icons') format('svg');

diff --git a/test/expected/css/_icons.less b/test/expected/css/_icons.less
@@ -2,6 +2,7 @@
 	font-family: "Icons";
 	src: url('../fonts/Icons.eot');
 	src: url('../fonts/Icons.eot?#iefix') format('eot'),
+		url('../fonts/Icons.woff2') format('woff2'),
 		url('../fonts/Icons.woff') format('woff'),
 		url('../fonts/Icons.ttf') format('truetype'),
 		url('../fonts/Icons.svg#Icons') format('svg');

diff --git a/test/expected/css/_icons.scss b/test/expected/css/_icons.scss
@@ -2,6 +2,7 @@
 	font-family: "Icons";
 	src: url('../fonts/Icons.eot');
 	src: url('../fonts/Icons.eot?#iefix') format('eot'),
+		url('../fonts/Icons.woff2') format('woff2'),
 		url('../fonts/Icons.woff') format('woff'),
 		url('../fonts/Icons.ttf') format('truetype'),
 		url('../fonts/Icons.svg#Icons') format('svg');

diff --git a/test/expected/fonts/Icons.woff b/test/expected/fonts/Icons.woff
diff --git a/test/expected/fonts/Icons.woff2 b/test/expected/fonts/Icons.woff2
diff --git a/test/main.js b/test/main.js
@@ -24,7 +24,7 @@ describe('gulp-iconfont-css', function() {
 				}))
 				.pipe(iconfont({
 					fontName: fontName,
-					formats: ['woff', 'svg'],
+					formats: ['woff2', 'woff', 'svg'],
 					timestamp: 1438703262
 				}))
 				.pipe(gulp.dest(resultsDir + '/fonts/'))
@@ -34,6 +34,11 @@ describe('gulp-iconfont-css', function() {
 						fs.readFileSync(__dirname + '/expected/css/_icons.' + type, 'utf8')
 					);
 
+					assert.equal(
+						fs.readFileSync(resultsDir + '/fonts/Icons.woff2', 'utf8'),
+						fs.readFileSync(__dirname + '/expected/fonts/Icons.woff2', 'utf8')
+					);
+
 					assert.equal(
 						fs.readFileSync(resultsDir + '/fonts/Icons.woff', 'utf8'),
 						fs.readFileSync(__dirname + '/expected/fonts/Icons.woff', 'utf8')
@@ -46,6 +51,7 @@ describe('gulp-iconfont-css', function() {
 
 					fs.unlinkSync(resultsDir + '/css/_icons.' + type);
 					fs.rmdirSync(resultsDir + '/css/');
+					fs.unlinkSync(resultsDir + '/fonts/' + fontName + '.woff2');
 					fs.unlinkSync(resultsDir + '/fonts/' + fontName + '.woff');
 					fs.unlinkSync(resultsDir + '/fonts/' + fontName + '.svg');
 					fs.rmdirSync(resultsDir + '/fonts/');
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,7 +37,7 @@ gulp.task('iconfont', function(){ @@
     });
     ```
-    `gulp-iconfont-css` works well with `gulp-iconfont` but you can use it in a more modular fashion by directly using `gulp-svgicons2svgfont`, `gulp-svg2tff`, `gulp-ttf2eot` and/or `gulp-ttf2woff`.
+    `gulp-iconfont-css` works well with `gulp-iconfont` but you can use it in a more modular fashion by directly using `gulp-svgicons2svgfont`, `gulp-svg2tff`, `gulp-ttf2eot`, `gulp-ttf2woff` and/or `gulp-ttf2woff2`.
     ## API
@@ Expand Down @@