From 990ac0aef6120281d5e4a3c3dc9a6f549d27af7b Mon Sep 17 00:00:00 2001
From: Tom French <15848336+TomAFrench@users.noreply.github.com>
Date: Mon, 27 Nov 2023 09:33:55 +0000
Subject: [PATCH] chore: add dependency on noir_js from docs package (#3559)

---
 .github/workflows/docs-pr.yml      | 25 +++++--------------------
 docs/package.json                  |  1 +
 tooling/noir_js_types/package.json |  3 ++-
 yarn.lock                          |  1 +
 4 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/docs-pr.yml b/.github/workflows/docs-pr.yml
index 02044c82224..2b304b72b6f 100644
--- a/.github/workflows/docs-pr.yml
+++ b/.github/workflows/docs-pr.yml
@@ -55,7 +55,7 @@ jobs:
     if: needs.add_label.outputs.has_label == 'true'
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
     
       - name: Setup Node.js
         uses: actions/setup-node@v2
@@ -71,24 +71,8 @@ jobs:
         run: |
           npm i wasm-opt -g
 
-      - name: Install dependencies
-        run: yarn
-
-      - name: Build acvm_js
-        run: yarn workspace @noir-lang/acvm_js build
-
-      - name: Build noirc_abi
-        run: yarn workspace @noir-lang/noirc_abi build
-
-      - name: Build noir_js_types
-        run: yarn workspace @noir-lang/types build
-
-      - name: Build barretenberg wrapper
-        run: yarn workspace @noir-lang/backend_barretenberg build
-
-      - name: Run noir_js
-        run: |
-          yarn workspace @noir-lang/noir_js build
+      - name: Install Yarn dependencies
+        uses: ./.github/actions/setup
 
       - name: Remove pre-releases
         working-directory: docs
@@ -97,8 +81,9 @@ jobs:
         run: yarn setStable
     
       - name: Build docs
+        working-directory: docs
         run: 
-          yarn workspace docs build
+          yarn workspaces foreach -Rt run build
 
       - name: Deploy to Netlify
         uses: nwtgck/actions-netlify@v2.1
diff --git a/docs/package.json b/docs/package.json
index 09f8d718b56..db0efbe7543 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -13,6 +13,7 @@
     "@docusaurus/preset-classic": "^2.4.0",
     "@easyops-cn/docusaurus-search-local": "^0.35.0",
     "@mdx-js/react": "^1.6.22",
+    "@noir-lang/noir_js": "workspace:*",
     "axios": "^1.4.0",
     "clsx": "^1.2.1",
     "docusaurus-plugin-typedoc": "1.0.0-next.18",
diff --git a/tooling/noir_js_types/package.json b/tooling/noir_js_types/package.json
index 57bb2f050b7..4232358ddff 100644
--- a/tooling/noir_js_types/package.json
+++ b/tooling/noir_js_types/package.json
@@ -19,7 +19,8 @@
     "build": "yarn run build:cjs && yarn run build:esm",
     "nightly:version": "jq --arg new_version \"-$(git rev-parse --short HEAD)$1\" '.version = .version + $new_version' package.json > package-tmp.json && mv package-tmp.json package.json",
     "publish": "echo 📡 publishing `$npm_package_name` && yarn npm publish",
-    "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore  --max-warnings 0"
+    "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore  --max-warnings 0",
+    "clean": "rm -rf ./lib"
   },
   "exports": {
     ".": {
diff --git a/yarn.lock b/yarn.lock
index 9c6a447d718..6ae655f8ce2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8290,6 +8290,7 @@ __metadata:
     "@docusaurus/preset-classic": ^2.4.0
     "@easyops-cn/docusaurus-search-local": ^0.35.0
     "@mdx-js/react": ^1.6.22
+    "@noir-lang/noir_js": "workspace:*"
     axios: ^1.4.0
     clsx: ^1.2.1
     docusaurus-plugin-typedoc: 1.0.0-next.18