Skip to content

Next Release: v3.0.0-beta.3 #1007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sghoweri merged 14 commits into from
May 16, 2019
Merged

Next Release: v3.0.0-beta.3 #1007

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b30ed5c
Added separated pattern-folder support
Feb 21, 2019
263ee42
Small fix for double nested folders
Mar 7, 2019
b18399c
Update loadPattern.js from the suggestion of @engelfrost
engelfrost Mar 11, 2019
6a2a467
The separated pattern folder name must be the pattern name
Mar 11, 2019
b4efba4
Merge branch 'feature/separated-pattern-folder' of https://github.com…
Mar 11, 2019
0907bab
Updated tests since pattern folder name has to be the pattern name
Mar 11, 2019
8ffce15
Removed not needed eslint ignore line
Mar 12, 2019
2225f99
Remove eslint-disable and made changed pattern name and dir behavior
Mar 19, 2019
9810c11
Merge branch 'master' into dev
EvanLovely Apr 10, 2019
185c016
docs: update readme to show new create command
EvanLovely Apr 10, 2019
911ff06
fix(uikit): uikit no longer requires being in the root directory
enigmatic Apr 15, 2019
abf24d4
Merge pull request #1006 from enigmatic/uikit-styledir
sghoweri Apr 15, 2019
6a4cec2
Merge branch 'dev' into feature/separated-pattern-folder
sghoweri May 15, 2019
8c205ee
Merge pull request #992 from JosefBredereck/feature/separated-pattern…
sghoweri May 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
The separated pattern folder name must be the pattern name 
Like @engelfrost suggested it should be the same name, so that there is no error with the pattern group and subgroup names.
  • Loading branch information
Josef Bredereck committed Mar 11, 2019
commit 6a2a467b427cd08c3ce3851de206a2362fafdef9
7 changes: 4 additions & 3 deletions packages/core/src/lib/object_factory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@ const Pattern = function(relPath, data, patternlab) {
*/
const pathObj = path.parse(path.normalize(relPath));
const info = {};
// colors(.mustache) is subbed in 00-atoms-/00-global/00-colors
// 00-colors(.mustache) is subbed in 00-atoms-/00-global/00-colors
info.hasDir =
pathObj.dir.indexOf(pathObj.name) !== -1 ||
pathObj.dir.indexOf(pathObj.name.split('~')[0]) !== -1;
path.basename(pathObj.dir) === pathObj.name ||
path.basename(pathObj.dir) === pathObj.name.split('~')[0];

info.dir = info.hasDir ? pathObj.dir.split(path.sep).pop() : '';
info.dirLevel = pathObj.dir.split(path.sep).length;

Expand Down