Skip to content
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.

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

Pattern Lab Node v1.2.0 #290

Merged
merged 52 commits into from
Mar 11, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
4e0ad4d
Support for configuring a default pattern in config.json
geoffp Feb 26, 2016
8752652
Add glob to match ?p= pattern URLs on the main UI chrome so BrowserSync
geoffp Feb 26, 2016
276761f
add .editorconfig and .eslintrc from pattern-engines branch
Feb 27, 2016
6ad1f85
deleting the changelog in favor of https://github.com/pattern-lab/pat…
bmuenzenmeyer Feb 27, 2016
4dbe10d
Make the glob include anything with a parameter right after the leading
Feb 27, 2016
4f4b06c
Better .eslintrc with more rules
Feb 27, 2016
fae00ec
Reformatted lineage_hunter.js to pass lint
Feb 27, 2016
31b94bd
add keyword spacing rule and update lineage_hunter to match
Feb 27, 2016
6db75a9
more rule refinements
Feb 27, 2016
8f27e79
more reformatting and tweaks
Feb 27, 2016
d2ff6ea
most of the rest of the builder JS, reformatted
Feb 27, 2016
7863fef
config and task runner cleanup
Feb 27, 2016
2f57f65
more robust parameter to json conversion
Feb 27, 2016
3a4ecc2
Merge branch 'dev' into code-cleanup
bmuenzenmeyer Feb 28, 2016
bf27083
added eslint to devDependencies. removed dead function
bmuenzenmeyer Feb 28, 2016
c7609d7
loosen rules on block scope "violations" and redeclares.
bmuenzenmeyer Feb 28, 2016
0714855
shortened the eslint consecutive variable declaration indent- because…
bmuenzenmeyer Feb 28, 2016
7fab92b
missed reformatting this file
bmuenzenmeyer Feb 28, 2016
39d7df2
Merge branch 'dev' into fix-browsersync-double-badge
bmuenzenmeyer Feb 28, 2016
083238e
Merge branch 'fix-browsersync-double-badge' into dev
bmuenzenmeyer Feb 28, 2016
1d4d59a
Merge branch 'replacing-eval-with-JSON.parse' of https://github.com/e…
bmuenzenmeyer Feb 28, 2016
25d3b7f
Merge pull request #276 from e2tha-e/replacing-eval-with-JSON.parse
Feb 28, 2016
c304a78
turn off block scoped var rule
bmuenzenmeyer Feb 28, 2016
657ca99
turn off redeclare
bmuenzenmeyer Feb 28, 2016
79855cb
Added eslint tasks to build (both) and travis step (grunt only)
bmuenzenmeyer Feb 29, 2016
c638157
add note about our new standardization tools in CONTRIBUTING.md
bmuenzenmeyer Feb 29, 2016
87c5100
Merge branch 'dev' into code-cleanup
bmuenzenmeyer Feb 29, 2016
e4658cd
Merge branch 'e2tha-e-replacing-eval-with-JSON.parse' into code-cleanup
bmuenzenmeyer Feb 29, 2016
2e3236b
fix a bad merge
bmuenzenmeyer Feb 29, 2016
717e139
Merge pull request #275 from pattern-lab/code-cleanup
Feb 29, 2016
b746ff8
oops, debugger statement
geoffp Feb 29, 2016
9105c4b
Merge remote-tracking branch 'refs/remotes/upstream/dev' into default…
geoffp Feb 29, 2016
211b233
moved builder/*.js files and fixed all references
bmuenzenmeyer Mar 2, 2016
b5622af
move source/_patternlab-files/partials to core/templates
bmuenzenmeyer Mar 2, 2016
05a922c
#133
bmuenzenmeyer Mar 4, 2016
db06056
remove a debug statement
bmuenzenmeyer Mar 5, 2016
d167a97
cacheBust support
bmuenzenmeyer Mar 7, 2016
a8f83ce
Merge pull request #280 from pattern-lab/133
Mar 7, 2016
88198f0
fix some eslint warnings
bmuenzenmeyer Mar 7, 2016
848a29f
Merge branch 'default-pattern-config' of https://github.com/geoffp/pa…
bmuenzenmeyer Mar 7, 2016
6f967dc
Merge branch 'geoffp-default-pattern-config' into dev
bmuenzenmeyer Mar 7, 2016
31a5b11
renamed config.json to patternlab-config.json for better consumption
bmuenzenmeyer Mar 7, 2016
029ac93
Merge pull request #282 from pattern-lab/192-namespaceconfig
Mar 7, 2016
32d00c4
Updating `.gitignore` to just say `public`
zacanger Mar 9, 2016
5ad8344
Updating gitignore for Thumbs.db
zacanger Mar 9, 2016
03e85a7
Implement pattern state lowest common denominator
bmuenzenmeyer Mar 9, 2016
5090a26
futher clarify pattern states
bmuenzenmeyer Mar 10, 2016
9ceb4ed
fix an errant typo in a unit test
bmuenzenmeyer Mar 10, 2016
baf7b94
Merge pull request #284 from pattern-lab/203-patternstates-inheritance
Mar 10, 2016
7ab342c
Merge pull request #283 from zacanger/patch-1
geoffp Mar 10, 2016
f7e0a79
update package.json with version bump
bmuenzenmeyer Mar 11, 2016
c53440a
add js directory to watch:all grunt task
bmuenzenmeyer Mar 11, 2016
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
11 changes: 11 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# editorconfig.org
root = true

[*]
indent_style = space
indent_size = 2
tab_width = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
83 changes: 83 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
{
"env": {
"node": true,
"builtin": true
},
"globals": {},
"rules": {
"block-scoped-var": 0,
"camelcase": 0,
"comma-spacing": [1, {"before": false, "after": true}],
"consistent-return": 2,
"curly": [2, "all"],
"dot-notation": [1, { "allowKeywords": true }],
"eqeqeq": [2, "allow-null"],
"global-strict": [0, "never"],
"guard-for-in": 2,
"indent": [2, 2, {"SwitchCase": 1, "VariableDeclarator": 1}],
"lines-around-comment": [2, {
"beforeBlockComment": true,
"beforeLineComment": true,
"allowBlockStart": true,
"allowObjectStart": true,
"allowArrayStart": true
}],
"key-spacing": 0,
"keyword-spacing": 1,
"new-cap": 0,
"no-alert": 2,
"no-bitwise": 2,
"no-caller": 2,
"no-cond-assign": [2, "except-parens"],
"no-debugger": 2,
"no-dupe-args": 2,
"no-dupe-keys": 2,
"no-empty": 2,
"no-eval": 2,
"no-extend-native": 2,
"no-extra-bind": 2,
"no-extra-parens": 0,
"no-extra-semi": 2,
"no-func-assign": 2,
"no-implied-eval": 2,
"no-invalid-regexp": 2,
"no-irregular-whitespace": 1,
"no-iterator": 2,
"no-loop-func": 2,
"no-mixed-requires": 0,
"no-multi-str": 2,
"no-multi-spaces": 1,
"no-native-reassign": 2,
"no-new": 2,
"no-param-reassign": 1,
"no-proto": 2,
"no-redeclare": 0,
"no-script-url": 2,
"no-self-assign": 2,
"no-self-compare": 2,
"no-sequences": 2,
"no-shadow": 2,
"no-undef": 2,
"no-underscore-dangle": 0,
"no-unreachable": 1,
"no-unused-vars": 1,
"no-use-before-define": 1,
"no-useless-call": 2,
"no-useless-concat": 2,
"no-with": 2,
"quotes": [0, "single"],
"radix": 2,
"semi": [0, "never"],
"strict": 0,
"space-before-blocks": 1,
"space-before-function-paren": [1, {
"anonymous": "always",
"named": "never"
}],
"space-in-parens": [1, "never"],
"space-infix-ops": 1,
"valid-typeof": 2,
"vars-on-top": 0,
"wrap-iife": [2, "inside"]
}
}
7 changes: 5 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Contributing to Patternlab Node
If you'd like to contribute to Pattern Lab Node, please do so! There is always a lot of ground to cover and something for your wheelhouse.
If you'd like to contribute to Pattern Lab Node, please do so! There is always a lot of ground to cover and something for your wheelhouse.

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.

Expand All @@ -9,4 +9,7 @@ No pull request is too small. Check out any [up for grabs issues](https://github
3. If you can, add some unit tests using the existing patterns in the `./test` directory

##Coding style
Regarding code style like indentation and whitespace, follow the conventions you see used in the source already. Add enough source code comments to help the next person.
Two files combine within the project to define and maintain our coding style.

* The `.editorconfig` controls spaces / tabs within supported editors. Check out their [site](http://editorconfig.org/).
* The `.eslintrc` defines our javascript standards. Some editors will evaluate this real-time - otherwise it's run using `grunt|gulp build`
16 changes: 2 additions & 14 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,22 +1,10 @@
node_modules/
.DS_Store
public/index.html
public/styleguide.html
public/styleguide/html/styleguide.html
public/css/*
public/data/*
public/fonts/*
public/js/*
public/images/*
public/patterns/*
latest-change.txt
patternlab.json
.sass-cache/*
/sass-cache
source/images/Thumbs.db
public/styleguide/css/static.css.map
public/styleguide/css/styleguide-specific.css.map
public/styleguide/css/styleguide.css.map
Thumbs.db
source/css/style.css.map
.idea/
public/styleguide/
public
36 changes: 0 additions & 36 deletions .jslintrc

This file was deleted.

Loading