Skip to content

Commit

Permalink
Merge pull request #3 from geoblink/greenkeeper/initial
Browse files Browse the repository at this point in the history
Update dependencies to enable Greenkeeper 🌴
  • Loading branch information
Sumolari authored Dec 20, 2019
2 parents cea9741 + 09530fc commit fbb3652
Show file tree
Hide file tree
Showing 7 changed files with 196 additions and 110 deletions.
1 change: 1 addition & 0 deletions .github/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[![NPM](https://img.shields.io/npm/v/@geoblink/design-system)](https://www.npmjs.com/package/@geoblink/design-system)
[![Build Status](https://travis-ci.com/geoblink/design-system.svg?branch=master)](https://travis-ci.com/geoblink/design-system)
[![Codecov](https://img.shields.io/codecov/c/gh/geoblink/design-system)](https://codecov.io/gh/geoblink/design-system)
[![Greenkeeper badge](https://badges.greenkeeper.io/geoblink/design-system.svg)](https://greenkeeper.io/)

## Getting started

Expand Down
4 changes: 0 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ jobs:
script:
- yarn lint

- stage: test
node_js: 8
script:
- yarn test
- stage: test
node_js: 10
script:
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Changelog

## 29.1.1

Fix:

- `@fortawesome/free-solid-svg-icons` is no longer required if not mocking pro icons.

Changed:

- Updated most dependencies to their latest versions.
- Added Greenkeeper to the repo.

## 29.1.0

New:
Expand Down
13 changes: 2 additions & 11 deletions build/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@ function assetsSystemPath (_path) {

/**
* @typedef {Object} LoaderOptions
* @property {string} [options.outputStyle]
* @property {boolean} [options.sourceMap]
* @property {boolean} [options.extract]
* @property {boolean} [options.usePostCSS]
*/

/**
Expand Down Expand Up @@ -95,17 +91,12 @@ function cssLoaders (options) {
}
}

const scssOptions = {
outputStyle: options.outputStyle || 'compressed'
}
const sassOptions = Object.assign({ indentedSyntax: true }, scssOptions)

// https://vue-loader.vuejs.org/en/configurations/extract-css.html
return {
css: generateLoaders(),
postcss: generateLoaders(),
sass: generateLoaders('sass', sassOptions).concat(sassResourcesConfig),
scss: generateLoaders('sass', scssOptions).concat(sassResourcesConfig)
sass: generateLoaders('sass', { indentedSyntax: true }).concat(sassResourcesConfig),
scss: generateLoaders('sass', { }).concat(sassResourcesConfig)
}

// generate loader string to be used with extract text plugin
Expand Down
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@geoblink/design-system",
"version": "29.1.0",
"version": "29.1.1",
"description": "Geoblink Design System for Vue.js",
"author": "Geoblink <contact@geoblink.com>",
"main": "dist/system.js",
Expand Down Expand Up @@ -101,7 +101,7 @@
"babel-loader": "^8.0.6",
"chai": "^4.2.0",
"chai-things": "^0.2.0",
"chalk": "^2.4.2",
"chalk": "^3.0.0",
"chokidar": "^3.3.0",
"codemirror": "^5.48.2",
"compression-webpack-plugin": "^3.0.1",
Expand All @@ -121,13 +121,13 @@
"eslint-plugin-standard": "^4.0.1",
"eslint-plugin-vue": "^6.0.1",
"execa": "^3.4.0",
"file-loader": "^4.1.0",
"file-loader": "^5.0.2",
"friendly-errors-webpack-plugin": "^1.7.0",
"fs-extra": "^8.1.0",
"glob": "^7.1.6",
"html-webpack-plugin": "^3.2.0",
"http-proxy-middleware": "^0.19.1",
"hygen": "^4.0.8",
"http-proxy-middleware": "^0.20.0",
"hygen": "^5.0.3",
"jest": "^24.8.0",
"jest-junit-reporter": "^1.1.0",
"jest-serializer-vue": "^2.0.2",
Expand All @@ -147,20 +147,20 @@
"postcss-safe-parser": "^4.0.1",
"postcss-url": "^8.0.0",
"resize-observer-polyfill": "^1.5.1",
"rimraf": "^2.6.3",
"sass-loader": "^7.1.0",
"rimraf": "^3.0.0",
"sass-loader": "^8.0.0",
"sass-resources-loader": "^2.0.1",
"semver": "^6.3.0",
"semver": "^7.1.1",
"shelljs": "^0.8.2",
"sinon": "^7.4.1",
"style-loader": "^1.0.0",
"theo": "^8.1.4",
"tinycolor2": "^1.4.1",
"uglifyjs-webpack-plugin": "^2.2.0",
"url-loader": "^2.1.0",
"url-loader": "^3.0.0",
"vue": "^2.5.22",
"vue-directive-tooltip": "~1.5.0",
"vue-docgen-api": "^3.19.5",
"vue-directive-tooltip": "~1.6.3",
"vue-docgen-api": "^4.2.0",
"vue-jest": "^3.0.4",
"vue-loader": "^15.7.1",
"vue-style-loader": "^4.1.2",
Expand Down
10 changes: 9 additions & 1 deletion src/utils/mockFontAwesomeProIcons.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
import { fas } from '@fortawesome/free-solid-svg-icons'
const fas = (function () {
try {
return require('@fortawesome/free-solid-svg-icons')
} catch (error) {
return null
}
})()

const _ = require('lodash')

export default function mockFontAwesomeProIcons (library) {
if (!fas) throw new Error('To mock FontAwesome pro icons you must install @fortawesome/free-solid-svg-icons')

const iconsToMock = [
'faChevronUp',
'faChevronDown',
Expand Down
Loading

1 comment on commit fbb3652

@vercel
Copy link

@vercel vercel bot commented on fbb3652 Dec 20, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to following URLs:

Please sign in to comment.