Automattic · dereksmart · Mar 24, 2017 · Feb 2, 2017 · Feb 2, 2017 · Feb 2, 2017
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1 @@
+_inc/client/**/test/*.js
diff --git a/.eslintrc b/.eslintrc
@@ -1,79 +1,86 @@
 {
 	"parser": "babel-eslint",
+	"extends": "wpcalypso/react",
 	"env": {
 		"browser": true,
 		"es6": true,
 		"mocha": true,
-		"node": true
+		"node": true,
+		"jquery": true
 	},
 	"ecmaFeatures": {
 		"jsx": true,
 		"modules": true
 	},
 	"plugins": [
-		"eslint-plugin-react"
+		"eslint-plugin-react",
+		"lodash"
 	],
 	"rules": {
+		"array-bracket-spacing": [ 1, "always" ],
 		"brace-style": [ 1, "1tbs" ],
 		// REST API objects include underscores
 		"camelcase": 0,
-		"comma-dangle": 0,
 		"comma-spacing": 1,
-		// Allows returning early as undefined
-		"consistent-return": 0,
-		"dot-notation": 1,
-		"eqeqeq": [ 2, "allow-null" ],
-		"eol-last": 1,
+		"curly": 1,
+		"computed-property-spacing": [ 1, "always" ],
+		"func-call-spacing": 1,
 		"indent": [ 1, "tab", { "SwitchCase": 1 } ],
+		"jsx-quotes": [ 1, "prefer-double" ],
 		"key-spacing": 1,
-		// Most common is "Emitter", should be improved
-		"new-cap": 1,
-		"no-cond-assign": 2,
+		"keyword-spacing": 1,
+		"lodash/import-scope": [ 2, "method" ],
+		"max-len": 0, // Ignored for Jetpack
+		"new-cap": [ 1, { "capIsNew": false, "newIsCap": true } ],
 		"no-else-return": 1,
-		"no-empty": 1,
-		// Flux stores use switch case fallthrough
-		"no-fallthrough": 0,
-		"no-lonely-if": 1,
-		"no-mixed-requires": 0,
-		"no-mixed-spaces-and-tabs": 1,
-		"no-multiple-empty-lines": [ 1, { "max": 1 } ],
+		"no-extra-semi": 1,
+		"no-multiple-empty-lines": [ 1, { max: 1 } ],
 		"no-multi-spaces": 1,
-		"no-nested-ternary": 1,
-		"no-new": 1,
-		"no-process-exit": 1,
+		"no-restricted-imports": [ 1, "lib/sites-list", "lib/mixins/data-observe" ],
+		"no-restricted-modules": [ 1, "lib/sites-list", "lib/mixins/data-observe" ],
 		"no-shadow": 1,
 		"no-spaced-func": 1,
 		"no-trailing-spaces": 1,
-		"no-underscore-dangle": 0,
 		// Allows Chai `expect` expressions
 		"no-unused-expressions": 0,
-		"no-unused-vars": 1,
-		// Teach eslint about React+JSX
-		"react/jsx-uses-react": 1,
-		"react/jsx-uses-vars": 1,
-		// Allows function use before declaration
-		"no-use-before-define": [ 2, "nofunc" ],
-		// We split external, internal, module variables
-		"one-var": 0,
-		"operator-linebreak": [ 1, "after", { "overrides": { "?": "ignore", ":": "ignore" } } ],
+		"no-var": 1,
+		"object-curly-spacing": [ 1, "always" ],
+		"operator-linebreak": [ 1, "after", { "overrides": {
+			"?": "before",
+			":": "before"
+		} } ],
 		"padded-blocks": [ 1, "never" ],
-		"quote-props": [ 1, "as-needed" ],
+		"prefer-const": 1,
+		"quote-props": [ 1, "as-needed", { "keywords": true } ],
 		"quotes": [ 1, "single", "avoid-escape" ],
+		"react/jsx-curly-spacing": [ 1, "always" ],
+		"react/jsx-no-bind": 1,
+		"react/jsx-space-before-closing": 1,
+		"react/no-danger": 1,
+		"react/no-did-mount-set-state": 1,
+		"react/no-did-update-set-state": 1,
+		"react/no-is-mounted": 1,
+		"react/prefer-es6-class": 1,
+		"semi": 1,
 		"semi-spacing": 1,
-		"space-after-keywords": [ 1, "always" ],
 		"space-before-blocks": [ 1, "always" ],
 		"space-before-function-paren": [ 1, "never" ],
-		// Our array literal index exception violates this rule
-		"space-in-brackets": 0,
 		"space-in-parens": [ 1, "always" ],
 		"space-infix-ops": [ 1, { "int32Hint": false } ],
-		// Ideal for "!" but not for "++"
-		"space-unary-ops": 0,
-		// Assumed by default with Babel
-		"strict": [ 2, "never" ],
+		"space-unary-ops": [ 1, {
+			"overrides": {
+				"!": true
+			}
+		} ],
+		"template-curly-spacing": [ 1, "always" ],
 		"valid-jsdoc": [ 1, { "requireReturn": false } ],
-		// Common top-of-file requires, expressions between external, interal
-		"vars-on-top": 1,
-		"yoda": 0
+		"wpcalypso/i18n-ellipsis": 1,
+		"wpcalypso/i18n-no-collapsible-whitespace": 1,
+		"wpcalypso/i18n-no-this-translate": 1,
+		"wpcalypso/i18n-no-variables": 1,
+		"wpcalypso/i18n-mismatched-placeholders": 1,
+		"wpcalypso/import-docblock": 1,
+		"wpcalypso/jsx-gridicon-size": 1,
+		"wpcalypso/jsx-classname-namespace": 0 // Ignored for Jetpack
 	}
 }
diff --git a/.svnignore b/.svnignore
@@ -1,3 +1,5 @@
+.eslintrc
+.eslintignore
 .git
 .gitignore
 .sass-cache

diff --git a/.travis.yml b/.travis.yml
@@ -8,10 +8,7 @@ env:
   global:
     - WP_TRAVISCI=phpunit
 
-cache:
-  directories:
-    - ~/.yarn
-    - ~/.nvm
+cache: yarn
 
 # Next we define our matrix of additional build configurations to test against.
 # The versions listed above will automatically create our first configuration,
@@ -28,9 +25,11 @@ cache:
 matrix:
   include:
   - php: "5.6"
-    env: WP_TRAVISCI="npm run test-client"
+    env: WP_TRAVISCI="yarn lint"
   - php: "5.6"
-    env: WP_TRAVISCI="npm run test-gui"
+    env: WP_TRAVISCI="yarn test-client"
+  - php: "5.6"
+    env: WP_TRAVISCI="yarn test-gui"
   - php: "5.2"
   - php: "5.3"
   - php: "5.5"

diff --git a/_inc/client/README.md b/_inc/client/README.md
@@ -96,7 +96,6 @@ Action types dispatched during the UI lifecycle are listed in `state/action-type
 * **getApiRootUrl( state )**
 * **getConnectUrl( state )**
 * **getCurrentVersion( state )**
-* **getHappinessGravatarIds( state )**
 * **getInitialStateStatsData( state )**
 * **getJetpackNotices( state )**
 * **getJetpackStateNoticesErrorCode( state )**

diff --git a/_inc/client/admin.js b/_inc/client/admin.js
@@ -19,6 +19,8 @@ import Main from 'main';
 // Initialize the accessibile focus to allow styling specifically for keyboard navigation
 accessibleFocus();
 
+const Initial_State = window.Initial_State;
+
 Initial_State.locale = JSON.parse( Initial_State.locale );
 
 if ( 'undefined' !== typeof Initial_State.locale[ '' ] ) {
@@ -61,14 +63,15 @@ function render() {
 					<Route path='/dashboard' name={ i18n.translate( 'At A Glance' ) } component={ Main } />
 					<Route path='/apps' name={ i18n.translate( 'Apps', { context: 'Navigation item.' } ) } component={ Main } />
 					<Route path='/plans' name={ i18n.translate( 'Plans', { context: 'Navigation item.' } ) } component={ Main } />
-					<Route path='/settings' name={ i18n.translate( 'General', { context: 'Navigation item.' } ) } component={ Main } />
-					<Route path='/general' name={ i18n.translate( 'General', { context: 'Navigation item.' } ) } component={ Main } />
-					<Route path='/engagement' name={ i18n.translate( 'Engagement', { context: 'Navigation item.' } ) } component={ Main } />
+					<Route path='/settings' name={ i18n.translate( 'Settings', { context: 'Navigation item.' } ) } component={ Main } />
+					<Route path='/discussion' name={ i18n.translate( 'Discussion', { context: 'Navigation item.' } ) } component={ Main } />
 					<Route path='/security' name={ i18n.translate( 'Security', { context: 'Navigation item.' } ) } component={ Main } />
-					<Route path='/appearance' name={ i18n.translate( 'Appearance', { context: 'Navigation item.' } ) } component={ Main } />
+					<Route path='/traffic' name={ i18n.translate( 'Traffic', { context: 'Navigation item.' } ) } component={ Main } />
 					<Route path='/writing' name={ i18n.translate( 'Writing', { context: 'Navigation item.' } ) } component={ Main } />
-					<Route path='/search' component={ Main } />
-					<Route path="*" />
+					<Route path='/sharing' name={ i18n.translate( 'Sharing', { context: 'Navigation item.' } ) } component={ Main } />
+					<Route path='/wpbody-content' component={ Main } />
+					<Route path='/wp-toolbar' component={ Main } />
+					<Route path="*" component={ Main } />
 				</Router>
 			</Provider>
 		</div>,

diff --git a/_inc/client/appearance/index.jsx b/_inc/client/appearance/index.jsx
diff --git a/_inc/client/apps/index.jsx b/_inc/client/apps/index.jsx
@@ -44,7 +44,7 @@ const Apps = ( props ) => {
 					</div>
 				</div>
 				<div className="jp-landing-apps__clouds jp-clouds-top">
-					<img src={ imagePath + '/white-clouds.svg' } />
+					<img src={ imagePath + '/white-clouds.svg' } alt="" />
 				</div>
 			</div>
 
@@ -56,7 +56,7 @@ const Apps = ( props ) => {
 					props.userCanManagePlugins
 					?	<div className="jp-landing-apps__feature">
 							<div className="jp-landing-apps__feature-col jp-landing-apps__feature-img">
-								
+
 								<svg width="300" height="200" viewBox="0 0 1005 700" xmlns="http://www.w3.org/2000/svg" xmlnsXlink="http://www.w3.org/1999/xlink" aria-labelledby="wpcomPlugins" role="img"><title id="wpcomPlugins">{ __( 'Image of managing your sites plugins on your WordPress.com dashboard' ) }</title><defs><rect id="a" width="1005" height="700" rx="8"/><rect id="b" width="335" height="233" rx="8"/><path id="c" d="M40 19.9996V0H0v39.9992h40z"/><path id="e" d="M40 19.9996V0H0v39.9992h40z"/><path id="g" d="M40 19.9996V0H0v39.9992h40z"/><path id="i" d="M40 19.9996V0H0v39.9992h40z"/><path id="k" d="M40 19.9996V0H0v39.9992h40z"/></defs><g fill="none" fill-rule="evenodd"><g><rect fill="#F3F6F8" width="1005" height="700" rx="8"/><use fill="#F3F6F8" xlinkHref="#a"/></g><g><rect fill="#E9EFF3" width="1005" height="65" rx="8"/><path d="M27.5 31c-4.1425 0-7.5-3.3575-7.5-7.5s3.3575-7.5 7.5-7.5 7.5 3.3575 7.5 7.5-3.3575 7.5-7.5 7.5zm50 0c-4.1425 0-7.5-3.3575-7.5-7.5s3.3575-7.5 7.5-7.5 7.5 3.3575 7.5 7.5-3.3575 7.5-7.5 7.5zm-25 0c-4.1425 0-7.5-3.3575-7.5-7.5s3.3575-7.5 7.5-7.5 7.5 3.3575 7.5 7.5-3.3575 7.5-7.5 7.5z" fill="#4F748E"/></g><path fill="#0087BE" d="M0 47h1005v65H0"/><g><path fill="#FFF" d="M196 176h614v85H196z"/><g transform="translate(740 199)"><mask id="d" fill="#fff"><use xlinkHref="#c"/></mask><path d="M18 31.5352l-9.768-9.768 3.536-3.534L18 24.4652l17.316-17.316c-3.67-4.368-9.166-7.15-15.316-7.15-11.046 0-20 8.956-20 20 0 11.046 8.954 20 20 20s20-8.954 20-20c0-3.056-.706-5.942-1.932-8.532L18 31.5352z" fill="#4AB866" mask="url(#d)"/></g><path fill="#87A6BC" d="M211 191h55v55h-55z"/><path d="M244.5 213v-7.5c0-.828-.672-1.5-1.5-1.5s-1.5.672-1.5 1.5v7.5h-6v-7.5c0-.828-.672-1.5-1.5-1.5s-1.5.672-1.5 1.5v7.5H228v6c0 4.1865 2.4555 7.7895 6 9.4755V234h9v-5.5245c3.5445-1.686 6-5.289 6-9.4755v-6h-4.5z" fill="#FFF"/><path fill="#87A6BC" d="M286 197h225v18H286z"/><path fill="#A8BECE" d="M286 225h165v14H286z"/><g><path fill="#FFF" d="M196 271h614v85H196z"/><g transform="translate(740 294)"><mask id="f" fill="#fff"><use xlinkHref="#e"/></mask><path d="M18 31.5352l-9.768-9.768 3.536-3.534L18 24.4652l17.316-17.316c-3.67-4.368-9.166-7.15-15.316-7.15-11.046 0-20 8.956-20 20 0 11.046 8.954 20 20 20s20-8.954 20-20c0-3.056-.706-5.942-1.932-8.532L18 31.5352z" fill="#4AB866" mask="url(#f)"/></g><path fill="#87A6BC" d="M211 286h55v55h-55z"/><path d="M244.5 308v-7.5c0-.828-.672-1.5-1.5-1.5s-1.5.672-1.5 1.5v7.5h-6v-7.5c0-.828-.672-1.5-1.5-1.5s-1.5.672-1.5 1.5v7.5H228v6c0 4.1865 2.4555 7.7895 6 9.4755V329h9v-5.5245c3.5445-1.686 6-5.289 6-9.4755v-6h-4.5z" fill="#FFF"/><g><path fill="#87A6BC" d="M286 292h225v18H286z"/><path fill="#A8BECE" d="M286 320h165v14H286z"/></g></g><g><path fill="#FFF" d="M196 366h614v85H196z"/><g transform="translate(740 389)"><mask id="h" fill="#fff"><use xlinkHref="#g"/></mask><path d="M18 31.5352l-9.768-9.768 3.536-3.534L18 24.4652l17.316-17.316c-3.67-4.368-9.166-7.15-15.316-7.15-11.046 0-20 8.956-20 20 0 11.046 8.954 20 20 20s20-8.954 20-20c0-3.056-.706-5.942-1.932-8.532L18 31.5352z" fill="#4AB866" mask="url(#h)"/></g><path fill="#87A6BC" d="M211 381h55v55h-55z"/><path d="M244.5 403v-7.5c0-.828-.672-1.5-1.5-1.5s-1.5.672-1.5 1.5v7.5h-6v-7.5c0-.828-.672-1.5-1.5-1.5s-1.5.672-1.5 1.5v7.5H228v6c0 4.1865 2.4555 7.7895 6 9.4755V424h9v-5.5245c3.5445-1.686 6-5.289 6-9.4755v-6h-4.5z" fill="#FFF"/><g><path fill="#87A6BC" d="M286 387h225v18H286z"/><path fill="#A8BECE" d="M286 415h165v14H286z"/></g></g><g><path fill="#FFF" d="M196 461h614v85H196z"/><g transform="translate(740 484)"><mask id="j" fill="#fff"><use xlinkHref="#i"/></mask><path d="M18 31.5352l-9.768-9.768 3.536-3.534L18 24.4652l17.316-17.316c-3.67-4.368-9.166-7.15-15.316-7.15-11.046 0-20 8.956-20 20 0 11.046 8.954 20 20 20s20-8.954 20-20c0-3.056-.706-5.942-1.932-8.532L18 31.5352z" fill="#4AB866" mask="url(#j)"/></g><path fill="#87A6BC" d="M211 476h55v55h-55z"/><path d="M244.5 498v-7.5c0-.828-.672-1.5-1.5-1.5s-1.5.672-1.5 1.5v7.5h-6v-7.5c0-.828-.672-1.5-1.5-1.5s-1.5.672-1.5 1.5v7.5H228v6c0 4.1865 2.4555 7.7895 6 9.4755V519h9v-5.5245c3.5445-1.686 6-5.289 6-9.4755v-6h-4.5z" fill="#FFF"/><g><path fill="#87A6BC" d="M286 482h225v18H286z"/><path fill="#A8BECE" d="M286 510h165v14H286z"/></g></g><g><path fill="#FFF" d="M196 556h614v85H196z"/><g transform="translate(740 579)"><mask id="l" fill="#fff"><use xlinkHref="#k"/></mask><path d="M18 31.5352l-9.768-9.768 3.536-3.534L18 24.4652l17.316-17.316c-3.67-4.368-9.166-7.15-15.316-7.15-11.046 0-20 8.956-20 20 0 11.046 8.954 20 20 20s20-8.954 20-20c0-3.056-.706-5.942-1.932-8.532L18 31.5352z" fill="#4AB866" mask="url(#l)"/></g><path fill="#87A6BC" d="M211 571h55v55h-55z"/><path d="M244.5 593v-7.5c0-.828-.672-1.5-1.5-1.5s-1.5.672-1.5 1.5v7.5h-6v-7.5c0-.828-.672-1.5-1.5-1.5s-1.5.672-1.5 1.5v7.5H228v6c0 4.1865 2.4555 7.7895 6 9.4755V614h9v-5.5245c3.5445-1.686 6-5.289 6-9.4755v-6h-4.5z" fill="#FFF"/><g><path fill="#87A6BC" d="M286 577h225v18H286z"/><path fill="#A8BECE" d="M286 605h165v14H286z"/></g></g></g></g></svg>
 
 							</div>
@@ -145,7 +145,7 @@ const Apps = ( props ) => {
 
 			<div className="jp-landing-apps__footer">
 				<div className="jp-landing-apps__clouds jp-clouds-bottom">
-					<img src={ imagePath + '/white-clouds-reverse.svg' } />
+					<img src={ imagePath + '/white-clouds-reverse.svg' } alt="" />
 				</div>
 				<div className="jp-landing-apps__footer-top">
 					<h2 className="jp-landing-apps__title">
@@ -156,7 +156,7 @@ const Apps = ( props ) => {
 						{ __( 'Get WordPress apps for any screen.' ) }
 					</p>
 
-					<img src={ imagePath + '/apps/triple-devices.svg' } className="jp-landing-apps__devices" role="img" alt={ __( 'Example of three devices to use the WordPress apps. An iPhone, Android phone, and a apple laptop computer.' ) } />
+					<img src={ imagePath + '/apps/triple-devices.svg' } className="jp-landing-apps__devices" alt={ __( 'Example of three devices to use the WordPress apps. An iPhone, Android phone, and a apple laptop computer.' ) } />
 				</div>
 
 				<div className="jp-landing-apps__downloads">