Skip to content

Commit 2de5d74

Browse files
author
Tobias Brennecke
committed
Merge branch 'dev' into update-contributing-md
# Conflicts: # .github/CONTRIBUTING.md
2 parents d36a1ce + 2bd4a47 commit 2de5d74

File tree

10 files changed

+3606
-26
lines changed

10 files changed

+3606
-26
lines changed

.github/CONTRIBUTING.md

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,27 @@ If you'd like to contribute to Pattern Lab Node, please do so! There is always a
55

66
No pull request is too small. Check out any [up for grabs issues](https://github.com/pattern-lab/patternlab-node/labels/up%20for%20grabs) as a good way to get your feet wet, or add some more unit tests.
77

8+
## Developing Locally
9+
10+
The best way to make changes to the Pattern Lab Node core and test them is through your existing edition.
11+
12+
* Fork this repository on Github.
13+
* Create a new branch in your fork and push your changes in that fork.
14+
* `npm install`
15+
* `npm link`
16+
* `cd /path/to/your/edition`
17+
* `npm link patternlab-node`
18+
19+
820
Guidelines
921
----------
1022

11-
1. Please keep your pull requests concise and limited to **ONE** substantive change at a time. This makes reviewing and testing so much easier.
12-
2. *ALWAYS* submit pull requests against the [dev branch](https://github.com/pattern-lab/patternlab-node/tree/dev). If this does not occur, I will first, try to redirect you gently, second, port over your contribution manually if time allows, and/or third, close your pull request. If you have a major feature to stabilize over time, talk to @bmuenzenmeyer about making a dedicated `feature-branch`
13-
3. If you can, add some unit tests using the existing patterns in the `./test` directory
14-
4. Please mention the issue number in commits if you can, so anyone can see to which issue your changes belong to. For instance:
23+
* _ALWAYS_ submit pull requests against the [dev branch](https://github.com/pattern-lab/patternlab-node/tree/dev). If this does not occur, I will first, try to redirect you gently, second, port over your contribution manually if time allows, and/or third, close your pull request. If you have a major feature to stabilize over time, talk to @bmuenzenmeyer via an issue about making a dedicated `feature-branch`
24+
* Please keep your pull requests concise and limited to **ONE** substantive change at a time. This makes reviewing and testing so much easier.
25+
* Commits should reference the issue you are adressing. For any Pull Request that you send, use the template provided.
26+
* If you can, add some unit tests using the existing patterns in the `./test` directory
27+
* Large enhancements should begin with opening an issue. This will result in a more systematic way for us to review your contribution and determine if a [specifcation discussion](https://github.com/pattern-lab/the-spec/issues) needs to occur.
28+
* Please mention the issue number in commits if you can, so anyone can see to which issue your changes belong to. For instance:
1529
- `#123 Fix resolving patterns in pattern_hunter`
1630
- `Feature #42: improve improbability drive`
1731

.github/stale.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Number of days of inactivity before an issue becomes stale
2+
daysUntilStale: 60
3+
# Number of days of inactivity before a stale issue is closed
4+
daysUntilClose: 7
5+
# Issues with these labels will never be considered stale
6+
exemptLabels:
7+
- staged of next release
8+
# Label to use when marking an issue as stale
9+
staleLabel: needs response
10+
# Comment to post when marking an issue as stale. Set to `false` to disable
11+
markComment: >
12+
This issue has been automatically marked as stale because it has not had
13+
recent activity. It will be closed if no further activity occurs. Thank you
14+
for your contributions.
15+
# Comment to post when closing a stale issue. Set to `false` to disable
16+
closeComment: false

core/lib/data_loader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const glob = require('glob'),
1313
* @returns {*}
1414
*/
1515
function loadFile(dataFilesPath, fsDep) {
16-
const dataFilesFullPath = dataFilesPath + '*.{json,yml,yaml}';
16+
const dataFilesFullPath = dataFilesPath + '{.,[!-]*.}{json,yml,yaml}';
1717

1818
if (dataFilesPath) {
1919
const dataFiles = glob.sync(dataFilesFullPath),

core/lib/parameter_hunter.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,8 @@ var parameter_hunter = function () {
280280
console.log(err);
281281
}
282282

283+
paramData = pattern_assembler.parse_data_links_specific(patternlab, paramData, pattern.patternPartial)
284+
283285
var allData = plutils.mergeData(globalData, localData);
284286
allData = plutils.mergeData(allData, paramData);
285287

core/lib/patternlab.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* patternlab-node - v2.11.1 - 2017
2+
* patternlab-node - v2.12.0 - 2017
33
*
44
* Brian Muenzenmeyer, Geoff Pursell, Raphael Okon, tburny and the web community.
55
* Licensed under the MIT license.
@@ -26,7 +26,8 @@ var diveSync = require('diveSync'),
2626
ui_builder = new ui(),
2727
pe = require('./pattern_exporter'),
2828
pattern_exporter = new pe(),
29-
PatternGraph = require('./pattern_graph').PatternGraph;
29+
PatternGraph = require('./pattern_graph').PatternGraph,
30+
updateNotifier = require('update-notifier');
3031

3132
//register our log events
3233
plutils.log.on('error', msg => console.log(msg));
@@ -43,6 +44,12 @@ console.log(
4344
var patternEngines = require('./pattern_engines');
4445
var EventEmitter = require('events').EventEmitter;
4546

47+
//bootstrap update notifier
48+
updateNotifier({
49+
pkg: packageInfo,
50+
updateCheckInterval: 1000 * 60 * 60 * 24 // notify at most once a day
51+
}).notify();
52+
4653
/**
4754
* Given a path, load info from the folder to compile into a single config object.
4855
* @param dataFilesPath

core/lib/ui_builder.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -592,6 +592,9 @@ var ui_builder = function () {
592592
//plugins
593593
output += 'var plugins = ' + JSON.stringify(patternlab.plugins || []) + ';' + eol;
594594

595+
//theme
596+
output += 'var theme = ' + JSON.stringify(patternlab.config.theme) + ';' + eol;
597+
595598
//smaller config elements
596599
output += 'var defaultShowPatternInfo = ' + (patternlab.config.defaultShowPatternInfo ? patternlab.config.defaultShowPatternInfo : 'false') + ';' + eol;
597600
output += 'var defaultPattern = "' + (patternlab.config.defaultPattern ? patternlab.config.defaultPattern : 'all') + '";' + eol;

0 commit comments

Comments
 (0)