Merge magicspace changes (update)

vilicvane · Oct 26, 2023 · 0dda42d · 0dda42d
2 parents b78d346 + 4653f6c
commit 0dda42d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,5 +6,4 @@ node_modules/
 yarn-error.log
 # TypeScript Build Artifacts
 bld/
-.bld/
 *.tsbuildinfo
diff --git a/.magicspace/boilerplate.json b/.magicspace/boilerplate.json
@@ -39,7 +39,8 @@
             "name": "library"
           },
           {
-            "name": "test"
+            "name": "test",
+            "references": ["library"]
           }
         ]
       },

diff --git a/.prettierignore b/.prettierignore
@@ -2,6 +2,5 @@
 boilerplate.schema.json
 # TypeScript Build Artifacts
 bld/
-.bld/
 # Lerna
 lerna.json
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
   "type": "module",
   "scripts": {
     "3": "yarn && yarn-deduplicate && yarn",
-    "build": "rimraf --glob packages/*/{.bld,bld} && tsc --build",
+    "build": "rimraf --glob packages/*/bld && tsc --build",
     "lint": "eslint --no-error-on-unmatched-pattern . && run-in-every eslint-project --parallel --echo -- eslint --no-error-on-unmatched-pattern .",
     "lint-prettier": "prettier --check .",
     "test": "yarn lint-prettier && yarn build && yarn lint && yarn bare-test",
@@ -27,7 +27,7 @@
     "packages/cli"
   ],
   "devDependencies": {
-    "@mufan/eslint-plugin": "^0.2.12",
+    "@mufan/eslint-plugin": "^0.2.13",
     "@types/jest": "^29.5.6",
     "@types/node": "^18.13.0",
     "cross-env": "^7.0.3",

diff --git a/packages/utils/src/test/tsconfig.json b/packages/utils/src/test/tsconfig.json
@@ -4,7 +4,11 @@
     "composite": true,
     "types": ["node", "jest"],
     "rootDir": ".",
-    "outDir": "../../.bld/test"
+    "outDir": "../../bld/test"
   },
-  "references": [{"path": "../library"}]
+  "references": [
+    {
+      "path": "../library"
+    }
+  ]
 }
diff --git a/yarn.lock b/yarn.lock
@@ -704,10 +704,10 @@
     yargs "16.2.0"
     yargs-parser "20.2.4"
 
-"@mufan/eslint-plugin@^0.2.12":
-  version "0.2.12"
-  resolved "https://registry.yarnpkg.com/@mufan/eslint-plugin/-/eslint-plugin-0.2.12.tgz#1aa87974b5f9e2f08d6602f38f9e120a22c85c38"
-  integrity sha512-hgZhoRXvKg9sjMTPooxu83TddpZxDR9fRvrqK7EdOZvQHFcD4thbGPAhDNiQVNdRkYbtxyWoS57QQoB6DtWCgQ==
+"@mufan/eslint-plugin@^0.2.13":
+  version "0.2.13"
+  resolved "https://registry.yarnpkg.com/@mufan/eslint-plugin/-/eslint-plugin-0.2.13.tgz#00e46df7c8457f3cb6a2c1bd63f00e40fbd70483"
+  integrity sha512-R+PXPG8voZNy6TSjDrZ1UunqTyRIYnWvmQDk3ZidDcays2gZ1hqmYW3ODd6751uUaolqk36VYfq044Yw76+btg==
   dependencies:
     "@types/eslint" "^8.44.4"
     "@typescript-eslint/eslint-plugin" "^6.7.5"