Skip to content

Commit

Permalink
Chore: prepare 4.0.1 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander Krasnoyarov committed Oct 19, 2016
1 parent e22b4ad commit d7307e6
Show file tree
Hide file tree
Showing 9 changed files with 64 additions and 39 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ jspm_packages
# Optional REPL history
.node_repl_history

# Composer
lib/vendor

# Applcation
dist

Expand Down
13 changes: 12 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
# Head
# 4.0.1 - 2016-10-19

- Fixed: CLI `fontName` and `formats` arguments bug.
- Chore: use `^` instead `~` for `ajv-cli`, `package-schema`, `remark-cli`, `remark-lint`, `remark-preset-lint-itgalaxy`.
- Chore: update a minimal version of `ajv-cli` from `0.9.0` to `1.1.0`.
- Chore: update a minimal version of `remark-preset-lint-itgalaxy` from `1.0.0` to `2.0.0`.
- Chore: update a minimal version of `nunjucks` from `2.0.0` to `2.5.0`.
- Chore: update a minimal version of `eslint-plugin-import` from `1.16.0` to `2.0.0`.
- Chore: update a minimal version of `eslint-plugin-promise` from `2.0.0` to `3.0.0`.
- Chore: update a minimal version of `eslint-plugin-lodash` from `1.10.0` to `2.1.0`.
- Chore: rename `eslint-plugin-xo` to `eslint-plugin-unicorn`.
- Chore: update a minimal version of `eslint-plugin-unicorn` from `0.5.0` to `1.0.0`.
- Chore: update a minimal version of `eslint-plugin-itgalaxy` from `13.0.0` to `23.0.0`.
- Chore: update a minimal version of `cosmiconfig` from `1.0.0` to `2.0.0`.

# 4.0.0

Expand Down
26 changes: 11 additions & 15 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,16 @@ The MIT License (MIT)

