chore(common): CHECKOUT-6271 Make changes to circle config (#1798)

Author: animesh1987

.circleci/config.yml

@@ -11,6 +11,37 @@ orbs:
   node: bigcommerce/internal-node@volatile
 
 jobs:
+  test-packages:
+    <<: *node_executor
+    steps:
+      - ci/pre-setup
+      - node/npm-install
+      - run:
+          name: "Run unit tests for packages"
+          command: npm run test:others
+
+  test-core:
+    <<: *node_executor
+    parallelism: 2
+    resource_class: small
+    steps:
+      - ci/pre-setup
+      - node/npm-install
+      - run: mkdir ~/junit
+      - run:
+          name: "Run unit tests for core package"
+          command: |
+            TEST=$(circleci tests glob "packages/core/**/*.spec.ts" | circleci tests split --split-by=timings)
+            npx nx run core:generate
+            npm test $TEST -- --runInBand
+      - run:
+          command: cp junit.xml ~/junit/
+          when: always
+      - store_test_results:
+          path: ~/junit
+      - store_artifacts:
+          path: ~/junit
+
   test:
     <<: *node_executor
     steps:
@@ -19,18 +50,22 @@ jobs:
       - run:
           name: "Run unit tests"
           command: npm run test:series -- --coverage
-      - store_artifacts:
-          path: coverage
-          destination: coverage
-
-  build:
+    
+  lint:
     <<: *node_executor
+    resource_class: medium+
     steps:
       - ci/pre-setup
       - node/npm-install
       - run:
-          name: "Run linter"
+          name: "Run lint"
           command: npm run lint
+
+  build:
+    <<: *node_executor
+    steps:
+      - ci/pre-setup
+      - node/npm-install
       - run:
           name: "Build distribution files"
           command: npm run build && npm run docs
@@ -87,7 +122,9 @@ workflows:
 
   default:
     jobs:
-      - test
+      - test-core
+      - test-packages
+      - lint
       - build
       - ci/validate-commits
 
@@ -97,7 +134,9 @@ workflows:
             branches:
               ignore: /pull\/[0-9]+/
           requires:
-            - test
+            - test-core
+            - test-packages
+            - lint
             - build
             - ci/validate-commits
       - ci/build-js-artifact:
@@ -119,9 +158,7 @@ workflows:
             branches:
               only: master
           requires:
-            - test
-            - build
-            - ci/validate-commits
+            - ci/notify-success
       - npm_release:
           requires:
             - approve_npm_release

.gitignore

@@ -10,3 +10,4 @@
 /packages/**/generated
 .idea
 .vscode
+junit.xml

jest.preset.js

@@ -1,6 +1,5 @@
-
 const nxPreset = require('@nrwl/jest/preset');
-     
+
 module.exports = {
     ...nxPreset,
     coverageThreshold: {
@@ -11,18 +10,10 @@ module.exports = {
             statements: 80,
         },
     },
+    reporters: ['default', 'jest-junit'],
     transform: {
-        '^.+\\.[tj]s$': 'ts-jest'
+        '^.+\\.[tj]s$': 'ts-jest',
     },
-    moduleFileExtensions: [
-        'ts',
-        'tsx',
-        'js',
-        'jsx',
-        'json',
-    ],
-    collectCoverageFrom: [
-        'src/**/*.{js,ts}',
-        '!src/**/*.mock.ts'
-    ],
-}
+    moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json'],
+    collectCoverageFrom: ['src/**/*.{js,ts}', '!src/**/*.mock.ts'],
+};

nx.json

@@ -16,7 +16,8 @@
           "build-watch",
           "lint",
           "test"
-        ]
+        ],
+        "parallel": 5
       }
     }
   }

package-lock.json

@@ -36,15 +36,20 @@
     "bundle-dts": "npx nx run core:build-dts",
     "docs": "npx nx run core:docs",
     "generate": "npx nx run core:generate",
-    "lint": "npx nx run-many --target=lint --all",
+    "lint": "npx nx run-many --target=lint --parallel=5 --all --verbose",
     "release": "echo 'Please do not release locally, use CircleCi'",
     "release:version": "git add dist docs && standard-version -a",
     "release:alpha": "export PRERELEASE=alpha; npm run lint && npm test && npm run build && npm run release:version",
-    "test": "npx nx run-many --all --target=test --parallel",
-    "test:coverage": "npx nx run-many --all --target=test --parallel -- --coverage",
-    "test:series": "npx nx run-many --all --target=test --parallel -- --runInBand",
+    "test": "jest --config packages/core/jest.config.js",
+    "test:coverage": "npx nx run-many --all --target=test --parallel=5 -- --coverage",
+    "test:series": "npx nx run-many --all --target=test --parallel=5 -- --runInBand",
+    "test:core": "npx nx run core:test -- --coverage --runInBand",
+    "test:others": "npx nx run-many --all --target=test --exclude core --parallel=5 -- --runInBand",
     "test:watch": "npx nx run-many --all --target=test --parallel -- --watch"
   },
+  "jest-junit": {
+    "addFileAttribute": "true"
+  },
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
     "@bigcommerce/bigpay-client": "^5.22.0",
@@ -104,6 +109,7 @@
     "eslint-plugin-react": "^7.30.1",
     "eslint-plugin-react-hooks": "^4.6.0",
     "jest": "^24.9.0",
+    "jest-junit": "^15.0.0",
     "nx": "^13.10.3",
     "prettier": "^2.6.2",
     "request": "^2.83.0",

package.json

@@ -8,5 +8,5 @@ module.exports = {
         },
     },
     setupFilesAfterEnv: ['../../jest-setup.js'],
-    coverageDirectory: '../../coverage/packages/core'
+    coverageDirectory: '../../coverage/packages/core',
 };

packages/core/jest.config.js

@@ -103,7 +103,8 @@
             "outputs": ["coverage/packages/core"],
             "options": {
                 "jestConfig": "packages/core/jest.config.js",
-                "passWithNoTests": true
+                "passWithNoTests": true,
+                "runInBand": true
             },
             "dependsOn": [
                 {

packages/core/project.json

@@ -60,7 +60,6 @@ describe('GoogleRecaptchaScriptLoader', () => {
             const loadPromise = googleRecaptchaScriptLoader.load();
 
             mockWindow.grecaptcha = getGoogleRecaptchaMock();
-            // tslint:disable-next-line:no-non-null-assertion
             mockWindow.initRecaptcha!();
 
             expect(loadPromise).resolves.toEqual(mockWindow.grecaptcha);