@newskit-render/core 1.2.3 → 1.5.2

package/next.config.js

@@ -4,11 +4,8 @@ const withTM = require('next-transpile-modules')([
   '@newskit-render/auth',
   '@newskit-render/my-account',
   '@newskit-render/validation',
-  '@newskit-render/shared-components',
 ])
 
-const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer')
-
 module.exports = withTM({
   webpack: (config, options) => {
     if (options.isServer) {
@@ -28,16 +25,6 @@ module.exports = withTM({
       'react'
     )
 
-    if (process.env.ANALYZE) {
-      config.plugins.push(
-        new BundleAnalyzerPlugin({
-          analyzerMode: 'server',
-          analyzerPort: options.isServer ? 8888 : 8889,
-          openAnalyzer: true,
-        })
-      )
-    }
-
     return config
   },
   async rewrites() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newskit-render/core",
-  "version": "1.2.3",
+  "version": "1.5.2",
   "description": "Newskit Render - Core package",
   "author": "",
   "license": "UNLICENSED",
@@ -24,26 +24,26 @@
     "pact:test": "NEWSKIT_API_ENV_URL='http://localhost:4343' jest --config=jest.config.pact.js",
     "pact:publish": "pact-broker publish ./__pacts__/pacts --consumer-app-version=$(git describe --match '*core*' --abbrev=0) --tag='dev' --broker-base-url=$PACT_BROKER_URL --broker-token=$PACT_BROKER_TOKEN",
     "lint": "eslint --ext .js,.jsx,.ts,.tsx . --color && prettier --check './**/*.{js,jsx,ts,tsx,json}'",
-    "lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --color --fix && prettier --write './**/*.{js,jsx,ts,tsx,json}'",
-    "analyze": "ANALYZE=true yarn build"
+    "lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --color --fix && prettier --write './**/*.{js,jsx,ts,tsx,json}'"
   },
   "dependencies": {
     "@apollo/client": "^3.4.16",
-    "@newskit-render/api": "^0.3.2",
-    "@newskit-render/auth": "^0.21.1",
-    "@newskit-render/checkout": "^0.4.2",
-    "@newskit-render/my-account": "^0.105.2",
-    "@newskit-render/shared-components": "^0.8.4",
-    "@newskit-render/sitemap": "^0.24.2",
-    "@newskit-render/validation": "^0.25.0",
+    "@newskit-render/api": "^0.4.1",
+    "@newskit-render/auth": "^0.22.1",
+    "@newskit-render/checkout": "^0.6.2",
+    "@newskit-render/my-account": "^0.110.2",
+    "@newskit-render/shared-components": "^0.14.0",
+    "@newskit-render/sitemap": "^0.25.1",
+    "@newskit-render/validation": "^0.26.1",
     "cross-fetch": "^3.1.4",
     "graphql": "^15.6.0",
     "newrelic": "^7.1.0",
-    "newskit": "^4.0.1",
+    "newskit": "4.0.1",
     "next": "^12.0.2",
     "react": "^17.0.1",
     "react-dom": "^17.0.2",
     "react-helmet": "^6.1.0",
+    "react-hook-form": "7.8.4",
     "striptags": "^3.1.1"
   },
   "devDependencies": {
@@ -58,7 +58,7 @@
     "@typescript-eslint/eslint-plugin": "^3.7.1",
     "@typescript-eslint/parser": "^3.7.1",
     "babel-jest": "^26.3.0",
-    "cypress": "^5.1.0",
+    "cypress": "9.0.0",
     "eslint": "^6.6.0",
     "eslint-config-airbnb": "^18.2.0",
     "eslint-config-airbnb-typescript": "^9.0.0",
@@ -82,10 +82,12 @@
     "prettier-eslint-cli": "^5.0.0",
     "ts-jest": "^27.0.5",
     "typescript": "^4.4.3",
-    "wait-on": "^5.3.0",
-    "webpack-bundle-analyzer": "^4.5.0"
+    "wait-on": "^5.3.0"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "resolutions": {
+    "newskit/react-hook-form": "7.8.4"
   }
 }

package/pages/account/payment/index.tsx

@@ -0,0 +1,18 @@
+import newrelic from 'newrelic'
+import {
+  Payment,
+  getProviderProps,
+  PaymentProvider,
+} from '@newskit-render/my-account'
+
+export default Payment
+
+export const getServerSideProps = async (context) => {
+  newrelic.setTransactionName('Edit Payment method')
+
+  return getProviderProps({
+    ...context,
+    provider: 'Payment',
+    paymentProvider: PaymentProvider.Zuora,
+  })
+}

package/pages/checkout/index.tsx

@@ -0,0 +1,7 @@
+import { CheckoutPage, getProviderProps } from '@newskit-render/checkout'
+
+export default CheckoutPage
+
+export const getServerSideProps = async (context) => {
+  return getProviderProps(context)
+}

package/temp/header.tsx

@@ -103,7 +103,7 @@ const pastDueBanner = {
   },
   cancelled: {
     title: 'Your subscription has been cancelled.',
-    text: 'You will lose access to all benefits on ##DATE##. To re-activate your subscription call 0800 555 1234.',
+    text: 'You’ll no longer have access to subscription benefits. To re-activate call 0800 555 1234.',
   },
   treshold: {
     firstNotice: 26,
@@ -152,87 +152,87 @@ const Header: React.FC<{ user: UserData }> = ({ user }) => {
 
   return (
     <>
-    <StyledHeader aria-label="StyledHeader">
-      <MainGrid>
-        <Cell xs={12}>
-          <Stack
-            flow="horizontal-center"
-            stackDistribution="space-between"
-            wrap="nowrap"
-          >
-            <NextLink
-              type="standalone"
-              overrides={{ stylePreset: 'linkStandaloneInverse' }}
-              href="/"
-              aria-label="Logo Link"
-            >
-              <Visible md lg xl>
-                <NewsKitLogoFull color="white" size="sizing120" />
-              </Visible>
-              <Visible xs sm>
-                <NewsKitLogoShort color="white" size="sizing120" />
-              </Visible>
-            </NextLink>
+      <StyledHeader aria-label="StyledHeader">
+        <MainGrid>
+          <Cell xs={12}>
             <Stack
               flow="horizontal-center"
-              stackDistribution="flex-end"
+              stackDistribution="space-between"
               wrap="nowrap"
             >
-              <NavigationContainer show={showMenu}>
-                <Navigation>
-                  {showMenu && (
-                    <Block
-                      spaceStack="space050"
-                      data-testid="mobile-block-space"
+              <NextLink
+                type="standalone"
+                overrides={{ stylePreset: 'linkStandaloneInverse' }}
+                href="/"
+                aria-label="Logo Link"
+              >
+                <Visible md lg xl>
+                  <NewsKitLogoFull color="white" size="sizing120" />
+                </Visible>
+                <Visible xs sm>
+                  <NewsKitLogoShort color="white" size="sizing120" />
+                </Visible>
+              </NextLink>
+              <Stack
+                flow="horizontal-center"
+                stackDistribution="flex-end"
+                wrap="nowrap"
+              >
+                <NavigationContainer show={showMenu}>
+                  <Navigation>
+                    {showMenu && (
+                      <Block
+                        spaceStack="space050"
+                        data-testid="mobile-block-space"
+                      />
+                    )}
+                    <NavButton
+                      buttonText="Section One"
+                      href="/section-one"
+                      isMobile={showMenu}
+                      ariaLabel="Section One Link"
+                    />
+                    <NavButton
+                      buttonText="Section Two"
+                      href="/section-two"
+                      isMobile={showMenu}
+                      ariaLabel="Section Two Link"
+                    />
+                    <NavButton
+                      buttonText="Section Three"
+                      href="/section-three"
+                      isMobile={showMenu}
+                      ariaLabel="Section Three Link"
+                    />
+                  </Navigation>
+                </NavigationContainer>
+                <Visible xs sm>
+                  <Block spaceInline="space050">
+                    <IconFilledMenu
+                      overrides={{
+                        size: 'iconSize030',
+                        stylePreset: 'linkStandaloneInverse',
+                      }}
+                      onClick={mobileMenuControl}
+                      onKeyDown={handleEnterKeyPress(mobileMenuControl)}
+                      role="button"
+                      tabIndex={0}
+                      aria-label="Mobile Menu Button"
+                      data-testid="mobile-menu-btn"
                     />
-                  )}
-                  <NavButton
-                    buttonText="Section One"
-                    href="/section-one"
-                    isMobile={showMenu}
-                    ariaLabel="Section One Link"
-                  />
-                  <NavButton
-                    buttonText="Section Two"
-                    href="/section-two"
-                    isMobile={showMenu}
-                    ariaLabel="Section Two Link"
-                  />
-                  <NavButton
-                    buttonText="Section Three"
-                    href="/section-three"
-                    isMobile={showMenu}
-                    ariaLabel="Section Three Link"
-                  />
-                </Navigation>
-              </NavigationContainer>
-              <Visible xs sm>
-                <Block spaceInline="space050">
-                  <IconFilledMenu
-                    overrides={{
-                      size: 'iconSize030',
-                      stylePreset: 'linkStandaloneInverse',
-                    }}
-                    onClick={mobileMenuControl}
-                    onKeyDown={handleEnterKeyPress(mobileMenuControl)}
-                    role="button"
-                    tabIndex={0}
-                    aria-label="Mobile Menu Button"
-                    data-testid="mobile-menu-btn"
-                  />
-                </Block>
-              </Visible>
+                  </Block>
+                </Visible>
+              </Stack>
             </Stack>
-          </Stack>
-        </Cell>
-      </MainGrid>
-    </StyledHeader>
-    <PastDueBannerExternal
-      pastDueBanner={pastDueBanner}
-      vxInstances={user?.vxInstances}
-      wrapper={BannerContainer}
-    />
-  </>
+          </Cell>
+        </MainGrid>
+      </StyledHeader>
+      <PastDueBannerExternal
+        pastDueBanner={pastDueBanner}
+        vxInstances={user?.vxInstances}
+        wrapper={BannerContainer}
+      />
+    </>
   )
 }
 

package/pages/api/account/zuora/generate-rsa.ts

@@ -1,5 +0,0 @@
-import { NextApiRequest, NextApiResponse } from 'next'
-import { generateRSASignature } from '@newskit-render/my-account'
-
-export default (req: NextApiRequest, res: NextApiResponse) =>
-  generateRSASignature(req, res)