Merge branch 'develop' into feature/sdk-1096-error-reporting-plugin

rudderlabs · Jul 17, 2024 · 786928c · 786928c
2 parents 55a7a9f + 5d750cf
commit 786928c
Show file tree

Hide file tree

Showing 73 changed files with 2,272 additions and 1,999 deletions.
diff --git a/.github/workflows/draft-new-release.yml b/.github/workflows/draft-new-release.yml
@@ -84,7 +84,6 @@ jobs:
           npm run bump-version:monorepo
           npx replace $CURRENT_VERSION_VALUE $NEW_VERSION_VALUE sonar-project.properties
           npm run clean
-          npm run setup
           git add .
           git commit -m "chore(monorepo): sync versions and generate release logs" -n
 

diff --git a/.github/workflows/security-code-quality-and-bundle-size-checks.yml b/.github/workflows/security-code-quality-and-bundle-size-checks.yml
@@ -31,7 +31,7 @@ jobs:
           install_script: setup:ci
           build_script: check:size:build
           clean_script: clean
-          script: npm run check:size:json:ci --silent -- --output-style=static --silent=true --exclude=@rudderstack/analytics-js-sanity-suite,@rudderstack/analytics-js-loading-scripts
+          script: npm run check:size:json:ci --silent -- --output-style=static --silent=true --exclude=@rudderstack/analytics-js-sanity-suite
           is_monorepo: true
 
   security-code-quality-checks:
@@ -41,6 +41,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Setup Node
         uses: actions/setup-node@v4
@@ -56,12 +58,20 @@ jobs:
 
       - name: Execute code quality checks
         run: |
-          npm run check:circular
           npm run check:duplicates
 
+      - name: Build the project
+        env:
+          BASE_REF: ${{ github.event.pull_request.base.sha }}
+        run: |
+          npm run build:ci
+          npm run build:modern:ci
+
       - name: Execute package linting checks
+        env:
+          BASE_REF: ${{ github.event.pull_request.base.sha }}
         run: |
-          npm run check:pub
+          npm run check:pub:ci
 
       - name: Execute security checks
         run: |

diff --git a/.github/workflows/unit-tests-and-lint.yml b/.github/workflows/unit-tests-and-lint.yml
@@ -35,6 +35,8 @@ jobs:
           npm run setup:ci
 
       - name: Execute unit tests
+        env:
+          BASE_REF: ${{ github.event.pull_request.base.sha || 'HEAD' }}
         run: |
           npm run test:ci
 
@@ -46,6 +48,8 @@ jobs:
           files: ./packages/analytics-js/reports/coverage/clover.xml,./packages/analytics-js-common/reports/coverage/clover.xml,./packages/analytics-js-integrations/reports/coverage/clover.xml,./packages/analytics-js-plugins/reports/coverage/clover.xml,./packages/analytics-js-service-worker/reports/coverage/clover.xml,./packages/analytics-v1.1/reports/coverage/clover.xml,./packages/analytics-js-cookies/reports/coverage/clover.xml
 
       - name: Execute linting check
+        env:
+          BASE_REF: ${{ github.event.pull_request.base.sha || 'HEAD' }}
         run: |
           npm run check:lint:ci
 

diff --git a/nx.json b/nx.json
@@ -37,27 +37,23 @@
       "inputs": ["default", "^production"],
       "cache": true
     },
-    "build-browser": {
+    "build:modern": {
       "inputs": ["default", "^production"],
       "cache": true
     },
-    "build-browser-modern": {
+    "build:browser": {
       "inputs": ["default", "^production"],
       "cache": true
     },
-    "build-npm": {
+    "build:browser:modern": {
       "inputs": ["default", "^production"],
       "cache": true
     },
-    "build-npm-modern": {
+    "build:package": {
       "inputs": ["default", "^production"],
       "cache": true
     },
-    "build-package": {
-      "inputs": ["default", "^production"],
-      "cache": true
-    },
-    "build-check-size": {
+    "build:package:modern": {
       "inputs": ["default", "^production"],
       "cache": true
     },
@@ -66,12 +62,34 @@
       "cache": true
     },
     "check:size:json": {
-      "inputs": ["default", "^production", "{projectRoot}/.size-limit.js"],
+      "inputs": [
+        "default",
+        "^production",
+        "{projectRoot}/.size-limit.js",
+        "{projectRoot}/.size-limit.mjs"
+      ],
       "cache": true
     },
     "check:pub": {
       "inputs": ["{projectRoot}/package.json"],
       "cache": true
+    },
+    "test:pre-commit:affected": {
+      "inputs": ["default", "^test"],
+      "cache": true
+    },
+    "check:size:build:pre-commit:affected": {
+      "inputs": ["default", "^production"],
+      "cache": true
+    },
+    "check:size:json:pre-commit:affected": {
+      "inputs": [
+        "default",
+        "^production",
+        "{projectRoot}/.size-limit.js",
+        "{projectRoot}/.size-limit.mjs"
+      ],
+      "cache": true
     }
   },
   "generators": {
@@ -95,6 +113,7 @@
       "!{projectRoot}/**/*.txt",
       "!{projectRoot}/serve.json",
       "!{projectRoot}/.size-limit.js",
+      "!{projectRoot}/.size-limit.mjs",
       "!{projectRoot}/.jscpd.json",
       "{workspaceRoot}/tsconfig.build.json",
       "{workspaceRoot}/tsconfig.json",