Upgrade prettier to v2 (#926)

* Upgrade to prettier v2 for modern TypeScript support.

* Change trailing comma to prettier v1 default.

Minimizes changes during v2 upgrade.

* Apply prettier v2 formatting changes.

Yaaay touching all of the files!

* Set end of line to LF.

.gitattributes

@@ -1,2 +1,2 @@
 **/package-lock.json binary linguist-generated=true
-* text=auto
+* text=auto eol=lf

package.json

@@ -23,4 +23,4 @@
     "format": "lerna run --parallel --stream format",
     "bump-version": "node ./scripts/bump-version.js"
   }
-}
+}

packages/commerce-sdk-react/.prettierrc.yaml

@@ -4,3 +4,4 @@ semi: false
 bracketSpacing: false
 tabWidth: 4
 arrowParens: 'always'
+trailingComma: 'none'

packages/commerce-sdk-react/scripts/version.js

@@ -11,10 +11,7 @@ const path = require('path')
 const os = require('os')
 const fs = require('fs')
 
-const date = new Date()
-    .toString()
-    .split(' ')
-    .slice(1, 4)
+const date = new Date().toString().split(' ').slice(1, 4)
 const heading = `## v${pkg.version} (${date[0]} ${date[1]}, ${date[2]})\n`
 
 const changelog = path.resolve(os.tmpdir(), 'CHANGELOG.md')

packages/commerce-sdk-react/src/auth/index.test.ts

