Skip to content

Commit

Permalink
chore!: remove unused source-resolver package (#3791)
Browse files Browse the repository at this point in the history
# Description

## Problem\*

Resolves
#3760 (comment)

## Summary\*

This PR removes the source-resolver package now that it's no longer
used.

## Additional Context



## Documentation\*

Check one:
- [ ] No documentation needed.
- [ ] Documentation included in this PR.
- [ ] **[Exceptional Case]** Documentation to be submitted in a separate
PR.

# PR Checklist\*

- [ ] I have tested the changes locally.
- [ ] I have formatted the changes with [Prettier](https://prettier.io/)
and/or `cargo fmt` on default settings.
  • Loading branch information
TomAFrench committed Dec 14, 2023
1 parent e3dcc21 commit 57d2505
Show file tree
Hide file tree
Showing 21 changed files with 24 additions and 833 deletions.
6 changes: 1 addition & 5 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ packages
**/node_modules
**/outputs

# Source resolver
compiler/source-resolver/lib
compiler/source-resolver/lib-node

# Noir.js
tooling/noir_js/lib

Expand All @@ -19,4 +15,4 @@ compiler/wasm/nodejs
compiler/wasm/web
tooling/noirc_abi_wasm/nodejs
tooling/noirc_abi_wasm/web
tooling/noir_js/lib
tooling/noir_js/lib
26 changes: 3 additions & 23 deletions .github/workflows/test-js-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -265,22 +265,7 @@ jobs:
yarn workspace @noir-lang/noir_js build
yarn workspace @noir-lang/noir_js test
test-source-resolver:
name: source-resolver
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3

- name: Install Yarn dependencies
uses: ./.github/actions/setup

- name: Build @noir-lang/source-resolver
run: yarn workspace @noir-lang/source-resolver build

- name: Run tests
run: yarn workspace @noir-lang/source-resolver test

test-noir-wasm:
needs: [build-noir-wasm, build-nargo]
Expand Down Expand Up @@ -319,10 +304,6 @@ jobs:
- name: Install Playwright
uses: ./.github/actions/install-playwright

- name: Install dependencies
run: |
yarn workspace @noir-lang/source-resolver build
- name: Run node tests
run: yarn workspace @noir-lang/noir_wasm test:node

Expand Down Expand Up @@ -411,8 +392,8 @@ jobs:
- name: Setup `integration-tests`
run: |
# Note the lack of spaces between package names.
PACKAGES_TO_BUILD="@noir-lang/source-resolver,@noir-lang/types,@noir-lang/backend_barretenberg,@noir-lang/noir_js"
yarn workspaces foreach -vp --from "{$PACKAGES_TO_BUILD}" run build
PACKAGES_TO_BUILD="@noir-lang/types,@noir-lang/backend_barretenberg,@noir-lang/noir_js"
yarn workspaces foreach -vtp --from "{$PACKAGES_TO_BUILD}" run build
- name: Run `integration-tests`
run: |
Expand All @@ -431,7 +412,6 @@ jobs:
- test-noirc-abi
- test-noir-js-backend-barretenberg
- test-noir-js
- test-source-resolver
- test-noir-wasm
- test-noir-codegen
- test-integration
Expand Down
5 changes: 0 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ pkg/
!.yarn/sdks
!.yarn/versions

# Source resolver
compiler/source-resolver/node_modules
compiler/source-resolver/lib
compiler/source-resolver/lib-node

# Noir.js
tooling/noir_js/lib

Expand Down
3 changes: 1 addition & 2 deletions Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,11 @@ RUN yarn workspace @noir-lang/backend_barretenberg test
RUN ./scripts/nargo_compile_noir_js_assert_lt.sh
RUN rm -rf /usr/src/noir/tooling/noir_js/test/noir_compiled_examples/assert_lt/target/debug_assert_lt.json
RUN yarn workspace @noir-lang/noir_js test
RUN yarn workspace @noir-lang/source-resolver test
RUN ./scripts/nargo_compile_wasm_fixtures.sh
RUN yarn workspace @noir-lang/noir_wasm test:node
RUN yarn workspace @noir-lang/noir_wasm test:browser
RUN ./scripts/nargo_compile_noir_codegen_assert_lt.sh
RUN rm -rf /usr/src/noir/tooling/noir_codegen/test/assert_lt/target/debug_assert_lt.json
RUN yarn workspace @noir-lang/noir_codegen test
RUN apt-get install -y libc++-dev
RUN yarn test:integration
RUN yarn test:integration
1 change: 0 additions & 1 deletion compiler/integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"@noir-lang/backend_barretenberg": "workspace:*",
"@noir-lang/noir_js": "workspace:*",
"@noir-lang/noir_wasm": "workspace:*",
"@noir-lang/source-resolver": "workspace:*",
"@nomicfoundation/hardhat-chai-matchers": "^2.0.0",
"@nomicfoundation/hardhat-ethers": "^3.0.0",
"@web/dev-server-esbuild": "^0.3.6",
Expand Down
1 change: 0 additions & 1 deletion compiler/source-resolver/.eslintignore

This file was deleted.

3 changes: 0 additions & 3 deletions compiler/source-resolver/.eslintrc.js

This file was deleted.

43 changes: 0 additions & 43 deletions compiler/source-resolver/package.json

This file was deleted.

31 changes: 0 additions & 31 deletions compiler/source-resolver/src/index.ts

This file was deleted.

17 changes: 0 additions & 17 deletions compiler/source-resolver/src/index_node.ts

This file was deleted.

51 changes: 0 additions & 51 deletions compiler/source-resolver/test/cjs_initialization.test.cjs

This file was deleted.

58 changes: 0 additions & 58 deletions compiler/source-resolver/test/esm_initialization.test.mjs

This file was deleted.

16 changes: 0 additions & 16 deletions compiler/source-resolver/tsconfig.cjs.json

This file was deleted.

16 changes: 0 additions & 16 deletions compiler/source-resolver/tsconfig.esm.json

This file was deleted.

2 changes: 0 additions & 2 deletions compiler/source-resolver/types/index.d.ts

This file was deleted.

2 changes: 0 additions & 2 deletions compiler/source-resolver/types/index_node.d.ts

This file was deleted.

3 changes: 0 additions & 3 deletions compiler/wasm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@
"build:nix": "nix build -L .#noir_wasm",
"install:from:nix": "yarn clean && yarn build:nix && cp -rL ./result/noir_wasm/nodejs ./ && cp -rL ./result/noir_wasm/web ./"
},
"peerDependencies": {
"@noir-lang/source-resolver": "workspace:*"
},
"devDependencies": {
"@esm-bundle/chai": "^4.3.4-fix.0",
"@web/dev-server-esbuild": "^0.3.6",
Expand Down
4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"private": true,
"workspaces": [
"compiler/wasm",
"compiler/source-resolver",
"compiler/integration-tests",
"tooling/noir_js_types",
"tooling/noirc_abi_wasm",
Expand All @@ -27,10 +26,9 @@
"install:noirc_abi_wasm": "yarn workspace @noir-lang/noirc_abi run install:from:nix",
"install:from:nix": "yarn install:acvm_js && yarn install:noir_wasm && yarn install:noirc_abi_wasm",
"build:types": "yarn workspace @noir-lang/types run build",
"build:source-resolver": "yarn workspace @noir-lang/source-resolver run build",
"build:backend_barretenberg": "yarn workspace @noir-lang/backend_barretenberg run build",
"build:noir_js": "yarn workspace @noir-lang/noir_js run build",
"build:js:only": "yarn build:types && yarn build:source-resolver && yarn build:backend_barretenberg && yarn build:noir_js",
"build:js:only": "yarn build:types && yarn build:backend_barretenberg && yarn build:noir_js",
"prepare:publish": "yarn clean && yarn install:from:nix && yarn build:js:only",
"nightly:version": "yarn workspaces foreach run nightly:version",
"publish:all": "yarn install && yarn workspaces foreach run publish"
Expand Down
5 changes: 0 additions & 5 deletions release-please-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@
"extra-files": [
"Cargo.toml",
"flake.nix",
{
"type": "json",
"path": "compiler/source-resolver/package.json",
"jsonpath": "$.version"
},
{
"type": "json",
"path": "compiler/wasm/package.json",
Expand Down
Loading

0 comments on commit 57d2505

Please sign in to comment.