Skip to content
This repository has been archived by the owner on Jun 17, 2021. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/2.0.11'
Browse files Browse the repository at this point in the history
  • Loading branch information
Yago committed May 7, 2018
2 parents 92043ed + 0224623 commit 6f45324
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 12 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

*2.0.11* (2018-05-07)
- 🐛 fix empty yml import (453ac27)

*2.0.10* (2018-05-07)
- 🐛 lint and fix infinite doc loop (6a6620c)

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.10
2.0.11
4 changes: 2 additions & 2 deletions build/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"main.css": "static/css/main.3c8f75da.css",
"main.css.map": "static/css/main.3c8f75da.css.map",
"main.js": "static/js/main.9ae05756.js",
"main.js.map": "static/js/main.9ae05756.js.map"
"main.js": "static/js/main.a25cc584.js",
"main.js.map": "static/js/main.a25cc584.js.map"
}
2 changes: 1 addition & 1 deletion build/service-worker.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions build/static/js/main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/static/js/main.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "toolbox-reader",
"version": "2.0.10",
"version": "2.0.11",
"private": true,
"eslintConfig": {
"parser": "babel-eslint",
Expand Down
8 changes: 4 additions & 4 deletions src/epics/atomic.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ export function getComponentsEpic(action$) {
// Loop over each components
// eslint-disable-next-line no-param-reassign
payload[type] = payload[type].map((component, id) => {
const path = `components/${type}/${component.name}/`;
const config = yaml.load(`${path}${component.name}.yml`);
const markup = `${path}${component.name}.twig`;
const path = `components/${type}/${component}/`;
const config = yaml.load(`${path}${component}.yml`);
const markup = `${path}${component}.twig`;

// format related variants collection
const variants = config && config.variants ? config.variants.map((item, i) => {
Expand All @@ -45,7 +45,7 @@ export function getComponentsEpic(action$) {
type,
parent_id: id,
parent: config.name,
markup: `${path}${(`${component.name}-${variant.name}`).toLowerCase()}.twig`,
markup: `${path}${(`${component}-${variant.name}`).toLowerCase()}.twig`,
};
}) : [];

Expand Down

0 comments on commit 6f45324

Please sign in to comment.