Merge branch 'develop' into npm-auto-publish

Author: Jeremy Wiebe

CHANGELOG.md

@@ -1,4 +1,19 @@
 ## To be released
+
+## v2.7.4 (February 2, 2017)
+- Add new classname prefixes to CSS documentation: `pw-` and `qa-`
+- Add links to alternative CSSComb text editor plugins
+- Fix `lint-md` to work properly on Node.js v6+
+
+## v2.7.3
+- Temporarily disable `spaced-comment` errors, until Astro release builds comply
+  with this rule.
+
+## v2.7.2
+- Temporarily downgrade `spaced-comment` errors to warning level, until Astro
+  release builds comply with this rule.
+
+## v2.7.1
 - Re-organized and cleaned up markdown linting files
 - Switched to using `no-duplicate-headings-in-section` (instead of
   `no-duplicate-headings`)

css/class-naming-conventions/readme.md

@@ -286,6 +286,8 @@ Prefix | Purpose | Location |
 `.c-` | Component classes: this includes the root component (typically the class that defines the component itself), sub-component class, and the modifier class. [See above](#component-oriented-naming) | Project's component directory |
 `.t-` | Template classes: These class names are declared as the `template` in the corresponding [view](https://mobify.atlassian.net/wiki/display/PLAT/Views). Example template classes include: `.t-pdp`, `.t-home`, `.t-category`. | Project's template directory |
 `.u-` | Utility classes: these are meant as one-off, strongly opinionated, high specificity overrides for very narrowly defined styles. | Project's `/styles/utilities` directory |
+`.pw-` | Progressive Web classes: these classes are reserved as styling hooks for React components built into Mobify's [Progressive Web SDK](https://github.com/mobify/progressive-web-sdk) | These classes are located either in the SDK component's source directory in the SDK, or in a Project's theme directory. |
+`.qa-` | QA classes: these classes are reserved for, and used as selector hooks for tests (unit tests, integration tests, etc.). These classes are **not meant as styling hooks**, so no CSS should be applied to any `qa-` classes! | In a project's test directories. |
 `.x-` | Classes that start with `x-` are considered global states or document states. That means these classes should only be applied to the `html` or `body` element. Example states include `x-ios`, `x-portrait`, `x-retina`, `x-header-is-sticky`, etc. | *varies* |
 `.m-` (*) | Desktop embedded mobile markup classes: these are classes that we will use if we author Markup that is intended for clients to embed onto their desktop pages, but is for mobile content. | *n/a* |
 `.js-` | Javascript classes are used exclusively by scripts and should never have CSS styles applied to them. Repeat: **Do NOT** style Javascript classes. | *n/a*

css/csscomb/readme.md

@@ -34,3 +34,9 @@ Before you start, make sure you have [Package Control](https://packagecontrol.io
   (Find your local path by running `npm config get prefix` and append `/lib/node_modules/mobify-code-style/css/.csscomb.json` to the result)
 1. Restart Sublime
 1. Start combing your Sass!
+
+### Other Text Editors
+
+* [CSSComb for VIM](https://github.com/csscomb/vim-csscomb)
+* [jetbrains-csscomb](https://github.com/csscomb/jetbrains-csscomb) which should work for all JetBrains IDEs, such as IDEA, PyCharm, WebStorm, PhpStorm, RubyMine, and perhaps others.
+* [CSSComb for Emacs](https://github.com/channikhabra/css-comb.el), including Aquamacs

docs/bin/lint-md

@@ -14,11 +14,16 @@ done
 DOCS_DIR="$(cd "$(dirname "$BIN")/.." && pwd)"
 REMARK_RC="$DOCS_DIR/remarkrc"
 
-# This is tricky. `remark` is a dep of mobify-code-style
-# and so won't show up in `node_modules/.bin` of a project
-# that uses mobify-code-style. We have to move into the
-# the mobify-code-style /docs directory and find the npm
-# bin directory relative that _that_ to find remark!
-REMARK_CLI="$(cd "$DOCS_DIR" && npm bin)/remark"
+if [[ $(node -v) =~ ^v[0-4] ]]; then
+	# Node v4!!
+	# This is tricky. `remark` is a dep of mobify-code-style
+	# and so won't show up in `node_modules/.bin` of a project
+	# that uses mobify-code-style. We have to move into the
+	# the mobify-code-style /docs directory and find the npm
+	# bin directory relative that _that_ to find remark!
+    REMARK_CLI="$(cd "$DOCS_DIR" && npm bin)/remark"
+else
+    REMARK_CLI="$(npm bin)/remark"
+fi
 
 $REMARK_CLI --rc-path $REMARK_RC "$@"

es5/mobify-es5.yml

@@ -46,7 +46,6 @@ rules:
     - never
   space-infix-ops: error
   space-unary-ops: error
-  spaced-comment: error
   no-undef: error
   eol-last: warn
   quotes:

javascript/.eslintrc

@@ -84,9 +84,6 @@
         // Disallow spacing around non-word unary operators: -, +, --, ++, !, !!
         "space-unary-ops": [2, { "words": true, "nonwords": false }],
 
-        // Enforce whitespace after the start of a comment (// or /*)
-        "spaced-comment": 2,
-
         // Disallow undeclared variables (unless mentioned in /*global ...*/ comment)
         "no-undef": 2,
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobify-code-style",
-  "version": "2.7.0",
+  "version": "2.7.4",
   "description": "Code style guide and linting tools for Mobify",
   "repository": {
     "type": "git",