fix: noir_js import (#6381)

Switches noir_js from portal to file to avoid symlinking the noir/packages/noir_js that is unable to find its own dependencies. By instead using the file import, it copies noir/packages/noir_js into yarn-project/node_modules where it should be able to find the other portalled dependencies.
AztecProtocol · May 14, 2024 · e9c7e5f · e9c7e5f
1 parent 03fe797
commit e9c7e5f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/yarn-project/noir-protocol-circuits-types/package.json b/yarn-project/noir-protocol-circuits-types/package.json
@@ -52,7 +52,7 @@
     "@aztec/types": "workspace:^",
     "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js",
     "@noir-lang/noir_codegen": "portal:../../noir/packages/noir_codegen",
-    "@noir-lang/noir_js": "portal:../../noir/packages/noir_js",
+    "@noir-lang/noir_js": "file:../../noir/packages/noir_js",
     "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi",
     "@noir-lang/types": "portal:../../noir/packages/types",
     "change-case": "^5.4.4",

diff --git a/yarn-project/package.json b/yarn-project/package.json
@@ -72,7 +72,7 @@
     "@noir-lang/types": "portal:../noir/packages/types",
     "@noir-lang/noirc_abi": "portal:../noir/packages/noirc_abi",
     "@noir-lang/noir_codegen": "portal:../noir/packages/noir_codegen",
-    "@noir-lang/noir_js": "portal:../noir/packages/noir_js",
+    "@noir-lang/noir_js": "file:../noir/packages/noir_js",
     "jest-runner@^29.7.0": "patch:jest-runner@npm%3A29.7.0#./.yarn/patches/jest-runner-npm-29.7.0-3bc9f82b58.patch"
   }
 }
diff --git a/yarn-project/yarn.lock b/yarn-project/yarn.lock
@@ -582,7 +582,7 @@ __metadata:
     "@jest/globals": ^29.5.0
     "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js"
     "@noir-lang/noir_codegen": "portal:../../noir/packages/noir_codegen"
-    "@noir-lang/noir_js": "portal:../../noir/packages/noir_js"
+    "@noir-lang/noir_js": "file:../../noir/packages/noir_js"
     "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi"
     "@noir-lang/types": "portal:../../noir/packages/types"
     "@types/jest": ^29.5.0
@@ -2851,15 +2851,16 @@ __metadata:
   languageName: node
   linkType: soft
 
-"@noir-lang/noir_js@portal:../noir/packages/noir_js::locator=%40aztec%2Faztec3-packages%40workspace%3A.":
-  version: 0.0.0-use.local
-  resolution: "@noir-lang/noir_js@portal:../noir/packages/noir_js::locator=%40aztec%2Faztec3-packages%40workspace%3A."
+"@noir-lang/noir_js@file:../noir/packages/noir_js::locator=%40aztec%2Faztec3-packages%40workspace%3A.":
+  version: 0.29.0
+  resolution: "@noir-lang/noir_js@file:../noir/packages/noir_js#../noir/packages/noir_js::hash=edd4c2&locator=%40aztec%2Faztec3-packages%40workspace%3A."
   dependencies:
     "@noir-lang/acvm_js": 0.45.0
     "@noir-lang/noirc_abi": 0.29.0
     "@noir-lang/types": 0.29.0
+  checksum: 33ebaa2b3cabd8fc71c6d07ecd014fde7be0036aed5b56d37ad08241ce41848c2330bafda50eb0c270a57dbc2a795edf88d1d8a129b89a409d4d49a1b835d577
   languageName: node
-  linkType: soft
+  linkType: hard
 
 "@noir-lang/noirc_abi@portal:../noir/packages/noirc_abi::locator=%40aztec%2Faztec3-packages%40workspace%3A.":
   version: 0.0.0-use.local