Merge branch 'main' into fix/tilesource-test

.circleci/config.yml

@@ -1,24 +1,28 @@
 version: 2.1
 orbs:
   browser-tools: circleci/[email protected]
+  nx: nrwl/[email protected]
 jobs:
   build:
     docker:
-      - image:  cimg/node:20.4.0-browsers
+      - image: cimg/node:20.4.0-browsers
     resource_class: large
     environment:
       LOGS_DIR: /tmp/ngx-mime-build/logs
       BROWSER_PROVIDER_READY_FILE: /tmp/ngx-mime-build/readyfile
     steps:
       - checkout
       - browser-tools/install-chrome
+      - run:
+          command: yarn install --frozen-lockfile
+          name: Install dependencies
+      - nx/set-shas
       - run: 'mkdir -p $LOGS_DIR'
       - run: 'chmod +x ./scripts/ci/build-and-test.sh'
       - run: 'chmod +x ./scripts/lambdatest/start-tunnel.sh'
       - run: 'chmod +x ./scripts/lambdatest/wait-tunnel.sh'
       - run: 'chmod +x ./scripts/lambdatest/stop-tunnel.sh'
       - run: 'chmod +x ./scripts/ci/wait-on.sh'
-      - run: 'yarn install'
       - run:
           name: Build and test
           command: './scripts/ci/build-and-test.sh'

apps/integration-e2e/project.json

@@ -5,17 +5,10 @@
   "projectType": "application",
   "targets": {
     "e2e": {
-      "executor": "@nx/cypress:cypress",
-      "options": {
-        "cypressConfig": "apps/integration-e2e/cypress.config.ts",
-        "devServerTarget": "ngx-mime:serve:development",
-        "testingType": "e2e"
-      },
-      "configurations": {
-        "production": {
-          "devServerTarget": "ngx-mime:serve:production"
-        }
-      }
+      "command": "yarn e2e"
+    },
+    "e2e:ci": {
+      "command": "yarn e2e:ci"
     },
     "lint": {
       "executor": "@nx/linter:eslint",

package.json

@@ -40,11 +40,14 @@
     "cucumber:android": "MODE=mobile yarn cucumber",
     "cucumber:iphone": "MODE=iphone yarn cucumber",
     "cucumber:elements": "MODE=elements yarn cucumber",
+    "affected:apps": "nx affected:apps",
+    "affected:libs": "nx affected:libs",
     "affected:build": "nx affected:build",
     "affected:e2e": "nx affected:e2e",
     "affected:test": "nx affected:test",
     "affected:lint": "nx affected:lint",
-    "affected:dep-graph": "nx affected:dep-graph",
+    "affected:dep-graph": "nx graph --affected",
+    "affected": "nx affected",
     "format:write": "nx format:write",
     "format:check": "nx format:check",
     "release": "sh scripts/release/release.sh"

scripts/ci/build-and-test.sh

@@ -3,7 +3,7 @@
 set -e
 
 echo ""
-echo "Building sources and running tests"
+echo "Building sources, linting and running tests"
 echo ""
 export TUNNEL_IDENTIFIER="ngx-mime-${CIRCLE_BUILD_NUM}"
 
@@ -18,15 +18,16 @@ function finish {
 
 rm -rf dist
 
+yarn format:check
+yarn affected --base=$NX_BASE --head=$NX_HEAD -t lint,test --parallel=4
+
 yarn build
 yarn build:libs
 yarn build:elements
 
-yarn affected:lint
-yarn affected:test
 
 trap finish EXIT
 start_tunnel &
 wait_for_tunnel
 
-yarn e2e:ci
+yarn affected --base=$NX_BASE --head=$NX_HEAD -t e2e:ci