Merge pull request #781 from Financial-Times/ACQ-2540-fix-prettier-es…

…lint-and-lint-staged-config-in-our-repos

ACQ-2540: fix prettier, eslint and lint-staged configs

.eslintignore

@@ -2,5 +2,9 @@
 /dist
 /.eslintrc.js
 /public
-secret-squirrel.js
-secret-squirrel.cjs
+package-lock.json
+*.json
+*.sh
+.*
+*.feature
+/docs

.eslintrc.js

@@ -1,7 +1,7 @@
 module.exports = {
 	extends: [
         "@financial-times/eslint-config-next",
-        "prettier",
+        "plugin:prettier/recommended",
         "plugin:storybook/recommended"
     ],
 	rules: {

.prettierignore

@@ -11,6 +11,7 @@ node_modules
 
 /coverage
 /pa11y-screen-capture
+/docs
 
 *.json
 *.sh

.toolkitrc.yml

@@ -4,9 +4,9 @@ plugins:
   - "@dotcom-tool-kit/jest"
   - "@dotcom-tool-kit/eslint"
   - "@dotcom-tool-kit/prettier"
-  - "@dotcom-tool-kit/lint-staged"
+  - "@dotcom-tool-kit/lint-staged-npm"
   - "@dotcom-tool-kit/husky-npm"
-  - './toolkit/run-storybook'
+  - "./toolkit/run-storybook"
 hooks:
   test:local:
     - Eslint
@@ -15,10 +15,16 @@ hooks:
     - Eslint
     - JestCI
   run:local:
-   - RunStorybook
+    - RunStorybook
 options:
   "@dotcom-tool-kit/circleci":
     nodeVersion: 18.17-browsers
   "@dotcom-tool-kit/babel":
     files: "components/{*.jsx,index.js}"
     outputPath: dist
+  "@dotcom-tool-kit/lint-staged-npm":
+    testGlob: "**/*.{js,jsx,json,scss}"
+    formatGlob: "**/*.{js,jsx,json,scss}"
+  "@dotcom-tool-kit/prettier":
+    files: ["**/*.{js,jsx,json,scss}"]
+    configFile: ".prettierrc.js"

components/accept-terms-subscription.jsx

@@ -95,16 +95,18 @@ export function AcceptTermsSubscription({
 				<ul className="o-typography-list ncf__accept-terms-list">
 					<li>
 						<span className="terms-transition terms-transition--immediate">
-							I give consent for the chosen payment method to be charged automatically.
+							I give consent for the chosen payment method to be charged
+							automatically.
 						</span>
 					</li>
 					<li>
 						<span className="terms-transition terms-transition--immediate">
-							By placing your order subject to the Terms & Conditions (save for section 2) referred to
-							below, you are waiving your statutory right to cancel our contract within 14 days of
-							payment. Your payment is a one-time payment collected at the time of checkout, and
-							unsubscribing or cancelling at any point (whether before or after the 14-day period)
-							will not entitle you to a refund.
+							By placing your order subject to the Terms & Conditions (save for
+							section 2) referred to below, you are waiving your statutory right
+							to cancel our contract within 14 days of payment. Your payment is
+							a one-time payment collected at the time of checkout, and
+							unsubscribing or cancelling at any point (whether before or after
+							the 14-day period) will not entitle you to a refund.
 						</span>
 					</li>
 					<li>

components/confirmation.jsx

@@ -117,11 +117,9 @@ export function Confirmation({
 				</p>
 			</div>
 			<p className="ncf__paragraph">
-				{
-					!isTermedSubscriptionTermType
-						? 'We will automatically renew your subscription using the payment method provided unless you cancel before your renewal date. '
-						: ''
-				}
+				{!isTermedSubscriptionTermType
+					? 'We will automatically renew your subscription using the payment method provided unless you cancel before your renewal date. '
+					: ''}
 				{'See our '}
 				<a
 					className="ncf__link ncf__link--external"