@@ -10,7 +10,7 @@ import {helpers} from 'commerce-sdk-isomorphic'
 
 jest.mock('./storage', () => {
     return {
-        CookieStorage: jest.fn(function() {
+        CookieStorage: jest.fn(function () {
             const map = new Map()
             return {
                 set(key: string, value: string) {
@@ -24,7 +24,7 @@ jest.mock('./storage', () => {
                 }
             }
         }),
-        LocalStorage: jest.fn(function() {
+        LocalStorage: jest.fn(function () {
             const map = new Map()
             return {
                 set(key: string, value: string) {

packages/commerce-sdk-react/src/hooks/ShopperBaskets/mutation.ts

@@ -182,7 +182,8 @@ type UseShopperBasketsMutationArg = {
 }
 
 type ShopperBasketsClient = ApiClients['shopperBaskets']
-export type ShopperBasketsMutationType = typeof ShopperBasketsMutations[keyof typeof ShopperBasketsMutations]
+export type ShopperBasketsMutationType =
+    (typeof ShopperBasketsMutations)[keyof typeof ShopperBasketsMutations]
 
 /**
  * @private
@@ -450,11 +451,13 @@ export function useShopperBasketsMutation<Action extends ShopperBasketsMutationT
     return useMutation<Data, Error, Params>(
         (params, apiClients) => {
             const method = apiClients['shopperBaskets'][action] as MutationFunction<Data, Params>
-            return (method.call as (
-                apiClient: ShopperBasketsClient,
-                params: Params,
-                rawResponse: boolean | undefined
-            ) => any)(apiClients['shopperBaskets'], {...params, headers}, rawResponse)
+            return (
+                method.call as (
+                    apiClient: ShopperBasketsClient,
+                    params: Params,
+                    rawResponse: boolean | undefined
+                ) => any
+            )(apiClients['shopperBaskets'], {...params, headers}, rawResponse)
         },
         {
             onSuccess: (data, params) => {

packages/commerce-sdk-react/src/hooks/ShopperCustomers/mutation.ts

@@ -439,7 +439,8 @@ export const SHOPPER_CUSTOMERS_NOT_IMPLEMENTED = [
     'updateCustomerProductList'
 ]
 
-export type ShopperCustomersMutationType = typeof ShopperCustomersMutations[keyof typeof ShopperCustomersMutations]
+export type ShopperCustomersMutationType =
+    (typeof ShopperCustomersMutations)[keyof typeof ShopperCustomersMutations]
 
 type UseShopperCustomersMutationHeaders = NonNullable<
     Argument<Client['registerCustomer']>
@@ -473,11 +474,13 @@ function useShopperCustomersMutation<Action extends ShopperCustomersMutationType
     return useMutation<Data, Error, Params>(
         (params, apiClients) => {
             const method = apiClients['shopperCustomers'][action] as MutationFunction<Data, Params>
-            return (method.call as (
-                apiClient: ShopperCustomersClient,
-                params: Params,
-                rawResponse: boolean | undefined
-            ) => any)(apiClients['shopperCustomers'], {...params, headers}, rawResponse)
+            return (
+                method.call as (
+                    apiClient: ShopperCustomersClient,
+                    params: Params,
+                    rawResponse: boolean | undefined
+                ) => any
+            )(apiClients['shopperCustomers'], {...params, headers}, rawResponse)
         },
         {
             onSuccess: (data, params) => {

packages/commerce-sdk-react/src/hooks/ShopperLogin/helper.ts

@@ -17,7 +17,7 @@ export const ShopperLoginHelpers = {
     Logout: 'logout'
 } as const
 
-type ShopperLoginHelpersType = typeof ShopperLoginHelpers[keyof typeof ShopperLoginHelpers]
+type ShopperLoginHelpersType = (typeof ShopperLoginHelpers)[keyof typeof ShopperLoginHelpers]
 
 /**
  * A hook for Public Client Shopper Login OAuth helpers.

packages/commerce-sdk-react/src/hooks/ShopperOrders/mutation.ts

@@ -79,7 +79,8 @@ export const SHOPPER_ORDERS_NOT_IMPLEMENTED = [
     'UpdatePaymentInstrumentForOrder'
 ]
 
-export type ShopperOrdersMutationType = typeof ShopperOrdersMutations[keyof typeof ShopperOrdersMutations]
+export type ShopperOrdersMutationType =
+    (typeof ShopperOrdersMutations)[keyof typeof ShopperOrdersMutations]
 
 type UseShopperOrdersMutationHeaders = NonNullable<Argument<Client['createOrder']>>['headers']
 type UseShopperOrdersMutationArg = {
@@ -113,11 +114,13 @@ function useShopperOrdersMutation<Action extends ShopperOrdersMutationType>(
     return useMutation<Data, Error, Params>(
         (params, apiClients) => {
             const method = apiClients['shopperOrders'][action] as MutationFunction<Data, Params>
-            return (method.call as (
-                apiClient: ShopperOrdersClient,
-                params: Params,
-                rawResponse: boolean | undefined
-            ) => any)(apiClients['shopperOrders'], {...params, headers}, rawResponse)
+            return (
+                method.call as (
+                    apiClient: ShopperOrdersClient,
+                    params: Params,
+                    rawResponse: boolean | undefined
+                ) => any
+            )(apiClients['shopperOrders'], {...params, headers}, rawResponse)
         },
         {
             onSuccess: (data, params) => {

packages/commerce-sdk-react/src/hooks/utils.ts

@@ -49,9 +49,7 @@ export const updateCache = <Action extends CombinedMutationTypes>(
     const isMatchingKey = (cacheQuery: {queryKey: {[x: string]: any}}, queryKey: QueryKey) =>
         queryKey.every((item, index) =>
             isObject(item) && isObject(cacheQuery.queryKey[index])
-                ? Object.entries(cacheQuery.queryKey[index])
-                      .sort()
-                      .toString() ===
+                ? Object.entries(cacheQuery.queryKey[index]).sort().toString() ===
                   Object.entries(item as Record<string, unknown>)
                       .sort()
                       .toString()

packages/internal-lib-build/.prettierrc.yaml

@@ -4,3 +4,4 @@ semi: false
 bracketSpacing: false
 tabWidth: 4
 arrowParens: 'always'
+trailingComma: 'none'

packages/internal-lib-build/package.json

@@ -62,7 +62,7 @@
     "jest-environment-jsdom": "^26.6.2",
     "jest-environment-jsdom-global": "^2.0.4",
     "jest-fetch-mock": "^2.1.2",
-    "prettier": "^1.19.1",
+    "prettier": "^2.8.3",
     "raf": "^3.4.0",
     "regenerator-runtime": "^0.13.9",
     "replace-in-file": "^6.2.0",

packages/pwa-kit-create-app/.prettierrc.yaml

@@ -4,3 +4,4 @@ semi: false
 bracketSpacing: false
 tabWidth: 4
 arrowParens: 'always'
+trailingComma: 'none'

packages/pwa-kit-dev/.prettierrc.yaml

@@ -4,3 +4,4 @@ semi: false
 bracketSpacing: false
 tabWidth: 4
 arrowParens: 'always'
+trailingComma: 'none'

packages/pwa-kit-dev/package.json

@@ -87,7 +87,7 @@
     "mime-types": "2.1.32",
     "minimatch": "3.0.5",
     "open": "^8.4.0",
-    "prettier": "^1.18.2",
+    "prettier": "^2.8.3",
     "pwa-kit-runtime": "^2.6.0-dev",
     "react-refresh": "^0.13.0",
     "replace-in-file": "^6.2.0",

packages/pwa-kit-dev/scripts/file-utils.test.js

@@ -10,13 +10,17 @@ const fs = require('fs')
 
 const fileUtils = require('./file-utils')
 
-const successCallbackAdapter = (value = true) => (...args) => {
-    args[args.length - 1](null, value)
-}
-
-const failureCallbackAdapter = (value = {}) => (...args) => {
-    args[args.length - 1](value)
-}
+const successCallbackAdapter =
+    (value = true) =>
+    (...args) => {
+        args[args.length - 1](null, value)
+    }
+
+const failureCallbackAdapter =
+    (value = {}) =>
+    (...args) => {
+        args[args.length - 1](value)
+    }
 
 const argsIgnoringCallback = (mock, index = 0) => mock.mock.calls[index].slice(0, -1)
 

packages/pwa-kit-dev/scripts/version.js

@@ -11,10 +11,7 @@ const path = require('path')
 const os = require('os')
 const fs = require('fs')
 
-const date = new Date()
-    .toString()
-    .split(' ')
-    .slice(1, 4)
+const date = new Date().toString().split(' ').slice(1, 4)
 const heading = `## v${pkg.version} (${date[0]} ${date[1]}, ${date[2]})\n`
 
 const changelog = path.resolve(os.tmpdir(), 'CHANGELOG.md')

packages/pwa-kit-dev/src/configs/jest/jest.config.js

@@ -13,11 +13,8 @@ module.exports = {
     testEnvironment: 'jsdom',
     testPathIgnorePatterns: ['node_modules', 'build'],
     moduleNameMapper: {
-        '\\.(jpg|jpeg|png|gif|eot|otf|webp|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': path.join(
-            __dirname,
-            'mocks',
-            'fileMock.js'
-        ),
+        '\\.(jpg|jpeg|png|gif|eot|otf|webp|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
+            path.join(__dirname, 'mocks', 'fileMock.js'),
         '\\.(svg)$': path.join(__dirname, 'mocks', 'svgMock.js'),
         '\\.(css|less)$': path.join(__dirname, 'mocks', 'styleMock.js')
     },

packages/pwa-kit-dev/src/ssr/server/build-dev-server.test.js

@@ -360,7 +360,7 @@ describe('DevServer proxying', () => {
             .get(targetPath)
             .reply(
                 200,
-                function() {
+                function () {
                     requestHeaders.push(this.req.headers)
                 },
                 responseHeaders
@@ -414,9 +414,7 @@ describe('DevServer proxying', () => {
     test('restricts methods', () => {
         // Use nock to mock out a host to which we proxy, though we
         // do not expect the request to be made.
-        const nockResponse = nock('https://test.proxy.com')
-            .get('/test/path3')
-            .reply(200, 'OK')
+        const nockResponse = nock('https://test.proxy.com').get('/test/path3').reply(200, 'OK')
 
         const app = NoWebpackDevServerFactory._createApp(opts())
         const path = '/mobify/caching/base3/test/path3'
@@ -434,7 +432,7 @@ describe('DevServer proxying', () => {
         // Use nock to mock out a host to which we proxy
         const nockResponse = nock('https://test.proxy.com')
             .get('/test/path3')
-            .reply(200, function() {
+            .reply(200, function () {
                 const headers = this.req.headers
                 expect('x-mobify-access-key' in headers).toBe(false)
                 expect('cache-control' in headers).toBe(false)
@@ -474,9 +472,7 @@ describe('DevServer proxying', () => {
     test('handles error', () => {
         const app = NoWebpackDevServerFactory._createApp(opts())
 
-        return request(app)
-            .get('/mobify/proxy/base2/test/path')
-            .expect(500)
+        return request(app).get('/mobify/proxy/base2/test/path').expect(500)
     })
 })
 
@@ -748,9 +744,7 @@ describe('DevServer service worker', () => {
         test(`${name} (and handle 404s correctly)`, () => {
             const app = createApp()
 
-            return request(app)
-                .get(requestPath)
-                .expect(404)
+            return request(app).get(requestPath).expect(404)
         })
     })
 })
@@ -795,18 +789,14 @@ describe('DevServer serveStaticFile', () => {
         const app = NoWebpackDevServerFactory._createApp(options)
         app.__devMiddleware = MockWebpackDevMiddleware
         app.use('/test', NoWebpackDevServerFactory.serveStaticFile('static/favicon.ico'))
-        return request(app)
-            .get('/test')
-            .expect(200)
+        return request(app).get('/test').expect(200)
     })
 
     test('should return 404 if static file does not exist', async () => {
         const options = opts()
         const app = NoWebpackDevServerFactory._createApp(options)
         app.__devMiddleware = MockWebpackDevMiddleware
         app.use('/test', NoWebpackDevServerFactory.serveStaticFile('static/IDoNotExist.ico'))
-        return request(app)
-            .get('/test')
-            .expect(404)
+        return request(app).get('/test').expect(404)
     })
 })

packages/pwa-kit-react-sdk/.prettierrc.yaml

@@ -4,3 +4,4 @@ semi: false
 bracketSpacing: false
 tabWidth: 4
 arrowParens: 'always'
+trailingComma: 'none'

packages/pwa-kit-react-sdk/scripts/file-utils.test.js

@@ -10,13 +10,17 @@ const fs = require('fs')
 
 const fileUtils = require('./file-utils')
 
-const successCallbackAdapter = (value = true) => (...args) => {
-    args[args.length - 1](null, value)
-}
-
-const failureCallbackAdapter = (value = {}) => (...args) => {
-    args[args.length - 1](value)
-}
+const successCallbackAdapter =
+    (value = true) =>
+    (...args) => {
+        args[args.length - 1](null, value)
+    }
+
+const failureCallbackAdapter =
+    (value = {}) =>
+    (...args) => {
+        args[args.length - 1](value)
+    }
 
 const argsIgnoringCallback = (mock, index = 0) => mock.mock.calls[index].slice(0, -1)
 

packages/pwa-kit-react-sdk/scripts/setup-jsdom.js

@@ -9,7 +9,7 @@ global.document = require('jsdom').jsdom('<body></body>')
 global.window = document.defaultView
 global.window.matchMedia =
     global.window.matchMedia ||
-    function() {
+    function () {
         return {
             matches: false,
             addListener: () => {},

packages/pwa-kit-react-sdk/scripts/version.js

@@ -11,10 +11,7 @@ const path = require('path')
 const os = require('os')
 const fs = require('fs')
 
-const date = new Date()
-    .toString()
-    .split(' ')
-    .slice(1, 4)
+const date = new Date().toString().split(' ').slice(1, 4)
 const heading = `## v${pkg.version} (${date[0]} ${date[1]}, ${date[2]})\n`
 
 const changelog = path.resolve(os.tmpdir(), 'CHANGELOG.md')