Merge remote-tracking branch 'bp/main'

waitingsong · Apr 24, 2024 · 79cc3a7 · 79cc3a7
2 parents 85b5553 + 319f27a
commit 79cc3a7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/.githooks/init-repo.sh b/.githooks/init-repo.sh
@@ -19,6 +19,7 @@ if [ -z "$CI" ]; then
   git config --local core.precomposeUnicode true
   git config --local fetch.prune true
   git config --local pull.rebase true
+  git config --local push.autoSetupRemote true
   git config --local push.followTags true
   git config --local rebase.autoStash true
   git config --local remote.origin.prune true

diff --git a/.scripts/purge.sh b/.scripts/purge.sh
@@ -2,9 +2,15 @@
 
 
 npm run clean
+
 if [[ -d node_modules/nx ]]; then
   nx reset
 fi
+
 rm -rf node_modules package-lock.json
 npm run refresh
 
+if [[ -d node_modules/nx ]]; then
+  nx reset
+fi
+
diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
     "bootstrap": "npm i --loglevel info --disturl=https://npmmirror.com/dist/",
     "build": "sh .scripts/build.sh",
     "ci": "npm run cov",
-    "clean": "lerna clean --loglevel error --yes && lerna run clean && nx reset",
+    "clean": "lerna clean --loglevel error --yes && lerna run clean",
     "cov": "sh .scripts/cov.sh",
     "lint": "sh .scripts/lint.sh",
     "lint:cycle": "lerna exec -- madge --circular --extensions ts src",