Skip to content

Commit

Permalink
Merge branch 'use-new-test-env' of https://github.com/ensdomains/ens-…
Browse files Browse the repository at this point in the history
…app-v3 into use-new-test-env
  • Loading branch information
talentlessguy committed Feb 4, 2025
2 parents eb50f50 + c30312f commit 5602d5f
Show file tree
Hide file tree
Showing 11 changed files with 9 additions and 69 deletions.
2 changes: 0 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
.yarn/**/* linguist-generated -diff
.yalc/**/* linguist-generated -diff
.pnp.cjs text linguist-generated -diff
.pnp.loader.mjs text linguist-generated -diff
yarn.lock text linguist-generated -diff
yalc.lock text linguist-generated -diff
*.lock text linguist-generated -diff

# Archives
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/knip.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- uses: actions/checkout@v3

- name: Install pnpm
run: corepack enable pnpm
run: npm i -g --force corepack && corepack enable pnpm

- name: Install Node.js
uses: actions/setup-node@v3
Expand Down
21 changes: 1 addition & 20 deletions .github/workflows/pages-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,10 @@ env:

on: [push]
jobs:
yalc_check:
runs-on: ubuntu-latest
outputs:
can_deploy: ${{ steps.has_yalc.conclusion == 'success' }}
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Install Yalc
run: npm i -g yalc

- id: has_yalc
run: |
! yalc check | grep -qe .

deploy:
if: ${{ always() }}
runs-on: ubuntu-latest
needs: [yalc_check]
permissions:
contents: read
deployments: write
Expand All @@ -36,12 +21,8 @@ jobs:
- name: Install Misc. Deps
run: sudo apt-get install -y libcairo2-dev libjpeg8-dev libpango1.0-dev libgif-dev build-essential g++

- name: Check Yalc
if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' }}
run: if [ ${{ needs.yalc_check.outputs.can_deploy }} != true ]; then exit 1; else exit 0; fi

- name: Install pnpm
run: corepack enable pnpm
run: npm i -g --force corepack && corepack enable pnpm

- name: Install Node.js
uses: actions/setup-node@v3
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v3

- name: Install pnpm
run: corepack enable pnpm
run: npm i -g --force corepack && corepack enable pnpm

- name: Install Node.js
uses: actions/setup-node@v3
Expand All @@ -35,7 +35,7 @@ jobs:
- uses: actions/checkout@v3

- name: Install pnpm
run: corepack enable pnpm
run: npm i -g --force corepack && corepack enable pnpm

- name: Install Node.js
uses: actions/setup-node@v3
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
- uses: actions/checkout@v3

- name: Install pnpm
run: corepack enable pnpm
run: npm i -g --force corepack && corepack enable pnpm

- name: Install Node.js
uses: actions/setup-node@v3
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
- uses: actions/checkout@v3

- name: Install pnpm
run: corepack enable pnpm
run: npm i -g --force corepack && corepack enable pnpm

- name: Install Node.js
uses: actions/setup-node@v3
Expand Down Expand Up @@ -153,7 +153,7 @@ jobs:
- run: ./scripts/check-chrome.sh

- name: Install pnpm
run: corepack enable pnpm
run: npm i -g --force corepack && corepack enable pnpm

- name: Install Node.js
uses: actions/setup-node@v3
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -72,5 +72,3 @@ tsconfig.vitest-temp.json
.sentryclirc

.dev.vars

*yalc*
1 change: 0 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
.yalc
.next
node_modules
pnpm-lock.yaml
Expand Down
12 changes: 2 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -469,17 +469,10 @@ Cloudflare will automatically build and deploy a test site when pushed to a new

## External Package Local Development

1. Install yalc globally:
2. Link a local package:

```bash
npm i -g yalc
```

2. Run relevant update script within external repo, for example:

```bash
# Example publish script for ENSjs, be aware this may have changed.
pnpm publish:local:ensjs
pnpm link ../ensjs
```

3. Run pnpm install within this repo:
Expand All @@ -488,7 +481,6 @@ pnpm publish:local:ensjs
pnpm install
```

If updating an existing yalc installation, you can add the `--force` flag.

## Coding guidelines

Expand Down
6 changes: 0 additions & 6 deletions next.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,6 @@ const nextConfig = {
if (babelIncludeRegexes.some((r) => r.test(excludePath))) {
return false
}
if (/\.yalc\/@ensdomains\/thorin/.test(excludePath)) {
return true
}
if (/\.yalc\/@ensdomains\/ensjs/.test(excludePath)) {
return true
}
return /node_modules/.test(excludePath)
}
}
Expand Down
6 changes: 0 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,6 @@
"e2e:stateful": "npx playwright test --project=stateful",
"e2e:ci": "E2E=true CI=true STABLE_MODE=true SLOW_MODE=true pnpm tenv start --extra-time 11368000",
"postinstall": "husky install",
"local:add:ensjs": "yalc add @ensdomains/ensjs --workspace && pnpm install",
"local:remove:ensjs": "node ./scripts/removeWorkspace.mjs @ensdomains/ensjs && yalc remove @ensdomains/ensjs && pnpm install",
"local:add:thorin": "yalc add @ensdomains/thorin --workspace && pnpm install",
"local:remove:thorin": "node ./scripts/removeWorkspace.mjs @ensdomains/thorin && yalc remove @ensdomains/thorin && pnpm install",
"local:add:ens-test-env": "yalc add @ensdomains/ens-test-env --workspace && pnpm install",
"local:remove:ens-test-env": "node ./scripts/removeWorkspace.mjs @ensdomains/ens-test-env && yalc remove @ensdomains/ens-test-env && pnpm install",
"wrangle": "wrangler pages dev ./out --local --log-level none",
"wrangle:dev": "wrangler pages dev ./next",
"wrangle:list": "wrangler deployments list",
Expand Down
2 changes: 0 additions & 2 deletions pnpm-workspace.yaml

This file was deleted.

14 changes: 0 additions & 14 deletions scripts/removeWorkspace.mjs

This file was deleted.

0 comments on commit 5602d5f

Please sign in to comment.