Merge pull request #22 from getlarge/21-refactor-replace-local-ory-li…

…braries refactor: replace local Ory libraries
getlarge · Jan 15, 2024 · 916414b · 916414b
2 parents 7dfa2ef + a4799fb
commit 916414b
Show file tree

Hide file tree

Showing 129 changed files with 2,382 additions and 4,958 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,7 +1,7 @@
 {
   "root": true,
   "ignorePatterns": ["**/*"],
-  "plugins": ["@nx/eslint-plugin"],
+  "plugins": ["@nx"],
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx", "*.cjs"],

diff --git a/.github/actions/checkout-and-yarn/action.yaml b/.github/actions/checkout-and-yarn/action.yaml
@@ -33,7 +33,7 @@ runs:
         token: ${{ inputs.token }}
 
     - name: Set up Node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ inputs.node-version }}
 

diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
@@ -130,7 +130,7 @@ jobs:
 
       - name: Derive appropriate SHAs for base and head for `nx affected` commands
         id: set-shas
-        uses: nrwl/nx-set-shas@v3
+        uses: nrwl/nx-set-shas@v4
         with:
           # solves issue where no projects are affected after merging to main
           workflow-id: ${{ steps.ref-workflow.outputs.value }}
@@ -242,7 +242,7 @@ jobs:
       # When building images in CI runner
       - name: Retrieve build output from external workflow
         if: github.event_name == 'workflow_dispatch'
-        uses: dawidd6/action-download-artifact@v2
+        uses: dawidd6/action-download-artifact@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           branch: ${{ needs.init.outputs.current-branch }}
@@ -259,7 +259,7 @@ jobs:
 
       - name: Retrieve build output from current workflow
         if: github.event_name != 'workflow_dispatch' && steps.check-build-artifact.outputs.exists == 'true'
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ env.BUILD_ARTIFACTS }}
           path: ${{ env.BUILD_FOLDER }}
@@ -274,7 +274,7 @@ jobs:
         run: exit 1
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -125,7 +125,7 @@ jobs:
       - name: Derive appropriate SHAs for base and head for `nx affected` commands
         id: set-shas
         uses:
-          nrwl/nx-set-shas@v3
+          nrwl/nx-set-shas@v4
 
           # get commits count and increment by 1 for safety
       - name: Find depth of NX_BASE
@@ -291,9 +291,22 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Regenerate backend apps package.json
-        if: needs.init.outputs.should-update-packages == 'true'
-        run: NX_CLOUD_DISTRIBUTED_EXECUTION=false yarn refresh-pkg-json
+      # this step now goes in conflict with package.json regeneration via ESLint @nx/dependency-checks rule
+      # - name: Regenerate backend apps package.json
+      #   if: needs.init.outputs.should-update-packages == 'true'
+      #   run: NX_CLOUD_DISTRIBUTED_EXECUTION=false yarn refresh-pkg-json
+
+      # - name: Add, commit and push backend package.json
+      #   if: needs.init.outputs.should-update-packages == 'true'
+      #   id: commit-pkg
+      #   uses: stefanzweifel/git-auto-commit-action@v4
+      #   with:
+      #     commit_message: 'chore: regenerate backend package*.json [skip ci]'
+      #     file_pattern: 'apps/**/package*.json'
+      #     commit_options: '--no-verify'
+
+      # - if: steps.commit-pkg.outputs.changes_detected == 'true'
+      #   run: echo "BASE_DEPTH=$((${{ env.BASE_DEPTH }} + 1))" >> $GITHUB_ENV
 
       - name: Regenerate frontend models
         if: needs.init.outputs.should-update-models == 'true'
@@ -303,18 +316,6 @@ jobs:
         if: needs.init.outputs.should-update-models == 'true'
         run: npx nx format:write --projects=shared-ng-open-api
 
-      - name: Add, commit and push backend package.json
-        if: needs.init.outputs.should-update-packages == 'true'
-        id: commit-pkg
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: 'chore: regenerate backend package*.json [skip ci]'
-          file_pattern: 'apps/**/package*.json'
-          commit_options: '--no-verify'
-
-      - if: steps.commit-pkg.outputs.changes_detected == 'true'
-        run: echo "BASE_DEPTH=$((${{ env.BASE_DEPTH }} + 1))" >> $GITHUB_ENV
-
       - name: Add, commit and push generated models
         if: needs.init.outputs.should-update-models == 'true'
         id: commit-ng-models
@@ -449,7 +450,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v3
+        uses: nrwl/nx-set-shas@v4
 
       - run: npx nx-cloud start-ci-run
 

diff --git a/apps/auth/.eslintrc.json b/apps/auth/.eslintrc.json
@@ -18,6 +18,23 @@
     {
       "files": ["*.js", "*.jsx", "*.cjs"],
       "rules": {}
+    },
+    {
+      "files": ["*.json"],
+      "parser": "jsonc-eslint-parser",
+      "rules": {
+        "@nx/dependency-checks": [
+          "error",
+          {
+            "buildTargets": ["build"],
+            "checkMissingDependencies": true,
+            "checkObsoleteDependencies": true,
+            "checkVersionMismatches": true,
+            "includeTransitiveDependencies": true,
+            "ignoredDependencies": ["@jest/globals", "@nestjs/testing"]
+          }
+        ]
+      }
     }
   ]
 }