feat: fix type resolution for production pages

.circleci/config.yml

@@ -79,10 +79,6 @@ commands:
       - run:
           command: |
             pnpm jest --clearCache
-  increment-docker-version:
-    description: Increment Docker Version
-    steps:
-      - run: ~/project/.circleci/config/commands/increment-docker-version.sh
   install-cypher-shell:
     steps:
       - run:
@@ -112,10 +108,15 @@ commands:
             - ~/.nvm
       - run:
           command: |
+            source $BASH_ENV
             nvm install 22.14.0
             nvm alias default 22.14.0
             node -v
             which node
+            npm -v
+            which npm
+            npx -v
+            which npx
           name: Set Node Version
   install-packages:
     steps:
@@ -210,6 +211,7 @@ commands:
     description: Restore Workspace
     steps:
       - checkout
+      - setup-env
       - attach_workspace:
           at: ~/
       - run:
@@ -225,13 +227,12 @@ commands:
           keys:
             - nvm-cache-{{ checksum ".nvmrc" }}
           name: Restore NVM Cache
-      - load-nvm
       - install-pnpm
-      - setup-env
   restore-workspace-database:
     description: Restore Workspace
     steps:
       - checkout
+      - setup-env
       - attach_workspace:
           at: ~/
       - run:
@@ -247,10 +248,8 @@ commands:
           keys:
             - nvm-cache-{{ checksum ".nvmrc" }}
           name: Restore NVM Cache
-      - load-nvm
       - install-pnpm
       - install-cypher-shell
-      - setup-env
   restore-workspace-infra:
     description: Restore Infra Workspace
     steps:
@@ -601,10 +600,10 @@ jobs:
     resource_class: large
     steps:
       - checkout
+      - setup-env
+      - install-nvm
       - install-terraform
-      - increment-docker-version
       - login-docker
-      - increment-docker-version
       - persist_to_workspace:
           paths:
             - .docker/config.json
@@ -951,7 +950,7 @@ workflows:
               only:
                 - staging
           requires:
-            - tf-apply-ci
+            - setup-infra-workspace
       - docker-api:
           context:
             - prod
@@ -960,7 +959,7 @@ workflows:
               only:
                 - staging
           requires:
-            - tf-apply-ci
+            - setup-infra-workspace
       - docker-sites:
           context:
             - prod
@@ -969,7 +968,7 @@ workflows:
               only:
                 - staging
           requires:
-            - tf-apply-ci
+            - setup-infra-workspace
       - docker-landing:
           context:
             - prod
@@ -1006,4 +1005,102 @@ workflows:
           requires:
             - hold-apply
           stage: prod
+  infra-pr-tag:
+    jobs:
+      - setup-infra-workspace:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^[0-9]+\.[0-9]+\.[0-9]+$/
+      - tf-plan:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^[0-9]+\.[0-9]+\.[0-9]+$/
+          name: tf-plan-ci
+          requires:
+            - setup-infra-workspace
+          stage: ci
+      - tf-apply:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^[0-9]+\.[0-9]+\.[0-9]+$/
+          name: tf-apply-ci
+          requires:
+            - tf-plan-ci
+          stage: ci
+      - docker-web:
+          context:
+            - prod
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^[0-9]+\.[0-9]+\.[0-9]+$/
+          requires:
+            - setup-infra-workspace
+      - docker-api:
+          context:
+            - prod
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^[0-9]+\.[0-9]+\.[0-9]+$/
+          requires:
+            - setup-infra-workspace
+      - docker-sites:
+          context:
+            - prod
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^[0-9]+\.[0-9]+\.[0-9]+$/
+          requires:
+            - setup-infra-workspace
+      - docker-landing:
+          context:
+            - prod
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^[0-9]+\.[0-9]+\.[0-9]+$/
+          requires:
+            - setup-infra-workspace
+      - tf-plan:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^[0-9]+\.[0-9]+\.[0-9]+$/
+          requires:
+            - docker-web
+            - docker-api
+            - docker-sites
+            - docker-landing
+          stage: prod
+      - hold-apply:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^[0-9]+\.[0-9]+\.[0-9]+$/
+          requires:
+            - tf-plan
+          type: approval
+      - tf-apply:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^[0-9]+\.[0-9]+\.[0-9]+$/
+          requires:
+            - hold-apply
+          stage: prod
 working_directory: ~/project

.circleci/config/commands/install-nvm.yml

@@ -15,7 +15,12 @@ steps:
   - run:
       name: 'Set Node Version'
       command: |
+        source $BASH_ENV
         nvm install 22.14.0
         nvm alias default 22.14.0
         node -v
         which node
+        npm -v
+        which npm
+        npx -v
+        which npx

.circleci/config/commands/restore-workspace-database.yml

@@ -1,6 +1,7 @@
 description: 'Restore Workspace'
 steps:
   - checkout
+  - setup-env
   # Attach `dist` folder
   - attach_workspace:
       at: ~/
@@ -17,7 +18,5 @@ steps:
       name: 'Restore NVM Cache'
       keys:
         - nvm-cache-{{ checksum ".nvmrc" }}
-  - load-nvm
   - install-pnpm
   - install-cypher-shell
-  - setup-env

.circleci/config/commands/restore-workspace.yml

@@ -1,6 +1,7 @@
 description: 'Restore Workspace'
 steps:
   - checkout
+  - setup-env
   # Attach `dist` folder
   - attach_workspace:
       at: ~/
@@ -17,6 +18,4 @@ steps:
       name: 'Restore NVM Cache'
       keys:
         - nvm-cache-{{ checksum ".nvmrc" }}
-  - load-nvm
   - install-pnpm
-  - setup-env

.circleci/config/env.sh

@@ -34,7 +34,6 @@ echo "export NEO4J_USER=neo4j" >> $BASH_ENV
 #
 # Slack settings
 #
-
 if [ "$CIRCLE_USERNAME" == "$GITHUB_VLADSLAV" ]; then
   echo "export SLACK_PARAM_MENTIONS=\<@${SLACK_VLADSLAV}\>" >> $BASH_ENV
 elif [ "$CIRCLE_USERNAME" == "$GITHUB_ASSIM" ]; then
@@ -47,6 +46,13 @@ else
   echo "export SLACK_PARAM_MENTIONS=\<@${SLACK_WEBBER}\>" >> $BASH_ENV
 fi
 
-# Done
-source $BASH_ENV
+#
+# Docker tag version from git tags
+#
+# Note: || true prevents script failure when grep finds no matches (returns exit code 1)
+VERSION_TAG=$(git tag --points-at HEAD | grep -E "^[0-9]+\.[0-9]+\.[0-9]+$" | head -1 || true)
+
+eval "$(node ./scripts/validate-semver.js "$VERSION_TAG")"
 
+# Done
+source $BASH_ENV

.circleci/config/install-nvm.sh

@@ -7,3 +7,6 @@ echo 'source $NVM_DIR/nvm.sh' >> $BASH_ENV
 if [ ! -d "$NVM_DIR" ]; then
   wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash
 fi
+
+# Source BASH_ENV to make nvm available in current shell
+source $BASH_ENV

.circleci/config/jobs/setup-infra-workspace.yml

@@ -2,11 +2,11 @@ executor: docker-node
 resource_class: large
 steps:
   - checkout
+  - setup-env
+  - install-nvm
   - install-terraform
-  - increment-docker-version
-  # - install-packer
   - login-docker
-  - increment-docker-version
+
   - persist_to_workspace:
       root: ~/
       # Persists the docker login