Merge branch 'staging' into feature/88-gravity-form-story

Greg Rickaby · web-flow · commit f3ef28537512 · 2021-01-13T08:43:22.000-06:00
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -24,25 +24,26 @@ module.exports = {
       version: 'detect'
     },
     jsdoc: {
+      unnamedRootBase: ['props'],
       tagNamePreference: {
         returns: 'return'
       }
     }
   },
   plugins: ['react', 'react-hooks', 'jsx-a11y', 'prettier', 'jsdoc'],
   rules: {
+    'func-style': ['error', 'declaration'],
+    'jsdoc/check-indentation': 1,
+    'jsdoc/check-line-alignment': [1, 'always'],
     'jsx-a11y/anchor-is-valid': 'off',
+    'no-console': ['error', {allow: ['warn', 'error']}],
+    'prettier/prettier': 'error',
     'react/react-in-jsx-scope': 'off',
     'react/jsx-filename-extension': [
       1,
       {
         extensions: ['.js', '.jsx']
       }
-    ],
-    'prettier/prettier': 'error',
-    'func-style': ['error', 'declaration'],
-    'jsdoc/check-indentation': 1,
-    'jsdoc/check-line-alignment': [1, 'always'],
-    'no-console': ['error', {allow: ['warn', 'error']}]
+    ]
   }
 }
diff --git a/package.json b/package.json
@@ -54,7 +54,7 @@
     "@storybook/react": "^6.1.14",
     "algoliasearch": "^4.8.3",
     "babel-loader": "^8.2.2",
-    "chromatic": "^5.5.0",
+    "chromatic": "^5.6.0",
     "dayjs": "^1.10.3",
     "deepmerge": "^4.2.2",
     "eslint": "^7.17.0",
diff --git a/yarn.lock b/yarn.lock
@@ -4417,10 +4417,10 @@ chownr@^2.0.0:
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
   integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
 
-chromatic@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/chromatic/-/chromatic-5.5.0.tgz#664808ae41c662560a475004e6353847a9c13ed3"
-  integrity sha512-MaSyaNO4uIx7Ve+uMEBYDgkQKMi8iQdg62kHfpum5QDSlxXTUreQYSaUM1P66ud7uFcmS4Sq+csWTY2LjT3F+g==
+chromatic@^5.6.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/chromatic/-/chromatic-5.6.0.tgz#a2bf53851160ac6e33397986d83e9fff7ad3175d"
+  integrity sha512-IHBGD9y9aWxJBMWa9Wl5d7YNORt2NjpZRVskU/M6xPd+PFgLPhyVn7/6nzF1CF5j4Zh9zzTXL2/GbDfqQ2Dr/A==
   dependencies:
     "@actions/core" "^1.2.4"
     "@actions/github" "^4.0.0"

Original file line number	Diff line number	Diff line change
`@@ -24,25 +24,26 @@ module.exports = {`
`24`	`24`	`version: 'detect'`
`25`	`25`	`},`
`26`	`26`	`jsdoc: {`
	`27`	`+ unnamedRootBase: ['props'],`
`27`	`28`	`tagNamePreference: {`
`28`	`29`	`returns: 'return'`
`29`	`30`	`}`
`30`	`31`	`}`
`31`	`32`	`},`
`32`	`33`	`plugins: ['react', 'react-hooks', 'jsx-a11y', 'prettier', 'jsdoc'],`
`33`	`34`	`rules: {`
	`35`	`+ 'func-style': ['error', 'declaration'],`
	`36`	`+ 'jsdoc/check-indentation': 1,`
	`37`	`+ 'jsdoc/check-line-alignment': [1, 'always'],`
`34`	`38`	`'jsx-a11y/anchor-is-valid': 'off',`
	`39`	`+ 'no-console': ['error', {allow: ['warn', 'error']}],`
	`40`	`+ 'prettier/prettier': 'error',`
`35`	`41`	`'react/react-in-jsx-scope': 'off',`
`36`	`42`	`'react/jsx-filename-extension': [`
`37`	`43`	`1,`
`38`	`44`	`{`
`39`	`45`	`extensions: ['.js', '.jsx']`
`40`	`46`	`}`
`41`		`- ],`
`42`		`- 'prettier/prettier': 'error',`
`43`		`- 'func-style': ['error', 'declaration'],`
`44`		`- 'jsdoc/check-indentation': 1,`
`45`		`- 'jsdoc/check-line-alignment': [1, 'always'],`
`46`		`- 'no-console': ['error', {allow: ['warn', 'error']}]`
	`47`	`+ ]`
`47`	`48`	`}`
`48`	`49`	`}`