resolve merge conflicts

Author: LeonmanRolls

.gitattributes

@@ -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

.github/workflows/knip.yaml

@@ -7,15 +7,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+<<<<<<< HEAD
 
       - name: Install corepack
         run: npm i -g corepack
+=======
+>>>>>>> a87770a8fd11cef16bd907569957a24c609917ee
 
       - 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
+        uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: 'pnpm'

.github/workflows/pages-deployment.yaml

@@ -7,25 +7,9 @@ env:
 
 on: [push]
 jobs:
-  yalc_check:
-    runs-on: ubuntu-latest
-    outputs:
-      can_deploy: ${{ steps.has_yalc.conclusion == 'success' }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - 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
@@ -36,18 +20,11 @@ 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 corepack
-        run: npm i -g corepack
-
       - 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
+        uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: 'pnpm'

.github/workflows/test.yaml

@@ -11,14 +11,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install corepack
-        run: npm i -g corepack
-
       - 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
+        uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: 'pnpm'
@@ -27,7 +24,7 @@ jobs:
 
       - name: Get contract addresses
         run: 'parallel --lb --halt now,success=1,fail=1 ::: \
-          "pnpm tenv start -ng -ns -nb" \
+          "pnpm tenv start --no-graph --no-scripts --no-build --exit-after-deploy" \
           "pnpm wait-on ./.env.local"'
 
       - run: pnpm test:coverage
@@ -37,14 +34,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install corepack
-        run: npm i -g corepack
-
       - 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
+        uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: 'pnpm'
@@ -53,7 +47,7 @@ jobs:
 
       - name: Get contract addresses
         run: 'parallel --lb --halt now,success=1,fail=1 ::: \
-          "pnpm tenv start -ng -ns -nb" \
+          "pnpm tenv start --no-graph --no-scripts --no-build --exit-after-deploy" \
           "pnpm wait-on ./.env.local"'
 
       - name: Build stateless and export
@@ -73,14 +67,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install corepack
-        run: npm i -g corepack
-
       - 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
+        uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: 'pnpm'
@@ -141,14 +132,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install corepack
-        run: npm i -g corepack
-
       - 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
+        uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: 'pnpm'
@@ -172,7 +160,7 @@ jobs:
 
       - name: Run tests
         run: |
-          PLAYWRIGHT_SHARD=${{matrix.shard}} PLAYWRIGHT_TOTAL=${{strategy.job-total}} pnpm e2e:ci -nb
+          PLAYWRIGHT_SHARD=${{matrix.shard}} PLAYWRIGHT_TOTAL=${{strategy.job-total}} pnpm e2e:ci --no-build
 
       - uses: actions/upload-artifact@v4
         if: always()
@@ -199,10 +187,10 @@ jobs:
         run: npm i -g corepack
 
       - 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
+        uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: 'pnpm'

.gitignore

@@ -72,5 +72,3 @@ tsconfig.vitest-temp.json
 .sentryclirc
 
 .dev.vars
-
-*yalc*

.npmrc

@@ -1 +1,2 @@
-strict-peer-dependencies=false
+strict-peer-dependencies=false
+auto-install-peers=false

.prettierignore

@@ -1,4 +1,3 @@
-.yalc
 .next
 node_modules
 pnpm-lock.yaml

.stylelintrc.json

@@ -1,16 +1,12 @@
 {
-  "processors": ["stylelint-processor-styled-components"],
   "extends": [
-    "stylelint-config-standard-scss",
-    "stylelint-config-styled-components",
-    "stylelint-config-prettier"
+    "stylelint-config-standard"
   ],
-  "customSyntax": "postcss-scss",
+  "customSyntax": "postcss-styled-syntax",
   "rules": {
     "selector-type-case": ["lower", { "ignoreTypes": ["/^\\$\\w+/"] }],
     "selector-type-no-unknown": [true, { "ignoreTypes": ["/-styled-mixin/", "/^\\$\\w+/"] }],
     "value-keyword-case": ["lower", { "ignoreKeywords": ["dummyValue", "currentColor"] }],
-    "declaration-colon-newline-after": null,
     "declaration-empty-line-before": null,
     "property-no-unknown": [
       true,
@@ -20,11 +16,19 @@
     ],
     "color-function-notation": "legacy",
     "alpha-value-notation": "number",
-    "scss/operator-no-newline-after": null,
-    "scss/operator-no-unspaced": null,
     "custom-property-pattern": null,
     "rule-empty-line-before": null,
     "keyframes-name-pattern": null,
-    "keyframe-block-no-duplicate-selectors": null
+    "keyframe-block-no-duplicate-selectors": null,
+    "no-empty-source": null,
+    "media-query-no-invalid": null,
+    "at-rule-empty-line-before": null,
+    "declaration-block-no-redundant-longhand-properties": null,
+    "media-feature-range-notation": null,
+    "declaration-property-value-no-unknown": [true, {
+      "ignoreProperties": {
+        "-moz-background-clip": ["text"]
+      }
+    }]
   }
 }

README.md

@@ -107,7 +107,7 @@ The App is hosted on cloudflare and IPFS
 
 #### [Ens.js](https://github.com/ensdomains/ensjs-v3)
 
-Much of the logic around interacting with the ENS contracts has been extraced into this
+Much of the logic around interacting with the ENS contracts has been extracted into this
 library. This is mostly so that we can help to make the experience of interacting with
 ENS as simple as possible for other developers.
 
@@ -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:
@@ -488,7 +481,6 @@ pnpm publish:local:ensjs
 pnpm install
 ```
 
-If updating an existing yalc installation, you can add the `--force` flag.
 
 ## Coding guidelines