Fix merge errors

hubmapconsortium · Feb 15, 2024 · f469fd8 · f469fd8
1 parent 7d39925
commit f469fd8
Show file tree

Hide file tree

Showing 616 changed files with 23,780 additions and 82,925 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -47,6 +47,10 @@
               {
                 "sourceTag": "shared",
                 "onlyDependOnLibsWithTags": ["utils", "shared"]
+              },
+              {
+                "sourceTag": "ccf",
+                "onlyDependOnLibsWithTags": ["*"]
               }
             ]
           }

diff --git a/.github/workflows/beta-build.yml b/.github/workflows/beta-build.yml
@@ -57,4 +57,4 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: dist/ccf-ui
           publish_branch: beta
-          commit_message: "Beta deploy -- ${{ github.event.head_commit.message }}"
+          commit_message: 'Beta deploy -- ${{ github.event.head_commit.message }}'
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-# npx lint-staged
+npx lint-staged
diff --git a/.prettierignore b/.prettierignore
@@ -7,3 +7,6 @@ tsconfig.base.json
 
 .angular
 .nx/cache
+
+# Ignore big asset files
+*.n3store.json