Skip to content

Commit

Permalink
v1.18.0 — Narrow white rays image colour updated. (#44)
Browse files Browse the repository at this point in the history
### Added
- DangerJS dependency.
- DangerJS travis config.
- Snyk badge to readme.

### Changed
- Narrow white rays image colour updated to be white rather than grey.
- Updated dependencies.
- Travis runs build on Node v8 & 10.
- Package requires Node v8 or above.
  • Loading branch information
DamianMullins authored and ashleynolan committed Jan 25, 2019
1 parent de50403 commit 265e769
Show file tree
Hide file tree
Showing 7 changed files with 2,795 additions and 721 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: node_js

node_js:
- "10"
- "8"
- "6"

cache: yarn

Expand All @@ -12,4 +12,4 @@ notifications:
email: false

script:
- yarn run lint
- yarn danger ci
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,31 @@
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).


v1.18.0
------------------------------
*January 25, 2019*

### Added
- DangerJS dependency.
- DangerJS travis config.
- Snyk badge to readme.

### Changed
- Narrow white rays image colour updated to be white rather than grey.
- Updated dependencies.
- Travis runs build on Node v8 & 10.
- Package requires Node v8 or above.


v1.17.0
------------------------------
*January 22, 2019*

### Added
- Added new order detail icons


v1.16.0
------------------------------
*November 16, 2018*
Expand All @@ -28,6 +46,7 @@ v1.15.1
### Changed
- Rename google-plus icon


v1.15.0
------------------------------
*October 26, 2018*
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

[![npm version](https://badge.fury.io/js/%40justeat%2Ff-icons.svg)](https://badge.fury.io/js/%40justeat%2Ff-icons)
[![Build Status](https://travis-ci.org/justeat/f-icons.svg)](https://travis-ci.org/justeat/f-icons)
[![Known Vulnerabilities](https://snyk.io/test/github/justeat/f-icons/badge.svg?targetFile=package.json)](https://snyk.io/test/github/justeat/f-icons?targetFile=package.json)


## Usage

Expand All @@ -26,4 +28,4 @@ If you are using the [fozzie gulp build tasks](https://www.npmjs.com/package/@ju

You can then use the `f-icons` fozzie icons module styling.

## Documentation to be completed once module is in stable state.
## Documentation to be completed once module is in stable state.
40 changes: 40 additions & 0 deletions dangerfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/* eslint-disable no-console */
/* global danger, fail, message */

const bodyAndTitle = (danger.github.pr.body + danger.github.pr.title).toLowerCase();
const isTrivial = bodyAndTitle.includes('#trivial');

if (!isTrivial) {
// Fail if the title of the PR isn't in the format of a version i.e. vX.X.X (such as v1.4.0)
const versionRegex = /^(v[0-9]+\.[0-9]+\.[0-9]+)/;
const isPRTitleVersioned = danger.github.pr.title.match(versionRegex);
if (!isPRTitleVersioned) {
fail(':exclamation: PR title should start with the package version in the format v(x.x.x) (such as v1.4.0)');
}

// Fail if there isn’t a CHANGELOG entry – should update for every PR
if (!danger.git.modified_files.includes('CHANGELOG.md')) {
const changelogLink = 'https://github.com/justeat/f-icons/blob/master/CHANGELOG.md';
fail(`:memo: Please include a CHANGELOG entry. You can find the current version at <a href="${changelogLink}">CHANGELOG.md</a>`);
}

// Check for version update
const hasPackageJsonChanged = danger.git.modified_files.includes('package.json');
const packageDiff = danger.git.JSONDiffForFile('package.json');

packageDiff.then(result => {
if (!hasPackageJsonChanged || (hasPackageJsonChanged && !result.version)) {
const semverLink = 'https://docs.npmjs.com/getting-started/semantic-versioning';
console.log('Versioning Missing');
console.log(hasPackageJsonChanged, result);
fail(`:exclamation: This PR should include a <a href="${semverLink}">SEMVER</a> version bump, so that it can be published once merged.`);
}
}, err => {
console.log(err);
});

// Message on deletions
if (danger.github.pr.deletions > danger.github.pr.additions) {
message(':fire: :clap: You’re a deletion machine!');
}
}
12 changes: 7 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@justeat/f-icons",
"description": "Common icons for use in Fozzie projects.",
"version": "1.17.0",
"version": "1.18.0",
"files": [
"src"
],
Expand All @@ -18,15 +18,17 @@
},
"license": "Apache-2.0",
"engines": {
"node": ">=4.0.0"
"node": ">=8.0.0"
},
"dependencies": {
"@kickoff/utils.scss": "2.1.1",
"include-media": "^1.4.9"
"include-media": "1.4.9"
},
"devDependencies": {
"@justeat/stylelint-config-fozzie": "^1.1.0",
"stylelint": "^8.3.1"
"@justeat/stylelint-config-fozzie": "2.0.1",
"danger": "7.0.2",
"stylelint": "9.10.1",
"stylelint-scss": "3.5.1"
},
"keywords": [
"fozzie",
Expand Down
2 changes: 1 addition & 1 deletion src/img/decoration/rays--white--narrow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 265e769

Please sign in to comment.