Copyright (c) 2016 [itgalaxy](https://itgalaxy.company)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
The above copyright notice and this permission notice shall be included in all copies or substantial portions
of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.
17 changes: 15 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
# webfont

[![NPM version](https://img.shields.io/npm/v/webfont.svg)](https://www.npmjs.org/package/webfont) [![Travis Build Status](https://img.shields.io/travis/itgalaxy/webfont/master.svg?label=build)](https://travis-ci.org/itgalaxy/webfont) [![dependencies Status](https://david-dm.org/itgalaxy/webfont/status.svg)](https://david-dm.org/itgalaxy/webfont) [![devDependencies Status](https://david-dm.org/itgalaxy/webfont/dev-status.svg)](https://david-dm.org/itgalaxy/webfont?type=dev)
[![NPM version](https://img.shields.io/npm/v/webfont.svg)](https://www.npmjs.org/package/webfont)
[![Travis Build Status](https://img.shields.io/travis/itgalaxy/webfont/master.svg?label=build)](https://travis-ci.org/itgalaxy/webfont)
[![dependencies Status](https://david-dm.org/itgalaxy/webfont/status.svg)](https://david-dm.org/itgalaxy/webfont)
[![devDependencies Status](https://david-dm.org/itgalaxy/webfont/dev-status.svg)](https://david-dm.org/itgalaxy/webfont?type=dev)

Generator of webfont from SVG icons.

Features:

- Supported font formats: WOFF2, WOFF, EOT, TTF and SVG.

- Support configuration Files - use a JavaScript, JSON or YAML file to specify configuration information
for an entire directory and all of its subdirectories.

- Supported browsers: IE8+.

- Generates CSS files allows to use custom templates.

## Install
Expand Down Expand Up @@ -149,10 +157,15 @@ The CLI can exit the process with the following exit codes:

## Related

- [svgicons2svgfont](https://github.com/nfroidure/svgicons2svgfont) - Simple tool to merge multiple icons to an SVG font.
- [svgicons2svgfont](https://github.com/nfroidure/svgicons2svgfont) - Simple tool to merge multiple
icons to an SVG font.

- [svg2ttf](https://github.com/fontello/svg2ttf) - Converts SVG fonts to TTF format.

- [ttf2eot](https://github.com/fontello/ttf2eot) - Converts TTF fonts to EOT format.

- [ttf2woff](https://github.com/fontello/ttf2woff) - Converts TTF fonts to WOFF format.

- [ttf2woff2](https://github.com/nfroidure/ttf2woff2) - Converts TTF fonts to WOFF2.

## Contribution
Expand Down
29 changes: 13 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "webfont",
"version": "4.0.0",
"version": "4.0.1",
"description": "Generator of webfonts from svg icons, svg icons to svg font, svg font to ttf, ttf to eot, ttf to woff, ttf to woff2",
"license": "MIT",
"author": "itgalaxy <[email protected]>",
Expand Down Expand Up @@ -48,11 +48,11 @@
"!**/__tests__"
],
"dependencies": {
"cosmiconfig": "^1.0.0",
"cosmiconfig": "^2.0.0",
"globby": "^6.0.0",
"meow": "^3.3.0",
"mkdirp": "^0.5.1",
"nunjucks": "^2.0.0",
"nunjucks": "^2.5.0",
"resolve-from": "2.0.0",
"svg2ttf": "^4.0.0",
"svgicons2svgfont": "^5.0.0",
Expand All @@ -62,7 +62,7 @@
},
"devDependencies": {
"ava": "^0.16.0",
"ajv-cli": "~0.9.0",
"ajv-cli": "^1.1.0",
"babel-cli": "^6.11.0",
"babel-core": "^6.11.0",
"babel-preset-es2015": "^6.9.0",
Expand All @@ -71,14 +71,14 @@
"coveralls": "^2.11.6",
"eslint": "^3.4.0",
"eslint-plugin-ava": "^3.0.0",
"eslint-plugin-import": "^1.14.0",
"eslint-plugin-itgalaxy": "^13.0.0",
"eslint-plugin-import": "^2.0.0",
"eslint-plugin-itgalaxy": "^23.0.0",
"eslint-plugin-jsx-a11y": "^2.2.0",
"eslint-plugin-lodash": "^1.10.0",
"eslint-plugin-lodash": "^2.1.0",
"eslint-plugin-node": "^2.0.0",
"eslint-plugin-promise": "^2.0.0",
"eslint-plugin-promise": "^3.0.0",
"eslint-plugin-react": "^6.2.0",
"eslint-plugin-xo": "^0.5.0",
"eslint-plugin-unicorn": "^1.0.0",
"is-eot": "^1.0.0",
"is-svg": "^2.0.0",
"is-ttf": "^0.2.0",
Expand All @@ -87,10 +87,10 @@
"npmpub": "^3.1.0",
"npm-run-all": "^3.0.0",
"nyc": "^8.0.0",
"package-schema": "~1.0.0",
"remark-cli": "~2.0.0",
"remark-lint": "~5.0.0",
"remark-preset-lint-itgalaxy": "~1.0.0",
"package-schema": "^1.0.0",
"remark-cli": "^2.0.0",
"remark-lint": "^5.0.0",
"remark-preset-lint-itgalaxy": "^2.0.0",
"rimraf": "^2.5.2"
},
"scripts": {
Expand Down Expand Up @@ -123,9 +123,6 @@
]
},
"eslintConfig": {
"rules": {
"node/shebang": "off"
},
"extends": [
"plugin:itgalaxy/ava",
"plugin:itgalaxy/esnext",
Expand Down
5 changes: 5 additions & 0 deletions src/__tests__/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"node/no-unpublished-import": "off"
}
}
3 changes: 3 additions & 0 deletions src/__tests__/fixtures/svg-icons/.webfontrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"fontName": "foo"
}
2 changes: 1 addition & 1 deletion src/cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ Promise.resolve().then(
})
)
.then((options) => {
if (!options.files.length) {
if (options.files.length === 0) {
cli.showHelp();
}

Expand Down
5 changes: 4 additions & 1 deletion src/standalone.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,14 @@ function buildConfig(options) {
rcExtensions: true
};

let configPath = process.cwd();

if (options.configFile) {
cosmiconfigOptions.configPath = path.resolve(process.cwd(), options.configFile);
configPath = path.resolve(process.cwd(), options.configFile);
}

return cosmiconfig('webfont', cosmiconfigOptions)
.load(null, configPath)
.then((result) => {
if (!result) {
return Promise.reject(new Error('No configuration found'));
Expand Down

0 comments on commit d7307e6

Please sign in to comment.