Merge branch 'v3' into feature/template-extensibility

* v3: fix: remove device-context and detect-device-type (#1168) Dependency updates (#1170) [Snyk] Security upgrade cosmiconfig from 7.1.0 to 8.0.0 (#1145) [V3] Remove `cross-fetch` from `template-retail-react-app` (#1160) [v3] Add suffix to ssr build files (#1158) Consume new version of the commerce-sdk-isomorphic to enable Phased Launches support HTTP Basic Auth (#1153) # Conflicts: # packages/commerce-sdk-react/package-lock.json # packages/internal-lib-build/package-lock.json # packages/pwa-kit-runtime/package-lock.json # packages/template-retail-react-app/package-lock.json
SalesforceCommerceCloud · May 9, 2023 · 94308c5 · 94308c5
2 parents 240a9d5 + 9e4f23d
commit 94308c5
Show file tree

Hide file tree

Showing 20 changed files with 49 additions and 318 deletions.
diff --git a/packages/commerce-sdk-react/package.json b/packages/commerce-sdk-react/package.json
@@ -40,7 +40,7 @@
     "version": "node ./scripts/version.js"
   },
   "dependencies": {
-    "commerce-sdk-isomorphic": "^1.9.0",
+    "commerce-sdk-isomorphic": "^1.10.1",
     "js-cookie": "^3.0.1",
     "jwt-decode": "^3.1.2"
   },

