@newskit-render/core 1.83.0-alpha.0 → 1.84.0

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.83.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.83.0-alpha.0...@newskit-render/core@1.83.0) (2022-08-22)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
 ## [1.82.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.82.1-alpha.0...@newskit-render/core@1.82.1) (2022-08-22)
 
 **Note:** Version bump only for package @newskit-render/core

package/README.md

@@ -1,6 +1,6 @@
 # @newskit-render/core
 
-А template website built using Next.js.
+А template website built using Next.js framework.
 
 This package is used by [@newskit-render/create-render-app](https://www.npmjs.com/package/@newskit-render/create-render-app) as a template structure to scaffold the newly created project which the users of @newskit-render/create-render-app can use and modify for their purposes.
 

package/infrastructure/.circleci/config.yml

@@ -4,6 +4,7 @@ orbs:
   newskit:
     orbs:
       slack: circleci/slack@3.4.2
+      browser-tools: circleci/browser-tools@1.3.0
     executors:
       helm:
         docker:
@@ -15,7 +16,7 @@ orbs:
 
       node:
         docker:
-          - image: circleci/node:16.13-buster-browsers
+          - image: cimg/node:16.13.0-browsers
             auth:
               username: ${DOCKER_USERNAME}
               password: ${DOCKER_PASSWORD}
@@ -351,8 +352,9 @@ orbs:
               keys:
                 - <% PACKAGE_MANAGER >-build-{{ .Environment.BUILD_CACHE_VERSION }}-{{ checksum "<% PACKAGE_MANAGER_LOCK_FILE >" }}
                 - <% PACKAGE_MANAGER >-build-{{ .Environment.BUILD_CACHE_VERSION }}-
-          - attach_workspace:
-              at: ~/project
+          - restore_cache:
+              keys:
+                - cypress-{{ .Environment.CYPRESS_CACHE_VERSION }}-{{ checksum "<% PACKAGE_MANAGER_LOCK_FILE >" }}
           - run:
               name: 'Install dependencies'
               command: <% PACKAGE_INSTALL >
@@ -370,10 +372,32 @@ orbs:
               key: cypress-{{ .Environment.CYPRESS_CACHE_VERSION }}-{{ checksum "<% PACKAGE_MANAGER_LOCK_FILE >" }}
               paths:
                 - ~/.cache/Cypress
+          - persist_to_workspace:
+              root: ./
+              paths: .next
+
+      lint:
+        executor: node
+        steps:
+          - checkout
+          - attach_workspace:
+              at: ~/project
+          - restore_cache:
+              keys:
+                - <% PACKAGE_MANAGER >-build-{{ .Environment.BUILD_CACHE_VERSION }}-{{ checksum "<% PACKAGE_MANAGER_LOCK_FILE >" }}
           - run:
-              name: 'Run lint'
-              command: |
-                <% PACKAGE_RUN > lint
+              name: "Run lint"
+              command: <% PACKAGE_RUN > lint
+
+      test_unit:
+        executor: node
+        steps:
+          - checkout
+          - attach_workspace:
+              at: ~/project
+          - restore_cache:
+              keys:
+                - <% PACKAGE_MANAGER >-build-{{ .Environment.BUILD_CACHE_VERSION }}-{{ checksum "<% PACKAGE_MANAGER_LOCK_FILE >" }}
           - run:
               name: 'Run tests'
               command: |
@@ -386,12 +410,8 @@ orbs:
           - store_artifacts:
               path: tests
               destination: tests
-          - persist_to_workspace:
-              root: ./
-              paths: .next
 
       e2e_test:
-        working_directory: ~/project
         executor: node
         steps:
           - checkout
@@ -403,12 +423,23 @@ orbs:
           - restore_cache:
               keys:
                 - cypress-{{ .Environment.CYPRESS_CACHE_VERSION }}-{{ checksum "<% PACKAGE_MANAGER_LOCK_FILE >" }}
-                - cypress-{{ .Environment.CYPRESS_CACHE_VERSION }}-
           - run:
               name: 'Export Newskit API variables'
               command: |
                 echo "export NEWSKIT_API_X_API_KEY=$NEWSKIT_API_X_API_KEY" >> $BASH_ENV
                 echo "export NEWSKIT_API_ENV_URL=$NEWSKIT_API_ENV_URL" >> $BASH_ENV
+          - run:
+              name: 'install cypress dependencies'
+              command: |
+                sudo apt-get update
+                sudo apt-get install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb
+          - browser-tools/install-chrome
+          - browser-tools/install-chromedriver
+          - run:
+              name: Check chrome install
+              command: |
+                google-chrome --version
+                chromedriver --version
           - run:
               name: 'start server'
               command: |
@@ -448,7 +479,7 @@ orbs:
               command: |
                 sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
                 sudo apt-get update
-                sudo apt-get install python python-pip
+                sudo apt-get install python python3-pip
                 sudo pip install awscli
           - aws_assume_role_file
           - run:
@@ -734,6 +765,7 @@ only_on_pr_branch: &only_on_pr_branch
     branches:
       ignore:
         - master
+        - main
         - develop
         # if you have release branches you might add
         # - /^release.*/
@@ -742,7 +774,9 @@ only_on_pr_branch: &only_on_pr_branch
 only_on_master_branch: &only_on_master_branch
   filters:
     branches:
-      only: master
+      only: 
+        - master
+        - main
 
 workflows:
   pull_request:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newskit-render/core",
-  "version": "1.83.0-alpha.0",
+  "version": "1.84.0",
   "description": "Newskit Render - Core package",
   "author": "",
   "license": "UNLICENSED",
@@ -35,12 +35,12 @@
     "@apollo/client": "3.4.16",
     "@newskit-render/api": "^0.36.1",
     "@newskit-render/auth": "^0.44.0",
-    "@newskit-render/checkout": "^0.52.0-alpha.0",
+    "@newskit-render/checkout": "^0.52.0",
     "@newskit-render/feature-flags": "^0.24.0",
     "@newskit-render/feed": "^0.24.0",
-    "@newskit-render/my-account": "^2.3.0-alpha.0",
-    "@newskit-render/shared-components": "^0.70.0-alpha.0",
-    "@newskit-render/standalone-components": "^0.34.0-alpha.0",
+    "@newskit-render/my-account": "^2.3.0",
+    "@newskit-render/shared-components": "^0.70.0",
+    "@newskit-render/standalone-components": "^0.34.0",
     "@newskit-render/validation": "^0.51.0",
     "cross-fetch": "3.1.5",
     "graphql": "15.6.0",