diff --git a/packages/commerce-sdk-react/src/hooks/ShopperBaskets/index.test.ts b/packages/commerce-sdk-react/src/hooks/ShopperBaskets/index.test.ts
@@ -16,7 +16,13 @@ describe('Shopper Baskets hooks', () => {
         const unimplemented = getUnimplementedEndpoints(ShopperBaskets, queries, mutations)
         // If this test fails: create a new query hook, add the endpoint to the mutations enum,
         // or add it to the `expected` array with a comment explaining "TODO" or "never" (and why).
-        expect(unimplemented).toEqual([])
+        expect(unimplemented).toEqual([
+            'updateAsAgentBasket', //TODO: implement later
+            'addPriceAdjustmentToBasket', //TODO: implement later
+            'removePriceAdjustmentFromBasket', //TODO: implement later
+            'updatePriceAdjustmentInBasket', //TODO: implement later
+            'updateAsStorefrontBasket' //TODO: implement later
+        ])
     })
     test('all mutations have cache update logic', () => {
         // unimplemented = value in mutations enum, but no method in cache update matrix

diff --git a/packages/commerce-sdk-react/src/test-utils.tsx b/packages/commerce-sdk-react/src/test-utils.tsx
@@ -159,7 +159,7 @@ const getQueryName = (method: string): string => {
  * Gets the list of API endpoints that have not yet been implemented
  * @param SdkClass Class constructor from commerce-sdk-isomorphic to use as a source for endpoints
  * @param queryHooks Object containing implemented query hooks
- * @param mutationsEnum Enum containing mutation endpoint names
+ * @param mutations Enum containing mutation endpoint names
  * @returns List of endpoints that don't have a query or mutation hook
  */
 export const getUnimplementedEndpoints = (

diff --git a/packages/pwa-kit-dev/src/configs/webpack/config.js b/packages/pwa-kit-dev/src/configs/webpack/config.js
@@ -416,7 +416,7 @@ const renderer =
                     // We want to split the build on local development to reduce memory usage.
                     // It is required to have a single entry point for the remote server.
                     // See pwa-kit-runtime/ssr/server/build-remote-server.js render method.
-                    filename: mode === development ? '[name].js' : 'server-renderer.js',
+                    filename: mode === development ? '[name]-server.js' : 'server-renderer.js',
                     libraryTarget: 'commonjs2'
                 },
                 plugins: [

diff --git a/packages/pwa-kit-react-sdk/CHANGELOG.md b/packages/pwa-kit-react-sdk/CHANGELOG.md
@@ -1,4 +1,6 @@
 ## v2.8.0-dev (Mar 03, 2023)
+- Remove usage of `device-context` due to deprecation of user agent string. [#1168](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/1168)
+
 ## v2.7.0 (Mar 03, 2023)
 ## v2.6.0 (Jan 25, 2023)
 

diff --git a/packages/pwa-kit-react-sdk/src/ssr/browser/main.jsx b/packages/pwa-kit-react-sdk/src/ssr/browser/main.jsx
@@ -8,7 +8,6 @@
 import React, {useRef} from 'react'
 import ReactDOM from 'react-dom'
 import {BrowserRouter as Router} from 'react-router-dom'
-import DeviceContext from '../universal/device-context'
 import {ServerContext, CorrelationIdProvider} from '../universal/contexts'
 import App from '../universal/components/_app'
 import {getAppConfig} from '../universal/compatibility'
@@ -52,16 +51,14 @@ export const OuterApp = ({routes, error, WrappedApp, locals}) => {
                         return uuidv4()
                     }}
                 >
-                    <DeviceContext.Provider value={{type: window.__DEVICE_TYPE__}}>
-                        <AppConfig locals={locals}>
-                            <Switch
-                                error={error}
-                                appState={window.__PRELOADED_STATE__}
-                                routes={routes}
-                                App={WrappedApp}
-                            />
-                        </AppConfig>
-                    </DeviceContext.Provider>
+                    <AppConfig locals={locals}>
+                        <Switch
+                            error={error}
+                            appState={window.__PRELOADED_STATE__}
+                            routes={routes}
+                            App={WrappedApp}
+                        />
+                    </AppConfig>
                 </CorrelationIdProvider>
             </Router>
         </ServerContext.Provider>

diff --git a/packages/pwa-kit-react-sdk/src/ssr/server/react-rendering.js b/packages/pwa-kit-react-sdk/src/ssr/server/react-rendering.js
@@ -18,7 +18,6 @@ import {StaticRouter as Router, matchPath} from 'react-router-dom'
 import serialize from 'serialize-javascript'
 
 import {getAssetUrl} from '../universal/utils'
-import DeviceContext from '../universal/device-context'
 import {ServerContext, CorrelationIdProvider} from '../universal/contexts'
 
 import Document from '../universal/components/_document'
@@ -29,7 +28,7 @@ import {getAppConfig} from '../universal/compatibility'
 import Switch from '../universal/components/switch'
 import {getRoutes, routeComponent} from '../universal/components/route-component'
 import * as errors from '../universal/errors'
-import {detectDeviceType, isRemote} from 'pwa-kit-runtime/utils/ssr-server'
+import {isRemote} from 'pwa-kit-runtime/utils/ssr-server'
 import {proxyConfigs} from 'pwa-kit-runtime/utils/ssr-shared'
 import {getConfig} from 'pwa-kit-runtime/utils/ssr-config'
 import sprite from 'svg-sprite-loader/runtime/sprite.build'
@@ -116,7 +115,6 @@ export const render = async (req, res, next) => {
     const component = await route.component.getComponent()
 
     // Step 3 - Init the app state
-    const deviceType = detectDeviceType(req)
     const props = {
         error: null,
         appState: {},
@@ -125,8 +123,7 @@ export const render = async (req, res, next) => {
         res,
         App: WrappedApp,
         routes,
-        location,
-        deviceType
+        location
     }
     let appJSX = <OuterApp {...props} />
 
@@ -167,8 +164,7 @@ export const render = async (req, res, next) => {
             res,
             location,
             config,
-            appJSX,
-            deviceType
+            appJSX
         })
     } catch (e) {
         // This is an unrecoverable error.
@@ -192,17 +188,7 @@ export const render = async (req, res, next) => {
     }
 }
 
-const OuterApp = ({
-    req,
-    res,
-    error,
-    App,
-    appState,
-    routes,
-    routerContext,
-    location,
-    deviceType
-}) => {
+const OuterApp = ({req, res, error, App, appState, routes, routerContext, location}) => {
     const AppConfig = getAppConfig()
     return (
         <ServerContext.Provider value={{req, res}}>
@@ -211,11 +197,9 @@ const OuterApp = ({
                     correlationId={res.locals.requestId}
                     resetOnPageChange={false}
                 >
-                    <DeviceContext.Provider value={{type: deviceType}}>
-                        <AppConfig locals={res.locals}>
-                            <Switch error={error} appState={appState} routes={routes} App={App} />
-                        </AppConfig>
-                    </DeviceContext.Provider>
+                    <AppConfig locals={res.locals}>
+                        <Switch error={error} appState={appState} routes={routes} App={App} />
+                    </AppConfig>
                 </CorrelationIdProvider>
             </Router>
         </ServerContext.Provider>
@@ -230,15 +214,14 @@ OuterApp.propTypes = {
     appState: PropTypes.object,
     routes: PropTypes.array,
     routerContext: PropTypes.object,
-    location: PropTypes.object,
-    deviceType: PropTypes.string
+    location: PropTypes.object
 }
 
 const renderToString = (jsx, extractor) =>
     ReactDOMServer.renderToString(extractor.collectChunks(jsx))
 
 const renderApp = (args) => {
-    const {req, res, appStateError, appJSX, appState, config, deviceType} = args
+    const {req, res, appStateError, appJSX, appState, config} = args
     const extractor = new ChunkExtractor({statsFile: BUNDLES_PATH, publicPath: getAssetUrl()})
 
     const ssrOnly = 'mobify_server_only' in req.query || '__server_only' in req.query
@@ -300,7 +283,6 @@ const renderApp = (args) => {
     const windowGlobals = {
         __INITIAL_CORRELATION_ID__: res.locals.requestId,
         __CONFIG__: config,
-        __DEVICE_TYPE__: deviceType,
         __PRELOADED_STATE__: appState,
         __ERROR__: error,
         // `window.Progressive` has a long history at Mobify and some

diff --git a/packages/pwa-kit-react-sdk/src/ssr/server/react-rendering.test.js b/packages/pwa-kit-react-sdk/src/ssr/server/react-rendering.test.js
@@ -39,11 +39,6 @@ const opts = (overrides = {}) => {
     }
 }
 
-const mobile =
-    'Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1A543 Safari/419.3'
-const tablet =
-    'Mozilla/5.0 (iPad; CPU OS 6_1 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10B141 Safari/8536.25'
-
 jest.mock('../universal/compatibility', () => {
     const AppConfig = jest.requireActual('../universal/components/_app-config').default
     const {withReactQuery} = jest.requireActual('../universal/components/with-react-query')
@@ -433,28 +428,21 @@ describe('The Node SSR Environment', () => {
                 console.error(html)
                 const doc = parse(html)
                 const include = ['<div>This is a PWA</div>']
-                const data = dataFromHTML(doc)
                 const dataScript = doc.querySelectorAll('script[id=mobify-data]')[0]
                 expect(dataScript.innerHTML.split(/\r\n|\r|\n/)).toHaveLength(1)
-                expect(data.__DEVICE_TYPE__).toBe('DESKTOP')
                 include.forEach((s) => expect(html).toEqual(expect.stringContaining(s)))
                 expect(scriptsAreSafe(doc)).toBe(true)
             }
         },
         {
             description: `rendering PWA's for tablet`,
             req: {
-                url: '/pwa/',
-                headers: {
-                    'User-Agent': tablet
-                }
+                url: '/pwa/'
             },
             assertions: (res) => {
                 expect(res.statusCode).toBe(200)
                 const html = res.text
                 const doc = parse(html)
-                const data = dataFromHTML(doc)
-                expect(data.__DEVICE_TYPE__).toBe('TABLET')
                 const include = ['<div>This is a PWA</div>']
                 include.forEach((s) => expect(html).toEqual(expect.stringContaining(s)))
                 expect(scriptsAreSafe(doc)).toBe(true)
@@ -463,17 +451,12 @@ describe('The Node SSR Environment', () => {
         {
             description: `rendering PWA's for mobile`,
             req: {
-                url: '/pwa/',
-                headers: {
-                    'User-Agent': mobile
-                }
+                url: '/pwa/'
             },
             assertions: (res) => {
                 expect(res.statusCode).toBe(200)
                 const html = res.text
                 const doc = parse(html)
-                const data = dataFromHTML(doc)
-                expect(data.__DEVICE_TYPE__).toBe('PHONE')
                 const include = ['<div>This is a PWA</div>']
                 include.forEach((s) => expect(html).toEqual(expect.stringContaining(s)))
                 expect(scriptsAreSafe(doc)).toBe(true)

diff --git a/packages/pwa-kit-react-sdk/src/ssr/universal/device-context.js b/packages/pwa-kit-react-sdk/src/ssr/universal/device-context.js
diff --git a/packages/pwa-kit-runtime/CHANGELOG.md b/packages/pwa-kit-runtime/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## v2.8.0-dev (Mar 03, 2023)
 - Add optional parameter to override configuration folder used in `getConfig` [#1049](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/1049)
+- Remove usage of `detect-device-type` due to deprecation of user agent string. [#1168](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/1168)
+
 ## v2.7.0 (Mar 03, 2023)
 - Support Node 16 [#965](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/965)
 

diff --git a/packages/pwa-kit-runtime/package.json b/packages/pwa-kit-runtime/package.json
@@ -31,9 +31,9 @@
   },
   "dependencies": {
     "@loadable/babel-plugin": "^5.15.3",
-    "aws-sdk": "^2.1340.0",
+    "aws-sdk": "^2.1354.0",
     "aws-serverless-express": "3.4.0",
-    "cosmiconfig": "^7.1.0",
+    "cosmiconfig": "^8.1.3",
     "cross-env": "^5.2.1",
     "express": "^4.18.2",
     "header-case": "1.0.1",
@@ -42,7 +42,6 @@
     "morgan": "^1.10.0",
     "semver": "^7.3.8",
     "set-cookie-parser": "^2.6.0",
-    "ua-parser-js": "^1.0.34",
     "whatwg-encoding": "^1.0.5"
   },
   "devDependencies": {

diff --git a/packages/pwa-kit-runtime/src/ssr/server/express.js b/packages/pwa-kit-runtime/src/ssr/server/express.js
@@ -17,8 +17,7 @@ import {
     parseCacheControl,
     parseEndParameters,
     isRemote,
-    wrapResponseWrite,
-    detectDeviceType
+    wrapResponseWrite
 } from '../../utils/ssr-server'
 import {CONTENT_ENCODING, X_MOBIFY_FROM_CACHE} from './constants'
 import {X_MOBIFY_REQUEST_CLASS} from '../../utils/ssr-proxying'
@@ -53,18 +52,6 @@ export const RESOLVED_PROMISE = Promise.resolve()
  * appropriate to include these, the caller should add their values
  * (or values based on them) to the options.extras array.
  *
- * Requests that come to a deployed Express app contain headers that
- * identify the device type. By default, this method generates different
- * cache keys for different device types (effectively, the values of the
- * headers used by getBrowserSize are included in 'options.extras'). To
- * suppress this, pass true for options.ignoreDeviceType
- * Note: CloudFront will pass 4 device type headers, and ALL of them will
- * be present in the request headers, they are 'CloudFront-Is-Desktop-Viewer',
- * 'CloudFront-Is-Mobile-Viewer', 'CloudFront-Is-SmartTV-Viewer' and
- * 'CloudFront-Is-Tablet-Viewer'. The values can be 'true' or 'false', and it
- * is possible that a device falls into more than one device type category
- * and multiple device type headers can be 'true' at the same time.
- *
  * By default, method will generate different cache keys for requests with
  * different request classes (effectively, the value of the request-class
  * string is included in 'extras'). To suppress this, pass true for
@@ -74,8 +61,6 @@ export const RESOLVED_PROMISE = Promise.resolve()
  * @param [options] {Object} values that affect the cache key generation.
  * @param [options.extras] {Array<String|undefined>} extra string values
  * to be included in the key.
- * @param [options.ignoreDeviceType] {Boolean} set this to true to suppress
- * automatic variation of the key by device type.
  * @param [options.ignoreRequestClass] {Boolean} set this to true to suppress
  * automatic variation of the key by request class.
  * @returns {String} the generated key.
@@ -99,10 +84,6 @@ export const generateCacheKey = (req, options = {}) => {
         elements.push(...filteredQueryStrings)
     }
 
-    if (!options.ignoreDeviceType) {
-        elements.push(`device=${detectDeviceType(req)}`)
-    }
-
     if (!options.ignoreRequestClass) {
         const requestClass = req.get(X_MOBIFY_REQUEST_CLASS)
         if (requestClass) {

diff --git a/packages/pwa-kit-runtime/src/ssr/server/express.test.js b/packages/pwa-kit-runtime/src/ssr/server/express.test.js
@@ -878,52 +878,6 @@ describe('generateCacheKey', () => {
         expect(generateCacheKey(mockRequest({url: '/test3?a=2'}))).not.toEqual(result1)
     })
 
-    test('user agent affects key', () => {
-        const result1 = generateCacheKey(mockRequest())
-        const request2 = mockRequest({
-            headers: {
-                'user-agent':
-                    'Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1'
-            }
-        })
-        expect(generateCacheKey(request2)).not.toEqual(result1)
-        // query string and device type is hashed
-        expect(generateCacheKey(request2)).toBe(
-            `/test/${getHashForString(['a=1', 'device=PHONE'].join('-'))}`
-        )
-    })
-
-    test('CloudFront device headers affect key', () => {
-        const result1 = generateCacheKey(mockRequest())
-        const request2 = mockRequest({
-            headers: {
-                'CloudFront-Is-Desktop-Viewer': 'false',
-                'CloudFront-Is-Mobile-Viewer': 'true',
-                'CloudFront-Is-SmartTV-Viewer': 'false',
-                'CloudFront-Is-Tablet-Viewer': 'false'
-            }
-        })
-        expect(generateCacheKey(request2)).not.toEqual(result1)
-        expect(generateCacheKey(request2)).toBe(
-            `/test/${getHashForString(['a=1', 'device=PHONE'].join('-'))}`
-        )
-    })
-
-    test('multiple CloudFront device headers affect key', () => {
-        const request1 = mockRequest({
-            headers: {
-                'CloudFront-Is-Desktop-Viewer': 'false',
-                'CloudFront-Is-Mobile-Viewer': 'true',
-                'CloudFront-Is-SmartTV-Viewer': 'false',
-                'CloudFront-Is-Tablet-Viewer': 'true'
-            }
-        })
-
-        expect(generateCacheKey(request1)).toBe(
-            `/test/${getHashForString(['a=1', 'device=TABLET'].join('-'))}`
-        )
-    })
-
     test('request class affects key', () => {
         const result1 = generateCacheKey(mockRequest())
         const request2 = mockRequest({

diff --git a/packages/pwa-kit-runtime/src/utils/ssr-server.js b/packages/pwa-kit-runtime/src/utils/ssr-server.js
@@ -12,7 +12,6 @@
 // This file is kept for backwards compatibility / simpler imports.
 export * from './ssr-server/cached-response'
 export * from './ssr-server/configure-proxy'
-export * from './ssr-server/detect-device-type'
 export * from './ssr-server/metrics-sender'
 export * from './ssr-server/outgoing-request-hook'
 export * from './ssr-server/parse-end-parameters'